获取授权码调整

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserApplicationService.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.system.user.service.impl;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.model.TimeyMessage;
 import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
@@ -48,6 +49,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
 
     @Override
     public RestResponse apply(UserApplyRequest userApplyRequest, int applyTypeTeam) {
+        //申请公司id
         long companyId = userApplyRequest.getCompanyId();
         //获取用户原有的申请信息
         UserApplication userApplication = this.getOne(new QueryWrapper<UserApplication>()
@@ -78,6 +80,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         //申请加入项目时需要设置的信息
         userApplication.setPowerType(userApplyRequest.getPowerType());
         boolean result = this.saveOrUpdate(userApplication);
+
         if (result) {
             //申请操作成功，推送消息
             if (ApiConstants.ApplicationConstants.APPLY_TYPE_TEAM == applyTypeTeam) {
@@ -86,7 +89,8 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
                 List<Long> clerkIds = userService.getUserIdByCompanyIdAndRoleCode(companyId,
                         CommonEnum.DefaultRole.CLERK.getCode());
                 if (clerkIds != null && clerkIds.size() > 0) {
-
+                    TimeyMessage timeyMessage = new TimeyMessage();
+                    timeyMessage.setContent("");
                 }
             } else {
 

lift-system-service/src/main/java/cn/com/ty/lift/system/wechat/constants/WxConstants.java

@@ -17,25 +17,38 @@ public class WxConstants {
      */
     public static final String APP_LOGIN = "appLogin";
 
+    /**
+     * 用户授权路径
+     */
+    public static final String USER_INFO_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?"
+            + "appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
+
     /**
      * app登录配置常量
      */
     public interface AppConfigConstants {
+        /**
+         * appId
+         */
         String APP_ID = "wx0f10e6386fb9969e";
+        /**
+         * appSecret
+         */
         String APP_SECRET = "d4624c36b6795d1d99dcf0547af5443d";
-        String USER_INFO_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?"
-                + "appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
-
     }
 
     /**
      * 小程序登录配置常量
      */
     public interface AppletConfigConstants {
-        String APP_ID = "wx9183e5fa00c9614a";//小程序appId
-        String APP_SECRET = "2e4c634a4f1f54a871e79da9d6f1179e";//小程序secret
-        String AUTHORIZED_CODE_STR = "code";
-        String AUTH_URL = "https://api.weixin.qq.comI/sns/jscode2session?appid=APPID&secret=SECRET&js_code=JSCODE&grant_type=authorization_code";
+        /**
+         * 小程序appId
+         */
+        String APP_ID = "wx9183e5fa00c9614a";
+        /**
+         * 小程序secret
+         */
+        String APP_SECRET = "2e4c634a4f1f54a871e79da9d6f1179e";
     }
 
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/wechat/utils/WxUtil.java

@@ -18,15 +18,8 @@ public class WxUtil {
      * @description app端通过用户授权码获取用户openId
      */
     public static String getAppOpenIdByAuthCode(String authCode) {
-        String url = WxConstants.AppConfigConstants.USER_INFO_ACCESS_TOKEN_URL
-                .replace("APPID", WxConstants.AppConfigConstants.APP_ID)
-                .replace("SECRET", WxConstants.AppConfigConstants.APP_SECRET)
-                .replace("CODE", authCode);
-        JSONObject result = JSONUtil.parseObj(HttpUtil.get(url));
-        if (result.containsKey("openid")) {
-            return result.getStr("openid");
-        }
-        return null;
+        return getOpenIdByAuthCode(authCode, WxConstants.AppConfigConstants.APP_ID,
+                WxConstants.AppConfigConstants.APP_SECRET);
     }
 
     /**
@@ -36,9 +29,22 @@ public class WxUtil {
      * @date 2020/4/27 10:36 上午
      */
     public static String getAppletOpenIdByAuthCode(String authCode) {
-        String url = WxConstants.AppletConfigConstants.AUTH_URL
-                .replace("APPID", WxConstants.AppletConfigConstants.APP_ID)
-                .replace("SECRET", WxConstants.AppletConfigConstants.APP_SECRET)
+        return getOpenIdByAuthCode(authCode, WxConstants.AppletConfigConstants.APP_ID,
+                WxConstants.AppletConfigConstants.APP_SECRET);
+    }
+
+    /**
+     * @param authCode  授权码
+     * @param appId     appId
+     * @param appSecret appSecret
+     * @return openId
+     * @description 通过授权码获取微信openId
+     * @date 2020/4/30 2:47 下午
+     */
+    private static String getOpenIdByAuthCode(String authCode, String appId, String appSecret) {
+        String url = WxConstants.USER_INFO_ACCESS_TOKEN_URL
+                .replace("APPID", appId)
+                .replace("SECRET", appSecret)
                 .replace("CODE", authCode);
         JSONObject result = JSONUtil.parseObj(HttpUtil.get(url));
         if (result.containsKey("openid")) {