From 9d0b0d753e9c764e79ea14c87ba5b1c31de8fda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Tue, 9 Jul 2019 10:41:10 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=97=B6=E5=8C=BA=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5c92b3f..f887258 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=9999
-spring.profiles.active= pro
+spring.profiles.active= local
 server.servlet.context-path= /
 spring.aop.proxy-target-class=true
 # ==============================
-- 
Gitee


From a8dfeb5f3bde9f307c066ef3e5e0e42278b0b3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Tue, 9 Jul 2019 11:40:29 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f887258..74be025 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,6 +2,7 @@ server.port=9999
 spring.profiles.active= local
 server.servlet.context-path= /
 spring.aop.proxy-target-class=true
+spring.jackson.time-zone= GMT+8
 # ==============================
 # MyBatis configuration
 # ==============================
-- 
Gitee


From 5fee322c1829493f39acbdfc9359f0ad1389be32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Tue, 9 Jul 2019 13:57:14 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/custom/custom.css   | 22 +++++++++++++++++++
 .../templates/forum/user-profile.html         | 12 +++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/static/custom/custom.css b/src/main/resources/static/custom/custom.css
index f60038e..405fb9a 100644
--- a/src/main/resources/static/custom/custom.css
+++ b/src/main/resources/static/custom/custom.css
@@ -56,6 +56,28 @@ a.post-tag {
     border-bottom-left-radius: 2px;
 }
 
+.post-user-name {
+    color: #010101;
+    white-space: nowrap;
+    text-align: center;
+    padding-left: 10px;
+    margin: 1px 1px 1px 1px;
+    text-shadow: 0px 0px 0px #fff;
+    font-size: xx-large;
+    font-weight: bold;
+}
+
+.post-user {
+    color: #8f8f8f;
+    white-space: nowrap;
+    text-align: center;
+    padding-left: 10px;
+    margin: 1px 1px 1px 1px;
+    text-shadow: 0px 0px 0px #fff;
+    font-size: smaller;
+    font-weight: bold;
+}
+
 a.post-user {
     color: #505050;
     white-space: nowrap;
diff --git a/src/main/resources/templates/forum/user-profile.html b/src/main/resources/templates/forum/user-profile.html
index afb2254..de2445e 100644
--- a/src/main/resources/templates/forum/user-profile.html
+++ b/src/main/resources/templates/forum/user-profile.html
@@ -11,16 +11,18 @@
                     <div class="panel panel-default">
                         <div class="panel-body">
 	                        <div class="media-left media-top">
-	                            <img class="media-object img-rounded" width="50px" height="50px" alt="profile_pic"
+	                            <img class="media-object img-rounded" width="100px" height="100px" alt="profile_pic"
                                      th:src="@{${user.avatarLocation}}">
 	                        </div>
 	                        <div class="media-body">
 	                            <div class="media-heading">
-	                                <span class="post-user" th:text="${user.username}"></span>
-	                                <div class="post-user" th:text="${user.bio}"></div>
+	                                <span class="post-user-name" th:text="${user.username}"></span>
 	                            </div>
-                                <span class="post-user" th:text="${user.id}"></span>
-                                <span class="post-user" th:text="${user.dateCreated}"></span>
+                                <div class="media-heading">
+                                    <span class="post-user" th:text="'签名：' + ${user.bio}"></span>
+                                </div>
+                                <span class="post-user" th:text="'第 ' + ${user.id} + ' 号会员,'"></span>
+                                <span class="post-user" th:text="'加入于 ' +${user.dateCreated}"></span>
 	                        </div>
                         </div>
                     </div>
-- 
Gitee


From 6a18fdae60291ba8bee536c682a4540666ac8d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Tue, 9 Jul 2019 14:15:12 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/fstack/persistence/model/Comment.java | 5 ++++-
 src/main/java/com/fstack/persistence/model/User.java    | 5 ++++-
 src/main/java/com/fstack/util/TimeUtil.java             | 5 +++++
 src/main/resources/templates/forum/user-profile.html    | 5 +++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/fstack/persistence/model/Comment.java b/src/main/java/com/fstack/persistence/model/Comment.java
index 87ba2e1..e6c9562 100644
--- a/src/main/java/com/fstack/persistence/model/Comment.java
+++ b/src/main/java/com/fstack/persistence/model/Comment.java
@@ -1,5 +1,6 @@
 package com.fstack.persistence.model;
 
+import com.fstack.util.TimeUtil;
 import lombok.Data;
 
 import java.sql.Timestamp;
@@ -17,5 +18,7 @@ public class Comment {
 
     }
 
-
+    public String dateFormat() {
+        return TimeUtil.dateFormat(this.getDateCreated());
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/fstack/persistence/model/User.java b/src/main/java/com/fstack/persistence/model/User.java
index ae397d9..566fdc1 100644
--- a/src/main/java/com/fstack/persistence/model/User.java
+++ b/src/main/java/com/fstack/persistence/model/User.java
@@ -1,5 +1,6 @@
 package com.fstack.persistence.model;
 
+import com.fstack.util.TimeUtil;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -126,5 +127,7 @@ public class User implements Serializable {
         return this.activated == 1 ? true : false;
     }
 
-
+    public String dateFormat() {
+        return TimeUtil.dateFormatSecond(this.getDateCreated());
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/fstack/util/TimeUtil.java b/src/main/java/com/fstack/util/TimeUtil.java
index a37e788..5b939e0 100644
--- a/src/main/java/com/fstack/util/TimeUtil.java
+++ b/src/main/java/com/fstack/util/TimeUtil.java
@@ -43,4 +43,9 @@ public class TimeUtil {
         return simpleDateFormat.format(date);
     }
 
+    public static String dateFormatSecond(Timestamp timestamp) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date(timestamp.getTime());
+        return simpleDateFormat.format(date);
+    }
 }
diff --git a/src/main/resources/templates/forum/user-profile.html b/src/main/resources/templates/forum/user-profile.html
index de2445e..58abdde 100644
--- a/src/main/resources/templates/forum/user-profile.html
+++ b/src/main/resources/templates/forum/user-profile.html
@@ -22,7 +22,7 @@
                                     <span class="post-user" th:text="'签名：' + ${user.bio}"></span>
                                 </div>
                                 <span class="post-user" th:text="'第 ' + ${user.id} + ' 号会员,'"></span>
-                                <span class="post-user" th:text="'加入于 ' +${user.dateCreated}"></span>
+                                <span class="post-user" th:text="'加入于 ' +${user.dateFormat()}"></span>
 	                        </div>
                         </div>
                     </div>
@@ -59,8 +59,9 @@
                                 <div class="media">
                                     <div class="media-body">
                                         <div class="media-heading">
-                                            <a class="post-title" th:text="${comment.body}">comment</a>
+                                            <a class="post-title" th:href="@{/post/{postId}(postId=${comment.postId})}" th:text="${comment.body}">comment</a>
                                         </div>
+                                        <span class="post-date" th:text="${'评论于 ' + comment.dateFormat()}"></span>
                                     </div>
                                 </div>
                             </li>
-- 
Gitee


From dd21c255750a411b13afaa8adc1ac45f0310ba9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Tue, 9 Jul 2019 14:15:24 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c4bb20e..42aee72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.fstack</groupId>
 	<artifactId>FStackForum</artifactId>
-	<version>1.2.0</version>
+	<version>1.2.1</version>
 	<packaging>jar</packaging>
 
 	<name>FStackForum</name>
-- 
Gitee


From 742f9f36af7d1ba42d89e2771cdc2f91f8a47c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Tue, 9 Jul 2019 14:16:23 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 74be025..114b05e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=9999
-spring.profiles.active= local
+spring.profiles.active= pro
 server.servlet.context-path= /
 spring.aop.proxy-target-class=true
 spring.jackson.time-zone= GMT+8
-- 
Gitee