Parcourir la source

登录及时区设置

WXF il y a 3 ans
Parent
commit
9ea61e36d9

+ 1 - 1
api-common/src/main/java/api/common/util/TimeUtil.java

@@ -66,7 +66,7 @@ public class TimeUtil {
 
     //获取间隔 n 秒的时间
     public static Timestamp getPostTimestamp(int secends) {
-        return new Timestamp(System.currentTimeMillis() + secends * 1000);
+        return new Timestamp(System.currentTimeMillis() + secends * 1000L);
     }
 
     //获取两个时间间隔

+ 3 - 0
simulation-oauth-client/src/main/resources/bootstrap.yaml

@@ -3,6 +3,9 @@ spring:
     name: simulation-oauth-client
   profiles:
     active: dev
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
 
 mybatis:
   configuration:

+ 0 - 3
simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/SceneImportCtrl.java

@@ -14,9 +14,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

+ 3 - 0
simulation-resource-server/src/main/resources/bootstrap.yaml

@@ -3,6 +3,9 @@ spring:
     name: simulation-resource-server
   profiles:
     active: dev
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
 
 # 分页插件配置
 pagehelper:

+ 10 - 10
simulation-resource-server/src/main/resources/mapper/system/SceneImportMapper.xml

@@ -72,16 +72,16 @@
 
     <select id="getSceneImporPagetList" parameterType="api.common.pojo.param.system.SceneImportPageParam" resultType="api.common.pojo.po.system.SceneImportPO">
         select
-        id,
-        name,
-        scene_type,
-        status,
-        success_num,
-        false_num,
-        error_message,
-        total_time,
-        create_time,
-        is_deleted
+          id,
+          name,
+          scene_type,
+          status,
+          success_num,
+          false_num,
+          error_message,
+          total_time,
+          create_time,
+          is_deleted
         from simulation.scene_import_task
         where
         is_deleted = '0'