deason 7 年之前
父节点
当前提交
81ce11cd9b

+ 1 - 1
src/main/java/cn/com/qmth/examcloud/app/controller/v1/UserAuthRestController.java

@@ -40,7 +40,7 @@ public class UserAuthRestController {
 
     @ApiOperation(value = "获取用户信息接口")
     @RequestMapping(value = "/user/info", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result userInfo(@RequestHeader String key, @RequestHeader String token) throws Exception {
+    public Result getUserInfo(@RequestHeader String key, @RequestHeader String token) throws Exception {
         return userAuthService.getUserInfo(key, token);
     }
 

+ 19 - 0
src/main/java/cn/com/qmth/examcloud/app/model/Result.java

@@ -71,6 +71,13 @@ public class Result<T> implements Serializable {
         return this;
     }
 
+    public boolean isSuccess() {
+        if (Constants.CODE_200.equals(getCode())) {
+            return true;
+        }
+        return false;
+    }
+
     public String getCode() {
         return code;
     }
@@ -83,6 +90,18 @@ public class Result<T> implements Serializable {
         return data;
     }
 
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);

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

@@ -8,6 +8,9 @@
 package cn.com.qmth.examcloud.app.service;
 
 import cn.com.qmth.examcloud.app.model.Result;
+import cn.com.qmth.examcloud.app.utils.DateUtils;
+import cn.com.qmth.examcloud.app.utils.HttpUtils;
+import okhttp3.Request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +18,9 @@ import org.springframework.stereotype.Service;
 
 import java.io.File;
 
+import static cn.com.qmth.examcloud.app.model.Constants.PARAM_KEY;
+import static cn.com.qmth.examcloud.app.model.Constants.PARAM_TOKEN;
+
 /**
  * 网考业务服务接口
  */
@@ -25,7 +31,21 @@ public class NetExamService {
     private PropertyService propertyService;
 
     public Result getCurrentTime(String key, String token) throws Exception {
-        return null;
+        final String requestUrl = propertyService.getNetExamUrl() + "/api/online_exam_course/currentTime";
+        //封装请求参数
+        Request request = new Request.Builder()
+                .url(requestUrl)
+                .get()
+                .addHeader(PARAM_KEY, key)
+                .addHeader(PARAM_TOKEN, token)
+                .build();
+        //执行请求
+        Result<String> result = HttpUtils.call(request);
+        if (result.isSuccess()) {
+            //转换日期格式
+            result.setData(DateUtils.format(result.getData()));
+        }
+        return result;
     }
 
     public Result getOfflineExamCourseList(String key, String token) throws Exception {

+ 8 - 8
src/main/java/cn/com/qmth/examcloud/app/service/PropertyService.java

@@ -19,22 +19,22 @@ import org.springframework.stereotype.Component;
 public class PropertyService {
     private static Logger log = LoggerFactory.getLogger(PropertyService.class);
     @Value("${examcloud.exam.admin.url}")
-    private String examAdminUrl;
-    @Value("${examcloud.online.exam.url}")
-    private String onlineExamUrl;
+    private String examAdminUrl;//考务服务
+    @Value("${examcloud.net.exam.url}")
+    private String netExamUrl;//网考服务
     @Value("${examcloud.question.pool.url}")
-    private String questionPoolUrl;
+    private String questionPoolUrl;//题库服务
     @Value("${examcloud.user.auth.url}")
-    private String userAuthUrl;
+    private String userAuthUrl;//认证中心服务
     @Value("${examcloud.upyun.url}")
-    private String upYunUrl;
+    private String upYunUrl;//又拍云文件服务
 
     public String getExamAdminUrl() {
         return examAdminUrl;
     }
 
-    public String getOnlineExamUrl() {
-        return onlineExamUrl;
+    public String getNetExamUrl() {
+        return netExamUrl;
     }
 
     public String getQuestionPoolUrl() {

+ 27 - 0
src/main/java/cn/com/qmth/examcloud/app/utils/DateUtils.java

@@ -0,0 +1,27 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-07-18 14:25:01.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.app.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateUtils {
+    private static final String fmt = "yyyy-MM-dd HH:mm:ss";
+
+    public static String format(String longStr) {
+        try {
+            Long value = Long.parseLong(longStr);
+            Date date = new Date(value);
+            return new SimpleDateFormat(fmt).format(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return longStr;
+        }
+    }
+
+}

+ 1 - 1
src/main/java/cn/com/qmth/examcloud/app/utils/HttpUtils.java

@@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory;
 public class HttpUtils {
     private static Logger log = LoggerFactory.getLogger(HttpUtils.class);
 
-    public static Result call(Request request) throws Exception {
+    public static Result<String> call(Request request) throws Exception {
         Response response = HttpBuilder.client.getInstance().newCall(request).execute();
         String bodyStr = response.body().string();
         log.debug("Http response is " + bodyStr);

+ 1 - 1
src/main/resources/application.properties

@@ -14,7 +14,7 @@ logging.level.cn.com.qmth=DEBUG
 #蕉昢督昢華硊
 examcloud.exam.admin.url=http://ecs-dev.qmth.com.cn:8001
 #厙蕉督昢華硊
-examcloud.online.exam.url=http://ecs-dev.qmth.com.cn:8003
+examcloud.net.exam.url=http://ecs-dev.qmth.com.cn:8003
 #枙踱督昢華硊
 examcloud.question.pool.url=http://ecs-dev.qmth.com.cn:8868
 #'痐笢陑督昢華硊