From 4a6047bd22234d507d112e01ea00ee9c6049c348 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Mon, 7 Apr 2025 17:19:19 +0800
Subject: [PATCH] this is 4.2 update

---
 src/main/java/com/cultural/heritage/constant/UserConstant.java  | 2 +-
 .../heritage/controller/wx/WeChatLogisticsController.java       | 1 -
 .../cultural/heritage/service/user/impl/UserServiceImpl.java    | 2 +-
 src/main/resources/application-dev.yml                          | 1 -
 src/main/resources/application.yml                              | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/cultural/heritage/constant/UserConstant.java b/src/main/java/com/cultural/heritage/constant/UserConstant.java
index 13ebee7..22d5229 100644
--- a/src/main/java/com/cultural/heritage/constant/UserConstant.java
+++ b/src/main/java/com/cultural/heritage/constant/UserConstant.java
@@ -14,7 +14,7 @@ public interface UserConstant {
     /**
      * 用户默认头像
      */
-    String USER_DEFAULT_AVATAR = "avatar.png";
+    String USER_DEFAULT_AVATAR = FileConstant.SERVER_HOST + "feiyi/miniProgram/mine/main/avatar.png";
 
     /**
      * 用户登录键
diff --git a/src/main/java/com/cultural/heritage/controller/wx/WeChatLogisticsController.java b/src/main/java/com/cultural/heritage/controller/wx/WeChatLogisticsController.java
index ebd2943..3cf2fa0 100644
--- a/src/main/java/com/cultural/heritage/controller/wx/WeChatLogisticsController.java
+++ b/src/main/java/com/cultural/heritage/controller/wx/WeChatLogisticsController.java
@@ -65,7 +65,6 @@ public class WeChatLogisticsController {
     private RedisTemplate<String, Object> redisTemplate;
 
 
-
     @Resource
     private OrderService orderService;
 
diff --git a/src/main/java/com/cultural/heritage/service/user/impl/UserServiceImpl.java b/src/main/java/com/cultural/heritage/service/user/impl/UserServiceImpl.java
index def9177..029c3ce 100644
--- a/src/main/java/com/cultural/heritage/service/user/impl/UserServiceImpl.java
+++ b/src/main/java/com/cultural/heritage/service/user/impl/UserServiceImpl.java
@@ -185,7 +185,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 user.setUserAccount(userAccount);
                 user.setUserPassword(userPassword);
                 user.setMiniOpenId(openid);
-                user.setUserName("玲珑" + RandomUtil.randomString(8));
+                user.setUserName("泠珑" + RandomUtil.randomString(8));
                 user.setUserRole("user");
                 user.setPoints(10000);
                 user.setUserAvatar(UserConstant.USER_DEFAULT_AVATAR);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 894d225..dad97ce 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -92,7 +92,6 @@ wx:
     apiV3Key: fbemuj4Xql7CYlQJAoTEPYxvPSNgYT2t
     #通知地址
     notifyUrl: https://winning-mouse-internally.ngrok-free.app
-
     #微信服务器地址
     domain: https://api.mch.weixin.qq.com
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 18684a4..1ab53e5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev