diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseDTO.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseDTO.java
index 72c7e7fbb..6e8be07c4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseDTO.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseDTO.java
@@ -19,9 +19,9 @@ public class BaseDTO implements Serializable {
private String updatedBy;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
}
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java
index eb2e1081d..71c944dff 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java
@@ -16,6 +16,7 @@
package org.nl.modules.common.base;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.annotations.CreationTimestamp;
@@ -59,7 +60,7 @@ public class BaseEntity implements Serializable {
@UpdateTimestamp
@Column(name = "update_time")
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Timestamp updateTime;
/* 分组校验 */
diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml
index 13e2de704..3c786edda 100644
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -8,7 +8,7 @@ spring:
profiles:
active: dev
jackson:
- time-zone: GMT+8
+ time-zone: Asia/Shanghai
data:
redis:
repositories:
diff --git a/lms/nladmin-ui/src/views/system/param/index.vue b/lms/nladmin-ui/src/views/system/param/index.vue
index e55a3d698..89c99af60 100644
--- a/lms/nladmin-ui/src/views/system/param/index.vue
+++ b/lms/nladmin-ui/src/views/system/param/index.vue
@@ -162,7 +162,7 @@ export default {
const id = '123'
// 获取token保存到vuex中的用户信息,此处仅适用于本项目,注意删除或修改
// 实例化socket,这里我把用户名传给了后台,使后台能判断要把消息发给哪个用户,其实也可以后台直接获取用户IP来判断并推送
- const socketUrl = process.env.VUE_APP_WS_API + id
+ const socketUrl = window.g.prod.VUE_APP_BASE_API + id
this.socket = new WebSocket(socketUrl)
// 监听socket打开
this.socket.onopen = function() {
diff --git a/lms/nladmin-ui/src/views/tools/storage/index.vue b/lms/nladmin-ui/src/views/tools/storage/index.vue
index 985364957..33ed2d58b 100644
--- a/lms/nladmin-ui/src/views/tools/storage/index.vue
+++ b/lms/nladmin-ui/src/views/tools/storage/index.vue
@@ -94,16 +94,8 @@
-
-
- {{ parseTime(scope.row.createTime) }}
-
-
-
-
- {{ parseTime(scope.row.updateTime) }}
-
-
+
+