Skip to content

Commit

Permalink
!45 v2.7.1.3
Browse files Browse the repository at this point in the history
Merge pull request !45 from 码匠君/develop
  • Loading branch information
herodotus-ecosystem authored and gitee-org committed Jul 18, 2022
2 parents 6f4eb77 + 399d7a4 commit 780461d
Show file tree
Hide file tree
Showing 36 changed files with 699 additions and 57 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://shields.io/badge/Nacos-2.1.0-brightgreen" alt="Nacos 2.1.0"></a>
</p>
<p align="center">
<a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.7.1.2-red" alt="Version 2.7.1.2"></a>
<a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.7.1.3-red" alt="Version 2.7.1.3"></a>
<a href="https://www.oracle.com/java/technologies/javase-downloads.html" target="_blank"><img src="https://img.shields.io/badge/JDK-8%2C11%2C17-green" alt="Java 8,11,17"></a>
<a href="./LICENSE"><img src="https://shields.io/badge/License-Apache--2.0-blue" alt="License Apache 2.0"></a>
<a href="https://blog.csdn.net/Pointer_v" target="_blank"><img src="https://shields.io/badge/Author-%E7%A0%81%E5%8C%A0%E5%90%9B-orange" alt="码匠君"></a>
Expand Down
2 changes: 1 addition & 1 deletion configurations/docker/docker-compose/linux/herodotus/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=2.7.1.2
VERSION=2.7.1.3
GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
GATEWAY_SERVICE_PORT=8847
UAA_SERVICE_NAME=eurynome-cloud-uaa
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=2.7.1.2
VERSION=2.7.1.3
GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
GATEWAY_SERVICE_PORT=8847
UAA_SERVICE_NAME=eurynome-cloud-uaa
Expand Down
4 changes: 2 additions & 2 deletions dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
<parent>
<groupId>cn.herodotus.engine</groupId>
<artifactId>dependencies</artifactId>
<version>2.7.1.2</version>
<version>2.7.1.3</version>
<relativePath/>
</parent>

<groupId>cn.herodotus.eurynome</groupId>
<artifactId>dependencies</artifactId>
<version>2.7.1.2</version>
<version>2.7.1.3</version>
<packaging>pom</packaging>

<name>eurynome-cloud-dependencies</name>
Expand Down
4 changes: 2 additions & 2 deletions modules/eurynome-module-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
<parent>
<artifactId>modules</artifactId>
<groupId>cn.herodotus.eurynome</groupId>
<version>2.7.1.2</version>
<version>2.7.1.3</version>
</parent>

<artifactId>eurynome-module-common</artifactId>
<version>2.7.1.2</version>
<version>2.7.1.3</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions modules/eurynome-module-security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
<parent>
<artifactId>modules</artifactId>
<groupId>cn.herodotus.eurynome</groupId>
<version>2.7.1.2</version>
<version>2.7.1.3</version>
</parent>

<artifactId>eurynome-module-security</artifactId>
<version>2.7.1.2</version>
<version>2.7.1.3</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions modules/eurynome-module-upms-logic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
<parent>
<artifactId>modules</artifactId>
<groupId>cn.herodotus.eurynome</groupId>
<version>2.7.1.2</version>
<version>2.7.1.3</version>
</parent>

<artifactId>eurynome-module-upms-logic</artifactId>
<version>2.7.1.2</version>
<version>2.7.1.3</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public interface UpmsConstants {
String REGION_SYS_OWNERSHIP = AREA_PREFIX + "sys:ownership";
String REGION_SYS_SCOPE = AREA_PREFIX + "sys:scope";

String REGION_SYS_ELEMENT = AREA_PREFIX + "sys:element";

String REGION_SYS_DEPARTMENT = AREA_PREFIX + "sys:department";
String REGION_SYS_EMPLOYEE = AREA_PREFIX + "sys:employee";
String REGION_SYS_EMPLOYEE_DEPARTMENT = AREA_PREFIX + "sys:employee:department";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,273 @@
/*
* Copyright (c) 2020-2030 ZHENGGENGWEI(码匠君)<[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Eurynome Cloud 采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
*
* 1.请不要删除和修改根目录下的LICENSE文件。
* 2.请不要删除和修改 Eurynome Cloud 源码头部的版权声明。
* 3.请保留源码和相关描述文件的项目出处,作者声明等。
* 4.分发源码时候,请注明软件出处 https://gitee.com/herodotus/eurynome-cloud
* 5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/herodotus/eurynome-cloud
* 6.若您的项目无法满足以上几点,可申请商业授权
*/

package cn.herodotus.eurynome.module.upms.logic.entity.system;

import cn.herodotus.engine.data.core.entity.BaseSysEntity;
import cn.herodotus.eurynome.module.upms.logic.constants.UpmsConstants;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
import org.hibernate.annotations.GenericGenerator;

import javax.persistence.*;
import java.util.HashSet;
import java.util.Set;

/**
* <p>Description: 前端系统菜单 </p>
*
* @author : gengwei.zheng
* @date : 2022/7/12 12:05
*/
@Entity
@Table(name = "sys_element", indexes = {@Index(name = "sys_element_id_idx", columnList = "element_id")})
@Cacheable
@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = UpmsConstants.REGION_SYS_ELEMENT)
public class SysElement extends BaseSysEntity {

@Id
@GeneratedValue(generator = "system-uuid")
@GenericGenerator(name = "system-uuid", strategy = "uuid2")
@Column(name = "element_id", length = 64)
private String elementId;

@Column(name = "parent_id", length = 64)
private String parentId;

@Column(name = "path", length = 512)
private String path;

@Column(name = "name", length = 50)
private String name;

@Column(name = "component", length = 512)
private String component;

@Column(name = "redirect", length = 512)
private String redirect;

@Column(name = "title", length = 100)
private String title;

@Column(name = "type", length = 50)
private String type;

@Column(name = "icon", length = 100)
private String icon;

@JsonProperty("isHaveChild")
@Column(name = "have_child")
private Boolean haveChild = false;

@JsonProperty("isNotKeepAlive")
@Column(name = "not_keep_alive")
private Boolean notKeepAlive = false;

@JsonProperty("isHideAllChild")
@Column(name = "hide_all_child")
private Boolean hideAllChild = false;

@JsonProperty("isDetailContent")
@Column(name = "detail_content")
private Boolean detailContent = false;

@JsonProperty("isIgnoreAuth")
@Column(name = "ignore_auth")
private Boolean ignoreAuth = false;

@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = UpmsConstants.REGION_SYS_ROLE)
@Schema(title = "元素角色")
@ManyToMany(fetch = FetchType.EAGER)
@Fetch(FetchMode.SUBSELECT)
@JoinTable(name = "sys_element_role",
joinColumns = {@JoinColumn(name = "element_id")},
inverseJoinColumns = {@JoinColumn(name = "role_id")},
uniqueConstraints = {@UniqueConstraint(columnNames = {"element_id", "role_id"})},
indexes = {@Index(name = "sys_element_role_eid_idx", columnList = "element_id"), @Index(name = "sys_element_role_rid_idx", columnList = "role_id")})
private Set<SysRole> roles = new HashSet<>();

public String getElementId() {
return elementId;
}

public void setElementId(String elementId) {
this.elementId = elementId;
}

public String getParentId() {
return parentId;
}

public void setParentId(String parentId) {
this.parentId = parentId;
}

public String getPath() {
return path;
}

public void setPath(String path) {
this.path = path;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getComponent() {
return component;
}

public void setComponent(String component) {
this.component = component;
}

public String getRedirect() {
return redirect;
}

public void setRedirect(String redirect) {
this.redirect = redirect;
}

public String getTitle() {
return title;
}

public void setTitle(String title) {
this.title = title;
}

public String getType() {
return type;
}

public void setType(String type) {
this.type = type;
}

public String getIcon() {
return icon;
}

public void setIcon(String icon) {
this.icon = icon;
}

public Boolean getHaveChild() {
return haveChild;
}

public void setHaveChild(Boolean haveChild) {
this.haveChild = haveChild;
}

public Boolean getNotKeepAlive() {
return notKeepAlive;
}

public void setNotKeepAlive(Boolean notKeepAlive) {
this.notKeepAlive = notKeepAlive;
}

public Boolean getHideAllChild() {
return hideAllChild;
}

public void setHideAllChild(Boolean hideAllChild) {
this.hideAllChild = hideAllChild;
}

public Boolean getDetailContent() {
return detailContent;
}

public void setDetailContent(Boolean detailContent) {
this.detailContent = detailContent;
}

public Boolean getIgnoreAuth() {
return ignoreAuth;
}

public void setIgnoreAuth(Boolean ignoreAuth) {
this.ignoreAuth = ignoreAuth;
}

public Set<SysRole> getRoles() {
return roles;
}

public void setRoles(Set<SysRole> roles) {
this.roles = roles;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
SysElement sysMenu = (SysElement) o;
return Objects.equal(elementId, sysMenu.elementId);
}

@Override
public int hashCode() {
return Objects.hashCode(elementId);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("elementId", elementId)
.add("parentId", parentId)
.add("path", path)
.add("name", name)
.add("component", component)
.add("redirect", redirect)
.add("title", title)
.add("type", type)
.add("icon", icon)
.add("haveChild", haveChild)
.add("notKeepAlive", notKeepAlive)
.add("hideAllChild", hideAllChild)
.add("detailContent", detailContent)
.add("ignoreAuth", ignoreAuth)
.add("roles", roles)
.toString();
}
}
Loading

0 comments on commit 780461d

Please sign in to comment.