From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/wechat/GetOpenIdByCodeCmd.java | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/wechat/GetOpenIdByCodeCmd.java b/service-user/src/main/java/com/java110/user/cmd/wechat/GetOpenIdByCodeCmd.java
index 63997f7..1b440fc 100644
--- a/service-user/src/main/java/com/java110/user/cmd/wechat/GetOpenIdByCodeCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/wechat/GetOpenIdByCodeCmd.java
@@ -5,16 +5,25 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
+import com.java110.dto.user.UserAttrDto;
+import com.java110.dto.wechat.SmallWeChatDto;
+import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
+import com.java110.intf.user.IUserAttrV1InnerServiceSMO;
+import com.java110.po.user.UserAttrPo;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
+import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;
import java.text.ParseException;
+import java.util.List;
/**
* 鏍规嵁灏忕▼搴廲ode 鑾峰彇openId
@@ -26,6 +35,12 @@
@Autowired
private RestTemplate outRestTemplate;
+ @Autowired
+ private ISmallWechatV1InnerServiceSMO smallWechatV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserAttrV1InnerServiceSMO userAttrV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
Assert.hasKeyAndValue(reqJson, "code", "鏈寘鍚玞ode");
@@ -35,8 +50,24 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
- if("MALL".equals(reqJson.getString("appId"))){
- MappingCache.getValue()
+ String userId = context.getReqHeaders().get("user-id");
+
+ String appId = "";
+ String appSecret = "";
+ if ("MALL".equals(reqJson.getString("appId"))) {
+ appId = MappingCache.getValue(MappingConstant.MALL_WECHAT_DOMAIN, "appId");
+ appSecret = MappingCache.getValue(MappingConstant.MALL_WECHAT_DOMAIN, "appSecret");
+ } else {
+ SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
+ smallWeChatDto.setAppId(reqJson.getString("appId"));
+ List<SmallWeChatDto> smallWeChatDtos = smallWechatV1InnerServiceSMOImpl.querySmallWechats(smallWeChatDto);
+
+ if (smallWeChatDtos == null || smallWeChatDtos.size() < 1) {
+ throw new IllegalArgumentException("鏈厤缃皬绋嬪簭淇℃伅");
+ }
+
+ appId = smallWeChatDtos.get(0).getAppId();
+ appSecret = smallWeChatDtos.get(0).getAppSecret();
}
@@ -45,12 +76,10 @@
String urlString = "https://api.weixin.qq.com/sns/jscode2session?appid={appId}&secret={secret}&js_code={code}&grant_type={grantType}";
String response = outRestTemplate.getForObject(
urlString, String.class,
- smallWeChatDto.getAppId(),
- smallWeChatDto.getAppSecret(),
+ appId,
+ appSecret,
code,
- wechatAuthProperties.getGrantType());
-
- logger.debug("wechatAuthProperties:" + JSONObject.toJSONString(wechatAuthProperties));
+ "authorization_code");
logger.debug("寰俊杩斿洖鎶ユ枃锛�" + response);
@@ -62,7 +91,25 @@
}
String openId = responseObj.getString("openid");
- String sessionKey = responseObj.getString("session_key");
+
+ UserAttrDto userAttrDto = new UserAttrDto();
+ userAttrDto.setUserId(userId);
+ userAttrDto.setSpecCd(UserAttrDto.SPEC_MALL_OPEN_ID);
+ List<UserAttrDto> userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
+ if(userAttrDtos == null || userAttrDtos.size() < 1){
+ UserAttrPo userAttrPo = new UserAttrPo();
+ userAttrPo.setAttrId(GenerateCodeFactory.getAttrId());
+ userAttrPo.setUserId(userId);
+ userAttrPo.setSpecCd(UserAttrDto.SPEC_MALL_OPEN_ID);
+ userAttrPo.setValue(openId);
+ userAttrV1InnerServiceSMOImpl.saveUserAttr(userAttrPo);
+ }else {
+ UserAttrPo userAttrPo = new UserAttrPo();
+ userAttrPo.setAttrId(userAttrDtos.get(0).getAttrId());
+ userAttrPo.setValue(openId);
+ userAttrV1InnerServiceSMOImpl.updateUserAttr(userAttrPo);
+ }
+ context.setResponseEntity(ResultVo.createResponseEntity(openId));
}
}
--
Gitblit v1.8.0