update

src/main/java/cn/com/qmth/examcloud/app/controller/IndexController.java

@@ -11,6 +11,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author: fengdesheng
  * @since: 2018/7/16
@@ -19,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 public class IndexController {
 
     @RequestMapping(value = "/", method = RequestMethod.GET)
-    public String index() throws Exception {
+    public String index(HttpServletRequest request) throws Exception {
         return "index";
     }
 

src/main/java/cn/com/qmth/examcloud/app/controller/version_1_0/OfflineExamController.java → src/main/java/cn/com/qmth/examcloud/app/controller/version1/OfflineExamController.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.app.controller.version_1_0;
+package cn.com.qmth.examcloud.app.controller.version1;
 
 import cn.com.qmth.examcloud.app.model.Result;
 import cn.com.qmth.examcloud.app.service.NetExamService;
@@ -45,14 +45,14 @@ public class OfflineExamController {
     @ResponseBody
     @ApiOperation(value = "获取当前用户参加的离线课程列表接口")
     @RequestMapping(value = "/course/list", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getOfflineExamCourseList(@RequestHeader String key, @RequestHeader String token) throws Exception {
+    public Result getOfflineExamCourseList(@RequestHeader String key, @RequestHeader String token, HttpServletRequest request) throws Exception {
         return netExamService.getOfflineExamCourseList(key, token);
     }
 
     @ResponseBody
     @ApiOperation(value = "离线考试的抽取考题接口")
     @RequestMapping(value = "/record/start", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result startOfflineExamRecord(@RequestHeader String key, @RequestHeader String token, @RequestParam String examStudentId) throws Exception {
+    public Result startOfflineExamRecord(@RequestHeader String key, @RequestHeader String token, @RequestParam String examStudentId, HttpServletRequest request) throws Exception {
         return netExamService.startOfflineExamRecord(key, token, examStudentId);
     }
 
@@ -76,13 +76,13 @@ public class OfflineExamController {
     @ResponseBody
     @ApiOperation(value = "获取某份试卷的详细信息接口")
     @RequestMapping(value = "/paper/detail", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getPaperDetail(@RequestHeader String key, @RequestHeader String token, @RequestParam String paperId) throws Exception {
+    public Result getPaperDetail(@RequestHeader String key, @RequestHeader String token, @RequestParam String paperId, HttpServletRequest request) throws Exception {
         return questionPoolService.getPaperDetail(key, token, paperId);
     }
 
     @ApiOperation(value = "下载考题接口")
     @RequestMapping(value = "/paper/download", method = {RequestMethod.GET, RequestMethod.POST})
-    public String downloadPaper(@RequestParam String paperId, @RequestParam String orgName) throws Exception {
+    public String downloadPaper(@RequestHeader String key, @RequestHeader String token, @RequestParam String paperId, @RequestParam String orgName, HttpServletRequest request) throws Exception {
         String requestUrl = "redirect:" + questionPoolService.downloadPaper(paperId, orgName);
         log.debug(requestUrl);
         return requestUrl;
@@ -90,7 +90,7 @@ public class OfflineExamController {
 
     @ApiOperation(value = "下载已上传的“作答文件”接口")
     @RequestMapping(value = "/paper/answer/download", method = {RequestMethod.GET, RequestMethod.POST})
-    public String downloadPaperAnswer(@RequestParam String filePath) throws Exception {
+    public String downloadPaperAnswer(@RequestHeader String key, @RequestHeader String token, @RequestParam String filePath, HttpServletRequest request) throws Exception {
         String requestUrl = "redirect:" + upYunService.downloadPaperAnswer(filePath);
         log.debug(requestUrl);
         return requestUrl;

src/main/java/cn/com/qmth/examcloud/app/controller/version_1_0/PracticeExamRestController.java → src/main/java/cn/com/qmth/examcloud/app/controller/version1/PracticeExamRestController.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.app.controller.version_1_0;
+package cn.com.qmth.examcloud.app.controller.version1;
 
 import cn.com.qmth.examcloud.app.model.Result;
 import cn.com.qmth.examcloud.app.service.ExamAdminService;
@@ -15,6 +15,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 在线练习相关接口
  *
@@ -33,105 +35,105 @@ public class PracticeExamRestController {
 
     @ApiOperation(value = "获取某考生的“考试批次”列表接口")
     @RequestMapping(value = "/exam/practice/list", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getPracticeExamList(@RequestHeader String key, @RequestHeader String token, @RequestParam String studentId) throws Exception {
+    public Result getPracticeExamList(@RequestHeader String key, @RequestHeader String token, @RequestParam String studentId, HttpServletRequest request) throws Exception {
         return examAdminService.getPracticeExamList(key, token, studentId);
     }
 
     @ApiOperation(value = "获取某考试批次下的课程列表接口")
     @RequestMapping(value = "/exam/practice/course/list", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getPracticeExamCourseList(@RequestHeader String key, @RequestHeader String token, @RequestParam String examId) throws Exception {
+    public Result getPracticeExamCourseList(@RequestHeader String key, @RequestHeader String token, @RequestParam String examId, HttpServletRequest request) throws Exception {
         return netExamService.getPracticeExamCourseList(key, token, examId);
     }
 
     @ApiOperation(value = "获取当前练习的剩余作答时间接口")
     @RequestMapping(value = "/exam/record/heartbeat", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getExamRecordHeartbeat(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId) throws Exception {
+    public Result getExamRecordHeartbeat(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId, HttpServletRequest request) throws Exception {
         return netExamService.getExamRecordHeartbeat(key, token, examRecordId);
     }
 
     @ApiOperation(value = "考生“开始练习”接口")
     @RequestMapping(value = "/exam/record/start", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result startPracticeExamRecord(@RequestHeader String key, @RequestHeader String token, @RequestParam String examStudentId) throws Exception {
+    public Result startPracticeExamRecord(@RequestHeader String key, @RequestHeader String token, @RequestParam String examStudentId, HttpServletRequest request) throws Exception {
         return netExamService.startPracticeExamRecord(key, token, examStudentId);
     }
 
     @ApiOperation(value = "获取当前练习的试卷大题结构信息接口")
     @RequestMapping(value = "/exam/record/paper/struct/list", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getExamRecordPaperStructList(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId) throws Exception {
+    public Result getExamRecordPaperStructList(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId, HttpServletRequest request) throws Exception {
         return netExamService.getExamRecordPaperStructList(key, token, examRecordId);
     }
 
     @ApiOperation(value = "获取当前练习的考试基本信息接口")
     @RequestMapping(value = "/exam/info/{examId}", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getExamInfo(@RequestHeader String key, @RequestHeader String token, @PathVariable Long examId) throws Exception {
+    public Result getExamInfo(@RequestHeader String key, @RequestHeader String token, @PathVariable Long examId, HttpServletRequest request) throws Exception {
         return examAdminService.getExamInfo(key, token, examId);
     }
 
     @ApiOperation(value = "获取当前练习的试卷试题列表接口")
     @RequestMapping(value = "/exam/record/paper/question/list", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getExamRecordPaperQuestionList(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId) throws Exception {
+    public Result getExamRecordPaperQuestionList(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId, HttpServletRequest request) throws Exception {
         return netExamService.getExamRecordPaperQuestionList(key, token, examRecordId);
     }
 
     @ApiOperation(value = "获取考生作答的某个试题的详细信息接口")
     @RequestMapping(value = "/exam/record/paper/question/detail/{questionId}", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result questionDetail(@RequestHeader String key, @RequestHeader String token, @PathVariable String questionId) throws Exception {
+    public Result questionDetail(@RequestHeader String key, @RequestHeader String token, @PathVariable String questionId, HttpServletRequest request) throws Exception {
         return netExamService.getExamRecordPaperQuestionDetail(key, token, questionId);
     }
 
     @ApiOperation(value = "保存或更新考生作答的某个试题答案接口")
     @RequestMapping(value = "/exam/record/paper/question/answer/update", method = {RequestMethod.GET, RequestMethod.POST})
     public Result updateExamRecordPaperQuestionAnswer(@RequestHeader String key, @RequestHeader String token, @RequestParam String examQuestionId,
-                                                      @RequestParam String studentAnswer) throws Exception {
+                                                      @RequestParam String studentAnswer, HttpServletRequest request) throws Exception {
         return netExamService.updateExamRecordPaperQuestionAnswer(key, token, examQuestionId, studentAnswer);
     }
 
     @ApiOperation(value = "当前练习的交卷接口")
     @RequestMapping(value = "/exam/record/submit", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result submitPracticeExamRecord(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId) throws Exception {
+    public Result submitPracticeExamRecord(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId, HttpServletRequest request) throws Exception {
         return netExamService.submitPracticeExamRecord(key, token, examRecordId);
     }
 
     @ApiOperation(value = "检查考生当前是否有正在进行的练习记录接口")
     @RequestMapping(value = "/exam/record/online/check", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result checkOnlineExamRecord(@RequestHeader String key, @RequestHeader String token) throws Exception {
+    public Result checkOnlineExamRecord(@RequestHeader String key, @RequestHeader String token, HttpServletRequest request) throws Exception {
         return netExamService.checkOnlineExamRecord(key, token);
     }
 
     @ApiOperation(value = "获取当前考生的当前课程练习统计信息接口", hidden = true)
     @RequestMapping(value = "/exam/record/practice/course/total", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getExamRecordPracticeTotalInfo(@RequestHeader String key, @RequestHeader String token, @RequestParam String examStudentId) throws Exception {
+    public Result getExamRecordPracticeTotalInfo(@RequestHeader String key, @RequestHeader String token, @RequestParam String examStudentId, HttpServletRequest request) throws Exception {
         return netExamService.getExamRecordPracticeTotalInfo(key, token, examStudentId);
     }
 
     @ApiOperation(value = "获取当前考生的当前课程的历史练习记录接口")
     @RequestMapping(value = "/exam/record/practice/course/history/list", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getExamRecordPracticeHistoryList(@RequestHeader String key, @RequestHeader String token, @RequestParam String examStudentId) throws Exception {
+    public Result getExamRecordPracticeHistoryList(@RequestHeader String key, @RequestHeader String token, @RequestParam String examStudentId, HttpServletRequest request) throws Exception {
         return netExamService.getExamRecordPracticeHistoryList(key, token, examStudentId);
     }
 
     @ApiOperation(value = "获取成绩报告的答题情况统计接口")
     @RequestMapping(value = "/exam/record/total", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getExamRecordTotalInfo(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId) throws Exception {
+    public Result getExamRecordTotalInfo(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId, HttpServletRequest request) throws Exception {
         return netExamService.getExamRecordTotalInfo(key, token, examRecordId);
     }
 
     @ApiOperation(value = "获取作答的题列表接口")
     @RequestMapping(value = "/exam/record/paper/question/detail/list", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getExamRecordQuestionDetailList(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId) throws Exception {
+    public Result getExamRecordQuestionDetailList(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId, HttpServletRequest request) throws Exception {
         return netExamService.getExamRecordQuestionDetailList(key, token, examRecordId);
     }
 
     @ApiOperation(value = "获取当前试题的音频已播放次数接口")
     @RequestMapping(value = "/exam/record/paper/question/get/playtimes", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getExamRecordQuestionAudioPlayTimes(@RequestHeader String key, @RequestHeader String token, @RequestParam String questionId) throws Exception {
+    public Result getExamRecordQuestionAudioPlayTimes(@RequestHeader String key, @RequestHeader String token, @RequestParam String questionId, HttpServletRequest request) throws Exception {
         return netExamService.getExamRecordQuestionAudioPlayTimes(key, token, questionId);
     }
 
     @ApiOperation(value = "更新当前试题的音频已播放次数接口")
     @RequestMapping(value = "/exam/record/paper/question/update/playtimes", method = {RequestMethod.GET, RequestMethod.POST})
     public Result updateExamRecordQuestionAudioPlayTimes(@RequestHeader String key, @RequestHeader String token,
-                                                         @RequestParam String questionId, @RequestParam String mediaName) throws Exception {
+                                                         @RequestParam String questionId, @RequestParam String mediaName, HttpServletRequest request) throws Exception {
         return netExamService.updateExamRecordQuestionAudioPlayTimes(key, token, questionId, mediaName);
     }
 

src/main/java/cn/com/qmth/examcloud/app/controller/version_1_0/SystemRestController.java → src/main/java/cn/com/qmth/examcloud/app/controller/version1/SystemRestController.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.app.controller.version_1_0;
+package cn.com.qmth.examcloud.app.controller.version1;
 
 import cn.com.qmth.examcloud.app.model.Result;
 import cn.com.qmth.examcloud.app.service.NetExamService;
@@ -15,6 +15,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 系统服务相关接口
  *
@@ -33,19 +35,19 @@ public class SystemRestController {
 
     @ApiOperation(value = "获取服务器当前时间接口")
     @RequestMapping(value = "/system/currentTime", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getCurrentTime(@RequestHeader String key, @RequestHeader String token) throws Exception {
+    public Result getCurrentTime(@RequestHeader String key, @RequestHeader String token, HttpServletRequest request) throws Exception {
         return netExamService.getCurrentTime(key, token);
     }
 
     @ApiOperation(value = "获取短信验证码接口")
     @RequestMapping(value = "/send/sms/code", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result sendSmsCode(@RequestHeader String key, @RequestHeader String token, @RequestParam String phone) throws Exception {
+    public Result sendSmsCode(@RequestHeader String key, @RequestHeader String token, @RequestParam String phone, HttpServletRequest request) throws Exception {
         return smsService.sendSmsCode(key, token, phone);
     }
 
     @ApiOperation(value = "校验短信验证码接口")
     @RequestMapping(value = "/check/sms/code", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result checkSmsCode(@RequestHeader String key, @RequestHeader String token, @RequestParam String phone, @RequestParam String code) throws Exception {
+    public Result checkSmsCode(@RequestHeader String key, @RequestHeader String token, @RequestParam String phone, @RequestParam String code, HttpServletRequest request) throws Exception {
         return smsService.checkSmsCode(key, token, phone, code);
     }
 

src/main/java/cn/com/qmth/examcloud/app/controller/version_1_0/UserAuthRestController.java → src/main/java/cn/com/qmth/examcloud/app/controller/version1/UserAuthRestController.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.app.controller.version_1_0;
+package cn.com.qmth.examcloud.app.controller.version1;
 
 import cn.com.qmth.examcloud.app.model.LoginInfo;
 import cn.com.qmth.examcloud.app.model.Result;
@@ -38,7 +38,7 @@ public class UserAuthRestController {
     @ApiOperation(value = "登录接口")
     @RequestMapping(value = "/user/login", method = {RequestMethod.GET, RequestMethod.POST})
     public Result<User> login(@RequestParam String account, @RequestParam String password, @RequestParam(required = false) String accountType,
-                              @RequestParam(required = false) Long rootOrgId, @RequestParam(required = false) String domain) throws Exception {
+                              @RequestParam(required = false) Long rootOrgId, @RequestParam(required = false) String domain, HttpServletRequest request) throws Exception {
         LoginInfo loginInfo = new LoginInfo(account, password, accountType, rootOrgId, domain);
         Result<User> result = userAuthService.login(loginInfo);
         if (result.isSuccess()) {
@@ -50,7 +50,7 @@ public class UserAuthRestController {
 
     @ApiOperation(value = "登出接口")
     @RequestMapping(value = "/user/logout", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result logout(@RequestHeader String key, @RequestHeader String token) throws Exception {
+    public Result logout(@RequestHeader String key, @RequestHeader String token, HttpServletRequest request) throws Exception {
         return userAuthService.logout(key, token);
     }
 
@@ -63,13 +63,15 @@ public class UserAuthRestController {
 
     @ApiOperation(value = "修改密码接口")
     @RequestMapping(value = "/user/update/password", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result updatePassword(@RequestHeader String key, @RequestHeader String token, @RequestParam Long userId, @RequestParam String password) throws Exception {
+    public Result updatePassword(@RequestHeader String key, @RequestHeader String token, @RequestParam Long userId, @RequestParam String password,
+                                 HttpServletRequest request) throws Exception {
         return userAuthService.updatePassword(key, token, userId, password);
     }
 
     @ApiOperation(value = "保存用户绑定的手机号接口", hidden = true)
     @RequestMapping(value = "/user/binding/phone", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result userBindingPhone(@RequestHeader String key, @RequestHeader String token, @RequestParam Long userId, @RequestParam String phone, @RequestParam String code) throws Exception {
+    public Result userBindingPhone(@RequestHeader String key, @RequestHeader String token, @RequestParam Long userId, @RequestParam String phone,
+                                   @RequestParam String code, HttpServletRequest request) throws Exception {
         return userAuthService.userBindingPhone(key, token, userId, phone, code);
     }