deason 7 lat temu
rodzic
commit
7404c6ed13

+ 2 - 2
src/main/java/cn/com/qmth/examcloud/app/controller/version_1_0/UserAuthRestController.java

@@ -50,7 +50,7 @@ public class UserAuthRestController {
             accountType = LoginType.COMMON_LOGIN_NAME.name();
         }
         Result<UserInfo> result = userAuthService.login(account, password, accountType, rootOrgId, domain);
-       /*if (result.isSuccess()) {
+        /*if (result.isSuccess()) {
             //获取当前登录用户信息
             UserInfo userInfo = result.getData();
             //封装原始登录信息
@@ -74,7 +74,7 @@ public class UserAuthRestController {
     @ApiOperation(value = "获取用户信息接口")
     @RequestMapping(value = "/user/info", method = {RequestMethod.GET, RequestMethod.POST})
     public Result getUserInfo(@RequestHeader String key, @RequestHeader String token, HttpServletRequest request) throws Exception {
-        //String loginToken = (String) request.getAttribute("loginToken");
+        //token = (String) request.getAttribute("loginToken");
         return userAuthService.getUserInfo(key, token);
     }
 

+ 10 - 1
src/main/java/cn/com/qmth/examcloud/app/core/utils/DateUtils.java

@@ -13,7 +13,7 @@ import java.util.Date;
 public class DateUtils {
     private static final String fmt = "yyyy-MM-dd HH:mm:ss";
 
-    public static String format(String longStr) {
+    public static String formatLongDate(String longStr) {
         try {
             Long value = Long.parseLong(longStr);
             Date date = new Date(value);
@@ -24,4 +24,13 @@ public class DateUtils {
         }
     }
 
+    public static String format(Date date) {
+        try {
+            return new SimpleDateFormat(fmt).format(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
 }

+ 1 - 0
src/main/java/cn/com/qmth/examcloud/app/model/UserToken.java

@@ -45,6 +45,7 @@ public class UserToken implements Serializable {
         Calendar c = Calendar.getInstance();
         c.setTime(createTime);
         c.add(Calendar.SECOND, seconds);
+        //System.out.println(DateUtils.format(c.getTime()));
         //判断是否在n小时内
         if (c.getTime().after(new Date())) {
             return false;

+ 3 - 3
src/main/java/cn/com/qmth/examcloud/app/service/NetExamService.java

@@ -8,11 +8,11 @@
 package cn.com.qmth.examcloud.app.service;
 
 import cn.com.qmth.examcloud.app.core.exception.ApiException;
-import cn.com.qmth.examcloud.app.model.Constants;
-import cn.com.qmth.examcloud.app.model.Result;
 import cn.com.qmth.examcloud.app.core.utils.DateUtils;
 import cn.com.qmth.examcloud.app.core.utils.HttpUtils;
 import cn.com.qmth.examcloud.app.core.utils.JsonMapper;
+import cn.com.qmth.examcloud.app.model.Constants;
+import cn.com.qmth.examcloud.app.model.Result;
 import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
@@ -45,7 +45,7 @@ public class NetExamService {
         Result<String> result = HttpUtils.doGet(requestUrl, key, token);
         if (result.isSuccess()) {
             //转换日期格式
-            result.setData(DateUtils.format(result.getData()));
+            result.setData(DateUtils.formatLongDate(result.getData()));
         }
         return result;
     }