优化

src/main/resources/modules/SpringBoot/java/config/CacheConfig.java

@@ -1,13 +1,14 @@
 package ${domain}.config;
 
-import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.config.CacheConfiguration;
 import net.sf.ehcache.config.DiskStoreConfiguration;
+import org.springframework.cache.Cache;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.ehcache.EhCacheCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import ${domain}.frame.auth.LocalData;
 
 @Configuration
 @EnableCaching
@@ -15,6 +16,17 @@ public class CacheConfig {
 
     public static final String TOKEN_CACHE = "tokenCache";
 
+    /**
+     * 获取缓存
+     *
+     * @param cacheName 缓存名称
+     * @return
+     */
+    public static Cache getCache(String cacheName) {
+        EhCacheCacheManager cacheManager = LocalData.getBean(EhCacheCacheManager.class);
+        return cacheManager.getCache(cacheName);
+    }
+
     @Bean
     public EhCacheCacheManager getCacheManager() {
         net.sf.ehcache.config.Configuration configuration = new net.sf.ehcache.config.Configuration();
@@ -34,12 +46,12 @@ public class CacheConfig {
      *
      * @return 缓存
      */
-    private Cache buildTokenCache() {
+    private net.sf.ehcache.Cache buildTokenCache() {
         CacheConfiguration config = new CacheConfiguration();
         config.setMemoryStoreEvictionPolicy("LFU");//最少使用
         config.setTimeToLiveSeconds(60 * 60);//最长有效时间
         config.setTimeToIdleSeconds(60 * 60);//无访问最长有效时间
         config.setName(TOKEN_CACHE);
-        return new Cache(config);
+        return new net.sf.ehcache.Cache(config);
     }
 }

src/main/resources/modules/SpringBoot/java/frame/auth/Token.java

@@ -35,6 +35,10 @@ public class Token implements Serializable {
      * 用户名称
      */
     private String userName;
+    /**
+     * 用户别名
+     */
+    private String userAlias;
 
     private Set<String> resSet = new HashSet<>();
 
@@ -103,6 +107,14 @@ public class Token implements Serializable {
         this.userName = userName;
     }
 
+    public String getUserAlias() {
+        return userAlias;
+    }
+
+    public void setUserAlias(String userAlias) {
+        this.userAlias = userAlias;
+    }
+
     public String getToken() {
         return token;
     }

src/main/resources/modules/SpringBoot/java/module/wsys/ent/Tokens.java

@@ -34,6 +34,12 @@ public class Tokens extends BaseEntity {
     @ExcelProperty("用户名称")
     @ExcelNote("")
     private String userName;
+    /**
+     * USER_ALIAS - 用户别名
+     */
+    @ExcelProperty("用户别名")
+    @ExcelNote("")
+    private String userAlias;
     /**
      * LOGIN_TIME - 登录时间
      */
@@ -113,6 +119,14 @@ public class Tokens extends BaseEntity {
         this.userName = userName;
     }
 
+    public String getUserAlias() {
+        return this.userAlias;
+    }
+
+    public void setUserAlias(String userAlias) {
+        this.userAlias = userAlias;
+    }
+
     public Date getLoginTime() {
         return this.loginTime;
     }

src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.Cache;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -99,6 +100,9 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
 
         long id = IDgenerator.nextId();
         Tokens entity = MapperUtil.map(request, Tokens.class);
+        if (StringUtil.isEmpty(entity.getUserAlias())){
+            entity.setUserAlias(entity.getUserName());
+        }
         entity.setId(id);
 
         long result = tokensMapper.insert(entity, token);
@@ -118,27 +122,38 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
      * @param token   令牌
      * @return 响应
      */
-    @CacheEvict(value = CacheConfig.TOKEN_CACHE, key = "#request.token", condition = "!#result.hasError()")
     public TokensDeleteResponse delete(TokensDeleteRequest request, Token token) {
         TokensDeleteResponse response = new TokensDeleteResponse();
 
-        ValidationUtil.validate(request, response);
+        if (request.getId() != null) {
-        if (response.hasError()) {
+            Tokens tokens = tokensMapper.getById(request.getId(), token);
-            return response;
+            long result = tokensMapper.delete(request.getId(), token);
-        }
-        TokensFindRequest tokensFindRequest = new TokensFindRequest();
-        tokensFindRequest.setValid(true);
-        tokensFindRequest.setToken(request.getToken());
-        tokensFindRequest.setPageSize(0);
-        TokensFindResponse tokensFindResponse = this.find(tokensFindRequest, token);
-        for (Tokens tokens : tokensFindResponse.getResult()) {
-            long result = tokensMapper.delete(tokens.getId(), token);
             if (1L != result) {
                 response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
                 return response;
             }
+            response.setResult(result);
+            Cache cache = CacheConfig.getCache(CacheConfig.TOKEN_CACHE);
+            cache.evict(tokens.getToken());
+        } else if (StringUtil.isNotEmpty(request.getToken())) {
+            TokensFindRequest tokensFindRequest = new TokensFindRequest();
+            tokensFindRequest.setValid(true);
+            tokensFindRequest.setToken(request.getToken());
+            tokensFindRequest.setPageSize(0);
+            TokensFindResponse tokensFindResponse = this.find(tokensFindRequest, token);
+            for (Tokens tokens : tokensFindResponse.getResult()) {
+                long result = tokensMapper.delete(tokens.getId(), token);
+                if (1L != result) {
+                    response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
+                    return response;
+                }
+                Cache cache = CacheConfig.getCache(CacheConfig.TOKEN_CACHE);
+                cache.evict(tokens.getToken());
+            }
+            response.setResult(tokensFindResponse.getTotalCount());
+        } else {
+            response.addError(ErrorType.BUSINESS_ERROR, "登录凭证标识不存在!");
         }
-        response.setResult(tokensFindResponse.getTotalCount());
 
         return response;
     }
@@ -161,11 +176,14 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
 
         Tokens entity = tokensMapper.getById(request.getId(), token);
         if (entity == null) {
-        response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
+            response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
-        return response;
+            return response;
         }
 
         MapperUtil.map(request, entity);
+        if (StringUtil.isEmpty(entity.getUserAlias())){
+            entity.setUserAlias(entity.getUserName());
+        }
         long result = tokensMapper.update(entity, token);
         if (1L != result) {
             response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
@@ -240,19 +258,15 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
         } else {
             Tokens tokens = tokensFindResponse.getResult().get(0);
             Token newToken = new Token();
+            newToken.setId(tokens.getId());
+            newToken.setToken(tokens.getToken());
+            newToken.setUserId(tokens.getUserId());
+            newToken.setUserName(tokens.getUserName());
+            newToken.setUserAlias(tokens.getUserAlias());
             if (tokens.getUserName().equals(admin)) {//超级管理员
-                newToken.setId(0);
-                newToken.setToken(tokensFindResponse.getResult().get(0).getToken());
-                newToken.setUserId(0);
-                newToken.setUserName(admin);
                 newToken.putRes(".*");
             } else { // 管理员或用户
 <#if project.frameValue() = 1>
-                newToken.setId(tokens.getId());
-                newToken.setToken(tokensFindResponse.getResult().get(0).getToken());
-                newToken.setUserId(tokens.getUserId());
-                newToken.setUserName(tokens.getUserName());
-
                 // 获取用户的资源
                 ResLoadRequest resLoadRequest = new ResLoadRequest();
                 resLoadRequest.setPageSize(0);

src/main/resources/modules/SpringBoot/java/module/wsys/mgr/UserManagerImpl.java

@@ -341,6 +341,7 @@ public class UserManagerImpl implements UserManager {
             user = new User();
             user.setId(0);
             user.setUserName(admin);
+            user.setUserAlias("超级管理员");
         } else {//管理员登录
             UserFindRequest userFindRequest = new UserFindRequest();
             userFindRequest.setUserName(request.getUsername());
@@ -376,6 +377,7 @@ public class UserManagerImpl implements UserManager {
             tokensCreateRequest.setToken(UUID.randomUUID().toString());
             tokensCreateRequest.setUserId(user.getId());
             tokensCreateRequest.setUserName(user.getUserName());
+            tokensCreateRequest.setUserAlias(user.getUserAlias());
             tokensCreateRequest.setDeptId(user.getDeptId());
             tokensCreateRequest.setDeptCode(user.getDeptCode());
             tokensCreateRequest.setDeptName(user.getDeptName());

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_TokensMapper.xml

@@ -7,7 +7,7 @@
     <sql id="table">`SYS_TOKENS`</sql>
 
     <sql id="entityColumnList">
-        `ID`,`TOKEN`,`USER_ID`,`USER_NAME`,`LOGIN_TIME`,`VALID_TIME`,`VALID`,`DEPT_ID`,`DEPT_CODE`,`DEPT_NAME`,`TERMINAL`,`TERMINAL_IP`,`TERMINAL_INFO`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME`
+        `ID`,`TOKEN`,`USER_ID`,`USER_NAME`,`USER_ALIAS`,`LOGIN_TIME`,`VALID_TIME`,`VALID`,`DEPT_ID`,`DEPT_CODE`,`DEPT_NAME`,`TERMINAL`,`TERMINAL_IP`,`TERMINAL_INFO`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME`
     </sql>
 
     <resultMap id="tokens" type="${domain}.module.wsys.ent.Tokens">
@@ -15,6 +15,7 @@
         <result column="TOKEN"  jdbcType="VARCHAR" property="token"/>
         <result column="USER_ID"  jdbcType="BIGINT" property="userId"/>
         <result column="USER_NAME"  jdbcType="VARCHAR" property="userName"/>
+        <result column="USER_ALIAS"  jdbcType="VARCHAR" property="userAlias"/>
         <result column="LOGIN_TIME"  jdbcType="TIMESTAMP" property="loginTime"/>
         <result column="VALID_TIME"  jdbcType="TIMESTAMP" property="validTime"/>
         <result column="VALID"  jdbcType="BIT" property="valid"/>
@@ -44,6 +45,7 @@
         ${r"#"}{request.token,jdbcType=VARCHAR},
         ${r"#"}{request.userId,jdbcType=BIGINT},
         ${r"#"}{request.userName,jdbcType=VARCHAR},
+        ${r"#"}{request.userAlias,jdbcType=VARCHAR},
         ${r"#"}{request.loginTime,jdbcType=TIMESTAMP},
         ${r"#"}{request.validTime,jdbcType=TIMESTAMP},
         ${r"#"}{request.valid,jdbcType=BIT},
@@ -74,6 +76,7 @@
             ${r"#"}{item.token,jdbcType=VARCHAR},
             ${r"#"}{item.userId,jdbcType=BIGINT},
             ${r"#"}{item.userName,jdbcType=VARCHAR},
+            ${r"#"}{item.userAlias,jdbcType=VARCHAR},
             ${r"#"}{item.loginTime,jdbcType=TIMESTAMP},
             ${r"#"}{item.validTime,jdbcType=TIMESTAMP},
             ${r"#"}{item.valid,jdbcType=BIT},
@@ -118,6 +121,7 @@
         `TOKEN` = ${r"#"}{request.token,jdbcType=VARCHAR},
         `USER_ID` = ${r"#"}{request.userId,jdbcType=BIGINT},
         `USER_NAME` = ${r"#"}{request.userName,jdbcType=VARCHAR},
+        `USER_ALIAS` = ${r"#"}{request.userAlias,jdbcType=VARCHAR},
         `LOGIN_TIME` = ${r"#"}{request.loginTime,jdbcType=TIMESTAMP},
         `VALID_TIME` = ${r"#"}{request.validTime,jdbcType=TIMESTAMP},
         `VALID` = ${r"#"}{request.valid,jdbcType=BIT},
@@ -194,6 +198,9 @@
         <if test="request.userName != null and request.userName != ''">
             AND `USER_NAME` = ${r"#"}{request.userName}
         </if>
+        <if test="request.userAliasLike != null and request.userAliasLike != ''">
+            AND `USER_ALIAS` LIKE CONCAT('%',${r"#{"}request.userAliasLike},'%')
+        </if>
         <if test="request.loginTime != null">
             AND DATE_FORMAT(`LOGIN_TIME`,"%Y-%m-%d %T") = DATE_FORMAT(${r"#"}{request.loginTime},"%Y-%m-%d %T")
         </if>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_TokensMapper.xml

@@ -7,7 +7,7 @@
     <sql id="table">"SYS_TOKENS"</sql>
 
     <sql id="entityColumnList">
-        "ID","TOKEN","USER_ID","USER_NAME","LOGIN_TIME","VALID_TIME","VALID","DEPT_ID","DEPT_CODE","DEPT_NAME","TERMINAL","TERMINAL_IP","TERMINAL_INFO","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
+        "ID","TOKEN","USER_ID","USER_NAME","USER_ALIAS","LOGIN_TIME","VALID_TIME","VALID","DEPT_ID","DEPT_CODE","DEPT_NAME","TERMINAL","TERMINAL_IP","TERMINAL_INFO","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
     </sql>
 
     <resultMap id="tokens" type="${domain}.module.wsys.ent.Tokens">
@@ -15,6 +15,7 @@
         <result column="TOKEN" jdbcType="VARCHAR" property="token"/>
         <result column="USER_ID" jdbcType="BIGINT" property="userId"/>
         <result column="USER_NAME" jdbcType="VARCHAR" property="userName"/>
+        <result column="USER_ALIAS" jdbcType="VARCHAR" property="userAlias"/>
         <result column="LOGIN_TIME" jdbcType="TIMESTAMP" property="loginTime"/>
         <result column="VALID_TIME" jdbcType="TIMESTAMP" property="validTime"/>
         <result column="VALID" jdbcType="BIT" property="valid"/>
@@ -44,6 +45,7 @@
         ${r'#'}{request.token,jdbcType=VARCHAR},
         ${r'#'}{request.userId,jdbcType=BIGINT},
         ${r'#'}{request.userName,jdbcType=VARCHAR},
+        ${r'#'}{request.userAlias,jdbcType=VARCHAR},
         ${r'#'}{request.loginTime,jdbcType=TIMESTAMP},
         ${r'#'}{request.validTime,jdbcType=TIMESTAMP},
         ${r'#'}{request.valid,jdbcType=BIT},
@@ -74,6 +76,7 @@
             ${r'#'}{item.token,jdbcType=VARCHAR},
             ${r'#'}{item.userId,jdbcType=BIGINT},
             ${r'#'}{item.userName,jdbcType=VARCHAR},
+            ${r'#'}{item.userAlias,jdbcType=VARCHAR},
             ${r'#'}{item.loginTime,jdbcType=TIMESTAMP},
             ${r'#'}{item.validTime,jdbcType=TIMESTAMP},
             ${r'#'}{item.valid,jdbcType=BIT},
@@ -118,6 +121,7 @@
         "TOKEN" = ${r'#'}{request.token,jdbcType=VARCHAR},
         "USER_ID" = ${r'#'}{request.userId,jdbcType=BIGINT},
         "USER_NAME" = ${r'#'}{request.userName,jdbcType=VARCHAR},
+        "USER_ALIAS" = ${r'#'}{request.userAlias,jdbcType=VARCHAR},
         "LOGIN_TIME" = ${r'#'}{request.loginTime,jdbcType=TIMESTAMP},
         "VALID_TIME" = ${r'#'}{request.validTime,jdbcType=TIMESTAMP},
         "VALID" = ${r'#'}{request.valid,jdbcType=BIT},
@@ -196,6 +200,9 @@
         <if test="request.userName != null and request.userName != ''">
             AND "USER_NAME" = ${r'#'}{request.userName}
         </if>
+        <if test="request.userAliasLike != null and request.userAliasLike != ''">
+            AND "USER_ALIAS" LIKE '%'||${r"#{"}request.userAliasLike}||'%'
+        </if>
         <if test="request.loginTime != null and request.loginTime != ''">
             AND to_char("LOGIN_TIME",'yyyy-MM-dd HH24:mi:ss') = to_char(${r'#'}{request.loginTime},'yyyy-MM-dd HH24:mi:ss')
         </if>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_TokensMapper.xml

@@ -7,7 +7,7 @@
     <sql id="table">"SYS_TOKENS"</sql>
 
     <sql id="entityColumnList">
-        "ID","TOKEN","USER_ID","USER_NAME","LOGIN_TIME","VALID_TIME","VALID","DEPT_ID","DEPT_CODE","DEPT_NAME","TERMINAL","TERMINAL_IP","TERMINAL_INFO","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
+        "ID","TOKEN","USER_ID","USER_NAME","USER_ALIAS","LOGIN_TIME","VALID_TIME","VALID","DEPT_ID","DEPT_CODE","DEPT_NAME","TERMINAL","TERMINAL_IP","TERMINAL_INFO","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
     </sql>
 
     <resultMap id="tokens" type="${domain}.module.wsys.ent.Tokens">
@@ -15,6 +15,7 @@
         <result column="TOKEN"  jdbcType="VARCHAR" property="token"/>
         <result column="USER_ID"  jdbcType="BIGINT" property="userId"/>
         <result column="USER_NAME"  jdbcType="VARCHAR" property="userName"/>
+        <result column="USER_ALIAS"  jdbcType="VARCHAR" property="userAlias"/>
         <result column="LOGIN_TIME"  jdbcType="TIMESTAMP" property="loginTime"/>
         <result column="VALID_TIME"  jdbcType="TIMESTAMP" property="validTime"/>
         <result column="VALID"  jdbcType="BIT" property="valid"/>
@@ -44,6 +45,7 @@
         ${r"#"}{request.token,jdbcType=VARCHAR},
         ${r"#"}{request.userId,jdbcType=BIGINT},
         ${r"#"}{request.userName,jdbcType=VARCHAR},
+        ${r"#"}{request.userAlias,jdbcType=VARCHAR},
         ${r"#"}{request.loginTime,jdbcType=TIMESTAMP},
         ${r"#"}{request.validTime,jdbcType=TIMESTAMP},
         ${r"#"}{request.valid,jdbcType=BIT},
@@ -74,6 +76,7 @@
             ${r"#"}{item.token,jdbcType=VARCHAR},
             ${r"#"}{item.userId,jdbcType=BIGINT},
             ${r"#"}{item.userName,jdbcType=VARCHAR},
+            ${r"#"}{item.userAlias,jdbcType=VARCHAR},
             ${r"#"}{item.loginTime,jdbcType=TIMESTAMP},
             ${r"#"}{item.validTime,jdbcType=TIMESTAMP},
             ${r"#"}{item.valid,jdbcType=BIT},
@@ -118,6 +121,7 @@
         TOKEN = ${r"#"}{request.token,jdbcType=VARCHAR},
         USER_ID = ${r"#"}{request.userId,jdbcType=BIGINT},
         USER_NAME = ${r"#"}{request.userName,jdbcType=VARCHAR},
+        USER_ALIAS = ${r"#"}{request.userAlias,jdbcType=VARCHAR},
         LOGIN_TIME = ${r"#"}{request.loginTime,jdbcType=TIMESTAMP},
         VALID_TIME = ${r"#"}{request.validTime,jdbcType=TIMESTAMP},
         VALID = ${r"#"}{request.valid,jdbcType=BIT},
@@ -194,6 +198,9 @@
         <if test="request.userName != null and request.userName != ''">
             AND USER_NAME = ${r"#"}{request.userName}
         </if>
+        <if test="request.userAliasLike != null and request.userAliasLike != ''">
+            AND "USER_ALIAS" LIKE '%'||${r"#{"}request.userAliasLike}||'%'
+        </if>
         <if test="request.loginTime != null">
             AND LOGIN_TIME = ${r"#"}{request.loginTime}
         </if>

src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensCreateRequest.java

@@ -37,6 +37,11 @@ public class TokensCreateRequest extends BaseRequest {
     @Length(min = 0, max = 50, message = "[userName]用户名称长度不合法(0-50)")
     private String userName;
 
+    /**
+     * 用户名称
+     */
+    private String userAlias;
+
     /**
      * 登录时间
      */
@@ -114,6 +119,14 @@ public class TokensCreateRequest extends BaseRequest {
         this.userName = userName;
     }
 
+    public String getUserAlias() {
+        return this.userAlias;
+    }
+
+    public void setUserAlias(String userAlias) {
+        this.userAlias = userAlias;
+    }
+
     public Date getLoginTime() {
         return this.loginTime;
     }

src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensDeleteRequest.java

@@ -2,8 +2,6 @@ package ${domain}.module.wsys.req;
 
 import ${domain}.frame.base.BaseRequest;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * TokensDeleteRequest - 通行证删除
  *
@@ -13,12 +11,24 @@ import javax.validation.constraints.NotBlank;
  */
 public class TokensDeleteRequest extends BaseRequest {
 
+    /**
+     * 登录令牌ID
+     */
+    private Long id;
+
     /**
      * 登录令牌
      */
-    @NotBlank(message = "登录令牌不能为空")
     private String token;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public String getToken() {
         return token;
     }

src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensFindRequest.java

@@ -29,6 +29,11 @@ public class TokensFindRequest extends BaseFindRequest {
      */
     private String userName;
 
+    /**
+     * 用户别名
+     */
+    private String userAliasLike;
+
     /**
      * 登录时间
      */
@@ -109,6 +114,14 @@ public class TokensFindRequest extends BaseFindRequest {
         this.userName = userName;
     }
 
+    public String getUserAliasLike() {
+        return this.userAliasLike;
+    }
+
+    public void setUserAliasLike(String userAliasLike) {
+        this.userAliasLike = userAliasLike;
+    }
+
     public Date getLoginTime() {
         return this.loginTime;
     }

src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensUpdateRequest.java

@@ -43,6 +43,11 @@ public class TokensUpdateRequest extends BaseUpdateRequest {
     @Length(min = 0, max = 50, message = "[userName]用户名称长度不合法(0-50)")
     private String userName;
 
+    /**
+     * 用户别名
+     */
+    private String userAlias;
+
     /**
      * 登录时间
      */
@@ -128,6 +133,14 @@ public class TokensUpdateRequest extends BaseUpdateRequest {
         this.userName = userName;
     }
 
+    public String getUserAlias() {
+        return this.userAlias;
+    }
+
+    public void setUserAlias(String userAlias) {
+        this.userAlias = userAlias;
+    }
+
     public Date getLoginTime() {
         return this.loginTime;
     }

src/main/resources/modules/SpringBoot/java/module/wsys/req/UserUpdateRequest.java

@@ -4,8 +4,8 @@ import org.hibernate.validator.constraints.Length;
 import ${domain}.frame.base.BaseUpdateRequest;
 import ${domain}.frame.validation.Select;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * UserUpdateRequest - 用户更新
@@ -56,6 +56,11 @@ public class UserUpdateRequest extends BaseUpdateRequest {
      */
     private String deptName;
 
+    /**
+     * 角色代码
+     */
+    private List<String> roleCodeList;
+
     public Long getId() {
         return this.id;
     }
@@ -111,4 +116,12 @@ public class UserUpdateRequest extends BaseUpdateRequest {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
+
+    public List<String> getRoleCodeList() {
+        return roleCodeList;
+    }
+
+    public void setRoleCodeList(List<String> roleCodeList) {
+        this.roleCodeList = roleCodeList;
+    }
 }

src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml

@@ -87,6 +87,7 @@
 <field defaultValue="NULL" fieldComment="登录令牌" fieldLength="50" fieldName="TOKEN" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="用户主键" fieldLength="0" fieldName="USER_ID" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="用户名称" fieldLength="50" fieldName="USER_NAME" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="用户别名" fieldLength="50" fieldName="USER_ALIAS" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="false" isLike="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="登录时间" fieldLength="0" fieldName="LOGIN_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="有效时间" fieldLength="0" fieldName="VALID_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="是否有效" fieldLength="0" fieldName="VALID" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_TOKENS.sql

@@ -9,6 +9,7 @@ CREATE TABLE `SYS_TOKENS` (
         `TOKEN` VARCHAR(50) NOT NULL COMMENT '登录令牌',
         `USER_ID` BIGINT(20) NOT NULL COMMENT '用户主键',
         `USER_NAME` VARCHAR(50) NOT NULL COMMENT '用户名称',
+        `USER_ALIAS` VARCHAR(50) NOT NULL COMMENT '用户别名',
         `LOGIN_TIME` DATETIME NOT NULL COMMENT '登录时间',
         `VALID_TIME` DATETIME NOT NULL COMMENT '有效时间',
         `VALID` TINYINT(1) NOT NULL COMMENT '是否有效',

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_TOKENS.sql

@@ -9,6 +9,7 @@ CREATE TABLE "SYS_TOKENS" (
     "TOKEN" VARCHAR2(50) NULL,
     "USER_ID" NUMBER(19) NULL,
     "USER_NAME" VARCHAR2(50) NULL,
+    "USER_ALIAS" VARCHAR2(50) NULL,
     "LOGIN_TIME" DATE NULL,
     "VALID_TIME" DATE NULL,
     "VALID" CHAR(1) NULL,
@@ -31,6 +32,7 @@ COMMENT ON COLUMN "SYS_TOKENS"."ID" is '主键';
 COMMENT ON COLUMN "SYS_TOKENS"."TOKEN" is '登录令牌';
 COMMENT ON COLUMN "SYS_TOKENS"."USER_ID" is '用户主键';
 COMMENT ON COLUMN "SYS_TOKENS"."USER_NAME" is '用户名称';
+COMMENT ON COLUMN "SYS_TOKENS"."USER_ALIAS" is '用户别名';
 COMMENT ON COLUMN "SYS_TOKENS"."LOGIN_TIME" is '登录时间';
 COMMENT ON COLUMN "SYS_TOKENS"."VALID_TIME" is '有效时间';
 COMMENT ON COLUMN "SYS_TOKENS"."VALID" is '是否有效';

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_TOKENS.sql

@@ -9,6 +9,7 @@ CREATE TABLE IF NOT EXISTS SYS_TOKENS (
     "TOKEN" VARCHAR(50) NOT NULL,
     "USER_ID" BIGINT NOT NULL,
     "USER_NAME" VARCHAR(50) NOT NULL,
+    "USER_ALIAS" VARCHAR(50) NOT NULL,
     "LOGIN_TIME" DATETIME NOT NULL,
     "VALID_TIME" DATETIME NOT NULL,
     "VALID" BOOLEAN NOT NULL,

src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl

@@ -756,7 +756,7 @@
 
                 <el-divider></el-divider>
 
-                <pre>new Ajax("wsys", "user").find({}, function (response) {</pre>
+                <pre>new Ajax("wsys", "user", "find").post({}, function (response) {</pre>
                 <pre>    if (response.errors.length > 0) {</pre>
                 <pre>        nav.e(response.errors[0].message);</pre>
                 <pre>    } else {</pre>
@@ -1359,7 +1359,7 @@
         },
         methods: {
             doAjax: function () {
-                new Ajax("wsys", "user").find({}, function (response) {
+                new Ajax("wsys", "user", "find").post({}, function (response) {
                     if (response.errors.length > 0) {
                         nav.e(response.errors[0].message);
                     } else {

src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl

@@ -115,7 +115,7 @@
                 <ul>
                     <li>
                         <el-dropdown @command="onCommand">
-                            <el-link :underline="false" @click="onHome" icon="el-icon-user-solid">${r'${token.userName?default("登录信息")}'}</el-link>
+                            <el-link :underline="false" @click="onHome" icon="el-icon-user-solid">${r'${token.userAlias}'}</el-link>
 
                             <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item>个人信息</el-dropdown-item>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl

@@ -8,6 +8,9 @@
             <el-form-item label="用户名称" prop="userName">
                 <el-input v-model="vm.userName" clearable size="mini" placeholder="请输入用户名称"></el-input>
             </el-form-item>
+            <el-form-item label="用户别名" prop="userAliasLike">
+                <el-input v-model="vm.userAliasLike" clearable size="mini" placeholder="请输入用户别名模糊查询"></el-input>
+            </el-form-item>
             <el-form-item label="登录时间" prop="loginTime">
                 <el-date-picker
                         size="mini"
@@ -113,6 +116,12 @@
                     prop="userName"
                     label="用户名称">
             </el-table-column>
+            <el-table-column
+                    align="center"
+                    min-width="150"
+                    prop="userAlias"
+                    label="用户别名">
+            </el-table-column>
             <el-table-column
                     align="center"
                     min-width="140"
@@ -195,6 +204,7 @@
             vm: {//条件及分页参数
                 userId: null,
                 userName: null,
+                userAliasLike: null,
                 loginTime: null,
                 validTime: null,
                 valid: null,