From fc15917b486397211398f0d411af31b6b757080f Mon Sep 17 00:00:00 2001
From: Bosen <bosen_once@163.com>
Date: Thu, 7 Oct 2021 23:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/jieyue/user/service/UserInfoService.java | 2 +-
 src/main/resources/application.yml                            | 4 ++--
 src/main/resources/templates/user/home/index.html             | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/jieyue/user/service/UserInfoService.java b/src/main/java/com/example/jieyue/user/service/UserInfoService.java
index 905f97e..01759c1 100644
--- a/src/main/java/com/example/jieyue/user/service/UserInfoService.java
+++ b/src/main/java/com/example/jieyue/user/service/UserInfoService.java
@@ -59,7 +59,7 @@ public class UserInfoService {
             }
         }
         if (newPwd.equals("")){
-            newPwd = oldPwd;
+            newPwd = user.getPassword();
         }else{
             newPwd = DigestUtils.md5DigestAsHex(newPwd.getBytes());
         }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dfa07b7..6e9a061 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
-# site-url: 127.0.0.1
-site-url: 47.115.118.34
+site-url: 127.0.0.1
+# site-url: 47.115.118.34
 server:
   port: 80
   tomcat:
diff --git a/src/main/resources/templates/user/home/index.html b/src/main/resources/templates/user/home/index.html
index 2934d91..6f17101 100644
--- a/src/main/resources/templates/user/home/index.html
+++ b/src/main/resources/templates/user/home/index.html
@@ -1921,6 +1921,7 @@
                 <div class="col-lg-12">
                     <div class="single-latest-blog">
                         <div class="latest-blog-img">
+                            <div th:value="${lowImg.get(0)}" disabled="disabled"></div>
                             <a target="_blank" th:if="${lowImg.get('0')}!=null"
                                th:href="@{/user/shop(id=${lowImg.get('0').getMerchant()})}">
                                 <img th:src="@{${lowImg.get('0').getUrl()}}" style="width: 400px; height: 206px" alt=""/>