From 4367e8ad1c9208c7c0c4cbad97874a0524a0481b Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 11 八月 2022 16:58:23 +0800
Subject: [PATCH] 优化代码

---
 service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java
index 039f8ca..e6211a9 100644
--- a/service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java
@@ -2,25 +2,23 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.api.properties.WechatAuthProperties;
 import com.java110.api.smo.DefaultAbstractComponentSMO;
-import com.java110.core.base.smo.front.AbstractFrontServiceSMO;
+import com.java110.api.smo.staff.IStaffAuthSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
 import com.java110.core.factory.WechatFactory;
+import com.java110.core.log.LoggerFactory;
 import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
-import com.java110.api.properties.WechatAuthProperties;
-import com.java110.api.smo.staff.IStaffAuthSMO;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.exception.SMOException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -141,6 +139,16 @@
 
         String openUrl = "";
         String url = MappingCache.getValue("OWNER_WECHAT_URL");
+        url = url
+                + "/app/loginStaffWechatAuth?appId=992020061452450002&staffId="
+                + staffId + "&storeId=" + storeId + "&wId=" + WechatFactory.getWId(smallWeChatDto.getAppId())
+        + "&communityId=" + communityId;
+
+        if (url.contains("?")) {
+            url += ("&wAppId=" + smallWeChatDto.getAppId());
+        } else {
+            url += ("?wAppId=" + smallWeChatDto.getAppId());
+        }
         try {
             openUrl = WechatConstant.OPEN_AUTH
                     .replace("APPID", smallWeChatDto.getAppId())
@@ -149,11 +157,7 @@
                     .replace(
                             "REDIRECT_URL",
                             URLEncoder
-                                    .encode(
-                                            (url
-                                                    + "/app/loginStaffWechatAuth?appId=992020061452450002&staffId="
-                                                    + staffId + "&storeId=" + storeId + "&wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()))
-                                                    + "&communityId=" + communityId,
+                                    .encode(url,
                                             "UTF-8")).replace("STATE", "1");
             response.sendRedirect(openUrl);
         } catch (Exception e) {

--
Gitblit v1.8.0