fix(): 代码结构,风格更改

plus
DongZeLiang 2024-05-24 15:28:40 +08:00
parent 3f15bea510
commit d0edb52ddb
195 changed files with 470 additions and 1749 deletions

View File

@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.muyu</groupId>
<artifactId>muyu</artifactId>
<artifactId>cloud-server</artifactId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -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);
}
/**

View File

@ -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;
}
}

View File

@ -11,6 +11,8 @@
<artifactId>muyu-common-system</artifactId>
<description>muyu-common-system系统级远程调用</description>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

View File

@ -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<String> getPermissions () {
return permissions;
}
public void setPermissions (Set<String> permissions) {
this.permissions = permissions;
}
public Set<String> getRoles () {
return roles;
}
public void setRoles (Set<String> roles) {
this.roles = roles;
}
public SysUser getSysUser () {
return sysUser;
}
public void setSysUser (SysUser sysUser) {
this.sysUser = sysUser;
}
}

View File

@ -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<SysDept> children = new ArrayList<SysDept>();
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<SysDept> getChildren () {
return children;
}
public void setChildren (List<SysDept> 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();
}
}

View File

@ -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();
}
}

View File

@ -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();
}
}

View File

@ -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();
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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<String> getPermissions () {
return permissions;
}
public void setPermissions (Set<String> 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();
}
}

View File

@ -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<SysRole> getRoles () {
return roles;
}
public void setRoles (List<SysRole> 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();
}
}

View File

@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.muyu</groupId>
<artifactId>muyu</artifactId>
<artifactId>cloud-server</artifactId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.muyu</groupId>
<artifactId>muyu</artifactId>
<artifactId>cloud-server</artifactId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Some files were not shown because too many files have changed in this diff Show More