feat：多小程序登陆兼容

server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderChildrenInfoUserLoginWechatServiceImpl.java

@@ -7,14 +7,13 @@ import com.makeit.entity.saas.PlatTenant;
 import com.makeit.enums.Const;
 import com.makeit.enums.Const;
 import com.makeit.enums.HeaderConst;
 import com.makeit.enums.HeaderConst;
 import com.makeit.global.aspect.misc.nofill.NoFillUtil;
 import com.makeit.global.aspect.misc.nofill.NoFillUtil;
-import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.elder.PlatElderChildrenInfoService;
 import com.makeit.service.platform.elder.PlatElderChildrenInfoService;
 import com.makeit.service.saas.PlatTenantService;
 import com.makeit.service.saas.PlatTenantService;
 import com.makeit.service.wechat.PlatElderChildrenInfoUserLoginWechatService;
 import com.makeit.service.wechat.PlatElderChildrenInfoUserLoginWechatService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.id.IdGen;
 import com.makeit.utils.data.id.IdGen;
 import com.makeit.utils.msg.config.WxConfig;
 import com.makeit.utils.msg.config.WxConfig;
-import com.makeit.utils.request.RequestUtil;
+import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.sys.FileUtil;
 import com.makeit.utils.sys.FileUtil;
 import com.makeit.utils.third.wechat.WechatLoginPhoneDTO;
 import com.makeit.utils.third.wechat.WechatLoginPhoneDTO;
 import com.makeit.utils.third.wechat.WxUserInfo;
 import com.makeit.utils.third.wechat.WxUserInfo;
@@ -47,17 +46,8 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
     @Override
     @Override
     @Transactional
     @Transactional
     public WechatUserInfo login(WechatLoginPhoneDTO dto) {
     public WechatUserInfo login(WechatLoginPhoneDTO dto) {
+        buildAppIdAndSecret(dto);
 
 
-        PlatTenant platTenant = platTenantService.getOne(new QueryWrapper<PlatTenant>().lambda()
-                .eq(PlatTenant::getAppid, dto.getAppid())
-                .last("limit 1"));
-        if (platTenant != null) {
-            dto.setAppid(platTenant.getAppid());
-            dto.setSecret(platTenant.getSecret());
-        } else {
-            dto.setAppid(wxConfig.getAppId());
-            dto.setSecret(wxConfig.getAppSecret());
-        }
         WxUserInfo userInfo = WechatUtil.login(dto);
         WxUserInfo userInfo = WechatUtil.login(dto);
 
 
         logger.info("userinfo:{}", userInfo);
         logger.info("userinfo:{}", userInfo);
@@ -114,6 +104,25 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
 
 
     }
     }
 
 
+    private void buildAppIdAndSecret(WechatLoginPhoneDTO dto) {
+        boolean hasAppid = StringUtils.isNotEmpty(dto.getAppid());
+        if (hasAppid) {
+            PlatTenant platTenant = platTenantService.getOne(new QueryWrapper<PlatTenant>().lambda()
+                    .eq(PlatTenant::getAppid, dto.getAppid())
+                    .last("limit 1"));
+            if (platTenant != null) {
+                dto.setAppid(platTenant.getAppid());
+                dto.setSecret(platTenant.getSecret());
+            } else {
+                dto.setAppid(wxConfig.getAppId());
+                dto.setSecret(wxConfig.getAppSecret());
+            }
+        } else {
+            dto.setAppid(wxConfig.getAppId());
+            dto.setSecret(wxConfig.getAppSecret());
+        }
+    }
+
     @Override
     @Override
     public void logout() {
     public void logout() {
         TokenUtil.wechatLogout();
         TokenUtil.wechatLogout();