update previous code.(Wechat appId)

src/main/java/cn/quantgroup/xyqb/config/data/WechatConfiguration.java

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.config.data;
 import cn.quantgroup.xyqb.exception.BizException;
 import cn.quantgroup.xyqb.exception.BizExceptionEnum;
 import cn.quantgroup.xyqb.model.WechatConfigBean;
+import cn.quantgroup.xyqb.util.StringUtils;
 import com.alibaba.fastjson.JSONArray;
 import com.ctrip.framework.apollo.ConfigService;
 import lombok.Getter;
@@ -32,4 +33,8 @@ public class WechatConfiguration {
             return optional.get();
         }
     }
+
+    public WechatConfigBean getDefault(){
+        return list.stream().filter(WechatConfigBean::isDefaultMini).findFirst().get();
+    }
 }

src/main/java/cn/quantgroup/xyqb/constant/UserConstant.java

@@ -10,7 +10,7 @@ public class UserConstant {
     public static final Integer defaultTenantId = 560761;
     public static final String defaultTenantIdString = "560761";
 
-    public static final String defaultAppId = "560761";
+    public static final String defaultAppId = "";
     public static final String IMAGE_FORMAT_PNG = "png";
     public static final String IMG_BASE64_PATTREN = "data:image/" + IMAGE_FORMAT_PNG + ";base64,%s";
 

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -7,6 +7,7 @@ import cn.quantgroup.xyqb.aspect.captcha.CaptchaNewValidator;
 import cn.quantgroup.xyqb.aspect.forbidden.AccessForbiddenValidator;
 import cn.quantgroup.xyqb.aspect.limit.PasswordFreeAccessValidator;
 import cn.quantgroup.xyqb.aspect.lock.PasswordErrorFiniteValidator;
+import cn.quantgroup.xyqb.config.data.WechatConfiguration;
 import cn.quantgroup.xyqb.constant.UserConstant;
 import cn.quantgroup.xyqb.constant.enums.LoginType;
 import cn.quantgroup.xyqb.controller.IBaseController;
@@ -98,6 +99,9 @@ public class UserController implements IBaseController {
     @Autowired
     private IGeetestLogService geetestLogService;
 
+    @Autowired
+    private WechatConfiguration wechatConfiguration;
+
 
     /**
      * 登录（账号 + 密码）
@@ -126,6 +130,9 @@ public class UserController implements IBaseController {
             @RequestHeader(value = Constants.X_AUTH_TENANT, defaultValue = UserConstant.defaultTenantIdString) Integer tenantId
             ,
             HttpServletRequest request) {
+        if (org.apache.commons.lang3.StringUtils.isEmpty(appId)) {
+            appId = wechatConfiguration.getDefault().getAppId();
+        }
         log.info("loginV1 -> channelId:{},appChennel:{},createdFrom:{},userId:{},key:{},dimension:{}", channelId, appChannel, createdFrom, userId, key, dimension);
         return login(channelId, appChannel, createdFrom, userId, key, dimension, null, request, appId, tenantId);
     }
@@ -160,6 +167,10 @@ public class UserController implements IBaseController {
             @RequestParam(value = Constants.X_AUTH_APP_ID, defaultValue = UserConstant.defaultAppId) String appId,
             @RequestHeader(value = Constants.X_AUTH_TENANT, defaultValue = UserConstant.defaultTenantIdString) Integer tenantId
     ) {
+        if (org.apache.commons.lang3.StringUtils.isEmpty(appId)) {
+            appId = wechatConfiguration.getDefault().getAppId();
+        }
+
         log.info("loginV2 -> channelId:{},appChennel:{},createdFrom:{},userId:{},key:{},dimension:{}", channelId, appChannel, createdFrom, userId, key, dimension);
         return login(channelId, appChannel, createdFrom, userId, key, dimension, geetestlog_id, request, appId, tenantId);
     }
@@ -183,6 +194,9 @@ public class UserController implements IBaseController {
             @RequestHeader(value = Constants.X_AUTH_APP_ID, defaultValue = UserConstant.defaultAppId) String appId,
             @RequestHeader(value = Constants.X_AUTH_TENANT, defaultValue = UserConstant.defaultTenantIdString) Integer tenantId
     ) {
+        if (org.apache.commons.lang3.StringUtils.isEmpty(appId)) {
+            appId = wechatConfiguration.getDefault().getAppId();
+        }
         log.info("login -> channelId:{},appChannel:{},createdFrom:{},userId:{},key:{},dimension:{}", channelId, appChannel, createdFrom, userId, key, dimension);
         Merchant merchant = merchantService.findMerchantByName(key);
         if (merchant == null) {
@@ -221,6 +235,9 @@ public class UserController implements IBaseController {
             @RequestParam(required = false) Integer tenantId,
             @RequestHeader(value = Constants.X_AUTH_APP_ID, defaultValue = UserConstant.defaultAppId) String appId,
             HttpServletRequest request) {
+        if (org.apache.commons.lang3.StringUtils.isEmpty(appId)) {
+            appId = wechatConfiguration.getDefault().getAppId();
+        }
         log.info("login/fastV1 -> channelId:{},ZappChennel:{},createdFrom:{},key:{},btRegisterChannelId:{},dimension:{},clickId:{}", channelId, appChannel, createdFrom, key, btRegisterChannelId, dimension, clickId);
         return loginFast(channelId, appChannel, createdFrom, key, btRegisterChannelId, dimension, clickId, tenantId, null, appId, request);
     }
@@ -242,6 +259,9 @@ public class UserController implements IBaseController {
             @RequestParam(required = false) Long geetestLogId,
             @RequestHeader(value = Constants.X_AUTH_APP_ID, defaultValue = UserConstant.defaultAppId) String appId,
             HttpServletRequest request) {
+        if (org.apache.commons.lang3.StringUtils.isEmpty(appId)) {
+            appId = wechatConfiguration.getDefault().getAppId();
+        }
         Map<String, JsonResult> validMap = getHeaderParam(request);
         log.info("login/fast -> channelId:{},appChannel:{},createdFrom:{},btRegisterChannelId:{},key:{},dimension:{},clickId:{}", channelId, appChannel, createdFrom, btRegisterChannelId, key, dimension, clickId);
         JsonResult failResult = validMap.get(Constants.CHECK_FAIL);
@@ -538,12 +558,12 @@ public class UserController implements IBaseController {
         if (token.contains(Constants.TOKEN_MASTER)) {
             return JsonResult.buildSuccessResult(null, result);
         }
-        SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(token,tenantId);
+        SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(token, tenantId);
         if (sessionStruct == null || sessionStruct.getValues() == null) {
             // 使用token去电商查询信息, 如果token 不包含本系统token前缀
             if (!token.contains(prefix)) {
                 findTokenExchange(token, tenantId);
-                sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(token,tenantId);
+                sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(token, tenantId);
                 if (sessionStruct == null || sessionStruct.getValues() == null) {
                     return JsonResult.buildSuccessResult(null, result);
                 }
@@ -584,7 +604,7 @@ public class UserController implements IBaseController {
         if (token.contains(Constants.TOKEN_MASTER)) {
             return JsonResult.buildSuccessResult(null, tokenExchange);
         }
-        SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(token,tenantId);
+        SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(token, tenantId);
         if (sessionStruct == null || sessionStruct.getValues() == null) {
             return JsonResult.buildSuccessResult(null, tokenExchange);
         }

src/main/java/cn/quantgroup/xyqb/controller/external/WeChatController.java

 package cn.quantgroup.xyqb.controller.external;
 
+import cn.quantgroup.xyqb.config.data.WechatConfiguration;
 import cn.quantgroup.xyqb.constant.UserConstant;
 import cn.quantgroup.xyqb.constant.enums.LoginType;
 import cn.quantgroup.xyqb.Constants;
@@ -67,6 +68,9 @@ public class WeChatController implements IBaseController {
     @Autowired
     private IUserService userService;
 
+    @Autowired
+    private WechatConfiguration wechatConfiguration;
+
     /**
      * 用户中心UI的http协议头域名
      * http://passport.xyqb.com
@@ -189,6 +193,11 @@ public class WeChatController implements IBaseController {
         String redirect = null;
         String schema = null;
         String customRedirect = null;
+
+        if(StringUtils.isEmpty(appId)){
+            appId = wechatConfiguration.getDefault().getAppId();
+        }
+
         try {
             extData = new String(Base64.decodeBase64(extData), "UTF-8");
         } catch (Exception ex) {
@@ -356,6 +365,9 @@ public class WeChatController implements IBaseController {
         if (Objects.equals(Constants.PROTOCOL_HEAD_HTTPS, request.getScheme())) {
             schema = Constants.PROTOCOL_HEAD_HTTPS;
         }
+        if (org.apache.commons.lang3.StringUtils.isEmpty(appId)) {
+            appId = wechatConfiguration.getDefault().getAppId();
+        }
         receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, redirect, response,appId,tenantId);
     }
 

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.controller.internal.user;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
 import cn.quantgroup.xyqb.aspect.forbidden.AccessForbiddenValidator;
+import cn.quantgroup.xyqb.config.data.WechatConfiguration;
 import cn.quantgroup.xyqb.constant.UserConstant;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.controller.internal.user.resp.UserFullResp;
@@ -87,6 +88,8 @@ public class InnerController implements IBaseController {
 
     @Autowired
     private StmsRemoteService stmsRemoteService;
+    @Autowired
+    private WechatConfiguration wechatConfiguration;
 
     @Autowired
     private IUserDeregisterService userDeregisterService;
@@ -577,6 +580,10 @@ public class InnerController implements IBaseController {
     public JsonResult queryOpenIdByPhoneNo(String phoneNo,@RequestHeader(value =Constants.X_AUTH_TENANT,defaultValue = UserConstant.defaultTenantIdString) Integer tenantId
     ,@RequestHeader(value = Constants.X_AUTH_APP_ID,defaultValue = UserConstant.defaultAppId) String  appId) {
 
+        if (org.apache.commons.lang3.StringUtils.isEmpty(appId)) {
+            appId = wechatConfiguration.getDefault().getAppId();
+        }
+
         if (!ValidationUtil.validatePhoneNo(phoneNo)) {
             return JsonResult.buildErrorStateResult("手机号格式错误", null);
         }

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/applet/AppletController.java

 package cn.quantgroup.xyqb.controller.middleoffice.applet;
 
 import cn.quantgroup.xyqb.Constants;
+import cn.quantgroup.xyqb.config.data.WechatConfiguration;
 import cn.quantgroup.xyqb.constant.UserConstant;
 import cn.quantgroup.xyqb.controller.middleoffice.login.ILoginModule;
 import cn.quantgroup.xyqb.controller.middleoffice.login.LoginVo;
 import cn.quantgroup.xyqb.entity.middleoffice.AppletParamEntry;
 import cn.quantgroup.xyqb.exception.DataException;
 import cn.quantgroup.xyqb.model.JsonResult;
+import cn.quantgroup.xyqb.model.WechatConfigBean;
 import cn.quantgroup.xyqb.service.middleoffice.applet.IAppletService;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
@@ -36,6 +38,9 @@ public class AppletController {
     private final IAppletService iAppletService;
     private ILoginModule loginModule;
 
+    @Autowired
+    private WechatConfiguration wechatConfiguration;
+
     @Autowired
     AppletController(IAppletService iAppletService,
                      ILoginModule loginModule
@@ -70,7 +75,9 @@ public class AppletController {
         if (!containsAppName(appName)) {
             throw new DataException("appName不合法");
         }
-
+        if (org.apache.commons.lang3.StringUtils.isEmpty(appId)) {
+            appId = wechatConfiguration.getDefault().getAppId();
+        }
         LoginVo login = iAppletService.login(appName, openId, tenantId, utmSource, unionId,appId);
         return JsonResult.buildSuccessResultGeneric(login);
     }

src/main/java/cn/quantgroup/xyqb/model/WechatConfigBean.java

@@ -11,4 +11,8 @@ public class WechatConfigBean {
      * 0:为小程序
      */
     private Integer type;
+    /**
+     * 是否是默认的小程序
+     */
+    private boolean defaultMini;
 }