Merge pull request #58 from nadirvishun/master

binarywang · web-flow · commit 63ef8856a287 · 2022-06-30T16:16:15.000+08:00
修改为支持多账号的形式
diff --git a/src/main/java/com/github/binarywang/demo/wx/miniapp/config/WxMaConfiguration.java b/src/main/java/com/github/binarywang/demo/wx/miniapp/config/WxMaConfiguration.java
@@ -9,20 +9,18 @@
 import cn.binarywang.wx.miniapp.message.WxMaMessageHandler;
 import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.error.WxRuntimeException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import redis.clients.jedis.JedisPool;
 
-import javax.annotation.PostConstruct;
 import java.io.File;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -34,54 +32,37 @@
 public class WxMaConfiguration {
     private final WxMaProperties properties;
 
-    private static final Map<String, WxMaMessageRouter> routers = Maps.newHashMap();
-    private static Map<String, WxMaService> maServices;
-
     @Autowired
     public WxMaConfiguration(WxMaProperties properties) {
         this.properties = properties;
     }
 
-    public static WxMaService getMaService(String appid) {
-        WxMaService wxService = maServices.get(appid);
-        if (wxService == null) {
-            throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid));
-        }
-
-        return wxService;
-    }
-
-    public static WxMaMessageRouter getRouter(String appid) {
-        return routers.get(appid);
-    }
-
-    @PostConstruct
-    public void init() {
+    @Bean
+    public WxMaService wxMaService() {
         List<WxMaProperties.Config> configs = this.properties.getConfigs();
         if (configs == null) {
             throw new WxRuntimeException("大哥，拜托先看下项目首页的说明（readme文件），添加下相关配置，注意别配错了！");
         }
-
-        maServices = configs.stream()
-            .map(a -> {
-                WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+        WxMaService maService = new WxMaServiceImpl();
+        maService.setMultiConfigs(
+            configs.stream()
+                .map(a -> {
+                    WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
 //                WxMaDefaultConfigImpl config = new WxMaRedisConfigImpl(new JedisPool());
-                // 使用上面的配置时，需要同时引入jedis-lock的依赖，否则会报类无法找到的异常
-                config.setAppid(a.getAppid());
-                config.setSecret(a.getSecret());
-                config.setToken(a.getToken());
-                config.setAesKey(a.getAesKey());
-                config.setMsgDataFormat(a.getMsgDataFormat());
-
-                WxMaService service = new WxMaServiceImpl();
-                service.setWxMaConfig(config);
-                routers.put(a.getAppid(), this.newRouter(service));
-                return service;
-            }).collect(Collectors.toMap(s -> s.getWxMaConfig().getAppid(), a -> a));
+                    // 使用上面的配置时，需要同时引入jedis-lock的依赖，否则会报类无法找到的异常
+                    config.setAppid(a.getAppid());
+                    config.setSecret(a.getSecret());
+                    config.setToken(a.getToken());
+                    config.setAesKey(a.getAesKey());
+                    config.setMsgDataFormat(a.getMsgDataFormat());
+                    return config;
+                }).collect(Collectors.toMap(WxMaDefaultConfigImpl::getAppid, a -> a, (o, n) -> o)));
+        return maService;
     }
 
-    private WxMaMessageRouter newRouter(WxMaService service) {
-        final WxMaMessageRouter router = new WxMaMessageRouter(service);
+    @Bean
+    public WxMaMessageRouter wxMaMessageRouter(WxMaService wxMaService) {
+        final WxMaMessageRouter router = new WxMaMessageRouter(wxMaService);
         router
             .rule().handler(logHandler).next()
             .rule().async(false).content("订阅消息").handler(subscribeMsgHandler).end()
diff --git a/src/main/java/com/github/binarywang/demo/wx/miniapp/controller/WxMaMediaController.java b/src/main/java/com/github/binarywang/demo/wx/miniapp/controller/WxMaMediaController.java
@@ -1,29 +1,24 @@
 package com.github.binarywang.demo.wx.miniapp.controller;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
-
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.constant.WxMaConstants;
-import com.github.binarywang.demo.wx.miniapp.config.WxMaConfiguration;
+import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
 import com.google.common.collect.Lists;
 import com.google.common.io.Files;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
 import me.chanjar.weixin.common.error.WxErrorException;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * <pre>
@@ -34,9 +29,11 @@
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 @RestController
+@AllArgsConstructor
+@Slf4j
 @RequestMapping("/wx/media/{appid}")
 public class WxMaMediaController {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final WxMaService wxMaService;
 
     /**
      * 上传临时素材
@@ -45,11 +42,14 @@ public class WxMaMediaController {
      */
     @PostMapping("/upload")
     public List<String> uploadMedia(@PathVariable String appid, HttpServletRequest request) throws WxErrorException {
-        final WxMaService wxService = WxMaConfiguration.getMaService(appid);
+        if (!wxMaService.switchover(appid)) {
+            throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid));
+        }
 
         CommonsMultipartResolver resolver = new CommonsMultipartResolver(request.getSession().getServletContext());
 
         if (!resolver.isMultipart(request)) {
+            WxMaConfigHolder.remove();//清理ThreadLocal
             return Lists.newArrayList();
         }
 
@@ -60,16 +60,16 @@ public List<String> uploadMedia(@PathVariable String appid, HttpServletRequest r
             try {
                 MultipartFile file = multiRequest.getFile(it.next());
                 File newFile = new File(Files.createTempDir(), file.getOriginalFilename());
-                this.logger.info("filePath is ：" + newFile.toString());
+                log.info("filePath is ：" + newFile.toString());
                 file.transferTo(newFile);
-                WxMediaUploadResult uploadResult = wxService.getMediaService().uploadMedia(WxMaConstants.KefuMsgType.IMAGE, newFile);
-                this.logger.info("media_id ： " + uploadResult.getMediaId());
+                WxMediaUploadResult uploadResult = wxMaService.getMediaService().uploadMedia(WxMaConstants.KefuMsgType.IMAGE, newFile);
+                log.info("media_id ： " + uploadResult.getMediaId());
                 result.add(uploadResult.getMediaId());
             } catch (IOException e) {
-                this.logger.error(e.getMessage(), e);
+                log.error(e.getMessage(), e);
             }
         }
-
+        WxMaConfigHolder.remove();//清理ThreadLocal
         return result;
     }
 
@@ -78,8 +78,11 @@ public List<String> uploadMedia(@PathVariable String appid, HttpServletRequest r
      */
     @GetMapping("/download/{mediaId}")
     public File getMedia(@PathVariable String appid, @PathVariable String mediaId) throws WxErrorException {
-        final WxMaService wxService = WxMaConfiguration.getMaService(appid);
-
-        return wxService.getMediaService().getMedia(mediaId);
+        if (!wxMaService.switchover(appid)) {
+            throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid));
+        }
+        File media = wxMaService.getMediaService().getMedia(mediaId);
+        WxMaConfigHolder.remove();//清理ThreadLocal
+        return media;
     }
 }
diff --git a/src/main/java/com/github/binarywang/demo/wx/miniapp/controller/WxMaUserController.java b/src/main/java/com/github/binarywang/demo/wx/miniapp/controller/WxMaUserController.java
@@ -1,30 +1,31 @@
 package com.github.binarywang.demo.wx.miniapp.controller;
 
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
-import com.github.binarywang.demo.wx.miniapp.config.WxMaConfiguration;
+import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
 import com.github.binarywang.demo.wx.miniapp.utils.JsonUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 微信小程序用户接口
  *
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 @RestController
+@AllArgsConstructor
+@Slf4j
 @RequestMapping("/wx/user/{appid}")
 public class WxMaUserController {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final WxMaService wxMaService;
 
     /**
      * 登陆接口
@@ -35,17 +36,21 @@ public String login(@PathVariable String appid, String code) {
             return "empty jscode";
         }
 
-        final WxMaService wxService = WxMaConfiguration.getMaService(appid);
+        if (!wxMaService.switchover(appid)) {
+            throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid));
+        }
 
         try {
-            WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(code);
-            this.logger.info(session.getSessionKey());
-            this.logger.info(session.getOpenid());
+            WxMaJscode2SessionResult session = wxMaService.getUserService().getSessionInfo(code);
+            log.info(session.getSessionKey());
+            log.info(session.getOpenid());
             //TODO 可以增加自己的逻辑，关联业务相关数据
             return JsonUtils.toJson(session);
         } catch (WxErrorException e) {
-            this.logger.error(e.getMessage(), e);
+            log.error(e.getMessage(), e);
             return e.toString();
+        } finally {
+            WxMaConfigHolder.remove();//清理ThreadLocal
         }
     }
 
@@ -57,16 +62,19 @@ public String login(@PathVariable String appid, String code) {
     @GetMapping("/info")
     public String info(@PathVariable String appid, String sessionKey,
                        String signature, String rawData, String encryptedData, String iv) {
-        final WxMaService wxService = WxMaConfiguration.getMaService(appid);
+        if (!wxMaService.switchover(appid)) {
+            throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid));
+        }
 
         // 用户信息校验
-        if (!wxService.getUserService().checkUserInfo(sessionKey, rawData, signature)) {
+        if (!wxMaService.getUserService().checkUserInfo(sessionKey, rawData, signature)) {
+            WxMaConfigHolder.remove();//清理ThreadLocal
             return "user check failed";
         }
 
         // 解密用户信息
-        WxMaUserInfo userInfo = wxService.getUserService().getUserInfo(sessionKey, encryptedData, iv);
-
+        WxMaUserInfo userInfo = wxMaService.getUserService().getUserInfo(sessionKey, encryptedData, iv);
+        WxMaConfigHolder.remove();//清理ThreadLocal
         return JsonUtils.toJson(userInfo);
     }
 
@@ -78,16 +86,19 @@ public String info(@PathVariable String appid, String sessionKey,
     @GetMapping("/phone")
     public String phone(@PathVariable String appid, String sessionKey, String signature,
                         String rawData, String encryptedData, String iv) {
-        final WxMaService wxService = WxMaConfiguration.getMaService(appid);
+        if (!wxMaService.switchover(appid)) {
+            throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid));
+        }
 
         // 用户信息校验
-        if (!wxService.getUserService().checkUserInfo(sessionKey, rawData, signature)) {
+        if (!wxMaService.getUserService().checkUserInfo(sessionKey, rawData, signature)) {
+            WxMaConfigHolder.remove();//清理ThreadLocal
             return "user check failed";
         }
 
         // 解密
-        WxMaPhoneNumberInfo phoneNoInfo = wxService.getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
-
+        WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
+        WxMaConfigHolder.remove();//清理ThreadLocal
         return JsonUtils.toJson(phoneNoInfo);
     }
 
diff --git a/src/main/java/com/github/binarywang/demo/wx/miniapp/controller/WxPortalController.java b/src/main/java/com/github/binarywang/demo/wx/miniapp/controller/WxPortalController.java
