1、修改查询活动

src/main/java/com/dk/oauth/entity/Activity.java

@@ -119,6 +119,13 @@ public class Activity extends PageInfo<ActivityResponse> implements Serializable
     private JSONArray annexPaths;
 
     /**
+     * 跳转链接
+     */
+    @Excel(name = "跳转链接")
+    @ApiModelProperty(value = "跳转链接")
+    private String activityUrl;
+
+    /**
      * 应用代码
      */
     @Excel(name = "应用代码")

src/main/java/com/dk/oauth/entity/ActivityResponse.java

@@ -116,6 +116,13 @@ public class ActivityResponse extends PageInfo<ActivityResponse> implements Seri
     private JSONArray annexPaths;
 
     /**
+     * 跳转链接
+     */
+    @Excel(name = "跳转链接")
+    @ApiModelProperty(value = "跳转链接")
+    private String activityUrl;
+
+    /**
      * 应用代码
      */
     @Excel(name = "应用代码")

src/main/java/com/dk/oauth/entity/AuthAccessToken.java

@@ -43,6 +43,9 @@ public class AuthAccessToken {
     @TableField("user_id")
     private String userId;
 
+    @TableField("user_wxid")
+    private String userWxId;
+
     @TableField("cp_id")
     private String cpId;
 

src/main/java/com/dk/oauth/entity/UserLoginSuccess.java

@@ -22,6 +22,8 @@ public class UserLoginSuccess {
 
     private String userName;
 
+    private String userWxId;
+
     private String accessToken;
 
     private List<Map<String, Object>> menuList;
@@ -36,6 +38,7 @@ public class UserLoginSuccess {
 
     public UserLoginSuccess setByUserLogin(UserLogin userLogin) {
         this.userId = userLogin.getUserId();
+        this.userWxId = userLogin.getUserWxid();
         this.userPhone = userLogin.getUserPhone();
         this.userName = userLogin.getUserName();
         this.joinedCps = userLogin.getJoinedCps();

src/main/java/com/dk/oauth/feign/service/OrgFeign.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @desc : MdmServerFeign
  * @date : 2024-038-10 10:56
  */
-@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1" , path = Constant.MST_ORG, contextId = "org")
+@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1-zx" , path = Constant.MST_ORG, contextId = "org")
 public interface OrgFeign {
     /**
      * @desc : 注册商户时候插入部门--顶级

src/main/java/com/dk/oauth/feign/service/StaffFeign.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * @desc : MdmServerFeign
  * @date : 2024-038-10 10:56
  */
-@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1" , path = Constant.MST_STAFF, contextId = "staff")
+@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1-zx" , path = Constant.MST_STAFF, contextId = "staff")
 public interface StaffFeign {
     /**
      * @desc : 体验产品

src/main/java/com/dk/oauth/service/impl/AuthAccessTokenServiceImpl.java

@@ -155,14 +155,14 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
         // todo
 //        userWxLogin.setUserWxid("1");
         UserLogin userLogin = userMapper.getByWxid(userWxLogin.getUserWxid());
-        if (userLogin == null) {
-            //无用户
-            return ResponseResultUtil.error(ErrorCodeEnum.USER_NOT_EXIST.getCode(), ErrorCodeEnum.USER_NOT_EXIST.getMessage());
-        }
-        userLogin.checkUserLogin();
-        try {
-            // 设置应用代码
-            userLogin.setAppCode(Constant.AppCode.WEIXIN.getCode());
+            if (userLogin == null) {
+                //无用户
+                return ResponseResultUtil.error(ErrorCodeEnum.USER_NOT_EXIST.getCode(), ErrorCodeEnum.USER_NOT_EXIST.getMessage());
+            }
+            userLogin.checkUserLogin();
+            try {
+                // 设置应用代码
+                userLogin.setAppCode(Constant.AppCode.WEIXIN.getCode());
             return createToken(userLogin);
         } catch (Exception e) {
             log.error("获取accessToken发生异常=", e);
@@ -215,6 +215,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                 jwtGenerator.setSalt(username);
                 jwtGenerator.setUsername(username);
                 jwtGenerator.setUserId(userId);
+                jwtGenerator.setUserWxId(userLogin.getUserWxid());
                 jwtGenerator.setClientId(clientId);
                 jwtGenerator.setCpId(company.getCpId().toString());
                 jwtGenerator.setCpCode(company.getCpCode());
@@ -226,6 +227,8 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                 authAccessToken.setId(UUID.uuid32());
                 authAccessToken.setClientId(clientId);
                 authAccessToken.setTokenId(accessToken);
+                authAccessToken.setUserId(userId);
+                authAccessToken.setUserWxId(userLogin.getUserWxid());
                 authAccessToken.setCreateDate(new Date());
                 authAccessToken.setCpId(company.getCpId().toString());
                 authAccessToken.setCpCode(company.getCpCode());
@@ -241,26 +244,24 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                 }
             }
         }
-        // 默认取体验公司的dktest账号
-        Map<String, Object> collectQuery = new HashMap<>();
-        collectQuery.put("cpId", userLogin.getCurrentCp());
-        collectQuery.put("staffCode", "东科智云-体验");
-        ResponseResultVO<StaffResponse> feignExperience = staffFeign.getFeignExperience(collectQuery);
-        StaffResponse s = new StaffResponse();
-        log.info("---->>>getFeignExperience = " + feignExperience.toString());
-        //如果没有成功返回，状态设置为待审
-        if (feignExperience.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
-            //无用户
-            return ResponseResultUtil.error(ErrorCodeEnum.USER_NOT_EXIST.getCode(), ErrorCodeEnum.USER_NOT_EXIST.getMessage());
-        } else {
-            s = feignExperience.getData();
-        }
+        // 默认取体验公司的账号
+//        Map<String, Object> collectQuery = new HashMap<>();
+//        collectQuery.put("cpId", userLogin.getCurrentCp());
+//        collectQuery.put("staffCode", "东科智云-体验");
+//        ResponseResultVO<StaffResponse> feignExperience = staffFeign.getFeignExperience(collectQuery);
+//        StaffResponse s = new StaffResponse();
+//        log.info("---->>>getFeignExperience = " + feignExperience.toString());
+//        //如果没有成功返回，状态设置为待审
+//        if (feignExperience.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+//            //无用户
+//            return ResponseResultUtil.error(ErrorCodeEnum.USER_NOT_EXIST.getCode(), ErrorCodeEnum.USER_NOT_EXIST.getMessage());
+//        } else {
+//            s = feignExperience.getData();
+//        }
         UserLoginSuccess userLoginSuccess = new UserLoginSuccess()
                 .setByUserLogin(userLogin)
                 .setAccessToken(accessToken)
                 .setCompany(company)
-                .setStaffResponse(s)
-                //                .setMenuList(userMapper.getMenuByUser(userLogin.getAppCode(),userId,company.getCpId(),"zh_CN"))
                 ;
 
         return ResponseResultUtil.success(userLoginSuccess);
@@ -521,6 +522,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                 jwtGenerator.setSalt(username);
                 jwtGenerator.setUsername(username);
                 jwtGenerator.setUserId(userId);
+                jwtGenerator.setUserWxId(userLogin.getUserWxid());
                 jwtGenerator.setClientId(clientId);
                 jwtGenerator.setCpId(company.getCpId().toString());
                 jwtGenerator.setCpCode(company.getCpCode());
@@ -535,6 +537,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                 authAccessToken.setTokenId(accessToken);
                 authAccessToken.setCreateDate(new Date());
                 authAccessToken.setUserId(userId);
+                authAccessToken.setUserWxId(userLogin.getUserWxid());
                 authAccessToken.setCpId(company.getCpId().toString());
                 authAccessToken.setCpCode(company.getCpCode());
                 authAccessToken.setAppCode(userLogin.getAppCode());

src/main/java/com/dk/oauth/shiro/jwt/JWTGenerator.java

@@ -9,6 +9,7 @@ import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
 public class JWTGenerator implements ValueGenerator {
 
     private String username;
+    private String userWxId;
     private String userId;
     private String cpId;
     private String cpCode;
@@ -21,13 +22,13 @@ public class JWTGenerator implements ValueGenerator {
     @Override
     public String generateValue() throws OAuthSystemException {
         System.out.println("--->>> generateValue()");
-        return JwtUtil.sign(username, userId, appCode, clientId, salt, cpId, cpCode, lang);
+        return JwtUtil.sign(username, userId,userWxId, appCode, clientId, salt, cpId, cpCode, lang);
     }
 
     @Override
     public String generateValue(String param) throws OAuthSystemException {
         System.out.println("--->>> generateValuegenerateValue(String param)");
-        return JwtUtil.sign(username, userId, appCode, clientId, salt, cpId, cpCode, lang);
+        return JwtUtil.sign(username, userId,userWxId, appCode, clientId, salt, cpId, cpCode, lang);
     }
 
 }

src/main/java/com/dk/oauth/util/JwtUtil.java

@@ -16,6 +16,7 @@ import java.util.Date;
 public class JwtUtil {
     public static final String SHIRO_USER_NAME = "username";
     public static final String SHIRO_USER_ID = "userId";
+    public static final String SHIRO_USER_WX_ID = "userWxId";
     public static final String SHIRO_CP_ID = "cpId";
     public static final String SHIRO_CP_CODE = "cpCode";
     public static final String SHIRO_CLIENT_ID = "clientId";
@@ -105,6 +106,21 @@ public class JwtUtil {
     }
 
     /**
+     * @desc : 获取token中UserWxId
+     * @author : 周兴
+     * @date : 2023/2/26 16:32
+     */
+    public static String getUserWxId(String token) {
+        try {
+            DecodedJWT jwt = JWT.decode(token);
+            return jwt.getClaim(SHIRO_USER_WX_ID).asString();
+        } catch (JWTDecodeException e) {
+            log.error("error：{}", e.getMessage());
+            return null;
+        }
+    }
+
+    /**
      * @desc : 获取token中CpId
      * @author : 周兴
      * @date : 2023/2/26 16:32
@@ -176,7 +192,7 @@ public class JwtUtil {
      * @param salt     盐值
      * @return 加密的token
      */
-    public static String sign(String username, String userId, String appCode, String clientId, String salt, String cpId, String cpCode, String lang) {
+    public static String sign(String username, String userId, String userWxId, String appCode, String clientId, String salt, String cpId, String cpCode, String lang) {
         Date expireDate = new Date(System.currentTimeMillis() + OauthConstants.EXPIRES_IN);
         //加盐值
         Algorithm algorithm = Algorithm.HMAC256(salt);
@@ -184,6 +200,7 @@ public class JwtUtil {
         return JWT.create()
                 .withClaim(SHIRO_USER_NAME, username)
                 .withClaim(SHIRO_USER_ID, userId)
+                .withClaim(SHIRO_USER_WX_ID, userWxId)
                 .withClaim(SHIRO_CP_ID, cpId)
                 .withClaim(SHIRO_CP_CODE, cpCode)
                 .withClaim(SHIRO_APP_CODE, appCode)
@@ -206,7 +223,7 @@ public class JwtUtil {
                 .sign(algorithm);
     }
 
-    public static String sign(String username, String userId, String appCode, String clientId, String salt, String grantType, String cpId, String cpCode, String lang) {
+    public static String sign(String username, String userId, String userWxId, String appCode, String clientId, String salt, String grantType, String cpId, String cpCode, String lang) {
         Date expireDate = new Date(System.currentTimeMillis() + OauthConstants.EXPIRES_IN);
         //加盐值
         Algorithm algorithm = Algorithm.HMAC256(salt);
@@ -214,6 +231,7 @@ public class JwtUtil {
         return JWT.create()
                 .withClaim(SHIRO_USER_NAME, username)
                 .withClaim(SHIRO_USER_ID, userId)
+                .withClaim(SHIRO_USER_WX_ID, userWxId)
                 .withClaim(SHIRO_CP_ID, cpId)
                 .withClaim(SHIRO_CP_CODE, cpCode)
                 .withClaim(SHIRO_APP_CODE, appCode)