优化代码

service-user/src/main/java/com/java110/user/cmd/wechat/GetOpenIdByCodeCmd.java

@@ -16,6 +16,7 @@ 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.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,9 @@ import java.text.ParseException;
 import java.util.List;
 
 /**
+ * 这个接口没有写好 给商城专用，
+ * 重新写一个，这个接口查询完后还要 刷入用户中
+ * 没有考虑 不登录情况下 的openId 获取
  * 根据小程序code 获取openId
  */
 
@@ -92,18 +96,23 @@ public class GetOpenIdByCodeCmd extends Cmd {
 
         String openId = responseObj.getString("openid");
 
+        if (StringUtil.isEmpty(userId) || userId.startsWith("-")) {
+            context.setResponseEntity(ResultVo.createResponseEntity(openId));
+            return;
+        }
+
         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){
+        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 {
+        } else {
             UserAttrPo userAttrPo = new UserAttrPo();
             userAttrPo.setAttrId(userAttrDtos.get(0).getAttrId());
             userAttrPo.setValue(openId);

service-user/src/main/java/com/java110/user/cmd/wechat/GetWechatMiniOpenIdCmd.java

@@ -0,0 +1,90 @@
+package com.java110.user.cmd.wechat;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.wechat.SmallWeChatDto;
+import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
+import com.java110.intf.user.IUserAttrV1InnerServiceSMO;
+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 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;
+
+/**
+ * 获取小程序的openId
+ */
+@Java110Cmd(serviceCode = "wechat.getWechatMiniOpenId")
+public class GetWechatMiniOpenIdCmd extends Cmd {
+    private final static Logger logger = LoggerFactory.getLogger(GetWechatMiniOpenIdCmd.class);
+
+    @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", "未包含code");
+        Assert.hasKeyAndValue(reqJson, "appId", "未包含小程序ID");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        String appId = "";
+        String appSecret = "";
+
+        if ("MALL".equals(reqJson.getString("appId"))) {
+            appId = MappingCache.getValue(MappingConstant.MALL_WECHAT_DOMAIN, "wechatAppId");
+            appSecret = MappingCache.getValue(MappingConstant.MALL_WECHAT_DOMAIN, "wechatAppSecret");
+        } 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();
+        }
+
+
+        ResponseEntity<String> responseEntity;
+        String code = reqJson.getString("code");
+        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,
+                appId,
+                appSecret,
+                code,
+                "authorization_code");
+
+        logger.debug("微信返回报文：" + response);
+
+        //Assert.jsonObjectHaveKey(response, "errcode", "返回报文中未包含 错误编码，接口出错");
+        JSONObject responseObj = JSONObject.parseObject(response);
+
+        if (responseObj.containsKey("errcode") && !"0".equals(responseObj.getString("errcode"))) {
+            throw new IllegalArgumentException("微信验证失败，可能是code失效" + responseObj);
+        }
+
+        String openId = responseObj.getString("openid");
+    }
+}

springboot/src/main/java/com/java110/boot/configuration/ServiceConfiguration.java

@@ -113,6 +113,7 @@ public class ServiceConfiguration {
         exclusions.append("/app/user.ownerSendSms,");// 向业主发送验证码
         exclusions.append("/app/owner.getQrcodeOwner,");// 根据二维码查询业主信息
         exclusions.append("/app/payFeeQrcode.getQrcodeOweFees,");// 根据二维码查询业主欠费
+        exclusions.append("/app/wechat.getWechatMiniOpenId,");// 根据二维码查询业主欠费