From 11bf25156f6cc496011b5178475ab12588dffac5 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Wed, 14 Sep 2022 11:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BE=AE=E4=BF=A1=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mdd/common/utils/WeChatUtil.java | 21 +++++++++++++++++++
 .../front/service/impl/LoginServiceImpl.java  |  8 +------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/server/like-common/src/main/java/com/mdd/common/utils/WeChatUtil.java b/server/like-common/src/main/java/com/mdd/common/utils/WeChatUtil.java
index b0389faa..f4bd055d 100644
--- a/server/like-common/src/main/java/com/mdd/common/utils/WeChatUtil.java
+++ b/server/like-common/src/main/java/com/mdd/common/utils/WeChatUtil.java
@@ -1,5 +1,8 @@
 package com.mdd.common.utils;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.qcloud.cos.model.ciModel.auditing.Conf;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
@@ -9,6 +12,24 @@ import java.util.Map;
 
 public class WeChatUtil {
 
+    /**
+     * 微信小程序
+     *
+     * @author fzr
+     * @return WxMaService
+     */
+    public static WxMaService mnp() {
+        Map<String, String> config = ConfigUtil.get("mp_channel");
+
+        WxMaService service = new WxMaServiceImpl();
+        WxMaDefaultConfigImpl wxConfig = new WxMaDefaultConfigImpl();
+        wxConfig.setAppid(config.getOrDefault("appId", ""));
+        wxConfig.setSecret(config.getOrDefault("appSecret", ""));
+        service.setWxMaConfig(wxConfig);
+        return service;
+    }
+
+
     /**
      * 微信公众号
      *
diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
index 9eba015f..d2550681 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
@@ -90,14 +90,8 @@ public class LoginServiceImpl implements ILoginService {
         String gender    = params.getOrDefault("gender", "0");
         Integer client   = Integer.parseInt(params.getOrDefault("client", "1"));
 
-        Map<String, String> config = ConfigUtil.get("mp_channel");
-        WxMaService wxMaService = new WxMaServiceImpl();
-        WxMaDefaultConfigImpl wxConfig = new WxMaDefaultConfigImpl();
-        wxConfig.setAppid(config.getOrDefault("appId", ""));
-        wxConfig.setSecret(config.getOrDefault("appSecret", ""));
-        wxMaService.setWxMaConfig(wxConfig);
-
         try {
+            WxMaService wxMaService = WeChatUtil.mnp();
             WxMaJscode2SessionResult sessionResult = wxMaService.getUserService().getSessionInfo(code);
             String openId = sessionResult.getOpenid();
             String uniId = sessionResult.getUnionid();