1、VUE

Former-commit-id: a4c344e0d06466a5fb0190ac33ca7ec01b4a2c2f

src/main/resources/modules/SpringBoot/java/action/AjaxController.java

@@ -18,7 +18,7 @@ import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;
 import ${basePackage}.frame.base.BaseResponse;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.LogUtil;
 import ${basePackage}.frame.base.Error;
 

src/main/resources/modules/SpringBoot/java/action/FeignController.java

@@ -18,7 +18,7 @@ import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;
 import ${basePackage}.frame.base.BaseResponse;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.LogUtil;
 import ${basePackage}.frame.base.Error;
 import org.springframework.stereotype.Controller;

src/main/resources/modules/SpringBoot/java/action/GlobalController.java

@@ -28,7 +28,7 @@ import ${basePackage}.frame.base.BaseRequest;
 import ${basePackage}.frame.base.BaseResponse;
 import ${basePackage}.frame.base.ErrorType;
 import ${basePackage}.frame.base.Screen;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.AESUtil;
 import ${basePackage}.frame.utils.LogUtil;
 import ${basePackage}.frame.utils.MD5Util;

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

@@ -13,15 +13,10 @@ import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
 import ${basePackage}.frame.auth.LocalData;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.CookieUtil;
-import ${basePackage}.frame.utils.IDgenerator;
-import ${basePackage}.module.system.mgr.ResManager;
 import ${basePackage}.module.system.mgr.TokensManager;
-import ${basePackage}.module.system.req.ResCreateRequest;
-import ${basePackage}.module.system.req.ResFindRequest;
 import ${basePackage}.module.system.req.TokensBuildRequest;
-import ${basePackage}.module.system.rsp.ResFindResponse;
 import ${basePackage}.module.system.rsp.TokensBuildResponse;
 
 import javax.servlet.Filter;
@@ -130,29 +125,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 }
 
                 String path = request.getServletPath();
-
-                String[] profiles = LocalData.getEnvironment().getActiveProfiles();
-                for (String profile : profiles) {
-                    if (profile.contains("dev")) {//测试环境捕获资源
-                        ResFindRequest resFindRequest = new ResFindRequest();
-                        resFindRequest.setPageSize(0);
-                        resFindRequest.setResValue(request.getServletPath());
-                        ResManager resManager = LocalData.getBean(ResManager.class);
-                        ResFindResponse resFindResponse = resManager.find(resFindRequest, LocalData.getSysToken());
-
-                        if (resFindResponse.getResult().size() == 0) {//资源不存在，主动收集资源
-                            ResCreateRequest resCreateRequest = new ResCreateRequest();
-                            resCreateRequest.setResCode(IDgenerator.nextUUID());
-                            resCreateRequest.setResName("默认");
-                            resCreateRequest.setResValue(path);
-                            resCreateRequest.setValid(true);
-                            resCreateRequest.setResType("");
-                            resManager.create(resCreateRequest, LocalData.getSysToken());
-                        }
-                    }
-                }
-
-                // 授权
                 if (token_.hasRes(path)) {
                     return true;
                 }

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

@@ -5,7 +5,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import xyz.wbsite.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

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

@@ -1,6 +1,11 @@
-package ${basePackage}.frame.base;
+package ${basePackage}.frame.auth;
 
+import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.module.system.ent.Res;
+import ${basePackage}.module.system.mgr.ResManager;
+import ${basePackage}.module.system.req.ResCreateRequest;
+import ${basePackage}.module.system.req.ResFindRequest;
+import ${basePackage}.module.system.rsp.ResFindResponse;
 
 import java.io.Serializable;
 import java.util.HashSet;
@@ -35,12 +40,34 @@ public class Token implements Serializable {
 
     private Set<String> resSet = new HashSet<>();
 
-    public boolean hasRes(String resource) {
+    public boolean hasRes(String res) {
         for (String s : resSet) {
-            if (resource.matches(s)) {
+            if (res.matches(s)) {
                 return true;
             }
         }
+
+        String[] profiles = LocalData.getEnvironment().getActiveProfiles();
+        for (String profile : profiles) {
+            if (profile.contains("dev")) {//测试环境捕获资源
+                ResFindRequest resFindRequest = new ResFindRequest();
+                resFindRequest.setPageSize(0);
+                resFindRequest.setResValue(res);
+                ResManager resManager = LocalData.getBean(ResManager.class);
+                ResFindResponse resFindResponse = resManager.find(resFindRequest, LocalData.getSysToken());
+
+                if (resFindResponse.getResult().size() == 0) {//资源不存在，主动收集资源
+                    ResCreateRequest resCreateRequest = new ResCreateRequest();
+                    resCreateRequest.setResCode(IDgenerator.nextUUID());
+                    resCreateRequest.setResName("默认");
+                    resCreateRequest.setResValue(res);
+                    resCreateRequest.setValid(true);
+                    resCreateRequest.setResType("");
+                    resManager.create(resCreateRequest, LocalData.getSysToken());
+                }
+            }
+        }
+
         return false;
     }
 

src/main/resources/modules/SpringBoot/java/module/mgr/manager.ftl

@@ -10,7 +10,7 @@ import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}DeleteResponse
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}FindResponse;
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}GetResponse;
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}UpdateResponse;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 
 /**
  * ${table.tableComment}

src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl

@@ -3,7 +3,7 @@ package ${basePackage}.module.${moduleName}.mgr;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.Message;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.ValidationUtil;
 import ${basePackage}.module.${moduleName}.ent.${table.getCName()};

src/main/resources/modules/SpringBoot/java/module/mpr/mapper.java

@@ -11,7 +11,7 @@ import ${basePackage}.module.${moduleName}.req.${table.getCName()}DeleteRequest;
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}FindRequest;
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}GetRequest;
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}UpdateRequest;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 
 /**
  * ${table.tableName} - ${table.tableComment}

src/main/resources/modules/SpringBoot/java/module/system/mgr/DeptManager.java

@@ -1,6 +1,6 @@
 package ${basePackage}.module.system.mgr;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.DeptCreateRequest;
 import ${basePackage}.module.system.req.DeptDeleteRequest;
 import ${basePackage}.module.system.req.DeptFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mgr/DeptManagerImpl.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${basePackage}.frame.base.ErrorType;
 import ${basePackage}.frame.base.SortType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;

src/main/resources/modules/SpringBoot/java/module/system/mgr/DictItemManager.java

@@ -1,6 +1,6 @@
 package ${basePackage}.module.system.mgr;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.DictItemCreateRequest;
 import ${basePackage}.module.system.req.DictItemDeleteRequest;
 import ${basePackage}.module.system.req.DictItemFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mgr/DictItemManagerImpl.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;

src/main/resources/modules/SpringBoot/java/module/system/mgr/DictManager.java

@@ -1,6 +1,6 @@
 package ${basePackage}.module.system.mgr;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.DictCreateRequest;
 import ${basePackage}.module.system.req.DictDeleteRequest;
 import ${basePackage}.module.system.req.DictFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mgr/DictManagerImpl.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;

src/main/resources/modules/SpringBoot/java/module/system/mgr/FileManager.java

@@ -1,6 +1,6 @@
 package ${basePackage}.module.system.mgr;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.FileCreateRequest;
 import ${basePackage}.module.system.req.FileDeleteRequest;
 import ${basePackage}.module.system.req.FileFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mgr/FileManagerImpl.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;

src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManager.java

@@ -1,6 +1,6 @@
 package ${basePackage}.module.system.mgr;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.LogErrCreateRequest;
 import ${basePackage}.module.system.req.LogErrDeleteRequest;
 import ${basePackage}.module.system.req.LogErrFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManagerImpl.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;

src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManager.java

@@ -12,7 +12,7 @@ import ${basePackage}.module.system.rsp.ResFindResponse;
 import ${basePackage}.module.system.rsp.ResGetResponse;
 import ${basePackage}.module.system.rsp.ResTreeResponse;
 import ${basePackage}.module.system.rsp.ResUpdateResponse;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 
 /**
  * 资源

src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java

@@ -4,7 +4,7 @@ import ${basePackage}.frame.base.SortType;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.Message;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.ValidationUtil;
 import ${basePackage}.module.system.ent.Res;

src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleManager.java

@@ -1,6 +1,6 @@
 package ${basePackage}.module.system.mgr;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.RoleCreateRequest;
 import ${basePackage}.module.system.req.RoleDeleteRequest;
 import ${basePackage}.module.system.req.RoleFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleManagerImpl.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;

src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManager.java

@@ -1,6 +1,6 @@
 package ${basePackage}.module.system.mgr;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.RoleResCheckRequest;
 import ${basePackage}.module.system.req.RoleResCreateRequest;
 import ${basePackage}.module.system.req.RoleResDeleteRequest;

src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManagerImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;

src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManager.java

@@ -1,6 +1,6 @@
 package ${basePackage}.module.system.mgr;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.TokensBuildRequest;
 import ${basePackage}.module.system.req.TokensCreateRequest;
 import ${basePackage}.module.system.req.TokensDeleteRequest;

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

@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 import ${basePackage}.config.CacheConfig;
 import ${basePackage}.frame.auth.LocalData;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;

src/main/resources/modules/SpringBoot/java/module/system/mgr/UserManager.java

@@ -1,6 +1,6 @@
 package ${basePackage}.module.system.mgr;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.UserCreateRequest;
 import ${basePackage}.module.system.req.UserDeleteRequest;
 import ${basePackage}.module.system.req.UserFindRequest;

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MD5Util;
 import ${basePackage}.frame.utils.MapperUtil;

src/main/resources/modules/SpringBoot/java/module/system/mgr/UserRoleManager.java

@@ -1,6 +1,6 @@
 package ${basePackage}.module.system.mgr;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.UserRoleCreateRequest;
 import ${basePackage}.module.system.req.UserRoleDeleteRequest;
 import ${basePackage}.module.system.req.UserRoleFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mgr/UserRoleManagerImpl.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Message;

src/main/resources/modules/SpringBoot/java/module/system/mpr/DeptMapper.java

@@ -11,7 +11,7 @@ import ${basePackage}.module.system.req.DeptDeleteRequest;
 import ${basePackage}.module.system.req.DeptFindRequest;
 import ${basePackage}.module.system.req.DeptGetRequest;
 import ${basePackage}.module.system.req.DeptUpdateRequest;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 
 /**
  * DEPT - 部门

src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.ent.DictItem;
 import ${basePackage}.module.system.req.DictItemDeleteRequest;
 import ${basePackage}.module.system.req.DictItemFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mpr/DictMapper.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.ent.Dict;
 import ${basePackage}.module.system.req.DictDeleteRequest;
 import ${basePackage}.module.system.req.DictFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mpr/FileMapper.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.ent.File;
 import ${basePackage}.module.system.req.FileDeleteRequest;
 import ${basePackage}.module.system.req.FileFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mpr/LogErrMapper.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.LogErrDeleteRequest;
 import ${basePackage}.module.system.req.LogErrFindRequest;
 import ${basePackage}.module.system.req.LogErrGetRequest;

src/main/resources/modules/SpringBoot/java/module/system/mpr/ResMapper.java

@@ -11,7 +11,7 @@ import ${basePackage}.module.system.req.ResDeleteRequest;
 import ${basePackage}.module.system.req.ResFindRequest;
 import ${basePackage}.module.system.req.ResGetRequest;
 import ${basePackage}.module.system.req.ResUpdateRequest;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 
 /**
  * RES - 资源

src/main/resources/modules/SpringBoot/java/module/system/mpr/RoleMapper.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.ent.Role;
 import ${basePackage}.module.system.req.RoleDeleteRequest;
 import ${basePackage}.module.system.req.RoleFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mpr/RoleResMapper.java

@@ -11,7 +11,7 @@ import ${basePackage}.module.system.req.RoleResDeleteRequest;
 import ${basePackage}.module.system.req.RoleResFindRequest;
 import ${basePackage}.module.system.req.RoleResGetRequest;
 import ${basePackage}.module.system.req.RoleResUpdateRequest;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 
 /**
  * ROLE_RES - 角色资源关系

src/main/resources/modules/SpringBoot/java/module/system/mpr/TokensMapper.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.ent.Tokens;
 import ${basePackage}.module.system.req.TokensDeleteRequest;
 import ${basePackage}.module.system.req.TokensFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mpr/UserMapper.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.ent.User;
 import ${basePackage}.module.system.req.UserDeleteRequest;
 import ${basePackage}.module.system.req.UserFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/mpr/UserRoleMapper.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.ent.UserRole;
 import ${basePackage}.module.system.req.UserRoleDeleteRequest;
 import ${basePackage}.module.system.req.UserRoleFindRequest;

src/main/resources/modules/SpringBoot/java/module/system/rsp/TokensBuildResponse.java

@@ -1,7 +1,7 @@
 package ${basePackage}.module.system.rsp;
 
 import ${basePackage}.frame.base.BaseResponse;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 
 /**
  * TokensGetResponse - 通行证

src/main/resources/modules/SpringBoot/java/module/system/rsp/TokensLogoutResponse.java

@@ -1,7 +1,7 @@
 package ${basePackage}.module.system.rsp;
 
 import ${basePackage}.frame.base.BaseResponse;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 
 /**
  * TokensGetResponse - 通行证

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl

@@ -176,20 +176,9 @@
                         :filter-node-method="filterTree"
                         :expand-on-click-node="false">
                     <div class="tree" slot-scope="{ node, data }">
-                        <span>{{ data.label }}<span style="color: #409EFF">[{{data.value}}]</span></span>
                         <span>
-                             <el-button
-                                     icon="el-icon-plus"
-                                     type="text"
-                                     size="mini"
-                                     @click="onTreeCreate(data)">
-                             </el-button>
-                             <el-button
-                                     icon="el-icon-edit"
-                                     type="text"
-                                     size="mini"
-                                     @click="onTreeEdit(data)">
-                             </el-button>
+                            <el-button type="text" size="mini" icon="el-icon-plus" @click="onTreeCreate(data)"></el-button>
+                            {{ data.label }}<span style="color: #409EFF" @click="onTreeEdit(data)">[{{data.value}}]</span>
                         </span>
                     </div>
                 </el-tree>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl

@@ -170,20 +170,9 @@
                         :filter-node-method="filterTree"
                         :expand-on-click-node="false">
                     <div class="tree" slot-scope="{ node, data }">
-                        <span>{{ data.resName }}<span style="color: #409EFF">[{{data.resCode}}]</span></span>
                         <span>
-                             <el-button
-                                     icon="el-icon-plus"
-                                     type="text"
-                                     size="mini"
-                                     @click="onTreeCreate(data)">
-                             </el-button>
-                             <el-button
-                                     icon="el-icon-edit"
-                                     type="text"
-                                     size="mini"
-                                     @click="onTreeEdit(data)">
-                             </el-button>
+                            <el-button type="text" size="mini" icon="el-icon-plus" @click="onTreeCreate(data)"></el-button>
+                            {{ data.resName }}<span style="color: #409EFF" @click="onTreeEdit(data)">[{{data.resCode}}]</span>
                         </span>
                     </div>
                 </el-tree>

src/main/resources/modules/SpringBoot/test/TestConfig.ftl

@@ -1,6 +1,6 @@
 package ${basePackage}.config;
 
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 @Configuration

src/main/resources/modules/SpringBoot/test/system/DeptTest.java

@@ -7,7 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.mgr.DeptManager;
 import ${basePackage}.module.system.req.DeptCreateRequest;
 import ${basePackage}.module.system.req.DeptDeleteRequest;

src/main/resources/modules/SpringBoot/test/system/DictItemTest.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.mgr.DictItemManager;
 import ${basePackage}.module.system.req.DictItemCreateRequest;
 import ${basePackage}.module.system.req.DictItemDeleteRequest;

src/main/resources/modules/SpringBoot/test/system/DictTest.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.mgr.DictItemManager;
 import ${basePackage}.module.system.mgr.DictManager;
 import ${basePackage}.module.system.req.DictCreateRequest;

src/main/resources/modules/SpringBoot/test/system/FileTest.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.mgr.FileManager;
 import ${basePackage}.module.system.req.FileCreateRequest;
 import ${basePackage}.module.system.req.FileDeleteRequest;

src/main/resources/modules/SpringBoot/test/system/LogErrTest.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.mgr.LogErrManager;
 import ${basePackage}.module.system.req.LogErrCreateRequest;
 import ${basePackage}.module.system.req.LogErrDeleteRequest;

src/main/resources/modules/SpringBoot/test/system/ResTest.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.mgr.ResManager;
 import ${basePackage}.module.system.req.ResCreateRequest;
 import ${basePackage}.module.system.req.ResDeleteRequest;

src/main/resources/modules/SpringBoot/test/system/RoleResTest.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.mgr.RoleResManager;
 import ${basePackage}.module.system.req.RoleResCreateRequest;
 import ${basePackage}.module.system.req.RoleResDeleteRequest;

src/main/resources/modules/SpringBoot/test/system/RoleTest.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.mgr.RoleManager;
 import ${basePackage}.module.system.req.RoleCreateRequest;
 import ${basePackage}.module.system.req.RoleDeleteRequest;

src/main/resources/modules/SpringBoot/test/system/TokensTest.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.module.system.mgr.TokensManager;
 import ${basePackage}.module.system.req.TokensCreateRequest;

src/main/resources/modules/SpringBoot/test/system/UserRoleTest.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.mgr.UserRoleManager;
 import ${basePackage}.module.system.req.UserRoleCreateRequest;
 import ${basePackage}.module.system.req.UserRoleDeleteRequest;

src/main/resources/modules/SpringBoot/test/system/UserTest.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.mgr.UserManager;
 import ${basePackage}.module.system.req.UserCreateRequest;
 import ${basePackage}.module.system.req.UserDeleteRequest;

src/main/resources/modules/SpringBoot/test/test.ftl

@@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 <#if table.getImport()?length gt 1>
 ${table.getImport()}
 </#if>
-import ${basePackage}.frame.base.Token;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.${moduleName}.mgr.${table.getCName()}Manager;
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}CreateRequest;
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}DeleteRequest;