Merge branch 'master' into zjw

imt-server/imt-framework/imt-common/src/main/java/com/inspur/framework/common/util/date/DateUtils.java

@@ -151,7 +151,12 @@ public class DateUtils {
     }
 
     public static String tranUTC2LocalDateTime(String utcTimeString) throws ParseException {
-        SimpleDateFormat utcFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        String[] times = utcTimeString.split("\\.");
+        String format = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+        if(times.length <= 1) {
+            format = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+        }
+        SimpleDateFormat utcFormat =new SimpleDateFormat(format);
         utcFormat.setTimeZone(TimeZone.getTimeZone("UTC")); // 设置UTC时区
         Date utcDate = utcFormat.parse(utcTimeString); // 解析UTC时间
         SimpleDateFormat localFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

imt-server/imt-module-data/imt-module-data-biz/src/main/java/com/inspur/module/data/service/DataQueryService.java

@@ -34,7 +34,8 @@ public class DataQueryService implements IDataQueryService{
         List<Map<String, Object>> dataList = queryDataByTime(tableName, null, startTime, endTime, pageNum, pageSize);
         dataList.forEach(map -> {
             try {
-                map.put("time", DateUtils.tranUTC2LocalDateTime(map.get("time").toString()));
+                String time = map.get("time").toString();
+                map.put("time", DateUtils.tranUTC2LocalDateTime(time));
             } catch (ParseException e) {
                 throw new RuntimeException(e);
             }

imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/auth/AdminAuthServiceImpl.java

@@ -67,9 +67,9 @@ public class AdminAuthServiceImpl implements AdminAuthService {
     private SmsCodeApi smsCodeApi;
 
     /**
-     * 验证码的开关，默认为 true
+     * 验证码的开关，默认为 false
      */
-    @Value("${imt.captcha.enable:true}")
+    @Value("${imt.captcha.enable:false}")
     private Boolean captchaEnable;
 
     @Override

imt-ui/src/permission.js

@@ -1,61 +1,73 @@
-import router from './router'
-import store from './store'
-import { Message } from 'element-ui'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import { getAccessToken } from '@/utils/auth'
-import { isRelogin } from '@/utils/request'
+import router from "./router";
+import store from "./store";
+import { Message } from "element-ui";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { getAccessToken } from "@/utils/auth";
+import { isRelogin } from "@/utils/request";
 
-NProgress.configure({ showSpinner: false })
+NProgress.configure({ showSpinner: false });
 
-// 增加三方登陆 update by 芋艿
-const whiteList = ['/login', '/social-login',  '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
+// 增加三方登陆
+const whiteList = [
+  "/login",
+  "/social-login",
+  "/auth-redirect",
+  "/bind",
+  "/register",
+  "/oauthLogin/gitee",
+];
 
 router.beforeEach((to, from, next) => {
-  NProgress.start()
+  NProgress.start();
   if (getAccessToken()) {
-    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+    to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
     /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
+    if (to.path === "/login") {
+      next({ path: "/" });
+      NProgress.done();
     } else {
       if (store.getters.roles.length === 0) {
-        isRelogin.show = true
+        isRelogin.show = true;
         // 获取字典数据 add by 芋艿
-        store.dispatch('dict/loadDictDatas')
+        store.dispatch("dict/loadDictDatas");
         // 判断当前用户是否已拉取完 user_info 信息
-        store.dispatch('GetInfo').then(userInfo => {
-          isRelogin.show = false
+        store
+          .dispatch("GetInfo")
+          .then((userInfo) => {
+            isRelogin.show = false;
             // 触发 GenerateRoutes 事件时，将 menus 菜单树传递进去
-          store.dispatch('GenerateRoutes', userInfo.menus).then(accessRoutes => {
+            store
+              .dispatch("GenerateRoutes", userInfo.menus)
+              .then((accessRoutes) => {
                 // 根据 roles 权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-          })
-        }).catch(err => {
-          store.dispatch('LogOut').then(() => {
-            Message.error(err)
-            next({ path: '/' })
-          })
+                router.addRoutes(accessRoutes); // 动态添加可访问路由表
+                next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
+              });
           })
+          .catch((err) => {
+            store.dispatch("LogOut").then(() => {
+              Message.error(err);
+              next({ path: "/" });
+            });
+          });
       } else {
-        next()
+        next();
       }
     }
   } else {
     // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入
-      next()
+      next();
     } else {
-      const redirect = encodeURIComponent(to.fullPath) // 编码 URI，保证参数跳转回去后，可以继续带上
-      next(`/login?redirect=${redirect}`) // 否则全部重定向到登录页
-      NProgress.done()
+      const redirect = encodeURIComponent(to.fullPath); // 编码 URI，保证参数跳转回去后，可以继续带上
+      next(`/login?redirect=${redirect}`); // 否则全部重定向到登录页
+      NProgress.done();
     }
   }
-})
+});
 
 router.afterEach(() => {
-  NProgress.done()
-})
+  NProgress.done();
+});