From 7edbd68752990557596b54a43ef530f5442140ce Mon Sep 17 00:00:00 2001
From: "pan.wl.2" <cloudsiu@163.com>
Date: Wed, 13 Nov 2024 23:02:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=82=A8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/service/impl/LoginServiceImpl.java  | 11 ++++++--
 uniapp/src/pages/login/login.vue              | 25 ++++---------------
 2 files changed, 14 insertions(+), 22 deletions(-)

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 ec03dd6e..e308ea15 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
@@ -81,7 +81,10 @@ public class LoginServiceImpl implements ILoginService {
         user.setNickname("用户"+sn);
         user.setAccount(account);
         user.setPassword(pwd);
-        user.setAvatar("/api/static/default_avatar.png");
+
+        String defaultAvatar = ConfigUtils.get("default_image", "user_avatar", "/api/static/default_avatar.png");
+
+        user.setAvatar(defaultAvatar);
         user.setChannel(terminal);
         user.setIsNewUser(1);
         user.setCreateTime(System.currentTimeMillis() / 1000);
@@ -382,7 +385,11 @@ public class LoginServiceImpl implements ILoginService {
         // 创建用户
         if (StringUtils.isNull(user)) {
             Integer sn = this.__generateSn();
-            String defaultAvatar = "/api/static/default_avatar.png";
+
+            String defaultAvatar = ConfigUtils.get("default_image", "user_avatar", "/api/static/default_avatar.png");
+
+            user.setAvatar(defaultAvatar);
+
             String defaultNickname = "用户" + sn;
 
             if (StringUtils.isNotEmpty(avatar)) {
diff --git a/uniapp/src/pages/login/login.vue b/uniapp/src/pages/login/login.vue
index d697d53f..13a94aca 100644
--- a/uniapp/src/pages/login/login.vue
+++ b/uniapp/src/pages/login/login.vue
@@ -163,26 +163,11 @@
                     </u-button>
                 </view>
                 <view class="flex justify-between mt-[40rpx]">
-                    <view
-                        >已有账号，使用
-                        <span
-                            class="text-primary"
-                            @click="changeLoginWay(LoginWayEnum.ACCOUNT)"
-                            v-if="
-                                formData.scene == LoginWayEnum.MOBILE &&
-                                includeLoginWay(LoginWayEnum.ACCOUNT)
-                            "
-                            >密码登录</span
-                        >
-                        <span
-                            class="text-primary"
-                            @click="changeLoginWay(LoginWayEnum.MOBILE)"
-                            v-if="
-                                formData.scene == LoginWayEnum.ACCOUNT &&
-                                includeLoginWay(LoginWayEnum.MOBILE)
-                            "
-                            >验证码登录</span
-                        >
+                    <view v-if=”formData.scene == LoginWayEnum.MOBILE“>已有账号，使用
+                        <span class="text-primary" @click="changeLoginWay(LoginWayEnum.ACCOUNT)" v-if="includeLoginWay(LoginWayEnum.ACCOUNT)">密码登录</span>
+                    </view>
+                    <view v-if=”formData.scene == LoginWayEnum.ACCOUNT>已有账号，使用
+                        <span class="text-primary" @click="changeLoginWay(LoginWayEnum.MOBILE)" v-if="includeLoginWay(LoginWayEnum.MOBILE)">验证码登录</span>
                     </view>
                     <navigator url="/pages/register/register" hover-class="none"
                         >注册账号</navigator