deason 6 年之前
父節點
當前提交
065e767615

+ 8 - 5
src/main/java/cn/com/qmth/examcloud/app/controller/OfflineExamController.java

@@ -23,6 +23,9 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
 
+import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_KEY;
+import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_TOKEN;
+
 /**
  * 离线考试相关接口
  *
@@ -45,21 +48,21 @@ 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token) 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examStudentId) throws Exception {
         return netExamService.startOfflineExamRecord(key, token, examStudentId);
     }
 
     @ResponseBody
     @ApiOperation(value = "上传作答文件接口")
     @RequestMapping(value = "/paper/answer/upload", method = {RequestMethod.POST})
-    public Result uploadPaperAnswer(@RequestHeader String key, @RequestHeader String token, @RequestParam String examRecordId,
+    public Result uploadPaperAnswer(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examRecordId,
                                     @RequestParam(required = false) String md5, HttpServletRequest request) throws Exception {
         MultipartFile multipart = null;
         try {
@@ -76,13 +79,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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String paperId) throws Exception {
         return questionPoolService.getPaperDetail(key, token, paperId);
     }
 
     @ApiOperation(value = "下载考题接口")
     @RequestMapping(value = "/paper/download", method = {RequestMethod.GET})
-    public String downloadPaper(@RequestHeader String key, @RequestHeader String token, @RequestParam String paperId, @RequestParam String orgName) throws Exception {
+    public String downloadPaper(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String paperId, @RequestParam String orgName) throws Exception {
         String requestUrl = "redirectPermanent:" + questionPoolService.downloadPaper(key, token, paperId, orgName);
         log.debug(requestUrl);
         return requestUrl;

+ 30 - 28
src/main/java/cn/com/qmth/examcloud/app/controller/PracticeExamRestController.java

@@ -13,10 +13,12 @@ import cn.com.qmth.examcloud.app.service.NetExamService;
 import cn.com.qmth.examcloud.app.service.QuestionPoolService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_KEY;
+import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_TOKEN;
+
 /**
  * 在线练习相关接口
  *
@@ -37,134 +39,134 @@ 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String studentId) 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examId) 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) throws Exception {
+    public Result getExamRecordHeartbeat(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token) throws Exception {
         return netExamService.getExamRecordHeartbeat(key, token);
     }
 
     @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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examStudentId) 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examRecordId) 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @PathVariable Long examId) 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) throws Exception {
+    public Result getExamRecordPaperQuestionList(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token) throws Exception {
         return netExamService.getExamRecordPaperQuestionList(key, token);
     }
 
     @ApiOperation(value = "获取考生作答的某个试题的详细信息接口")
     @RequestMapping(value = "/exam/record/paper/question/detail/{questionId}/{examRecordId}", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result questionDetail(@RequestHeader String key, @RequestHeader String token, @PathVariable String questionId, @PathVariable String examRecordId) throws Exception {
+    public Result questionDetail(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @PathVariable String questionId, @PathVariable String examRecordId) throws Exception {
         return netExamService.getExamRecordPaperQuestionDetail(key, token, questionId, examRecordId);
     }
 
     @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 Integer order, @RequestParam String studentAnswer) throws Exception {
+    public Result updateExamRecordPaperQuestionAnswer(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam Integer order, @RequestParam String studentAnswer) throws Exception {
         return netExamService.updateExamRecordPaperQuestionAnswer(key, token, order, studentAnswer);
     }
 
     @ApiOperation(value = "当前练习的交卷接口")
     @RequestMapping(value = "/exam/record/submit", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result submitPracticeExamRecord(@RequestHeader String key, @RequestHeader String token) throws Exception {
+    public Result submitPracticeExamRecord(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token) throws Exception {
         return netExamService.submitPracticeExamRecord(key, token);
     }
 
     @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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token) 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examStudentId) 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examStudentId) 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examRecordId) 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examRecordId) 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String questionId) 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 {
+    public Result updateExamRecordQuestionAudioPlayTimes(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String questionId, @RequestParam String mediaName) throws Exception {
         return netExamService.updateExamRecordQuestionAudioPlayTimes(key, token, questionId, mediaName);
     }
-    
+
     @ApiOperation(value = "开考前查询“考试说明”")
     @RequestMapping(value = "/exam/practice/before/{examId}/{type}", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getBeforeExamRemark(@RequestHeader String key, @RequestHeader String token, @PathVariable Long examId, @PathVariable String type) throws Exception {
+    public Result getBeforeExamRemark(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @PathVariable Long examId, @PathVariable String type) throws Exception {
         return examAdminService.getBeforeExamRemark(key, token, examId, type);
     }
-    
+
     @ApiOperation(value = "查询练习记录配置信息")
     @RequestMapping(value = "/exam/practice/end/findExamRecordDataEntity/{examRecordDataId}", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result findExamRecordDataEntity(@RequestHeader String key, @RequestHeader String token, @PathVariable Long examRecordDataId) throws Exception {
+    public Result findExamRecordDataEntity(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @PathVariable Long examRecordDataId) throws Exception {
         return netExamService.findExamRecordDataEntity(key, token, examRecordDataId);
     }
-    
+
     @ApiOperation(value = "查询练习记录试题列表")
     @RequestMapping(value = "/exam/practice/end/getExamRecordQuestions/{examRecordDataId}", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getExamRecordQuestions(@RequestHeader String key, @RequestHeader String token, @PathVariable Long examRecordDataId) throws Exception {
+    public Result getExamRecordQuestions(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @PathVariable Long examRecordDataId) throws Exception {
         return netExamService.getExamRecordQuestions(key, token, examRecordDataId);
     }
 
     @ApiOperation(value = "查询某个试题内容")
     @RequestMapping(value = "/exam/practice/end/question", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getQuestion(@RequestHeader String key, @RequestHeader String token, @RequestParam String courseCode, 
-    		@RequestParam Long examId, @RequestParam String groupCode, @RequestParam String questionId) throws Exception {
+    public Result getQuestion(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String courseCode,
+                              @RequestParam Long examId, @RequestParam String groupCode, @RequestParam String questionId) throws Exception {
         return questionPoolService.getQuestion(key, token, courseCode, examId, groupCode, questionId);
     }
-    
+
     @ApiOperation(value = "获取冻结时间")
     @RequestMapping(value = "/exam/practice/getFreezeTime", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getFreezeTime(@RequestHeader String key, @RequestHeader String token, @RequestParam Long examId) throws Exception {
+    public Result getFreezeTime(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam Long examId) throws Exception {
         return examAdminService.getFreezeTime(key, token, examId);
     }
 }

+ 8 - 5
src/main/java/cn/com/qmth/examcloud/app/controller/SystemRestController.java

@@ -16,6 +16,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_KEY;
+import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_TOKEN;
+
 /**
  * 系统服务相关接口
  *
@@ -36,25 +39,25 @@ 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token) 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String phone) throws Exception {
         return userAuthService.sendSmsCode(key, token, phone);
     }
 
     @ApiOperation(value = "获取短信验证码接口(不带token)")
     @RequestMapping(value = "/send/sms/code4Student", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result sendSmsCode(@RequestParam(required = true) String phone) throws Exception {
+    public Result sendSmsCode(@RequestParam String phone) throws Exception {
         return userAuthService.code4Student(phone, true);
     }
-    
+
     @ApiOperation(value = "校验短信验证码接口", hidden = true)
     @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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String phone, @RequestParam String code) throws Exception {
         return smsService.checkSmsCode(key, token, phone, code);
     }
 

+ 11 - 8
src/main/java/cn/com/qmth/examcloud/app/controller/UserAuthRestController.java

@@ -19,6 +19,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_KEY;
+import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_TOKEN;
+
 /**
  * 认证中心相关接口
  *
@@ -54,11 +57,11 @@ public class UserAuthRestController {
         }
         return result;
     }
-    
+
     @ApiOperation(value = "验证码接口", notes = "参数accountType值说明:学生身份证号类型=STUDENT_IDENTITY_NUMBER,学生学号类型=STUDENT_CODE,学生手机号类型=STUDENT_PHONE")
     @RequestMapping(value = "/user/verify", method = {RequestMethod.GET, RequestMethod.POST})
     public Result<UserInfo> verifyLogin(@RequestParam String account, @RequestParam String smsCode, @RequestParam(required = false) Long rootOrgId,
-                                  @RequestParam(required = false) String domain, @RequestHeader String deviceId) throws Exception {
+                                        @RequestParam(required = false) String domain, @RequestHeader String deviceId) throws Exception {
         LoginInfo loginInfo = new LoginInfo(account, null, "STUDENT_PHONE", rootOrgId, domain, deviceId, smsCode);
         Result<UserInfo> result = userAuthService.login(loginInfo);
         if (result.isSuccess() && result.getData() != null) {
@@ -76,33 +79,33 @@ 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(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token) throws Exception {
         return userAuthService.logout(key, token);
     }
 
     @ApiOperation(value = "获取用户信息接口")
     @RequestMapping(value = "/user/info", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result getUserInfo(@RequestHeader String key, @RequestHeader String token) throws Exception {
+    public Result getUserInfo(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token) throws Exception {
         //return userAuthService.getUserInfo(key, token);
         return baseInfoService.getStudentInfo(key, token);
     }
 
     @ApiOperation(value = "修改密码接口")
     @RequestMapping(value = "/user/update/password", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result updatePassword(@RequestHeader String key, @RequestHeader String token, @RequestParam Long studentId, @RequestParam String password,
+    public Result updatePassword(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam Long studentId, @RequestParam String password,
                                  @RequestParam String newPassword) throws Exception {
         return userAuthService.updateStudentPassword(key, token, studentId, password, newPassword);
     }
-    
+
     @ApiOperation(value = "重置密码接口")
     @RequestMapping(value = "/user/reset/password", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result updateNewPassword(@RequestHeader String key, @RequestHeader String token, @RequestParam String newPassword) throws Exception {
+    public Result updateNewPassword(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String newPassword) throws Exception {
         return userAuthService.resetStudentPassword(key, token, newPassword);
     }
 
     @ApiOperation(value = "保存用户绑定的手机号接口")
     @RequestMapping(value = "/user/binding/phone", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result userBindingPhone(@RequestHeader String key, @RequestHeader String token, @RequestParam String phone, @RequestParam String code) throws Exception {
+    public Result userBindingPhone(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String phone, @RequestParam String code) throws Exception {
         return userAuthService.userBindingPhone(key, token, phone, code);
     }
 

+ 3 - 3
src/main/java/cn/com/qmth/examcloud/app/core/config/AccessInterceptor.java

@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.Map;
 
-import static cn.com.qmth.examcloud.app.model.Constants.PARAM_PASSWORD;
+import static cn.com.qmth.examcloud.app.model.Constants.*;
 
 /**
  * API请求拦截器
@@ -57,8 +57,8 @@ public class AccessInterceptor extends HandlerInterceptorAdapter {
         record.setAppCode(request.getHeader("appCode"));
         record.setPatchCode(request.getHeader("patchCode"));
         record.setAccount(request.getHeader("account"));
-        record.setLoginKey(request.getHeader("key"));
-        record.setLoginToken(request.getHeader("token"));
+        record.setLoginKey(request.getHeader(PARAM_APP_KEY));
+        record.setLoginToken(request.getHeader(PARAM_APP_TOKEN));
         record.setUrl(url);
         record.setIp(ip);
         record.setCreateDate(new Date());

+ 2 - 2
src/main/java/cn/com/qmth/examcloud/app/core/config/TokenFilter.java

@@ -101,8 +101,8 @@ public class TokenFilter implements Filter {
         }
 
         //将App Token替换为原始登录Token到request请求中
-        customRequest.addHeader(Constants.PARAM_KEY, loginInfo.getKey());
-        customRequest.addHeader(Constants.PARAM_TOKEN, loginInfo.getToken());
+        customRequest.addHeader(Constants.PARAM_APP_KEY, loginInfo.getKey());
+        customRequest.addHeader(Constants.PARAM_APP_TOKEN, loginInfo.getToken());
 
         //初始化内部接口请求鉴权
         userAuthService.initRequestTrace();