From f62c4c972f51fb5cd81f74868a8b90bc63351a99 Mon Sep 17 00:00:00 2001
From: czc <czc15706259078@163.com>
Date: Tue, 18 Jul 2023 14:44:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=97=A0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cyl/h5/controller/H5MemberController.java   |  6 ------
 .../java/com/cyl/wechat/WechatController.java   | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java
index c897cc4..ad4020d 100644
--- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java
@@ -51,12 +51,6 @@ public class H5MemberController {
         return ResponseEntity.ok(service.getMemberInfo());
     }
 
-    @ApiOperation("获取微信用户授权信息")
-    @PostMapping("/member/getWechatUserAuth")
-    public ResponseEntity<WechatUserAuth> getWechatUserAuth(@RequestBody String data){
-        return ResponseEntity.ok(service.getWechatUserAuth(data));
-    }
-
     @ApiOperation("设置会员微信信息")
     @PostMapping("/member/setWechatInfo")
     public void setWechatInfo(@RequestBody String data){
diff --git a/ruoyi-mall/src/main/java/com/cyl/wechat/WechatController.java b/ruoyi-mall/src/main/java/com/cyl/wechat/WechatController.java
index 102855b..60844b0 100644
--- a/ruoyi-mall/src/main/java/com/cyl/wechat/WechatController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/wechat/WechatController.java
@@ -1,10 +1,12 @@
 package com.cyl.wechat;
 
+import com.cyl.h5.service.H5MemberService;
 import com.cyl.wechat.response.JssdkConfigResponse;
+import com.cyl.wechat.response.WechatUserAuth;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,6 +17,9 @@ import java.util.stream.Stream;
 @RequestMapping("/no-auth/wechat")
 public class WechatController {
 
+    @Autowired
+    private H5MemberService service;
+
     @GetMapping("/jssdk")
     public ResponseEntity<JssdkConfigResponse> getJssdkConfig(){
         String appId = WechatPayData.appId;
@@ -32,4 +37,10 @@ public class WechatController {
         response.setSignature(signature);
         return ResponseEntity.ok(response);
     }
+
+    @ApiOperation("获取微信用户授权信息")
+    @PostMapping("/getWechatUserAuth")
+    public ResponseEntity<WechatUserAuth> getWechatUserAuth(@RequestBody String data){
+        return ResponseEntity.ok(service.getWechatUserAuth(data));
+    }
 }