bug fix

src/main/java/com/huiju/estateagents/common/WxUtils.java

@@ -38,9 +38,7 @@ public class WxUtils {
         }
     }
 
-    public WxMaService newService(TaMiniapp taMiniapp) {
-        serives.remove(taMiniapp.getMiniappId());
-
+    public WxMaService newService(TaMiniapp taMiniapp, boolean ...changeServices) {
         WxMaInMemoryConfig config = new WxMaInMemoryConfig();
         config.setAppid(taMiniapp.getMiniappId());
         config.setSecret(taMiniapp.getSecret());
@@ -50,6 +48,12 @@ public class WxUtils {
 
         WxMaService service = new WxMaServiceImpl();
         service.setWxMaConfig(config);
+
+        if (changeServices.length > 0 && changeServices[0]) {
+            serives.remove(taMiniapp.getMiniappId());
+            serives.put(taMiniapp.getMiniappId(), service);
+        }
+
         return service;
     }
 }

src/main/java/com/huiju/estateagents/controller/TaMiniappController.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.controller;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,14 +8,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaMiniappService;
+import org.apache.tomcat.jni.Mmap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 
 /**
  * <p>
@@ -33,6 +38,11 @@ public class TaMiniappController extends BaseController {
     @Autowired
     public ITaMiniappService iTaMiniappService;
 
+    @Autowired
+    private IMiniAppService miniAppService;
+
+    @Autowired
+    WxUtils wxUtils;
 
     /**
      * 分页查询列表
@@ -147,21 +157,47 @@ public class TaMiniappController extends BaseController {
     @PostMapping(value = "center/check/taMiniapp")
     public ResponseBean createQRCode(@RequestBody String paramStr) {
         if (StringUtils.isEmpty(paramStr)) {
-            return ResponseBean.error("生成二维码参数为空", ResponseBean.ERROR_MISSING_PARAMS);
+            return ResponseBean.error("参数不能为空", ResponseBean.ERROR_MISSING_PARAMS);
         }
 
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
-            return ResponseBean.error("非法生成二维码参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
-        String appid = params.getString("appid");
+        String appid = params.getString("miniappId");
         String secret = params.getString("secret");
         String path = params.getString("path");
 
         if (StringUtils.isEmpty(appid) || StringUtils.isEmpty(secret) || StringUtils.isEmpty(path)) {
+            return ResponseBean.error("缺失参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
 
+        TaMiniapp taMiniapp = null;
+        WxMaService service = wxUtils.getMiniApp(appid);
+        if (null != service) {
+            taMiniapp = iTaMiniappService.getById(appid);
+            if (null == taMiniapp) {
+                return ResponseBean.error("异常, 请联系技术人员", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }
+
+        if (null == service || !secret.equals(taMiniapp.getSecret())){
+            service = wxUtils.newService(new TaMiniapp(){{
+                setMiniappId(appid);
+                setSecret(secret);
+                setToken(params.getString("token"));
+            }});
+        }
+
+        try {
+            String qrCode = miniAppService.createQrCode(service, path);
+            return ResponseBean.success(new HashMap<String, Object>(){{
+                put("qrCode", qrCode);
+            }});
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error("校验不通过", ResponseBean.ERROR_UNAVAILABLE);
         }
-        return null;
     }
 }

src/main/java/com/huiju/estateagents/service/impl/TaMiniappServiceImpl.java

@@ -71,7 +71,7 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
 
         WxMaService appService = wxUtils.getMiniApp(taMiniapp.getMiniappId());
         if (null == appService || (null != orign && !taMiniapp.getSecret().equals(orign.getSecret()))) {
-            wxUtils.newService(taMiniapp);
+            wxUtils.newService(taMiniapp, true);
         }
 
         return taMiniapp;

src/main/resources/application-dev.yml

@@ -68,7 +68,7 @@ sms:
     # 验证码长度
     size: 4
     # 短信签名
-    sign:營銷雲
+    sign: 营销云
 
   visitor:
     code: "0501"