diff --git a/pom.xml b/pom.xml
index c4bb20e2535fe5c3c9a04f42d5efd1fd6d05e2ca..42aee72205ae66badd62c9d6a6b6ceef9a384c13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.fstack
FStackForum
- 1.2.0
+ 1.2.1
jar
FStackForum
diff --git a/src/main/java/com/fstack/persistence/model/Comment.java b/src/main/java/com/fstack/persistence/model/Comment.java
index 87ba2e11e976b7e66b60ab569f736fb57e2325e2..e6c95620ed042227a2d7899c5dab2154d122c9a2 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 ae397d9021fb13f57aa301e5c8ae66cb0b9e110f..566fdc165e2f9b7fb9c324b3f8d7a58c98bceb10 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 a37e78882a46b8e2bfa6c7c169f5f669907221d4..5b939e0357a36e189d2ca6d2b103354fa768ebca 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/application.properties b/src/main/resources/application.properties
index 5c92b3f4800f9ab543cb606fbb766e1b32dd9b3a..114b05eafa36010c22a9048b9fb53e06173c434f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,6 +2,7 @@ server.port=9999
spring.profiles.active= pro
server.servlet.context-path= /
spring.aop.proxy-target-class=true
+spring.jackson.time-zone= GMT+8
# ==============================
# MyBatis configuration
# ==============================
diff --git a/src/main/resources/static/custom/custom.css b/src/main/resources/static/custom/custom.css
index f60038ededae14ea3c19a6b540da3340cf2d3e55..405fb9a80dd5ebc2152996fa8060bf4d05aac2da 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 afb2254d3e66898f74115b2819ec2a615f7fcd2a..58abddef037a89b640e40aee40038520dd673fd1 100644
--- a/src/main/resources/templates/forum/user-profile.html
+++ b/src/main/resources/templates/forum/user-profile.html
@@ -11,16 +11,18 @@
@@ -57,8 +59,9 @@