自建

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -156,7 +156,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         }
         if(null != wxEnterpriseId) {
             WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
-            userDTOJson = qywxUserApiService.getUserByCode(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), code);
+            userDTOJson = qywxUserApiService.getUserByCode(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), code , qwDTO.getUrlHost());
         }else {
             userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(), code);
         }
@@ -394,7 +394,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId);
         MemberLoginQo user = new MemberLoginQo();
         if (StringUtils.isBlank(qo.getUserId())) {
-            user = getUserByCode(wxEnterpriseId, qwDTO.getMemberCorpid(), qo.getCode(), qo.getGicEnterpriseId());
+            user = getUserByCode(wxEnterpriseId, qwDTO.getMemberCorpid(), qo.getCode(), qo.getGicEnterpriseId(),qwDTO);
             if (user == null) {
                 logger.info("登录失败,从微信获取用户信息失败");
                 return resultResponse(HaoBanErrCode.ERR_6);
@@ -463,13 +463,13 @@ public class WxEnterpriseInfoController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1, user);
     }
 
-    private MemberLoginQo getUserByCode(String wxEnterpriseId, String corpid, String code, String enterpriseId) {
-        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
+    private MemberLoginQo getUserByCode(String wxEnterpriseId, String corpid, String code, String enterpriseId,WxEnterpriseQwDTO qwDTO) {
+        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal(), enterpriseId);
         if (null == secretSetting || StringUtils.isBlank(secretSetting.getSecretVal())) {
             logger.info("MEMBER_WAPPsecret没有配置{},{}", wxEnterpriseId, enterpriseId);
             return null;
         }
-        String userDTOJson = qywxUserApiService.getUserByCode(corpid, secretSetting.getSecretVal(), code);
+        String userDTOJson = qywxUserApiService.getUserByCode(corpid, secretSetting.getSecretVal(), code ,qwDTO.getUrlHost());
         logger.info("会员微信登录信息=============>{}", userDTOJson);
         return JSON.parseObject(userDTOJson, MemberLoginQo.class);
     }