yfh преди 2 дни
родител
ревизия
98bb396dd1

+ 4 - 2
fs-service/src/main/resources/application-druid-zkzh.yml

@@ -30,7 +30,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://rm-bp1l45210q9m4m83u.mysql.rds.aliyuncs.com:3306/jz_store?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://rm-bp1l45210q9m4m83u.mysql.rds.aliyuncs.com:3306/jz_store_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: Zkhj951753@#
                 # 从库数据源
@@ -139,4 +139,6 @@ rocketmq:
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
 cloud_host:
     company_name: 中康智慧
-
+openIM:
+    secret: openIM123
+    userID: imAdmin

+ 2 - 2
fs-user-app/src/main/java/com/fs/app/controller/WxH5MpController.java

@@ -132,14 +132,14 @@ public class WxH5MpController {
             userUpdate.setMpOpenId(wxMpUser.getOpenid());
             userUpdate.setUnionId(wxMpUser.getUnionId());
             userUpdate.setUpdateTime(new DateTime());
-            userUpdate.setNickname(wxMpUser.getNickname());
+            userUpdate.setNickName(wxMpUser.getNickname());
             userUpdate.setAvatar(wxMpUser.getHeadImgUrl());
             userService.updateFsUser(userUpdate);
             return userUpdate;
         } else {
             // 创建新用户
             FsUser newUser = new FsUser();
-            newUser.setNickname(wxMpUser.getNickname());
+            newUser.setNickName(wxMpUser.getNickname());
             newUser.setAvatar(wxMpUser.getHeadImgUrl());
             newUser.setStatus(1);
             newUser.setMpOpenId(wxMpUser.getOpenid());