add wechat config

src/main/java/cn/quantgroup/xyqb/Constants.java

@@ -54,7 +54,7 @@ public interface Constants {
     }
 
     interface WeChat {
-        String APP_ID = "wxcdf6077af8127559";
+        String APP_ID = "wx0a7c0bce0c3ac523";
         String REDIRECT_URL = "http://wechattest.xyqb.com/webchat/receiveCode";
         String SCOPE = "snsapi_userinfo";
     }

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

@@ -449,15 +449,14 @@ public class UserController implements IBaseController {
     public JsonResult associateWithWechat(String openId, String phoneNo) {
         User user = getCurrentUser();
         Long userId = user.getId();
-        User xyqbUser = userService.findByPhoneInDb(phoneNo);
         WechatUserInfo wechatUserInfo = wechatService.findWechatUserInfoByPhoneNo(phoneNo);
         if (wechatUserInfo != null) {
             return JsonResult.buildErrorStateResult("该手机号已绑定其他微信号码", null);
         }
-        if(xyqbUser != null && xyqbUser.getPhoneNo() != wechatUserInfo.getPhoneNo()) {
+        WechatUserInfo userInfo = wechatService.findWechatUserInfoFromDb(openId);
+        if(!user.getPhoneNo().equals(phoneNo)) {
             return JsonResult.buildErrorStateResult("该手机号已绑定其他微信号码", null);
         }
-        WechatUserInfo userInfo = wechatService.findWechatUserInfoFromDb(openId);
         //限制微信用户和xyqb用户为一对一的关系
         if (userInfo != null) {
             userInfo.setUserId(userId);

src/main/java/cn/quantgroup/xyqb/filter/RequestFilter.java

@@ -32,7 +32,7 @@ public class RequestFilter implements Filter {
     private static final String [] ALLOWED_PATTERNS = {
         "/innerapi/**", "/user/exist","/user/register","/user/login","/user/register/fast",
             "/user/login/fast", "/user/reset_password","/user/exist_check", "/user/associate_wechat",
-            "/jr58/**","/app/login","/app/login_super", "/wechat/**", "/config/**","/api/**","/user/exists_token", "platform/api/page/return_url"
+            "/jr58/**","/app/login","/app/login_super", "/wechat/**", "/config/**","/api/**","/user/exists_token", "platform/api/page/return_url", "MP_verify_AWiagUn4kZiwmTt0.txt"
     };
     private static final String UNAUTH_RESULT = JSONObject.toJSONString(JsonResult.buildErrorStateResult("登录失败", null));