From 7c36caa1b7bb37633e95b0934957b2b75a34a621 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 04 九月 2022 18:39:10 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 3f2c497..ee87c7c 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
@@ -78,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("/");
@@ -93,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("/");
}
@@ -109,6 +109,15 @@
ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, paramAuth.toJSONString(),
"/staff/updateStaffAppAuth", HttpMethod.POST);
url = MappingCache.getValue("OWNER_WECHAT_URL");
+ if(url.contains("/#/")){
+ if(url.contains("?")){
+ url += ("&wAppId="+smallWeChatDto.getAppId());
+ }else{
+ url += ("?wAppId="+smallWeChatDto.getAppId());
+ }
+ }else{
+ url += ("/#/?wAppId="+smallWeChatDto.getAppId());
+ }
return ResultVo.redirectPage(url);
}
@@ -139,6 +148,10 @@
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());
@@ -153,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