From ded40ebbd1613490fc68190dbd92db5d7243267f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 22 八月 2023 16:25:20 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 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 da83630..4653398 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.dto.wechat.SmallWeChatDto;
+import com.java110.utils.cache.UrlCache;
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 com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -80,7 +78,7 @@
ResponseEntity<String> paramOut = outRestTemplate.getForEntity(url, String.class);
- logger.debug("璋冪敤寰俊鎹㈠幓openId ", paramOut);
+ logger.debug("璋冪敤寰俊鎹㈠幓openId {}", paramOut);
if (paramOut.getStatusCode() != HttpStatus.OK) {
return ResultVo.redirectPage("/");
@@ -95,7 +93,7 @@
paramOut = outRestTemplate.getForEntity(url, String.class);
- logger.debug("璋冪敤寰俊鎹㈠幓openId ", paramOut);
+ logger.debug("璋冪敤寰俊鎹㈠幓openId {}", paramOut);
if (paramOut.getStatusCode() != HttpStatus.OK) {
return ResultVo.redirectPage("/");
}
@@ -110,7 +108,16 @@
ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, paramAuth.toJSONString(),
"/staff/updateStaffAppAuth", HttpMethod.POST);
- url = MappingCache.getValue("OWNER_WECHAT_URL");
+ url = UrlCache.getOwnerUrl();
+ if(url.contains("/#/")){
+ if(url.contains("?")){
+ url += ("&wAppId="+smallWeChatDto.getAppId());
+ }else{
+ url += ("?wAppId="+smallWeChatDto.getAppId());
+ }
+ }else{
+ url += ("/#/?wAppId="+smallWeChatDto.getAppId());
+ }
return ResultVo.redirectPage(url);
}
@@ -140,7 +147,17 @@
}
String openUrl = "";
- String url = MappingCache.getValue("OWNER_WECHAT_URL");
+ String url = UrlCache.getOwnerUrl();
+ 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 +166,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