设备和token

chsm-web-manage/src/main/java/com/sunyard/chsm/dto/DeviceDTO.java

@@ -73,6 +73,7 @@ public abstract class DeviceDTO {
          * 管理端口
          */
         private Integer managePort;
+        private Integer encKeyIdx;
         /**
          * 访问凭证
          */

chsm-web-manage/src/main/java/com/sunyard/config/security/jwt/AuthenticationSuccessHandler.java

@@ -2,7 +2,7 @@ package com.sunyard.config.security.jwt;
 
 import cn.hutool.core.util.StrUtil;
 import com.google.gson.Gson;
-import com.sunyard.ssp.common.constant.SecurityConstant;
+import com.sunyard.chsm.constant.SecurityConstant;
 import com.sunyard.ssp.modules.user.entity.ScUser;
 import com.sunyard.ssp.modules.user.service.IScUserService;
 import com.sunyard.ssp.utils.ResponseUtil;

chsm-web-manage/src/main/java/com/sunyard/config/security/jwt/JWTAuthenticationFilter.java

@@ -3,7 +3,7 @@ package com.sunyard.config.security.jwt;
 import cn.hutool.core.util.StrUtil;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.sunyard.ssp.common.constant.SecurityConstant;
+import com.sunyard.chsm.constant.SecurityConstant;
 import com.sunyard.ssp.utils.ResponseUtil;
 import com.sunyard.ssp.vo.TokenUser;
 import io.jsonwebtoken.Claims;

chsm-web-manage/src/main/java/com/sunyard/ssp/common/constant/SecurityConstant.java

@@ -1,78 +0,0 @@
-package com.sunyard.ssp.common.constant;
-
-/**
- * @author Exrickx
- */
-public interface SecurityConstant {
-
-    /**
-     * token分割
-     */
-    String TOKEN_SPLIT = "Bearer ";
-
-    /**
-     * JWT签名加密key
-     */
-    String JWT_SIGN_KEY = "keeper";
-
-    /**
-     * token参数头
-     */
-    String HEADER = "accessToken";
-
-    /**
-     * 权限参数头
-     */
-    String AUTHORITIES = "authorities";
-
-    /**
-     * 用户选择JWT保存时间参数头
-     */
-    String SAVE_LOGIN = "saveLogin";
-
-    /**
-     * github保存state前缀key
-     */
-    String GITHUB_STATE = "KEEPER_GITHUB:";
-
-    /**
-     * qq保存state前缀key
-     */
-    String QQ_STATE = "KEEPER_QQ:";
-
-    /**
-     * qq保存state前缀key
-     */
-    String WEIBO_STATE = "KEEPER_WEIBO:";
-
-    /**
-     * 交互token前缀key
-     */
-    String TOKEN_PRE = "KEEPER_TOKEN_PRE:";
-
-    /**
-     * 用户token前缀key 单点登录使用
-     */
-    String USER_TOKEN = "KEEPER_USER_TOKEN:";
-
-    /**
-     * 用户登陆之后的租户识别id
-     * @auther: ZS
-     * @description:
-     * @param:
-     * @return:
-     * @date: 2019/3/20 16:21
-     */
-    String TENANT_ID = "KEEPER_TENANT_ID";
-
-    /**
-     * 更新用户接口url
-     * @auther: ZS
-     * @description:
-     * @param:
-     * @return:
-     * @date: 2019/7/31 14:54
-     */
-    String USER_UPDATE_URL = "/keeper/user/admin/edit";
-
-}

chsm-web-manage/src/main/java/com/sunyard/ssp/modules/user/controller/ScUserController.java

@@ -5,10 +5,10 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.sunyard.chsm.constant.SecurityConstant;
 import com.sunyard.ssp.common.PageVo;
 import com.sunyard.ssp.common.Result;
 import com.sunyard.ssp.common.constant.CommonConstant;
-import com.sunyard.ssp.common.constant.SecurityConstant;
 import com.sunyard.ssp.common.enums.UserHeaderTypeEnum;
 import com.sunyard.ssp.modules.user.entity.ScDepartment;
 import com.sunyard.ssp.modules.user.entity.ScDepartmentHeader;

chsm-web-manage/src/main/java/com/sunyard/ssp/utils/SecurityUtil.java

@@ -2,8 +2,8 @@ package com.sunyard.ssp.utils;
 
 import cn.hutool.core.util.StrUtil;
 import com.google.gson.Gson;
+import com.sunyard.chsm.constant.SecurityConstant;
 import com.sunyard.ssp.common.constant.CommonConstant;
-import com.sunyard.ssp.common.constant.SecurityConstant;
 import com.sunyard.ssp.modules.user.entity.ScPermission;
 import com.sunyard.ssp.modules.user.entity.ScRole;
 import com.sunyard.ssp.modules.user.entity.ScUser;