Merge branch 'ty_fix' into alpha

Helius

2021-11-09 1b9fd5b66325f2d234756cc209468960c0fdb735

 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java

@@ -293,7 +293,7 @@
            return AjaxResult.buildFailInstance("code不存在");
        }
        AjaxResult res = new AjaxResult();
        String requrl = weChatApiTools.getXcxLoginUrl(code, HostInterceptor.getCompanyId(), AppConstance.MINI_PROGRAM_MANAGER_APP_ID);
        String requrl = weChatApiTools.getManagerXcxLoginUrl(code);

        String resultData = HttpCurlUtil.sendGetHttp(requrl, null);
        JSONObject json = JSONObject.fromObject(resultData);
@@ -318,6 +318,8 @@
        String token = userCacheManager.saveUserInfo(hasBind);
        LogUtil.info("用户token={}", token);

        authorityManager.initUserPower(res, hasBind);

        UserInfoVo userInfoVo = new UserInfoVo();
        userInfoVo.setId(hasBind.getSuId());
        userInfoVo.setName(hasBind.getSuName());