From d3904dbf378c4d14ba78fbe0ec49907047f5d8d2 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Tue, 26 Nov 2019 13:54:33 +0800
Subject: [PATCH] =?UTF-8?q?admin=E6=A8=A1=E5=9D=97=EF=BC=8C=E8=A1=A5?=
 =?UTF-8?q?=E5=85=A8=E5=BE=AE=E4=BF=A1=E5=B7=A5=E5=85=B7=E5=8C=85=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E5=90=8E=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-admin/epdc-admin-server/pom.xml      |  9 ++++
 .../service/impl/DeptMaCodeServiceImpl.java   |  8 ++--
 .../esua/epdc/utils/WxMaServiceUtils.java     | 46 +++++++++++++++++++
 .../src/main/resources/application.yml        | 21 +++++++--
 .../esua/epdc/async/WxMaSecCheckTask.java     |  2 -
 .../epdc/service/impl/AppUserServiceImpl.java |  3 --
 .../esua/epdc/utils/WxMaServiceUtils.java     |  4 +-
 7 files changed, 78 insertions(+), 15 deletions(-)
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/WxMaServiceUtils.java

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
index 0f7454f93..cf3a4fcf0 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
@@ -127,6 +127,9 @@
                 <!--小程序配置-->
                 <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
                 <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
+                <!--工作端小程序-->
+                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
+                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
             </properties>
         </profile>
         <profile>
@@ -143,6 +146,9 @@
                 <!--小程序配置-->
                 <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
                 <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
+                <!--工作端小程序-->
+                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
+                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
             </properties>
         </profile>
         <profile>
@@ -159,6 +165,9 @@
                 <!--小程序配置-->
                 <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
                 <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
+                <!--工作端小程序-->
+                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
+                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
             </properties>
         </profile>
     </profiles>
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
index 7af43fe8c..3e9c19894 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
@@ -18,7 +18,6 @@
 package com.elink.esua.epdc.service.impl;
 
 import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
-import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,6 +35,7 @@ import com.elink.esua.epdc.dto.UploadToOssDTO;
 import com.elink.esua.epdc.entity.DeptMaCodeEntity;
 import com.elink.esua.epdc.feign.OssFeignClient;
 import com.elink.esua.epdc.service.DeptMaCodeService;
+import com.elink.esua.epdc.utils.WxMaServiceUtils;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
@@ -59,7 +59,7 @@ import java.util.Map;
 public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMaCodeEntity> implements DeptMaCodeService {
 
     @Autowired
-    private WxMaService wxMaService;
+    private WxMaServiceUtils wxMaServiceUtils;
 
     @Autowired
     private OssFeignClient ossFeignClient;
@@ -150,7 +150,7 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
         UploadToOssDTO uploadDto;
 
         DeptMaCodeEntity entity;
-        WxMaQrcodeService qrcodeService = wxMaService.getQrcodeService();
+        WxMaQrcodeService qrcodeService = wxMaServiceUtils.normalWxMaService().getQrcodeService();
         for (Long gridId : gridIdList) {
             try {
                 wxaCodeUnlimit = qrcodeService.createWxaCodeUnlimit(String.valueOf(gridId), page);
@@ -211,7 +211,7 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
     private String createMaCode(String param, String pageUrl) {
         File wxaCodeUnlimit;
         try {
-            wxaCodeUnlimit = wxMaService.getQrcodeService().createWxaCodeUnlimit(param, pageUrl);
+            wxaCodeUnlimit = wxMaServiceUtils.normalWxMaService().getQrcodeService().createWxaCodeUnlimit(param, pageUrl);
         } catch (WxErrorException e) {
             throw new RenException("请求微信接口失败");
         }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/WxMaServiceUtils.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/WxMaServiceUtils.java
new file mode 100644
index 000000000..dafd82d00
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/WxMaServiceUtils.java
@@ -0,0 +1,46 @@
+package com.elink.esua.epdc.utils;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import com.elink.esua.epdc.wx.ma.WxMaConfig;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * 获取小程序业务工具
+ *
+ * @author work@yujt.net.cn
+ * @date 2019/11/25 13:29
+ */
+@Component
+public class WxMaServiceUtils {
+
+    @Value("${wx.ma.appId.normal}")
+    private String APPID_NORMAL;
+
+    @Value("${wx.ma.appId.work}")
+    private String APPID_WORK;
+
+    /**
+     * 获取党群e家 普通居民端配置
+     *
+     * @return cn.binarywang.wx.miniapp.api.WxMaService
+     * @author work@yujt.net.cn
+     * @date 2019/11/25 16:09
+     */
+    public final WxMaService normalWxMaService() {
+        final WxMaService wxMaService = WxMaConfig.getMaService(APPID_NORMAL);
+        return wxMaService;
+    }
+
+    /**
+     * 获取党群e家 工作端配置
+     *
+     * @return cn.binarywang.wx.miniapp.api.WxMaService
+     * @author work@yujt.net.cn
+     * @date 2019/11/25 16:10
+     */
+    public final WxMaService workWxMaService() {
+        final WxMaService wxMaService = WxMaConfig.getMaService(APPID_WORK);
+        return wxMaService;
+    }
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
index 432ae14e1..cb9caf2f0 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
@@ -68,11 +68,22 @@ mybatis-plus:
 
 wx:
   ma:
-    appid: @wx.ma.appId@
-    secret: @wx.ma.secret@
-    token: #微信小程序消息服务器配置的token
-    aesKey: #微信小程序消息服务器配置的EncodingAESKey
-    msgDataFormat: JSON
+    configs:
+      - appid: @wx.ma.appId@
+        secret: @wx.ma.secret@
+        token: #微信小程序消息服务器配置的token
+        aesKey: #微信小程序消息服务器配置的EncodingAESKey
+        msgDataFormat: JSON
+      - appid: @work.wx.ma.appId@
+        secret: @work.wx.ma.secret@
+        token: #微信小程序消息服务器配置的token
+        aesKey: #微信小程序消息服务器配置的EncodingAESKey
+        msgDataFormat: JSON
+    appId:
+      # 普通居民端的appId
+      normal: @wx.ma.appId@
+      # 工作端的appId
+      work: @work.wx.ma.appId@
 
 
 feign:
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/WxMaSecCheckTask.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/WxMaSecCheckTask.java
index e04f8535c..ea3a0915e 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/WxMaSecCheckTask.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/WxMaSecCheckTask.java
@@ -1,9 +1,7 @@
 package com.elink.esua.epdc.async;
 
 import cn.binarywang.wx.miniapp.api.WxMaSecCheckService;
-import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.elink.esua.epdc.utils.WxMaServiceUtils;
-import com.elink.esua.epdc.wx.ma.WxMaConfig;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index e9f0a7c66..0a6d5ca15 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -1,6 +1,5 @@
 package com.elink.esua.epdc.service.impl;
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.elink.esua.epdc.async.GroupTask;
@@ -22,7 +21,6 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.*;
-import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
@@ -30,7 +28,6 @@ import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.enums.*;
 import com.elink.esua.epdc.feign.AdminFeignClient;
-import com.elink.esua.epdc.feign.GroupFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.jwt.JwtTokenProperties;
 import com.elink.esua.epdc.jwt.JwtTokenUtils;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxMaServiceUtils.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxMaServiceUtils.java
index e384f75c0..dafd82d00 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxMaServiceUtils.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxMaServiceUtils.java
@@ -6,8 +6,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 /**
+ * 获取小程序业务工具
+ *
  * @author work@yujt.net.cn
- * @date 1 1
+ * @date 2019/11/25 13:29
  */
 @Component
 public class WxMaServiceUtils {