token中获取用户ID

src/main/java/com/chenyang/nse/bussiness/aop/DesensitizationStrategyAspect.java

@@ -65,7 +65,7 @@ public class DesensitizationStrategyAspect {
       if (!ObjectUtils.isEmpty(attributes)) {
          HttpServletRequest request = attributes.getRequest();
          if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-            username = TokenUtil.getUserId(request.getHeader("token"));
+            username = TokenUtil.getUserName(request.getHeader("token"));
          } else {
              username = null;
          }
@@ -188,7 +188,7 @@ public class DesensitizationStrategyAspect {
       if (!ObjectUtils.isEmpty(attributes)) {
          HttpServletRequest request = attributes.getRequest();
          if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-            username = TokenUtil.getUserId(request.getHeader("token"));
+            username = TokenUtil.getUserName(request.getHeader("token"));
          }
       }
 
@@ -265,7 +265,7 @@ public class DesensitizationStrategyAspect {
       if (!ObjectUtils.isEmpty(attributes)) {
          HttpServletRequest request = attributes.getRequest();
          if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-            username = TokenUtil.getUserId(request.getHeader("token"));
+            username = TokenUtil.getUserName(request.getHeader("token"));
          }
       }
 

src/main/java/com/chenyang/nse/bussiness/aop/EncryptLogAspect.java

@@ -101,7 +101,7 @@ public class EncryptLogAspect {
       if (!ObjectUtils.isEmpty(attributes)) {
          HttpServletRequest request = attributes.getRequest();
          if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-            username = TokenUtil.getUserId(request.getHeader("token"));
+            username = TokenUtil.getUserName(request.getHeader("token"));
          } else {
              username = null;
          }
@@ -370,7 +370,7 @@ public class EncryptLogAspect {
       if (!ObjectUtils.isEmpty(attributes)) {
          HttpServletRequest request = attributes.getRequest();
          if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-            username = TokenUtil.getUserId(request.getHeader("token"));
+            username = TokenUtil.getUserName(request.getHeader("token"));
          }
       }
 
@@ -590,7 +590,7 @@ public class EncryptLogAspect {
       if (!ObjectUtils.isEmpty(attributes)) {
          HttpServletRequest request = attributes.getRequest();
          if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-            username = TokenUtil.getUserId(request.getHeader("token"));
+            username = TokenUtil.getUserName(request.getHeader("token"));
          }
       }
 
@@ -692,7 +692,7 @@ public class EncryptLogAspect {
       if (!ObjectUtils.isEmpty(attributes)) {
          HttpServletRequest request = attributes.getRequest();
          if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-            username = TokenUtil.getUserId(request.getHeader("token"));
+            username = TokenUtil.getUserName(request.getHeader("token"));
          }
       }
 

src/main/java/com/chenyang/nse/bussiness/aop/OperLogAspect.java

@@ -142,7 +142,7 @@ public class OperLogAspect {
       if (!ObjectUtils.isEmpty(attributes)) {
          HttpServletRequest request = attributes.getRequest();
          if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-            username = TokenUtil.getUserId(request.getHeader("token"));
+            username = TokenUtil.getUserName(request.getHeader("token"));
          }
       }
 
@@ -213,7 +213,7 @@ public class OperLogAspect {
       if (!ObjectUtils.isEmpty(attributes)) {
          HttpServletRequest request = attributes.getRequest();
          if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-            username = TokenUtil.getUserId(request.getHeader("token"));
+            username = TokenUtil.getUserName(request.getHeader("token"));
          }
       }
 

src/main/java/com/chenyang/nse/bussiness/ccoresdf/impl/TCoreEncryptionServiceCCoreSDFImpl.java

@@ -67,7 +67,7 @@ public class TCoreEncryptionServiceCCoreSDFImpl implements TCoreEncryptionServic
    protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
    public void save(TCoreEncryption encryption) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (encryption.getId() != null && !encryption.getId().equals("")) {
          encryption.setUpdatetime(new Date());
          encryption.setUpdateuser(username);
@@ -159,7 +159,7 @@ public class TCoreEncryptionServiceCCoreSDFImpl implements TCoreEncryptionServic
    }
 
    public void saveSecretKey(TCoreSecretkey tCoreSecretKey) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (tCoreSecretKey.getId() != null && !tCoreSecretKey.getId().equals("")) {
          tCoreSecretKey.setUpdatetime(new Date());
          tCoreSecretKey.setUpdateuser(username);

src/main/java/com/chenyang/nse/bussiness/controller/IndexController.java

@@ -26,6 +26,7 @@ import com.chenyang.nse.bussiness.tools.object.JsonTool;
 import com.chenyang.nse.bussiness.tools.string.PasswordEncryptTool;
 import com.chenyang.nse.bussiness.tools.token.TokenUtil;
 import com.ghca.sso.SSOClient;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.SocketException;
@@ -41,6 +42,7 @@ import java.util.Properties;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,13 +80,13 @@ public class IndexController {
 
             return "login";
         } else {
-         LoginUser loginUser = (LoginUser)obj;
+            LoginUser loginUser = (LoginUser) obj;
             String flag = "1";
             if (EroleFlag.USER.getFlag().equals(flag)) {
                 Boolean sysChpwdFlg = false;
                 List<TConsoleSystemSetting> tcssLst = loginUser.getTcssLst();
                 if (null != tcssLst && tcssLst.size() > 0) {
-               for(TConsoleSystemSetting tcss : tcssLst) {
+                    for (TConsoleSystemSetting tcss : tcssLst) {
                         if (tcss.getId().equals("1") && "1".equals(tcss.getValue())) {
                             sysChpwdFlg = true;
                         }
@@ -114,8 +116,8 @@ public class IndexController {
         List<TBaseMenu> mLst = loginUser.getMenus();
         TBaseMenu nMenu = null;
 
-      for(int i = 0; i < mLst.size(); ++i) {
-         TBaseMenu mInfo = (TBaseMenu)mLst.get(i);
+        for (int i = 0; i < mLst.size(); ++i) {
+            TBaseMenu mInfo = (TBaseMenu) mLst.get(i);
             if (mInfo.getMenuname().equals("设置")) {
                 nMenu = mInfo;
                 break;
@@ -124,8 +126,8 @@ public class IndexController {
 
         TBaseMenu nSubMenu = null;
         if (null != nMenu) {
-         for(int i = 0; i < nMenu.getSubmenu().size(); ++i) {
-            TBaseMenu smInfo = (TBaseMenu)nMenu.getSubmenu().get(i);
+            for (int i = 0; i < nMenu.getSubmenu().size(); ++i) {
+                TBaseMenu smInfo = (TBaseMenu) nMenu.getSubmenu().get(i);
                 if (submenuname.equals(smInfo.getMenuname())) {
                     nSubMenu = smInfo;
                     break;
@@ -161,42 +163,14 @@ public class IndexController {
         Response resultContent = null;
         List<TBaseRole> trole = null;
         LoginUser loginUser = null;
-      TBaseUser newuser = new TBaseUser();
-      TBaseUser tBaseUser = null;
-      Cookie[] cookies = request.getCookies();
-      if (cookies != null) {
-         String cardUserName = "";
-
-         for(Cookie cookie : cookies) {
-            if ("KOAL_CERT_CN".equalsIgnoreCase(cookie.getName())) {
-               cardUserName = new String(URLDecoder.decode(cookie.getValue()).getBytes("ISO-8859-1"), "GBK");
-               tBaseUser = this.indexService.querykeyByUsername(cardUserName);
-               if (tBaseUser != null) {
-                  newuser = this.indexService.login1(tBaseUser);
-               } else {
-                  newuser = null;
-               }
-               break;
-            }
-         }
-
-         if ("".equals(cardUserName)) {
-            tBaseUser = this.indexService.querykeyByUsername(user.getUsername());
-            newuser = this.indexService.login1(user);
-            List var38 = this.operationService.query("", "", "");
-         }
-      } else {
-         tBaseUser = this.indexService.querykeyByUsername(user.getUsername());
-         newuser = this.indexService.login1(user);
-         List var34 = this.operationService.query("", "", "");
-      }
+        TBaseUser newUser = this.indexService.querykeyByUsername(user.getUsername());
 
-      if (null != newuser) {
+        if (null != newUser) {
             boolean resultVOBool = true;
             Response resultVOResponse = null;
 
             try {
-            ResultVO resultVO = LicenseKeyTool.verifyproperties(tBaseUser);
+                ResultVO resultVO = LicenseKeyTool.verifyproperties(newUser);
                 resultVOBool = resultVO.getResult();
                 resultVOResponse = resultVO.getResponse();
             } catch (Exception var26) {
@@ -204,49 +178,49 @@ public class IndexController {
                 resultVOResponse = RespHelper.createResp(false, "LGS_ERR_005", MesUtil.getMsg("LGS_ERR_005", new String[0]));
             }
 
-         if (!newuser.getId().equals("1") && !resultVOBool) {
+            if (!newUser.getId().equals("1") && !resultVOBool) {
                 resultContent = resultVOResponse;
-         } else if (newuser.getIsenable() == 0) {
+            } else if (newUser.getIsenable() == 0) {
                 resultContent = RespHelper.createResp(false, "LGS_ERR_005", MesUtil.getMsg("LGS_ERR_005", new String[0]));
-         } else if (newuser.getLimitnum() != null) {
-            int limitNum = Integer.parseInt(newuser.getLimitnum());
-            if (!newuser.getId().equals("1") && 0 == limitNum) {
+            } else if (newUser.getLimitnum() != null) {
+                int limitNum = Integer.parseInt(newUser.getLimitnum());
+                if (!newUser.getId().equals("1") && 0 == limitNum) {
                     resultContent = RespHelper.createResp(false, "LGS_ERR_006", MesUtil.getMsg("LGS_ERR_006", new String[0]));
-            } else if (!newuser.getPassword().toUpperCase().equals(user.getPassword().toUpperCase())) {
-               if (!newuser.getId().equals("1")) {
-                  resultContent = RespHelper.createResp(false, "LGS_ERR_007", MesUtil.getMsg("LGS_ERR_007", new String[]{newuser.getLimitnum()}));
-                  newuser.setLimitnum(limitNum - 1 + "");
+                } else if (!newUser.getPassword().toUpperCase().equals(user.getPassword().toUpperCase())) {
+                    if (!newUser.getId().equals("1")) {
+                        resultContent = RespHelper.createResp(false, "LGS_ERR_007", MesUtil.getMsg("LGS_ERR_007", new String[]{newUser.getLimitnum()}));
+                        newUser.setLimitnum(limitNum - 1 + "");
                     } else {
                         resultContent = RespHelper.createResp(false, "LGS_ERR_008", MesUtil.getMsg("LGS_ERR_008", new String[0]));
                     }
 
-               this.indexService.saveOrUpdate(newuser);
+                    this.indexService.saveOrUpdate(newUser);
                 } else {
                     try {
                         new Properties();
                         Properties var45 = PropertiesLoaderUtils.loadAllProperties("config.properties");
                         String limitnum = var45.get("login_limit_num").toString();
                         result = Boolean.TRUE;
-                  newuser.setLimitnum(limitnum);
-                  this.indexService.saveOrUpdate(newuser);
-                  String userId = newuser.getId();
+                        newUser.setLimitnum(limitnum);
+                        this.indexService.saveOrUpdate(newUser);
+                        String userId = newUser.getId();
                         loginUser = new LoginUser();
                         loginUser.setLicenseRst(true);
-                  loginUser.setTsysUser(newuser);
+                        loginUser.setTsysUser(newUser);
                         trole = this.indexService.queryRoleByUserId(userId);
                         loginUser.setTrole(trole);
                         if (trole.size() == 0) {
-                     if (!newuser.getId().equals("1")) {
+                            if (!newUser.getId().equals("1")) {
                                 List<TBaseMenu> menus = this.indexService.queryMenusByUserId(userId);
                                 loginUser.setMenus(menus);
                             }
-                  } else if (!newuser.getId().equals("1")) {
+                        } else if (!newUser.getId().equals("1")) {
                             List<TBaseMenu> menus = this.indexService.queryMenusByUserId(userId);
                             loginUser.setMenus(menus);
                             List<TBaseResource> resourcesList = this.indexService.queryResourcesListByRoleId(trole);
                             Map<String, TBaseResource> urlMap = new HashMap();
                             if (!ObjectUtils.isEmpty(resourcesList)) {
-                        for(TBaseResource tresources : resourcesList) {
+                                for (TBaseResource tresources : resourcesList) {
                                     urlMap.put(tresources.getUrl(), tresources);
                                 }
                             }
@@ -255,7 +229,7 @@ public class IndexController {
                             List<TConsolePrivilege> privilegeList = this.indexService.queryPrivilegeByRoleId(trole);
                             List<String> privileges = new ArrayList();
                             if (privilegeList != null) {
-                        for(TConsolePrivilege privilege : privilegeList) {
+                                for (TConsolePrivilege privilege : privilegeList) {
                                     privileges.add(privilege.getPrivilege());
                                 }
                             }
@@ -274,7 +248,7 @@ public class IndexController {
                             List<TBaseResource> resourcesList = this.indexService.queryResourcesListByRoleId(trole);
                             Map<String, TBaseResource> urlMap = new HashMap();
 
-                     for(TBaseResource tresources : resourcesList) {
+                            for (TBaseResource tresources : resourcesList) {
                                 urlMap.put(tresources.getUrl(), tresources);
                             }
 
@@ -282,7 +256,7 @@ public class IndexController {
                             List<TConsolePrivilege> privilegeList = this.indexService.queryPrivilegeByRoleId(trole);
                             List<String> privileges = new ArrayList();
                             if (privilegeList != null) {
-                        for(TConsolePrivilege privilege : privilegeList) {
+                                for (TConsolePrivilege privilege : privilegeList) {
                                     privileges.add(privilege.getPrivilege());
                                 }
                             }
@@ -297,17 +271,17 @@ public class IndexController {
                     }
 
                     Properties loadAllProperties = PropertiesLoaderUtils.loadAllProperties("config.properties");
-               String passwordSwith = (String)loadAllProperties.get("passwordSwith");
-               if ("1".equals(passwordSwith) && !newuser.getId().equals("1")) {
+                    String passwordSwith = (String) loadAllProperties.get("passwordSwith");
+                    if ("1".equals(passwordSwith) && !newUser.getId().equals("1")) {
                         Calendar c = Calendar.getInstance();
                         int nowdayOfYear = c.get(6);
                         int nowdayOfMonth = c.get(5);
                         int nowmonth = c.get(2) + 1;
-                  if (null == tBaseUser.getEditpasswordtime()) {
-                     tBaseUser.setEditpasswordtime(new Date());
+                        if (null == newUser.getEditpasswordtime()) {
+                            newUser.setEditpasswordtime(new Date());
                         } else {
                             Calendar c1 = Calendar.getInstance();
-                     c1.setTime(tBaseUser.getEditpasswordtime());
+                            c1.setTime(newUser.getEditpasswordtime());
                             int olddayOfYear = c1.get(6);
                             int olddayOfMonth = c1.get(5);
                             int oldmonth = c1.get(2) + 1;
@@ -342,7 +316,7 @@ public class IndexController {
         record.setOperationtime(new Date());
         if (loginUser != null) {
             record.setUser(loginUser.getTsysUser().getUsername());
-         String token = TokenUtil.getToken(user.getUsername(), user.getPassword());
+            String token = TokenUtil.getToken(user.getUsername(), user.getPassword(), newUser.getId());
             loginUser.setToken(token);
             resultContent = RespHelper.successResp(loginUser);
             String column_enc = "";
@@ -367,7 +341,7 @@ public class IndexController {
     public Response logout(HttpServletRequest request, HttpServletResponse response, Model model) {
         Map map = new HashMap();
         TConsoleLog record = new TConsoleLog();
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+        String username = TokenUtil.getUserName(request.getHeader("token"));
         record.setLogmessage("用户退出");
         record.setModule("系统模块");
         record.setOperationObject("DDM_00000");
@@ -417,7 +391,7 @@ public class IndexController {
 
     @RequestMapping({"/initMenu"})
     public String initMenu(HttpServletRequest request, HttpServletResponse response, Model model) throws Exception {
-      LoginUser loginUser = (LoginUser)request.getSession().getAttribute("loginUser");
+        LoginUser loginUser = (LoginUser) request.getSession().getAttribute("loginUser");
         String menu_json = JsonTool.toJsonString(loginUser.getMenus());
         if (menu_json == null) {
             return null;
@@ -431,7 +405,7 @@ public class IndexController {
     @ResponseBody
     public Map<String, Object> checkpwd(String pwd, HttpServletRequest request, HttpServletResponse response, Model model) {
         String p = PasswordEncryptTool.generatePassword(pwd);
-      LoginUser loginUser = (LoginUser)request.getSession().getAttribute("loginUser");
+        LoginUser loginUser = (LoginUser) request.getSession().getAttribute("loginUser");
         String realpwd = loginUser.getTsysUser().getPassword();
         boolean result = p.equals(realpwd);
         Map<String, Object> map = new HashMap();
@@ -442,7 +416,7 @@ public class IndexController {
     @RequestMapping({"/updatepwd"})
     public void updatepwd(String pwd, HttpServletRequest request, HttpServletResponse response, Model model) {
         String p = PasswordEncryptTool.generatePassword(pwd);
-      LoginUser loginUser = (LoginUser)request.getSession().getAttribute("loginUser");
+        LoginUser loginUser = (LoginUser) request.getSession().getAttribute("loginUser");
         TBaseUser user = loginUser.getTsysUser();
         user.setPassword(p);
         user.setChpwdflg(p);
@@ -494,7 +468,7 @@ public class IndexController {
         Map map = LicenseKeyTool.map;
 
         try {
-         LicenseKeyTool.verifyproperties((TBaseUser)null);
+            LicenseKeyTool.verifyproperties((TBaseUser) null);
         } catch (Exception e) {
             e.printStackTrace();
             map.put("flag", "0");
@@ -515,9 +489,9 @@ public class IndexController {
         List<Map<String, String>> list = new ArrayList();
         List<String> ipList = LicenseKeyTool.getLinuxLocalUUID();
 
-      for(int i = 0; i < ipList.size(); ++i) {
+        for (int i = 0; i < ipList.size(); ++i) {
             Map<String, String> x = new HashMap();
-         String ip = (String)ipList.get(i);
+            String ip = (String) ipList.get(i);
             String mac = null;
 
             try {
@@ -541,7 +515,7 @@ public class IndexController {
         Map map = LicenseKeyTool.map;
 
         try {
-         LicenseKeyTool.verifyproperties((TBaseUser)null);
+            LicenseKeyTool.verifyproperties((TBaseUser) null);
         } catch (Exception e) {
             e.printStackTrace();
             map.put("flag", "0");

src/main/java/com/chenyang/nse/bussiness/controller/api/APIController.java

@@ -201,7 +201,7 @@ public class APIController {
    @ResponseBody
    public Response<Map<String, String>> getUrlAndToken(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, String> params) {
       Map<String, String> map = new HashMap();
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
       String password = TokenUtil.getPassword(request.getHeader("token"));
       map.put("token", TokenUtil.getNoDateToken(username, password));
       String url = "";

src/main/java/com/chenyang/nse/bussiness/controller/console/SystemConsoleController.java

@@ -47,7 +47,7 @@ public class SystemConsoleController {
       thread.start();
       String username = "";
       if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-         username = TokenUtil.getUserId(request.getHeader("token"));
+         username = TokenUtil.getUserName(request.getHeader("token"));
       }
 
       TConsoleLog record = new TConsoleLog();

src/main/java/com/chenyang/nse/bussiness/controller/console/SystemLogConfigController.java

@@ -43,7 +43,7 @@ public class SystemLogConfigController {
       TCoreLogParam tCoreLogParam = new TCoreLogParam();
       tCoreLogParam.setReservemonth(reservemonth);
       tCoreLogParam.setCreatetime(new Date());
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       tCoreLogParam.setCreateuser(username);
       tCoreLogParam.setId(StringTool.getTablePrimaryKey());
       this.tCoreLogParamDao.save(tCoreLogParam);

src/main/java/com/chenyang/nse/bussiness/controller/core/DataSystemController.java

@@ -764,7 +764,7 @@ public class DataSystemController {
    @ResponseBody
    public Response<TCoreDatasystem> add(@RequestBody DataSystemConfig dataSystemConfig, String linkname, HttpServletRequest request, HttpServletResponse response, Model model) {
       TCoreDatasystem datasource = new TCoreDatasystem();
-      datasource.setCreateuser(TokenUtil.getUserId(request.getHeader("token")));
+      datasource.setCreateuser(TokenUtil.getUserName(request.getHeader("token")));
       datasource.setCreatetime(dataSystemConfig.getCreattime());
       datasource.setDbip(StringUtils.isBlank(dataSystemConfig.getDbip()) ? "" : dataSystemConfig.getDbip());
       datasource.setDbport(dataSystemConfig.getDbport());

src/main/java/com/chenyang/nse/bussiness/controller/core/DesensitizationStrategyController.java

@@ -74,7 +74,7 @@ public class DesensitizationStrategyController {
       String remarks = (String)map.get("remarks");
       String state = (String)map.get("state");
       String projectid = (String)map.get("projectId");
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
       String finalStrategyId = strategyId;
       ((Map)map.get("map")).forEach((k, v) -> {
          String[] split = k.toString().split("\\.");
@@ -304,7 +304,7 @@ public class DesensitizationStrategyController {
       if (!ObjectUtils.isEmpty(attributes)) {
          HttpServletRequest request = attributes.getRequest();
          if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-            username = TokenUtil.getUserId(request.getHeader("token"));
+            username = TokenUtil.getUserName(request.getHeader("token"));
          }
       }
 

src/main/java/com/chenyang/nse/bussiness/controller/core/EncryptionConfigController.java

@@ -171,7 +171,7 @@ public class EncryptionConfigController {
       String dataareaname = (String)map.get("dataareaname");
       String projectid = (String)map.get("projectId");
       String dataSystemid = (String)map.get("datasystemid");
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
       ((Map)map.get("map")).forEach((k, v) -> {
          String[] split = k.toString().split("#\\|#");
          String schemaname = split[0];
@@ -229,10 +229,10 @@ public class EncryptionConfigController {
    public Response<String> saveKafka(@RequestBody Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
       String projectid = (String)map.get("projectId");
       String dataSystemid = (String)map.get("datasystemid");
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
       String topic = (String)map.get("topic");
-      String fileid = TokenUtil.getUserId(request.getHeader("fileid"));
-      String encryptionSecretKeyId = TokenUtil.getUserId(request.getHeader("encryptionSecretKeyId"));
+      String fileid = TokenUtil.getUserName(request.getHeader("fileid"));
+      String encryptionSecretKeyId = TokenUtil.getUserName(request.getHeader("encryptionSecretKeyId"));
       List<String> dataColumList = new ArrayList();
       dataColumList.add(topic);
       dataColumList.add(fileid);

src/main/java/com/chenyang/nse/bussiness/controller/core/FieldScopeController.java

@@ -1790,7 +1790,7 @@ public class FieldScopeController {
       String datasystemid = (String)map.get("datasystemid");
       String projectid = (String)map.get("projectid");
       String editionid = (String)map.get("editionid");
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
       List<Map<String, String>> list = null;
       if ("1".equals(flag) && CacheUtil.cacheManager.containsKey("filter_name_" + datasystemid + "_" + schema + "_" + fieldname)) {
          list = (List)CacheUtil.getCacheValue("filter_name_" + datasystemid + "_" + schema + "_" + fieldname);
@@ -1997,7 +1997,7 @@ public class FieldScopeController {
       String projectid = (String)map.get("projectId");
       String dataSystemid = (String)map.get("datasystemid");
       String editionid = (String)map.get("editionid");
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
       ((Map)map.get("map")).forEach((k, v) -> {
          String[] split = k.toString().split("\\.");
          String schemaname = split[0];

src/main/java/com/chenyang/nse/bussiness/controller/core/FileSystemController.java

@@ -109,7 +109,7 @@ public class FileSystemController {
    @ResponseBody
    @PostMapping({"/saveFileStructureGroup"})
    public Response addFileStructureGroup(@Valid @RequestBody TCoreFileStructureGroup group, HttpServletRequest request) {
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
       Boolean flag = this.fileSystemService.checkRepeatGroupName(group.getGroupname());
       if (flag) {
          this.fileSystemService.saveFileStructureGroup(group);
@@ -205,7 +205,7 @@ public class FileSystemController {
    @ResponseBody
    @RequestMapping({"/delFileStructureGroup"})
    public Response delFileStructureGroup(@Valid @RequestBody FileStructureGroupParam param, HttpServletRequest request) {
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
       if (null != param.getGroupname()) {
          MDC.put("module", "文件结构管理");
          MDC.put("time", (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date()));

src/main/java/com/chenyang/nse/bussiness/controller/core/SchedulerController.java

@@ -214,7 +214,7 @@ public class SchedulerController {
    @ResponseBody
    public Response<String> saveSchedualTask(@RequestBody SchedulRuleVO vo, HttpServletRequest request) throws ParseException {
       String token = request.getHeader("token");
-      String username = TokenUtil.getUserId(token);
+      String username = TokenUtil.getUserName(token);
       TCoreSchedulerKmRules schedulerRule = vo.gettCoreSchedulerKmRules();
       schedulerRule.setCreateuser(username);
       String result = this.schedulerService.saveSchedualTask(schedulerRule);

src/main/java/com/chenyang/nse/bussiness/controller/core/TableRuleController.java

@@ -93,7 +93,7 @@ public class TableRuleController {
          String newUsername = "admin";
          String token = request.getHeader("token");
          if (token != null) {
-            newUsername = TokenUtil.getUserId(token);
+            newUsername = TokenUtil.getUserName(token);
          }
 
          info.setUsername(newUsername);

src/main/java/com/chenyang/nse/bussiness/controller/core/TdataProjectController.java

@@ -39,6 +39,7 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Restrictions;
@@ -47,6 +48,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -102,8 +104,8 @@ public class TdataProjectController {
    @RequestMapping({"/addDataProject"})
    public Response<String> addDataProject(@RequestBody TCoreDataProjectVO vo, HttpServletRequest request) {
       String token = request.getHeader("token");
-      String username = TokenUtil.getUserId(token);
-      String userid = this.userDao.queryUserIdByName(TokenUtil.getUserId(token));
+      String username = TokenUtil.getUserName(token);
+      String userid = this.userDao.queryUserIdByName(TokenUtil.getUserName(token));
       TCoreDataProject projectObj = vo.getProject();
       projectObj.setCreateuser(username);
       projectObj.setCreatetime(new Date());
@@ -254,7 +256,7 @@ public class TdataProjectController {
          return RespHelper.<String>createResp(false, "202", (String)map.get("msg"));
       } else {
          String token = request.getHeader("token");
-         String username = TokenUtil.getUserId(token);
+         String username = TokenUtil.getUserName(token);
          if (StringUtils.isNotEmpty(projectId)) {
             this.clientIpControlledDao.remove(new Criterion[]{Restrictions.eq("project_id", projectId)});
          }
@@ -279,25 +281,17 @@ public class TdataProjectController {
    @ResponseBody
    @RequestMapping({"/selectDataProject"})
    public Response<List<TCoreProjectDetailVO>> selectDataProject(@RequestBody TDataProjectReqVO vo) {
-      LoginUser loginUser = vo.getLoginUser();
       String note = vo.getNote();
       String proName = vo.getProName();
-      String uid = loginUser.getTsysUser().getId();
-      String gid = loginUser.getTsysGroup() == null ? "" : loginUser.getTsysGroup().getId();
-      String userid = "";
+      String uid = TokenUtil.getUserId(); //loginUser.getTsysUser().getId();
+      List<TCoreProjectDetailVO> proList = new ArrayList<>();
+      List<TCoreDataProject> list1 = new ArrayList<>();
       if (!"1".equals(uid)) {
-         userid = "('" + uid + "','" + gid + "')";
-      }
-
-      List<TCoreProjectDetailVO> proList = new ArrayList();
-      new ArrayList();
-      List<TCoreDataProject> list1 = new ArrayList();
-      if (!loginUser.getTsysUser().getId().equals("1")) {
-         List<TCoreDataProject> list2 = this.tdataProjectService.selectMyDataProject(loginUser.getTsysUser().getId(), proName, note);
-         UserVO uservo = this.userService.queryByUserid(loginUser.getTsysUser().getId());
-         if (uservo != null) {
+         List<TCoreDataProject> list2 = this.tdataProjectService.selectMyDataProject(uid, proName, note);
+         UserVO uservo = this.userService.queryByUserid(uid);
+         if (!ObjectUtils.isEmpty(uservo)) {
             List<TCoreDataProject> list3 = this.tdataProjectService.selectMyDataProject(uservo.getGroupid(), proName, note);
-            Map<String, TCoreDataProject> allProject = new HashMap();
+            Map<String, TCoreDataProject> allProject = new HashMap<>();
 
             for(TCoreDataProject userpro : list2) {
                allProject.put(userpro.getId(), userpro);

src/main/java/com/chenyang/nse/bussiness/controller/core/TdataSearchRegexController.java

@@ -543,7 +543,7 @@ public class TdataSearchRegexController {
    @RequestMapping({"/importExcel"})
    @ResponseBody
    public Response importExcel(@RequestPart("file") MultipartFile file, HttpServletRequest request) throws IOException {
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
       String msg = "";
       MultipartFile excelFile = file;
       if (null == file) {

src/main/java/com/chenyang/nse/bussiness/controller/core/encryption/TCoreEncryptionController.java

@@ -671,7 +671,7 @@ public class TCoreEncryptionController {
    public Response loadingTableParams(@RequestBody LoadingColumnParamVO loadingColumnParamVO, HttpServletRequest request, HttpServletResponse response) {
       String username = "";
       if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-         username = TokenUtil.getUserId(request.getHeader("token"));
+         username = TokenUtil.getUserName(request.getHeader("token"));
       }
 
       TCoreEncrypLog encryptionLog = new TCoreEncrypLog();
@@ -2656,7 +2656,7 @@ public class TCoreEncryptionController {
    public Response excelFileUpLoad(@RequestParam("fileUpload") MultipartFile excelFile, @RequestParam("pid") String pid, HttpServletRequest request, HttpServletResponse response) {
       InputStream in = null;
       String fileName = excelFile.getOriginalFilename();
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
 
       try {
          in = excelFile.getInputStream();
@@ -2856,7 +2856,7 @@ public class TCoreEncryptionController {
 
                         tCoreEncryptionTypeField.setProjectid(((TCoreProjectDatasource)coreProjectDatasources.get(0)).getProject_id());
                         tCoreEncryptionTypeField.setColumn_type(getColumnType);
-                        tCoreEncryptionTypeField.setCreateuser(TokenUtil.getUserId(request.getHeader("token")));
+                        tCoreEncryptionTypeField.setCreateuser(TokenUtil.getUserName(request.getHeader("token")));
                         tCoreEncryptionTypeField.setCreatetime(new Date());
                         tCoreEncryptionTypeField.setFlag("0");
                         tCoreEncryptionTypeField.setTschemas(jsonObject.getString("schema"));
@@ -3044,7 +3044,7 @@ public class TCoreEncryptionController {
                   TCoreEncryption oldt = (TCoreEncryption)this.tCoreEncryptionDao.queryUnique(new Criterion[]{Restrictions.eq("encryption_name", tCoreEncryption.getEncryption_name())});
                   String enctid = null;
                   Date date = new Date();
-                  String newUsername = TokenUtil.getUserId(request.getHeader("token"));
+                  String newUsername = TokenUtil.getUserName(request.getHeader("token"));
                   if (null != oldt) {
                      tCoreEncryption.setFlag("0");
                      enctid = oldt.getId();
@@ -3361,7 +3361,7 @@ public class TCoreEncryptionController {
       String copySuffix = PropertyGhcaUtil.copySuffix;
       String username = "";
       if (!ObjectUtils.isEmpty(request) && !ObjectUtils.isEmpty(request.getHeader("token"))) {
-         username = TokenUtil.getUserId(request.getHeader("token"));
+         username = TokenUtil.getUserName(request.getHeader("token"));
       }
 
       List<TCoreEncryptionTypeField> tCorTypeFieldList = new ArrayList();
@@ -4230,7 +4230,7 @@ public class TCoreEncryptionController {
    public Response importfile(@RequestParam("fileUpload") MultipartFile excelFile, HttpServletRequest request) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
       InputStream in = null;
       String fileName = excelFile.getOriginalFilename();
-      String username = TokenUtil.getUserId(request.getHeader("token"));
+      String username = TokenUtil.getUserName(request.getHeader("token"));
 
       try {
          in = excelFile.getInputStream();
@@ -4302,7 +4302,7 @@ public class TCoreEncryptionController {
                   TCoreEncryption oldt = (TCoreEncryption)this.tCoreEncryptionDao.queryUnique(new Criterion[]{Restrictions.eq("encryption_name", tCoreEncryption.getEncryption_name())});
                   String enctid = null;
                   Date date = new Date();
-                  String newUsername = TokenUtil.getUserId(request.getHeader("token"));
+                  String newUsername = TokenUtil.getUserName(request.getHeader("token"));
                   if (null != oldt) {
                      tCoreEncryption.setFlag("0");
                      enctid = oldt.getId();

src/main/java/com/chenyang/nse/bussiness/controller/restfulapi/AccountabilityAPIController.java

@@ -86,7 +86,7 @@ public class AccountabilityAPIController {
       ApiInfoLog info = new ApiInfoLog();
       info.setApitype("3");
       info.setAuthorization(token);
-      info.setUsername(TokenUtil.getUserId(token));
+      info.setUsername(TokenUtil.getUserName(token));
       info.setCalldatetime(new Date());
       info.setCreatetime(new Date());
       info.setRestatus(String.valueOf(result.get("code")));
@@ -197,7 +197,7 @@ public class AccountabilityAPIController {
          ApiInfoLog info = new ApiInfoLog();
          info.setApitype("3");
          info.setAuthorization(token);
-         info.setUsername(TokenUtil.getUserId(token));
+         info.setUsername(TokenUtil.getUserName(token));
          info.setCalldatetime(new Date());
          info.setCreatetime(new Date());
          info.setRestatus(String.valueOf(result.get("code")));

src/main/java/com/chenyang/nse/bussiness/controller/restfulapi/DataMaskingAPIController.java

@@ -75,7 +75,7 @@ public class DataMaskingAPIController {
                   ApiInfoLog info = new ApiInfoLog();
                   info.setApitype("3");
                   info.setAuthorization(token);
-                  info.setUsername(TokenUtil.getUserId(token));
+                  info.setUsername(TokenUtil.getUserName(token));
                   info.setCalldatetime(new Date());
                   info.setCreatetime(new Date());
                   info.setRestatus(String.valueOf(result.get("code")));
@@ -99,7 +99,7 @@ public class DataMaskingAPIController {
          ApiInfoLog info = new ApiInfoLog();
          info.setApitype("3");
          info.setAuthorization(token);
-         info.setUsername(TokenUtil.getUserId(token));
+         info.setUsername(TokenUtil.getUserName(token));
          info.setCalldatetime(new Date());
          info.setCreatetime(new Date());
          info.setRestatus(String.valueOf(result.get("code")));
@@ -214,7 +214,7 @@ public class DataMaskingAPIController {
                ApiInfoLog info = new ApiInfoLog();
                info.setApitype("3");
                info.setAuthorization(token);
-               info.setUsername(TokenUtil.getUserId(token));
+               info.setUsername(TokenUtil.getUserName(token));
                info.setCalldatetime(new Date());
                info.setCreatetime(new Date());
                info.setRestatus(String.valueOf(result.get("code")));
@@ -232,7 +232,7 @@ public class DataMaskingAPIController {
             ApiInfoLog info = new ApiInfoLog();
             info.setApitype("3");
             info.setAuthorization(token);
-            info.setUsername(TokenUtil.getUserId(token));
+            info.setUsername(TokenUtil.getUserName(token));
             info.setCalldatetime(new Date());
             info.setCreatetime(new Date());
             info.setRestatus(String.valueOf(result.get("code")));

src/main/java/com/chenyang/nse/bussiness/controller/restfulapi/FieldReportAPIController.java

@@ -89,7 +89,7 @@ public class FieldReportAPIController {
       ApiInfoLog info = new ApiInfoLog();
       info.setApitype("2");
       info.setAuthorization(token);
-      info.setUsername(TokenUtil.getUserId(request.getHeader("token")));
+      info.setUsername(TokenUtil.getUserName(request.getHeader("token")));
       info.setCalldatetime(new Date());
       info.setCreatetime(new Date());
       info.setRestatus(String.valueOf(result.get("code")));
@@ -212,7 +212,7 @@ public class FieldReportAPIController {
          ApiInfoLog info = new ApiInfoLog();
          info.setApitype("2");
          info.setAuthorization(token);
-         info.setUsername(TokenUtil.getUserId(token));
+         info.setUsername(TokenUtil.getUserName(token));
          info.setCalldatetime(new Date());
          info.setCreatetime(new Date());
          info.setRestatus(String.valueOf(result.get("code")));

src/main/java/com/chenyang/nse/bussiness/controller/restfulapi/TdataDiscoveryAPIController.java

@@ -89,7 +89,7 @@ public class TdataDiscoveryAPIController {
       ApiInfoLog info = new ApiInfoLog();
       info.setApitype("1");
       info.setAuthorization(token);
-      info.setUsername(TokenUtil.getUserId(token));
+      info.setUsername(TokenUtil.getUserName(token));
       info.setCalldatetime(new Date());
       info.setCreatetime(new Date());
       info.setRestatus(String.valueOf(result.get("code")));
@@ -202,7 +202,7 @@ public class TdataDiscoveryAPIController {
          ApiInfoLog info = new ApiInfoLog();
          info.setApitype("1");
          info.setAuthorization(token);
-         info.setUsername(TokenUtil.getUserId(token));
+         info.setUsername(TokenUtil.getUserName(token));
          info.setCalldatetime(new Date());
          info.setCreatetime(new Date());
          info.setRestatus(String.valueOf(result.get("code")));

src/main/java/com/chenyang/nse/bussiness/dean/impl/TCoreEncryptionServiceDeAnImpl.java

@@ -68,7 +68,7 @@ public class TCoreEncryptionServiceDeAnImpl implements TCoreEncryptionService {
    protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
    public void save(TCoreEncryption encryption) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (encryption.getId() != null && !encryption.getId().equals("")) {
          encryption.setUpdatetime(new Date());
          encryption.setUpdateuser(username);
@@ -176,7 +176,7 @@ public class TCoreEncryptionServiceDeAnImpl implements TCoreEncryptionService {
    }
 
    public void saveSecretKey(TCoreSecretkey tCoreSecretKey) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (tCoreSecretKey.getId() != null && !tCoreSecretKey.getId().equals("")) {
          tCoreSecretKey.setUpdatetime(new Date());
          tCoreSecretKey.setUpdateuser(username);

src/main/java/com/chenyang/nse/bussiness/encryptor/service/impl/TCoreEncryptionServiceSdkImpl.java

@@ -78,7 +78,7 @@ public class TCoreEncryptionServiceSdkImpl implements TCoreEncryptionService {
    protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
    public void save(TCoreEncryption encryption) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (encryption.getId() != null && !encryption.getId().equals("")) {
          encryption.setUpdatetime(new Date());
          encryption.setUpdateuser(username);
@@ -201,7 +201,7 @@ public class TCoreEncryptionServiceSdkImpl implements TCoreEncryptionService {
    }
 
    public void saveSecretKey(TCoreSecretkey tCoreSecretKey) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (tCoreSecretKey.getId() != null && !tCoreSecretKey.getId().equals("")) {
          tCoreSecretKey.setUpdatetime(new Date());
          tCoreSecretKey.setUpdateuser(username);

src/main/java/com/chenyang/nse/bussiness/kms/service/impl/TCoreEncryptionServiceKmsImpl.java

@@ -71,7 +71,7 @@ public class TCoreEncryptionServiceKmsImpl implements TCoreEncryptionService {
    protected static final String RUNNING = "-1";
 
    public void save(TCoreEncryption encryption) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (encryption.getId() != null && !encryption.getId().equals("")) {
          encryption.setUpdatetime(new Date());
          encryption.setUpdateuser(username);
@@ -143,7 +143,7 @@ public class TCoreEncryptionServiceKmsImpl implements TCoreEncryptionService {
       String challengeCode = this.kmsService.obtainChallengeCode();
       String accessToken = this.kmsService.obtainAccessToken(challengeCode);
       String sectet_key_plain_text = this.kmsService.obtainSecretKey(Kms.MasterKey.getInstance().getKeyid(), accessToken, tCoreSecretKey.getSectet_key_value());
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (tCoreSecretKey.getId() != null && !tCoreSecretKey.getId().equals("")) {
          tCoreSecretKey.setUpdatetime(new Date());
          tCoreSecretKey.setUpdateuser(username);

src/main/java/com/chenyang/nse/bussiness/quantum/impl/TCoreEncryptionServiceQuantumImpl.java

@@ -72,7 +72,7 @@ public class TCoreEncryptionServiceQuantumImpl implements TCoreEncryptionService
    protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
    public void save(TCoreEncryption encryption) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (encryption.getId() != null && !encryption.getId().equals("")) {
          encryption.setUpdatetime(new Date());
          encryption.setUpdateuser(username);
@@ -151,7 +151,7 @@ public class TCoreEncryptionServiceQuantumImpl implements TCoreEncryptionService
    }
 
    public void saveSecretKey(TCoreSecretkey tCoreSecretKey) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (tCoreSecretKey.getId() != null && !tCoreSecretKey.getId().equals("")) {
          tCoreSecretKey.setUpdatetime(new Date());
          tCoreSecretKey.setUpdateuser(username);

src/main/java/com/chenyang/nse/bussiness/sanwei/impl/TCoreEncryptionServiceSanWeiImpl.java

@@ -70,7 +70,7 @@ public class TCoreEncryptionServiceSanWeiImpl implements TCoreEncryptionService
    protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
    public void save(TCoreEncryption encryption) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (encryption.getId() != null && !encryption.getId().equals("")) {
          encryption.setUpdatetime(new Date());
          encryption.setUpdateuser(username);
@@ -138,7 +138,7 @@ public class TCoreEncryptionServiceSanWeiImpl implements TCoreEncryptionService
    }
 
    public void saveSecretKey(TCoreSecretkey tCoreSecretKey) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (tCoreSecretKey.getId() != null && !tCoreSecretKey.getId().equals("")) {
          tCoreSecretKey.setUpdatetime(new Date());
          tCoreSecretKey.setUpdateuser(username);

src/main/java/com/chenyang/nse/bussiness/service/core/impl/DataSystemServiceImpl.java

@@ -1001,7 +1001,7 @@ public class DataSystemServiceImpl implements DataSystemService {
    public List<TCoreDatasystem> querydatasourceds(String projectId) {
       List<Map<String, String>> list = this.tCoreProjectDatasourceVoDao.queryDatasystemListDataScope(projectId);
       String token = this.request.getHeader("token");
-      String userid = this.userDao.queryUserIdByName(TokenUtil.getUserId(token));
+      String userid = this.userDao.queryUserIdByName(TokenUtil.getUserName(token));
       List<TBaseUsersys> userSysLst = this.userService.queryusersysbyuserid(userid);
       Map<String, String> sysMap = new HashMap();
 
@@ -1881,7 +1881,7 @@ public class DataSystemServiceImpl implements DataSystemService {
          projectList = this.tCoreDataProjectDao.queryAll(Order.desc("createtime"), new Criterion[]{Restrictions.like("project", "", MatchMode.ANYWHERE), Restrictions.like("note", "", MatchMode.ANYWHERE)});
       }
 
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       TBaseUser tBaseUser = this.tBaseUserDao.queryByusername(username);
       if (!"1".equals(tBaseUser.getId())) {
          List<TBaseUserproject> baseUserProjectList = this.tBaseUserprojectDao.queryAll(new Criterion[]{Restrictions.eq("userid", tBaseUser.getId())});

src/main/java/com/chenyang/nse/bussiness/service/core/impl/encryption/TCoreEncryptionServiceImpl.java

@@ -62,7 +62,7 @@ public class TCoreEncryptionServiceImpl implements TCoreEncryptionService {
    protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
    public void save(TCoreEncryption encryption) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (encryption.getId() != null && !encryption.getId().equals("")) {
          TCoreEncryption tCoreEncryption = (TCoreEncryption)this.tCoreEncryptionDao.get(encryption.getId());
          tCoreEncryption.setEncryption_name(encryption.getEncryption_name());
@@ -172,7 +172,7 @@ public class TCoreEncryptionServiceImpl implements TCoreEncryptionService {
    }
 
    public void saveSecretKey(TCoreSecretkey tCoreSecretKey) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (tCoreSecretKey.getId() != null && !tCoreSecretKey.getId().equals("")) {
          TCoreSecretkey secretkey = (TCoreSecretkey)this.tCoreSecretkeyDao.get(tCoreSecretKey.getId());
          secretkey.setSecret_key_name(tCoreSecretKey.getSecret_key_name());

src/main/java/com/chenyang/nse/bussiness/thkms/service/impl/TCoreEncryptionServiceThKmsImpl.java

@@ -66,7 +66,7 @@ public class TCoreEncryptionServiceThKmsImpl implements TCoreEncryptionService {
    protected TCoreKeyTypeManagementDao tCoreKeyTypeManagementDao;
 
    public void save(TCoreEncryption encryption) {
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (encryption.getId() != null && !encryption.getId().equals("")) {
          encryption.setUpdatetime(new Date());
          encryption.setUpdateuser(username);
@@ -134,7 +134,7 @@ public class TCoreEncryptionServiceThKmsImpl implements TCoreEncryptionService {
 
    public void saveSecretKey(TCoreSecretkey tCoreSecretKey) {
       String sectet_key_plain_text = this.thKmsService.decryptDataKey(tCoreSecretKey.getSectet_key_value());
-      String username = TokenUtil.getUserId(this.request.getHeader("token"));
+      String username = TokenUtil.getUserName(this.request.getHeader("token"));
       if (tCoreSecretKey.getId() != null && !tCoreSecretKey.getId().equals("")) {
          tCoreSecretKey.setUpdatetime(new Date());
          tCoreSecretKey.setUpdateuser(username);

src/main/java/com/chenyang/nse/bussiness/tools/licensekey/LicenseKeyTool.java

@@ -253,7 +253,7 @@ public class LicenseKeyTool {
 
    public static void main(String[] args) {
 //      String content = "有效期1个月,10.10.200.24,fe:fc:fe:21:01:2d,2024-12-11,2025-01-11,5";
-      String content = "有效期12个月,172.16.100.75,bc:d0:74:a5:4d:b7,2024-12-11,2025-12-11,100";
+      String content = "有效期12个月,172.19.1.167,bc:d0:74:a5:4d:b7,2024-12-11,2025-12-11,100";
       String password = "ghca";
       System.out.println("加密之前：" + content);
       String encrypt = AesTool.encrypt(content, password);

src/main/java/com/chenyang/nse/bussiness/tools/token/TokenUtil.java

@@ -5,6 +5,10 @@ import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.interfaces.DecodedJWT;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -13,16 +17,30 @@ public class TokenUtil {
     private static final long EXPIRE_DATE = 7200000L;
     private static final String TOKEN_SECRET = "GHCA";
 
-   public static String getToken(String username, String password) {
+    /**
+     * 生成签名,2小时后过期
+     *
+     * @param username 用户名
+     * @param password 密码
+     * @param userId   用户ID
+     * @return 加密的token
+     */
+    public static String getToken(String username, String password, String userId) {
         String token = "";
 
         try {
-         Date date = new Date(System.currentTimeMillis() + 7200000L);
-         Algorithm algorithm = Algorithm.HMAC256("GHCA");
-         Map<String, Object> header = new HashMap();
+            Date date = new Date(System.currentTimeMillis() + EXPIRE_DATE);
+            Algorithm algorithm = Algorithm.HMAC256(TOKEN_SECRET);
+            Map<String, Object> header = new HashMap<>();
             header.put("typ", "JWT");
             header.put("alg", "HS256");
-         token = JWT.create().withHeader(header).withClaim("username", username).withClaim("password", password).withExpiresAt(date).sign(algorithm);
+            token = JWT
+                    .create()
+                    .withHeader(header)
+                    .withSubject(userId)
+                    .withClaim("username", username)
+                    .withClaim("password", password)
+                    .withExpiresAt(date).sign(algorithm);
             return token;
         } catch (Exception e) {
             e.printStackTrace();
@@ -35,8 +53,8 @@ public class TokenUtil {
 
         try {
             new Date(System.currentTimeMillis() + 7200000L);
-         Algorithm algorithm = Algorithm.HMAC256("GHCA");
-         Map<String, Object> header = new HashMap();
+            Algorithm algorithm = Algorithm.HMAC256(TOKEN_SECRET);
+            Map<String, Object> header = new HashMap<>();
             header.put("typ", "JWT");
             header.put("alg", "HS256");
             token = JWT.create().withHeader(header).withClaim("username", username).withClaim("password", password).sign(algorithm);
@@ -49,7 +67,7 @@ public class TokenUtil {
 
     public static boolean verify(String token) {
         try {
-         Algorithm algorithm = Algorithm.HMAC256("GHCA");
+            Algorithm algorithm = Algorithm.HMAC256(TOKEN_SECRET);
             JWTVerifier verifier = JWT.require(algorithm).build();
             verifier.verify(token);
             return true;
@@ -59,7 +77,31 @@ public class TokenUtil {
         }
     }
 
-   public static String getUserId(String token) {
+    /**
+     * 获取token中的用户ID
+     *
+     * @return 用户ID
+     */
+    public static String getUserId() {
+        try {
+            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            assert attributes != null;
+            HttpServletRequest request = attributes.getRequest();
+            String token = request.getHeader("token");
+            DecodedJWT jwt = JWT.decode(token);
+            return jwt.getSubject();
+        } catch (JWTDecodeException var2) {
+            return null;
+        }
+    }
+
+    /**
+     * 获取token中的用户名
+     *
+     * @param token 令牌
+     * @return 用户名
+     */
+    public static String getUserName(String token) {
         try {
             DecodedJWT jwt = JWT.decode(token);
             return jwt.getClaim("username").asString();
@@ -68,6 +110,12 @@ public class TokenUtil {
         }
     }
 
+    /**
+     * 获取token中的密码
+     *
+     * @param token 令牌
+     * @return 密码
+     */
     public static String getPassword(String token) {
         try {
             DecodedJWT jwt = JWT.decode(token);