diff --git a/muyu-auth/pom.xml b/muyu-auth/pom.xml index 930f41a..85b745f 100644 --- a/muyu-auth/pom.xml +++ b/muyu-auth/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.muyu - muyu + cloud-server 3.6.3 4.0.0 diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java index c9a8998..ad91f23 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; @@ -227,11 +228,7 @@ public class ServletUtils { * @return 解码后的内容 */ public static String urlDecode (String str) { - try { - return URLDecoder.decode(str, Constants.UTF8); - } catch (UnsupportedEncodingException e) { - return StringUtils.EMPTY; - } + return URLDecoder.decode(str, StandardCharsets.UTF_8); } /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java index 427fcc7..85ea8df 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java @@ -1,9 +1,6 @@ package com.muyu.common.core.web.domain; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import java.util.ArrayList; @@ -47,43 +44,4 @@ public class TreeEntity extends BaseEntity { */ private List children = new ArrayList<>(); - public String getParentName () { - return parentName; - } - - public void setParentName (String parentName) { - this.parentName = parentName; - } - - public Long getParentId () { - return parentId; - } - - public void setParentId (Long parentId) { - this.parentId = parentId; - } - - public Integer getOrderNum () { - return orderNum; - } - - public void setOrderNum (Integer orderNum) { - this.orderNum = orderNum; - } - - public String getAncestors () { - return ancestors; - } - - public void setAncestors (String ancestors) { - this.ancestors = ancestors; - } - - public List getChildren () { - return children; - } - - public void setChildren (List children) { - this.children = children; - } } diff --git a/muyu-common/muyu-common-system/pom.xml b/muyu-common/muyu-common-system/pom.xml index 62fdc74..ac7e01d 100644 --- a/muyu-common/muyu-common-system/pom.xml +++ b/muyu-common/muyu-common-system/pom.xml @@ -11,6 +11,8 @@ muyu-common-system + muyu-common-system系统级远程调用 + 17 17 diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java index ce39e96..a18af37 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java @@ -1,6 +1,8 @@ package com.muyu.common.system.domain; +import lombok.*; + import java.io.Serializable; import java.util.Set; @@ -9,6 +11,10 @@ import java.util.Set; * * @author muyu */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class LoginUser implements Serializable { private static final long serialVersionUID = 1L; @@ -57,75 +63,4 @@ public class LoginUser implements Serializable { */ private SysUser sysUser; - public String getToken () { - return token; - } - - public void setToken (String token) { - this.token = token; - } - - public Long getUserid () { - return userid; - } - - public void setUserid (Long userid) { - this.userid = userid; - } - - public String getUsername () { - return username; - } - - public void setUsername (String username) { - this.username = username; - } - - public Long getLoginTime () { - return loginTime; - } - - public void setLoginTime (Long loginTime) { - this.loginTime = loginTime; - } - - public Long getExpireTime () { - return expireTime; - } - - public void setExpireTime (Long expireTime) { - this.expireTime = expireTime; - } - - public String getIpaddr () { - return ipaddr; - } - - public void setIpaddr (String ipaddr) { - this.ipaddr = ipaddr; - } - - public Set getPermissions () { - return permissions; - } - - public void setPermissions (Set permissions) { - this.permissions = permissions; - } - - public Set getRoles () { - return roles; - } - - public void setRoles (Set roles) { - this.roles = roles; - } - - public SysUser getSysUser () { - return sysUser; - } - - public void setSysUser (SysUser sysUser) { - this.sysUser = sysUser; - } } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java index 9569d64..cb0d445 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java @@ -1,10 +1,7 @@ package com.muyu.common.system.domain; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -89,125 +86,25 @@ public class SysDept extends BaseEntity { */ private List children = new ArrayList(); - public Long getDeptId () { - return deptId; - } - - public void setDeptId (Long deptId) { - this.deptId = deptId; - } - - public Long getParentId () { - return parentId; - } - - public void setParentId (Long parentId) { - this.parentId = parentId; - } - - public String getAncestors () { - return ancestors; - } - - public void setAncestors (String ancestors) { - this.ancestors = ancestors; - } - @NotBlank(message = "部门名称不能为空") @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") public String getDeptName () { return deptName; } - public void setDeptName (String deptName) { - this.deptName = deptName; - } - @NotNull(message = "显示顺序不能为空") public Integer getOrderNum () { return orderNum; } - public void setOrderNum (Integer orderNum) { - this.orderNum = orderNum; - } - - public String getLeader () { - return leader; - } - - public void setLeader (String leader) { - this.leader = leader; - } - @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") public String getPhone () { return phone; } - public void setPhone (String phone) { - this.phone = phone; - } - @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") public String getEmail () { return email; } - - public void setEmail (String email) { - this.email = email; - } - - public String getStatus () { - return status; - } - - public void setStatus (String status) { - this.status = status; - } - - public String getDelFlag () { - return delFlag; - } - - public void setDelFlag (String delFlag) { - this.delFlag = delFlag; - } - - public String getParentName () { - return parentName; - } - - public void setParentName (String parentName) { - this.parentName = parentName; - } - - public List getChildren () { - return children; - } - - public void setChildren (List children) { - this.children = children; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("deptId", getDeptId()) - .append("parentId", getParentId()) - .append("ancestors", getAncestors()) - .append("deptName", getDeptName()) - .append("orderNum", getOrderNum()) - .append("leader", getLeader()) - .append("phone", getPhone()) - .append("email", getEmail()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java index 43d28eb..843c3b8 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java @@ -4,10 +4,7 @@ import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -80,106 +77,30 @@ public class SysDictData extends BaseEntity { @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - public Long getDictCode () { - return dictCode; - } - - public void setDictCode (Long dictCode) { - this.dictCode = dictCode; - } - - public Long getDictSort () { - return dictSort; - } - - public void setDictSort (Long dictSort) { - this.dictSort = dictSort; - } - @NotBlank(message = "字典标签不能为空") @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") public String getDictLabel () { return dictLabel; } - public void setDictLabel (String dictLabel) { - this.dictLabel = dictLabel; - } - @NotBlank(message = "字典键值不能为空") @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") public String getDictValue () { return dictValue; } - public void setDictValue (String dictValue) { - this.dictValue = dictValue; - } - @NotBlank(message = "字典类型不能为空") @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") public String getDictType () { return dictType; } - public void setDictType (String dictType) { - this.dictType = dictType; - } - @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") public String getCssClass () { return cssClass; } - public void setCssClass (String cssClass) { - this.cssClass = cssClass; - } - - public String getListClass () { - return listClass; - } - - public void setListClass (String listClass) { - this.listClass = listClass; - } - public boolean getDefault () { return UserConstants.YES.equals(this.isDefault); } - - public String getIsDefault () { - return isDefault; - } - - public void setIsDefault (String isDefault) { - this.isDefault = isDefault; - } - - public String getStatus () { - return status; - } - - public void setStatus (String status) { - this.status = status; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("dictCode", getDictCode()) - .append("dictSort", getDictSort()) - .append("dictLabel", getDictLabel()) - .append("dictValue", getDictValue()) - .append("dictType", getDictType()) - .append("cssClass", getCssClass()) - .append("listClass", getListClass()) - .append("isDefault", getIsDefault()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java index e87832d..56ba7f4 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java @@ -3,10 +3,7 @@ package com.muyu.common.system.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -52,55 +49,16 @@ public class SysDictType extends BaseEntity { @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - public Long getDictId () { - return dictId; - } - - public void setDictId (Long dictId) { - this.dictId = dictId; - } - @NotBlank(message = "字典名称不能为空") @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") public String getDictName () { return dictName; } - public void setDictName (String dictName) { - this.dictName = dictName; - } - @NotBlank(message = "字典类型不能为空") @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）") public String getDictType () { return dictType; } - - public void setDictType (String dictType) { - this.dictType = dictType; - } - - public String getStatus () { - return status; - } - - public void setStatus (String status) { - this.status = status; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("dictId", getDictId()) - .append("dictName", getDictName()) - .append("dictType", getDictType()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java index 38918d7..ca856c8 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java @@ -1,5 +1,9 @@ package com.muyu.common.system.domain; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -8,6 +12,10 @@ import org.apache.commons.lang3.builder.ToStringStyle; * * @author muyu */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class SysFile { /** * 文件名称 @@ -18,28 +26,4 @@ public class SysFile { * 文件地址 */ private String url; - - public String getName () { - return name; - } - - public void setName (String name) { - this.name = name; - } - - public String getUrl () { - return url; - } - - public void setUrl (String url) { - this.url = url; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("name", getName()) - .append("url", getUrl()) - .toString(); - } } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java index 9ad179f..c66f131 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java @@ -61,52 +61,4 @@ public class SysLogininfor extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date accessTime; - - public Long getInfoId () { - return infoId; - } - - public void setInfoId (Long infoId) { - this.infoId = infoId; - } - - public String getUserName () { - return userName; - } - - public void setUserName (String userName) { - this.userName = userName; - } - - public String getStatus () { - return status; - } - - public void setStatus (String status) { - this.status = status; - } - - public String getIpaddr () { - return ipaddr; - } - - public void setIpaddr (String ipaddr) { - this.ipaddr = ipaddr; - } - - public String getMsg () { - return msg; - } - - public void setMsg (String msg) { - this.msg = msg; - } - - public Date getAccessTime () { - return accessTime; - } - - public void setAccessTime (Date accessTime) { - this.accessTime = accessTime; - } } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java index c82fbb6..b207611 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java @@ -126,140 +126,4 @@ public class SysOperLog extends BaseEntity { */ @Excel(name = "消耗时间", suffix = "毫秒") private Long costTime; - - public Long getOperId () { - return operId; - } - - public void setOperId (Long operId) { - this.operId = operId; - } - - public String getTitle () { - return title; - } - - public void setTitle (String title) { - this.title = title; - } - - public Integer getBusinessType () { - return businessType; - } - - public void setBusinessType (Integer businessType) { - this.businessType = businessType; - } - - public Integer[] getBusinessTypes () { - return businessTypes; - } - - public void setBusinessTypes (Integer[] businessTypes) { - this.businessTypes = businessTypes; - } - - public String getMethod () { - return method; - } - - public void setMethod (String method) { - this.method = method; - } - - public String getRequestMethod () { - return requestMethod; - } - - public void setRequestMethod (String requestMethod) { - this.requestMethod = requestMethod; - } - - public Integer getOperatorType () { - return operatorType; - } - - public void setOperatorType (Integer operatorType) { - this.operatorType = operatorType; - } - - public String getOperName () { - return operName; - } - - public void setOperName (String operName) { - this.operName = operName; - } - - public String getDeptName () { - return deptName; - } - - public void setDeptName (String deptName) { - this.deptName = deptName; - } - - public String getOperUrl () { - return operUrl; - } - - public void setOperUrl (String operUrl) { - this.operUrl = operUrl; - } - - public String getOperIp () { - return operIp; - } - - public void setOperIp (String operIp) { - this.operIp = operIp; - } - - public String getOperParam () { - return operParam; - } - - public void setOperParam (String operParam) { - this.operParam = operParam; - } - - public String getJsonResult () { - return jsonResult; - } - - public void setJsonResult (String jsonResult) { - this.jsonResult = jsonResult; - } - - public Integer getStatus () { - return status; - } - - public void setStatus (Integer status) { - this.status = status; - } - - public String getErrorMsg () { - return errorMsg; - } - - public void setErrorMsg (String errorMsg) { - this.errorMsg = errorMsg; - } - - public Date getOperTime () { - return operTime; - } - - public void setOperTime (Date operTime) { - this.operTime = operTime; - } - - public Long getCostTime () { - return costTime; - } - - public void setCostTime (Long costTime) { - this.costTime = costTime; - } } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java index 09fda22..1708324 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java @@ -3,10 +3,7 @@ package com.muyu.common.system.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -109,14 +106,6 @@ public class SysRole extends BaseEntity { return roleId != null && 1L == roleId; } - public Long getRoleId () { - return roleId; - } - - public void setRoleId (Long roleId) { - this.roleId = roleId; - } - public boolean isAdmin () { return isAdmin(this.roleId); } @@ -127,118 +116,14 @@ public class SysRole extends BaseEntity { return roleName; } - public void setRoleName (String roleName) { - this.roleName = roleName; - } - @NotBlank(message = "权限字符不能为空") @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符") public String getRoleKey () { return roleKey; } - public void setRoleKey (String roleKey) { - this.roleKey = roleKey; - } - @NotNull(message = "显示顺序不能为空") public Integer getRoleSort () { return roleSort; } - - public void setRoleSort (Integer roleSort) { - this.roleSort = roleSort; - } - - public String getDataScope () { - return dataScope; - } - - public void setDataScope (String dataScope) { - this.dataScope = dataScope; - } - - public boolean isMenuCheckStrictly () { - return menuCheckStrictly; - } - - public void setMenuCheckStrictly (boolean menuCheckStrictly) { - this.menuCheckStrictly = menuCheckStrictly; - } - - public boolean isDeptCheckStrictly () { - return deptCheckStrictly; - } - - public void setDeptCheckStrictly (boolean deptCheckStrictly) { - this.deptCheckStrictly = deptCheckStrictly; - } - - public String getStatus () { - return status; - } - - public void setStatus (String status) { - this.status = status; - } - - public String getDelFlag () { - return delFlag; - } - - public void setDelFlag (String delFlag) { - this.delFlag = delFlag; - } - - public boolean isFlag () { - return flag; - } - - public void setFlag (boolean flag) { - this.flag = flag; - } - - public Long[] getMenuIds () { - return menuIds; - } - - public void setMenuIds (Long[] menuIds) { - this.menuIds = menuIds; - } - - public Long[] getDeptIds () { - return deptIds; - } - - public void setDeptIds (Long[] deptIds) { - this.deptIds = deptIds; - } - - public Set getPermissions () { - return permissions; - } - - public void setPermissions (Set permissions) { - this.permissions = permissions; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("roleName", getRoleName()) - .append("roleKey", getRoleKey()) - .append("roleSort", getRoleSort()) - .append("dataScope", getDataScope()) - .append("menuCheckStrictly", isMenuCheckStrictly()) - .append("deptCheckStrictly", isDeptCheckStrictly()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index 6be7436..fd773f7 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -145,36 +145,16 @@ public class SysUser extends BaseEntity { return userId != null && 1L == userId; } - public Long getUserId () { - return userId; - } - - public void setUserId (Long userId) { - this.userId = userId; - } - public boolean isAdmin () { return isAdmin(this.userId); } - public Long getDeptId () { - return deptId; - } - - public void setDeptId (Long deptId) { - this.deptId = deptId; - } - @Xss(message = "用户昵称不能包含脚本字符") @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") public String getNickName () { return nickName; } - public void setNickName (String nickName) { - this.nickName = nickName; - } - @Xss(message = "用户账号不能包含脚本字符") @NotBlank(message = "用户账号不能为空") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") @@ -182,147 +162,14 @@ public class SysUser extends BaseEntity { return userName; } - public void setUserName (String userName) { - this.userName = userName; - } - @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") public String getEmail () { return email; } - public void setEmail (String email) { - this.email = email; - } - @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") public String getPhonenumber () { return phonenumber; } - - public void setPhonenumber (String phonenumber) { - this.phonenumber = phonenumber; - } - - public String getSex () { - return sex; - } - - public void setSex (String sex) { - this.sex = sex; - } - - public String getAvatar () { - return avatar; - } - - public void setAvatar (String avatar) { - this.avatar = avatar; - } - - public String getPassword () { - return password; - } - - public void setPassword (String password) { - this.password = password; - } - - public String getStatus () { - return status; - } - - public void setStatus (String status) { - this.status = status; - } - - public String getDelFlag () { - return delFlag; - } - - public void setDelFlag (String delFlag) { - this.delFlag = delFlag; - } - - public String getLoginIp () { - return loginIp; - } - - public void setLoginIp (String loginIp) { - this.loginIp = loginIp; - } - - public Date getLoginDate () { - return loginDate; - } - - public void setLoginDate (Date loginDate) { - this.loginDate = loginDate; - } - - public SysDept getDept () { - return dept; - } - - public void setDept (SysDept dept) { - this.dept = dept; - } - - public List getRoles () { - return roles; - } - - public void setRoles (List roles) { - this.roles = roles; - } - - public Long[] getRoleIds () { - return roleIds; - } - - public void setRoleIds (Long[] roleIds) { - this.roleIds = roleIds; - } - - public Long[] getPostIds () { - return postIds; - } - - public void setPostIds (Long[] postIds) { - this.postIds = postIds; - } - - public Long getRoleId () { - return roleId; - } - - public void setRoleId (Long roleId) { - this.roleId = roleId; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("userName", getUserName()) - .append("nickName", getNickName()) - .append("email", getEmail()) - .append("phonenumber", getPhonenumber()) - .append("sex", getSex()) - .append("avatar", getAvatar()) - .append("password", getPassword()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("loginIp", getLoginIp()) - .append("loginDate", getLoginDate()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("dept", getDept()) - .toString(); - } } diff --git a/muyu-common/pom.xml b/muyu-common/pom.xml index 5b58e93..82874a8 100644 --- a/muyu-common/pom.xml +++ b/muyu-common/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.muyu - muyu + cloud-server 3.6.3 4.0.0 diff --git a/muyu-gateway/pom.xml b/muyu-gateway/pom.xml index 4c2258f..6c0d97d 100644 --- a/muyu-gateway/pom.xml +++ b/muyu-gateway/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.muyu - muyu + cloud-server 3.6.3 4.0.0 diff --git a/muyu-modules/muyu-file/pom.xml b/muyu-modules/muyu-modules-file/pom.xml similarity index 100% rename from muyu-modules/muyu-file/pom.xml rename to muyu-modules/muyu-modules-file/pom.xml diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/MuYuFileApplication.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/MuYuFileApplication.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/config/MinioConfig.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/config/MinioConfig.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/config/ResourcesConfig.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/config/ResourcesConfig.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/ISysFileService.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/ISysFileService.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java diff --git a/muyu-modules/muyu-file/src/main/resources/banner.txt b/muyu-modules/muyu-modules-file/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-file/src/main/resources/banner.txt rename to muyu-modules/muyu-modules-file/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-modules-file/src/main/resources/bootstrap.yml similarity index 100% rename from muyu-modules/muyu-file/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-modules-file/src/main/resources/bootstrap.yml diff --git a/muyu-modules/muyu-file/src/main/resources/logback.xml b/muyu-modules/muyu-modules-file/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-file/src/main/resources/logback.xml rename to muyu-modules/muyu-modules-file/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-gen/pom.xml b/muyu-modules/muyu-modules-gen/pom.xml similarity index 100% rename from muyu-modules/muyu-gen/pom.xml rename to muyu-modules/muyu-modules-gen/pom.xml diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/config/GenConfig.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/config/GenConfig.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/IGenTableService.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/IGenTableService.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/GenUtils.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/GenUtils.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java diff --git a/muyu-modules/muyu-gen/src/main/resources/banner.txt b/muyu-modules/muyu-modules-gen/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/banner.txt rename to muyu-modules/muyu-modules-gen/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-modules-gen/src/main/resources/bootstrap.yml similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-modules-gen/src/main/resources/bootstrap.yml diff --git a/muyu-modules/muyu-gen/src/main/resources/logback.xml b/muyu-modules/muyu-modules-gen/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/logback.xml rename to muyu-modules/muyu-modules-gen/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/muyu-modules/muyu-modules-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to muyu-modules/muyu-modules-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/muyu-modules/muyu-modules-gen/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml rename to muyu-modules/muyu-modules-gen/src/main/resources/mapper/generator/GenTableMapper.xml diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/controller.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/controller.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/domain.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/domain.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/mapper.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/service.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/service.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/serviceImpl.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/serviceImpl.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/sub-domain.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/sub-domain.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/js/api.js.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/js/api.js.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/sql/sql.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/sql/sql.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/sql/sql.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/sql/sql.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/index.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index.vue.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index.vue.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/readme.txt b/muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/readme.txt similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/readme.txt rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/readme.txt diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/xml/mapper.xml.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/xml/mapper.xml.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/xml/mapper.xml.vm diff --git a/muyu-modules/muyu-job/pom.xml b/muyu-modules/muyu-modules-job/pom.xml similarity index 100% rename from muyu-modules/muyu-job/pom.xml rename to muyu-modules/muyu-modules-job/pom.xml diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/MuYuJobApplication.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/MuYuJobApplication.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/config/ScheduleConfig.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/config/ScheduleConfig.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/config/ScheduleConfig.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/config/ScheduleConfig.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJob.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/domain/SysJob.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJob.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/domain/SysJob.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJobLog.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/domain/SysJobLog.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJobLog.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/domain/SysJobLog.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobLogService.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/ISysJobLogService.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobLogService.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/ISysJobLogService.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobService.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/ISysJobService.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobService.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/ISysJobService.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/task/MyTask.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/task/MyTask.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/task/MyTask.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/task/MyTask.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/CronUtils.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/CronUtils.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/CronUtils.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/CronUtils.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/ScheduleUtils.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/ScheduleUtils.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/ScheduleUtils.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/ScheduleUtils.java diff --git a/muyu-modules/muyu-job/src/main/resources/banner.txt b/muyu-modules/muyu-modules-job/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/banner.txt rename to muyu-modules/muyu-modules-job/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-modules-job/src/main/resources/bootstrap.yml similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-modules-job/src/main/resources/bootstrap.yml diff --git a/muyu-modules/muyu-job/src/main/resources/logback.xml b/muyu-modules/muyu-modules-job/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/logback.xml rename to muyu-modules/muyu-modules-job/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/muyu-modules/muyu-modules-job/src/main/resources/mapper/job/SysJobLogMapper.xml similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml rename to muyu-modules/muyu-modules-job/src/main/resources/mapper/job/SysJobLogMapper.xml diff --git a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml b/muyu-modules/muyu-modules-job/src/main/resources/mapper/job/SysJobMapper.xml similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml rename to muyu-modules/muyu-modules-job/src/main/resources/mapper/job/SysJobMapper.xml diff --git a/muyu-modules/muyu-system/pom.xml b/muyu-modules/muyu-modules-system/pom.xml similarity index 100% rename from muyu-modules/muyu-system/pom.xml rename to muyu-modules/muyu-modules-system/pom.xml diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/MuYuSystemApplication.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/MuYuSystemApplication.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/MuYuSystemApplication.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/MuYuSystemApplication.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysConfig.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java similarity index 63% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysConfig.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java index e2a10b5..86d9f6f 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysConfig.java +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java @@ -62,65 +62,22 @@ public class SysConfig extends BaseEntity { @Excel(name = "系统内置", readConverterExp = "Y=是,N=否") private String configType; - public Long getConfigId () { - return configId; - } - - public void setConfigId (Long configId) { - this.configId = configId; - } - @NotBlank(message = "参数名称不能为空") @Size(min = 0, max = 100, message = "参数名称不能超过100个字符") public String getConfigName () { return configName; } - public void setConfigName (String configName) { - this.configName = configName; - } - @NotBlank(message = "参数键名长度不能为空") @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") public String getConfigKey () { return configKey; } - public void setConfigKey (String configKey) { - this.configKey = configKey; - } - @NotBlank(message = "参数键值不能为空") @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符") public String getConfigValue () { return configValue; } - public void setConfigValue (String configValue) { - this.configValue = configValue; - } - - public String getConfigType () { - return configType; - } - - public void setConfigType (String configType) { - this.configType = configType; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("configId", getConfigId()) - .append("configName", getConfigName()) - .append("configKey", getConfigKey()) - .append("configValue", getConfigValue()) - .append("configType", getConfigType()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java new file mode 100644 index 0000000..95754ca --- /dev/null +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java @@ -0,0 +1,141 @@ +package com.muyu.system.domain; + +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.ArrayList; +import java.util.List; + +/** + * 菜单权限表 sys_menu + * + * @author muyu + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysMenu extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 菜单ID + */ + private Long menuId; + + /** + * 菜单名称 + */ + private String menuName; + + /** + * 父菜单名称 + */ + private String parentName; + + /** + * 父菜单ID + */ + private Long parentId; + + /** + * 显示顺序 + */ + private Integer orderNum; + + /** + * 路由地址 + */ + private String path; + + /** + * 组件路径 + */ + private String component; + + /** + * 路由参数 + */ + private String query; + + /** + * 是否为外链（0是 1否） + */ + private String isFrame; + + /** + * 是否缓存（0缓存 1不缓存） + */ + private String isCache; + + /** + * 类型（M目录 C菜单 F按钮） + */ + private String menuType; + + /** + * 显示状态（0显示 1隐藏） + */ + private String visible; + + /** + * 菜单状态（0正常 1停用） + */ + private String status; + + /** + * 权限字符串 + */ + private String perms; + + /** + * 菜单图标 + */ + private String icon; + + /** + * 子菜单 + */ + private List children = new ArrayList(); + @NotBlank(message = "菜单名称不能为空") + @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") + public String getMenuName () { + return menuName; + } + + @NotNull(message = "显示顺序不能为空") + public Integer getOrderNum () { + return orderNum; + } + + @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") + public String getPath () { + return path; + } + + @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") + public String getComponent () { + return component; + } + + @NotBlank(message = "菜单类型不能为空") + public String getMenuType () { + return menuType; + } + + @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") + public String getPerms () { + return perms; + } + +} diff --git a/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java new file mode 100644 index 0000000..18a4f64 --- /dev/null +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java @@ -0,0 +1,60 @@ +package com.muyu.system.domain; + +import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.common.core.xss.Xss; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; + +/** + * 通知公告表 sys_notice + * + * @author muyu + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysNotice extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 公告ID + */ + private Long noticeId; + + /** + * 公告标题 + */ + private String noticeTitle; + + /** + * 公告类型（1通知 2公告） + */ + private String noticeType; + + /** + * 公告内容 + */ + private String noticeContent; + + /** + * 公告状态（0正常 1关闭） + */ + private String status; + + @Xss(message = "公告标题不能包含脚本字符") + @NotBlank(message = "公告标题不能为空") + @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") + public String getNoticeTitle () { + return noticeTitle; + } + } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysPost.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysPost.java similarity index 58% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysPost.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysPost.java index d67f36a..1da43ab 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysPost.java +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysPost.java @@ -62,73 +62,20 @@ public class SysPost extends BaseEntity { * 用户是否存在此岗位标识 默认不存在 */ private boolean flag = false; - - public Long getPostId () { - return postId; - } - - public void setPostId (Long postId) { - this.postId = postId; - } - - @NotBlank(message = "岗位编码不能为空") + @NotBlank(message = "岗位编码不能为空") @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") public String getPostCode () { return postCode; } - public void setPostCode (String postCode) { - this.postCode = postCode; - } - @NotBlank(message = "岗位名称不能为空") @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") public String getPostName () { return postName; } - public void setPostName (String postName) { - this.postName = postName; - } - @NotNull(message = "显示顺序不能为空") public Integer getPostSort () { return postSort; } - - public void setPostSort (Integer postSort) { - this.postSort = postSort; - } - - public String getStatus () { - return status; - } - - public void setStatus (String status) { - this.status = status; - } - - public boolean isFlag () { - return flag; - } - - public void setFlag (boolean flag) { - this.flag = flag; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("postId", getPostId()) - .append("postCode", getPostCode()) - .append("postName", getPostName()) - .append("postSort", getPostSort()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java new file mode 100644 index 0000000..6ecede9 --- /dev/null +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java @@ -0,0 +1,29 @@ +package com.muyu.system.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 角色和部门关联 sys_role_dept + * + * @author muyu + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SysRoleDept { + /** + * 角色ID + */ + private Long roleId; + + /** + * 部门ID + */ + private Long deptId; +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java diff --git a/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java new file mode 100644 index 0000000..23d1979 --- /dev/null +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java @@ -0,0 +1,52 @@ +package com.muyu.system.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 当前在线会话 + * + * @author muyu + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SysUserOnline { + /** + * 会话编号 + */ + private String tokenId; + + /** + * 用户名称 + */ + private String userName; + + /** + * 登录IP地址 + */ + private String ipaddr; + + /** + * 登录地址 + */ + private String loginLocation; + + /** + * 浏览器类型 + */ + private String browser; + + /** + * 操作系统 + */ + private String os; + + /** + * 登录时间 + */ + private Long loginTime; +} diff --git a/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java new file mode 100644 index 0000000..28d9e8c --- /dev/null +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java @@ -0,0 +1,30 @@ +package com.muyu.system.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 用户和岗位关联 sys_user_post + * + * @author muyu + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SysUserPost { + /** + * 用户ID + */ + private Long userId; + + /** + * 岗位ID + */ + private Long postId; + +} diff --git a/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java new file mode 100644 index 0000000..058f902 --- /dev/null +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java @@ -0,0 +1,29 @@ +package com.muyu.system.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 用户和角色关联 sys_user_role + * + * @author muyu + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SysUserRole { + /** + * 用户ID + */ + private Long userId; + + /** + * 角色ID + */ + private Long roleId; +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java similarity index 51% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java index 9da75c4..c7d5f25 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java @@ -1,12 +1,19 @@ package com.muyu.system.domain.vo; -import com.muyu.common.core.utils.StringUtils; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; /** * 路由显示信息 * * @author muyu */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class MetaVo { /** * 设置该路由在侧边栏和面包屑中展示的名字 @@ -28,9 +35,6 @@ public class MetaVo { */ private String link; - public MetaVo () { - } - public MetaVo (String title, String icon) { this.title = title; this.icon = icon; @@ -47,45 +51,4 @@ public class MetaVo { this.icon = icon; this.link = link; } - - public MetaVo (String title, String icon, boolean noCache, String link) { - this.title = title; - this.icon = icon; - this.noCache = noCache; - if (StringUtils.ishttp(link)) { - this.link = link; - } - } - - public boolean isNoCache () { - return noCache; - } - - public void setNoCache (boolean noCache) { - this.noCache = noCache; - } - - public String getTitle () { - return title; - } - - public void setTitle (String title) { - this.title = title; - } - - public String getIcon () { - return icon; - } - - public void setIcon (String icon) { - this.icon = icon; - } - - public String getLink () { - return link; - } - - public void setLink (String link) { - this.link = link; - } } diff --git a/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java new file mode 100644 index 0000000..6ea8d3f --- /dev/null +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java @@ -0,0 +1,62 @@ +package com.muyu.system.domain.vo; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; +import lombok.Setter; + +import java.util.List; + +/** + * 路由配置信息 + * + * @author muyu + */ +@Data +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class RouterVo { + /** + * 路由名字 + */ + private String name; + + /** + * 路由地址 + */ + private String path; + + /** + * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现 + */ + private boolean hidden; + + /** + * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 + */ + private String redirect; + + /** + * 组件地址 + */ + private String component; + + /** + * 路由参数：如 {"id": 1, "name": "ry"} + */ + private String query; + + /** + * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面 + */ + private Boolean alwaysShow; + + /** + * 其他元素 + */ + private MetaVo meta; + + /** + * 子路由 + */ + private List children; + +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java similarity index 70% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java index 4f593ff..d1ef75f 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java @@ -3,6 +3,10 @@ package com.muyu.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import com.muyu.common.system.domain.SysDept; import com.muyu.system.domain.SysMenu; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.List; @@ -13,6 +17,10 @@ import java.util.stream.Collectors; * * @author muyu */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class TreeSelect implements Serializable { private static final long serialVersionUID = 1L; @@ -32,9 +40,6 @@ public class TreeSelect implements Serializable { @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; - public TreeSelect () { - - } public TreeSelect (SysDept dept) { this.id = dept.getDeptId(); @@ -48,27 +53,4 @@ public class TreeSelect implements Serializable { this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } - public Long getId () { - return id; - } - - public void setId (Long id) { - this.id = id; - } - - public String getLabel () { - return label; - } - - public void setLabel (String label) { - this.label = label; - } - - public List getChildren () { - return children; - } - - public void setChildren (List children) { - this.children = children; - } } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysPermissionService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysPermissionService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysPostService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysPostService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysUserService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysUserService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java similarity index 95% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index e4e2ec8..3a1befb 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -157,7 +157,14 @@ public class SysMenuServiceImpl extends ServiceImpl impl router.setPath(getRouterPath(menu)); router.setComponent(getComponent(menu)); router.setQuery(menu.getQuery()); - router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + router.setMeta( + MetaVo.builder() + .title(menu.getMenuName()) + .icon(menu.getIcon()) + .noCache(StringUtils.equals("1", menu.getIsCache())) + .link(menu.getPath()) + .build() + ); List cMenus = menu.getChildren(); if (StringUtils.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType())) { router.setAlwaysShow(true); @@ -170,7 +177,14 @@ public class SysMenuServiceImpl extends ServiceImpl impl children.setPath(menu.getPath()); children.setComponent(menu.getComponent()); children.setName(StringUtils.capitalize(menu.getPath())); - children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + children.setMeta( + MetaVo.builder() + .title(menu.getMenuName()) + .icon(menu.getIcon()) + .noCache(StringUtils.equals("1", menu.getIsCache())) + .link(menu.getPath()) + .build() + ); children.setQuery(menu.getQuery()); childrenList.add(children); router.setChildren(childrenList); diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/resources/banner.txt b/muyu-modules/muyu-modules-system/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/banner.txt rename to muyu-modules/muyu-modules-system/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-modules-system/src/main/resources/bootstrap.yml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-modules-system/src/main/resources/bootstrap.yml diff --git a/muyu-modules/muyu-system/src/main/resources/logback.xml b/muyu-modules/muyu-modules-system/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/logback.xml rename to muyu-modules/muyu-modules-system/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysConfigMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysPostMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysPostMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysMenu.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysMenu.java deleted file mode 100644 index b7f4558..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysMenu.java +++ /dev/null @@ -1,269 +0,0 @@ -package com.muyu.system.domain; - -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.ArrayList; -import java.util.List; - -/** - * 菜单权限表 sys_menu - * - * @author muyu - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SysMenu extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 菜单ID - */ - private Long menuId; - - /** - * 菜单名称 - */ - private String menuName; - - /** - * 父菜单名称 - */ - private String parentName; - - /** - * 父菜单ID - */ - private Long parentId; - - /** - * 显示顺序 - */ - private Integer orderNum; - - /** - * 路由地址 - */ - private String path; - - /** - * 组件路径 - */ - private String component; - - /** - * 路由参数 - */ - private String query; - - /** - * 是否为外链（0是 1否） - */ - private String isFrame; - - /** - * 是否缓存（0缓存 1不缓存） - */ - private String isCache; - - /** - * 类型（M目录 C菜单 F按钮） - */ - private String menuType; - - /** - * 显示状态（0显示 1隐藏） - */ - private String visible; - - /** - * 菜单状态（0正常 1停用） - */ - private String status; - - /** - * 权限字符串 - */ - private String perms; - - /** - * 菜单图标 - */ - private String icon; - - /** - * 子菜单 - */ - private List children = new ArrayList(); - - public Long getMenuId () { - return menuId; - } - - public void setMenuId (Long menuId) { - this.menuId = menuId; - } - - @NotBlank(message = "菜单名称不能为空") - @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") - public String getMenuName () { - return menuName; - } - - public void setMenuName (String menuName) { - this.menuName = menuName; - } - - public String getParentName () { - return parentName; - } - - public void setParentName (String parentName) { - this.parentName = parentName; - } - - public Long getParentId () { - return parentId; - } - - public void setParentId (Long parentId) { - this.parentId = parentId; - } - - @NotNull(message = "显示顺序不能为空") - public Integer getOrderNum () { - return orderNum; - } - - public void setOrderNum (Integer orderNum) { - this.orderNum = orderNum; - } - - @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") - public String getPath () { - return path; - } - - public void setPath (String path) { - this.path = path; - } - - @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") - public String getComponent () { - return component; - } - - public void setComponent (String component) { - this.component = component; - } - - public String getQuery () { - return query; - } - - public void setQuery (String query) { - this.query = query; - } - - public String getIsFrame () { - return isFrame; - } - - public void setIsFrame (String isFrame) { - this.isFrame = isFrame; - } - - public String getIsCache () { - return isCache; - } - - public void setIsCache (String isCache) { - this.isCache = isCache; - } - - @NotBlank(message = "菜单类型不能为空") - public String getMenuType () { - return menuType; - } - - public void setMenuType (String menuType) { - this.menuType = menuType; - } - - public String getVisible () { - return visible; - } - - public void setVisible (String visible) { - this.visible = visible; - } - - public String getStatus () { - return status; - } - - public void setStatus (String status) { - this.status = status; - } - - @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") - public String getPerms () { - return perms; - } - - public void setPerms (String perms) { - this.perms = perms; - } - - public String getIcon () { - return icon; - } - - public void setIcon (String icon) { - this.icon = icon; - } - - public List getChildren () { - return children; - } - - public void setChildren (List children) { - this.children = children; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("menuId", getMenuId()) - .append("menuName", getMenuName()) - .append("parentId", getParentId()) - .append("orderNum", getOrderNum()) - .append("path", getPath()) - .append("component", getComponent()) - .append("isFrame", getIsFrame()) - .append("IsCache", getIsCache()) - .append("menuType", getMenuType()) - .append("visible", getVisible()) - .append("status ", getStatus()) - .append("perms", getPerms()) - .append("icon", getIcon()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysNotice.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysNotice.java deleted file mode 100644 index 69675c1..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysNotice.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.muyu.system.domain; - -import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.common.core.xss.Xss; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - -/** - * 通知公告表 sys_notice - * - * @author muyu - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SysNotice extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 公告ID - */ - private Long noticeId; - - /** - * 公告标题 - */ - private String noticeTitle; - - /** - * 公告类型（1通知 2公告） - */ - private String noticeType; - - /** - * 公告内容 - */ - private String noticeContent; - - /** - * 公告状态（0正常 1关闭） - */ - private String status; - - public Long getNoticeId () { - return noticeId; - } - - public void setNoticeId (Long noticeId) { - this.noticeId = noticeId; - } - - @Xss(message = "公告标题不能包含脚本字符") - @NotBlank(message = "公告标题不能为空") - @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") - public String getNoticeTitle () { - return noticeTitle; - } - - public void setNoticeTitle (String noticeTitle) { - this.noticeTitle = noticeTitle; - } - - public String getNoticeType () { - return noticeType; - } - - public void setNoticeType (String noticeType) { - this.noticeType = noticeType; - } - - public String getNoticeContent () { - return noticeContent; - } - - public void setNoticeContent (String noticeContent) { - this.noticeContent = noticeContent; - } - - public String getStatus () { - return status; - } - - public void setStatus (String status) { - this.status = status; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("noticeId", getNoticeId()) - .append("noticeTitle", getNoticeTitle()) - .append("noticeType", getNoticeType()) - .append("noticeContent", getNoticeContent()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleDept.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleDept.java deleted file mode 100644 index 2a06ea8..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleDept.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.muyu.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 角色和部门关联 sys_role_dept - * - * @author muyu - */ -public class SysRoleDept { - /** - * 角色ID - */ - private Long roleId; - - /** - * 部门ID - */ - private Long deptId; - - public Long getRoleId () { - return roleId; - } - - public void setRoleId (Long roleId) { - this.roleId = roleId; - } - - public Long getDeptId () { - return deptId; - } - - public void setDeptId (Long deptId) { - this.deptId = deptId; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("deptId", getDeptId()) - .toString(); - } -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserOnline.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserOnline.java deleted file mode 100644 index c89bd42..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserOnline.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.muyu.system.domain; - -/** - * 当前在线会话 - * - * @author muyu - */ -public class SysUserOnline { - /** - * 会话编号 - */ - private String tokenId; - - /** - * 用户名称 - */ - private String userName; - - /** - * 登录IP地址 - */ - private String ipaddr; - - /** - * 登录地址 - */ - private String loginLocation; - - /** - * 浏览器类型 - */ - private String browser; - - /** - * 操作系统 - */ - private String os; - - /** - * 登录时间 - */ - private Long loginTime; - - public String getTokenId () { - return tokenId; - } - - public void setTokenId (String tokenId) { - this.tokenId = tokenId; - } - - public String getUserName () { - return userName; - } - - public void setUserName (String userName) { - this.userName = userName; - } - - public String getIpaddr () { - return ipaddr; - } - - public void setIpaddr (String ipaddr) { - this.ipaddr = ipaddr; - } - - public String getLoginLocation () { - return loginLocation; - } - - public void setLoginLocation (String loginLocation) { - this.loginLocation = loginLocation; - } - - public String getBrowser () { - return browser; - } - - public void setBrowser (String browser) { - this.browser = browser; - } - - public String getOs () { - return os; - } - - public void setOs (String os) { - this.os = os; - } - - public Long getLoginTime () { - return loginTime; - } - - public void setLoginTime (Long loginTime) { - this.loginTime = loginTime; - } -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserPost.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserPost.java deleted file mode 100644 index 8f29380..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserPost.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.muyu.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 用户和岗位关联 sys_user_post - * - * @author muyu - */ -public class SysUserPost { - /** - * 用户ID - */ - private Long userId; - - /** - * 岗位ID - */ - private Long postId; - - public Long getUserId () { - return userId; - } - - public void setUserId (Long userId) { - this.userId = userId; - } - - public Long getPostId () { - return postId; - } - - public void setPostId (Long postId) { - this.postId = postId; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("postId", getPostId()) - .toString(); - } -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserRole.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserRole.java deleted file mode 100644 index 8430826..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserRole.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.muyu.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 用户和角色关联 sys_user_role - * - * @author muyu - */ -public class SysUserRole { - /** - * 用户ID - */ - private Long userId; - - /** - * 角色ID - */ - private Long roleId; - - public Long getUserId () { - return userId; - } - - public void setUserId (Long userId) { - this.userId = userId; - } - - public Long getRoleId () { - return roleId; - } - - public void setRoleId (Long roleId) { - this.roleId = roleId; - } - - @Override - public String toString () { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("roleId", getRoleId()) - .toString(); - } -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java deleted file mode 100644 index df51982..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.muyu.system.domain.vo; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import java.util.List; - -/** - * 路由配置信息 - * - * @author muyu - */ -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class RouterVo { - /** - * 路由名字 - */ - private String name; - - /** - * 路由地址 - */ - private String path; - - /** - * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现 - */ - private boolean hidden; - - /** - * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 - */ - private String redirect; - - /** - * 组件地址 - */ - private String component; - - /** - * 路由参数：如 {"id": 1, "name": "ry"} - */ - private String query; - - /** - * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面 - */ - private Boolean alwaysShow; - - /** - * 其他元素 - */ - private MetaVo meta; - - /** - * 子路由 - */ - private List children; - - public String getName () { - return name; - } - - public void setName (String name) { - this.name = name; - } - - public String getPath () { - return path; - } - - public void setPath (String path) { - this.path = path; - } - - public boolean getHidden () { - return hidden; - } - - public void setHidden (boolean hidden) { - this.hidden = hidden; - } - - public String getRedirect () { - return redirect; - } - - public void setRedirect (String redirect) { - this.redirect = redirect; - } - - public String getComponent () { - return component; - } - - public void setComponent (String component) { - this.component = component; - } - - public String getQuery () { - return query; - } - - public void setQuery (String query) { - this.query = query; - } - - public Boolean getAlwaysShow () { - return alwaysShow; - } - - public void setAlwaysShow (Boolean alwaysShow) { - this.alwaysShow = alwaysShow; - } - - public MetaVo getMeta () { - return meta; - } - - public void setMeta (MetaVo meta) { - this.meta = meta; - } - - public List getChildren () { - return children; - } - - public void setChildren (List children) { - this.children = children; - } -} diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 846198c..69af346 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.muyu - muyu + cloud-server 3.6.3 4.0.0 - muyu-system - muyu-gen - muyu-job - muyu-file + muyu-modules-system + muyu-modules-gen + muyu-modules-job + muyu-modules-file muyu-modules diff --git a/muyu-visual/muyu-monitor/pom.xml b/muyu-visual/muyu-visual-monitor/pom.xml similarity index 100% rename from muyu-visual/muyu-monitor/pom.xml rename to muyu-visual/muyu-visual-monitor/pom.xml diff --git a/muyu-visual/muyu-monitor/src/main/java/com/muyu/modules/monitor/MuYuMonitorApplication.java b/muyu-visual/muyu-visual-monitor/src/main/java/com/muyu/modules/monitor/MuYuMonitorApplication.java similarity index 100% rename from muyu-visual/muyu-monitor/src/main/java/com/muyu/modules/monitor/MuYuMonitorApplication.java rename to muyu-visual/muyu-visual-monitor/src/main/java/com/muyu/modules/monitor/MuYuMonitorApplication.java diff --git a/muyu-visual/muyu-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java b/muyu-visual/muyu-visual-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java similarity index 100% rename from muyu-visual/muyu-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java rename to muyu-visual/muyu-visual-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java diff --git a/muyu-visual/muyu-monitor/src/main/resources/banner.txt b/muyu-visual/muyu-visual-monitor/src/main/resources/banner.txt similarity index 100% rename from muyu-visual/muyu-monitor/src/main/resources/banner.txt rename to muyu-visual/muyu-visual-monitor/src/main/resources/banner.txt diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-visual-monitor/src/main/resources/bootstrap.yml similarity index 100% rename from muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml rename to muyu-visual/muyu-visual-monitor/src/main/resources/bootstrap.yml diff --git a/muyu-visual/muyu-monitor/src/main/resources/logback.xml b/muyu-visual/muyu-visual-monitor/src/main/resources/logback.xml similarity index 100% rename from muyu-visual/muyu-monitor/src/main/resources/logback.xml rename to muyu-visual/muyu-visual-monitor/src/main/resources/logback.xml diff --git a/muyu-visual/pom.xml b/muyu-visual/pom.xml index 883b38c..b61fbf6 100644 --- a/muyu-visual/pom.xml +++ b/muyu-visual/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.muyu - muyu + cloud-server 3.6.3 4.0.0 - muyu-monitor + muyu-visual-monitor muyu-visual diff --git a/pom.xml b/pom.xml index 9852699..bb9e314 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.muyu - muyu + cloud-server 3.6.3 muyu