From c3362b1179d9e6f588a209ef9b6ef40dfa9499a0 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 23 十二月 2022 14:20:24 +0800
Subject: [PATCH] fix: 群成员重复

---
 src/main/java/com/example/jz/controller/WxAppController.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/jz/controller/WxAppController.java b/src/main/java/com/example/jz/controller/WxAppController.java
index 6415d2b..8d09512 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -17,6 +17,7 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
@@ -36,9 +37,11 @@
 
     private final String wxApp_accessToken_verify_url = "https://api.weixin.qq.com/cgi-bin/token";
 
-    private final String appid = "wxebbb232d366dae09";
+    @Value("${wx.appid}")
+    private  String appid;
 
-    private final String secret = "9a160c97c821eaa163240e8ec9185b77";
+    @Value("${wx.secret}")
+    private String secret;
 
     private final String js_code = "";
 
@@ -118,10 +121,12 @@
             role = user.getRole();
             id = user.getId();
         }
+        User user1 = userDao.selectOne(new QueryWrapper<User>().eq("user_mobile", phone_info.getPurePhoneNumber()));
         HashMap<String, Object> loginMessage = new HashMap<>();
         loginMessage.put("id", id);
         loginMessage.put("token", token);
         loginMessage.put("role", role);
+        loginMessage.put("time",user1.getUserIdcard());
         return R.ok(loginMessage);
     }
 
@@ -389,6 +394,9 @@
 
     @GetMapping("/group/user/sendMsg")
     public R sendUserMsg(@RequestParam Integer id, @RequestParam Integer groupId, @RequestParam String msg) {
+        if (StringUtils.isBlank(msg)){
+            return R.failed("msg is blank");
+        }
         Message message = new Message();
         message.setUserId(id);
         message.setText(msg);

--
Gitblit v1.8.0