update

src/main/java/cn/com/qmth/scancentral/controller/LoginController.java

@@ -0,0 +1,57 @@
+package cn.com.qmth.scancentral.controller;
+
+import cn.com.qmth.scancentral.bean.ScannerLoginInfo;
+import cn.com.qmth.scancentral.bean.User;
+import cn.com.qmth.scancentral.service.AuthService;
+import cn.com.qmth.scancentral.service.SessionService;
+import cn.com.qmth.scancentral.vo.AdminLoginVo;
+import cn.com.qmth.scancentral.vo.LogoutTimeVo;
+import cn.com.qmth.scancentral.vo.ScannerLoginVo;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.boot.api.utils.RequestUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@Api(tags = "登录相关接口")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/user")
+public class LoginController extends BaseController {
+
+    @Autowired
+    private AuthService authService;
+
+    @Autowired
+    private SessionService sessionService;
+
+    @ApiOperation(value = "管理员登录")
+    @PostMapping("/login")
+    public AdminLoginVo login(@RequestParam String loginName, @RequestParam String password,
+                              HttpServletRequest request) {
+        return AdminLoginVo.of(authService.adminLogin(loginName, password, RequestUtil.getIpAddress(request)));
+    }
+
+    @ApiOperation(value = "扫描员登录")
+    @PostMapping("/scanner/login")
+    public ScannerLoginVo scannerLogin(ScannerLoginInfo loginInfo, HttpServletRequest request) {
+        String ip = RequestUtil.getIpAddress(request);
+        return ScannerLoginVo.of(authService.login(ip, loginInfo));
+    }
+
+    @ApiOperation(value = "登出接口")
+    @PostMapping("/logout")
+    public LogoutTimeVo logout() {
+        User user = getAccessUser();
+        sessionService.userLogout(user);
+        LogoutTimeVo vo = new LogoutTimeVo();
+        vo.setLogoutTime(System.currentTimeMillis());
+        return vo;
+    }
+
+}

src/main/java/cn/com/qmth/scancentral/controller/SystemController.java

@@ -1,18 +1,5 @@
 package cn.com.qmth.scancentral.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.boot.api.utils.RequestUtil;
-import com.qmth.boot.core.exception.ParameterException;
-
 import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.config.SysProperty;
 import cn.com.qmth.scancentral.entity.AnswerCardEntity;
@@ -20,21 +7,27 @@ import cn.com.qmth.scancentral.entity.ExamEntity;
 import cn.com.qmth.scancentral.enums.Role;
 import cn.com.qmth.scancentral.enums.SystemMode;
 import cn.com.qmth.scancentral.exception.ParameterExceptions;
-import cn.com.qmth.scancentral.service.AdapteFileService;
-import cn.com.qmth.scancentral.service.AnswerCardService;
-import cn.com.qmth.scancentral.service.AnswerCardSubjectService;
-import cn.com.qmth.scancentral.service.ExamService;
-import cn.com.qmth.scancentral.service.SessionService;
+import cn.com.qmth.scancentral.service.*;
 import cn.com.qmth.scancentral.vo.ActiveTimeVo;
 import cn.com.qmth.scancentral.vo.AnswerCardVo;
-import cn.com.qmth.scancentral.vo.LogoutTimeVo;
 import cn.com.qmth.scancentral.vo.apistatus.ApiStatusVo;
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.boot.api.utils.RequestUtil;
+import com.qmth.boot.core.exception.ParameterException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
 
 @RestController
 @Api(tags = "系统接口")
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX)
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/sys")
 @Aac(strict = false, auth = true)
 public class SystemController extends BaseController {
 
@@ -57,7 +50,7 @@ public class SystemController extends BaseController {
     private AnswerCardSubjectService answerCardSubjectService;
 
     @ApiOperation(value = "心跳接口")
-    @PostMapping("heartbeat")
+    @PostMapping("/heartbeat")
     public ActiveTimeVo heartbeat() {
         User user = getAccessUser();
         ActiveTimeVo vo = new ActiveTimeVo();
@@ -65,19 +58,10 @@ public class SystemController extends BaseController {
         return vo;
     }
 
-    @ApiOperation(value = "登出接口")
-    @PostMapping("logout")
-    public LogoutTimeVo logout() {
-        User user = getAccessUser();
-        sessionService.userLogout(user);
-        LogoutTimeVo vo = new LogoutTimeVo();
-        vo.setLogoutTime(System.currentTimeMillis());
-        return vo;
-    }
 
     @Aac(auth = false)
     @ApiOperation(value = "服务端状态")
-    @RequestMapping("status")
+    @RequestMapping("/status")
     public ApiStatusVo status(HttpServletRequest request) {
         ApiStatusVo vo = new ApiStatusVo();
         vo.setFileUriPrefix(sysProperty.getFileUriPrefix());
@@ -91,7 +75,7 @@ public class SystemController extends BaseController {
     @ApiOperation(value = "答题卡卡格式查询")
     @PostMapping("/card/answer")
     public AnswerCardVo cardAnswer(HttpServletRequest request, @RequestParam Long examId,
-            @RequestParam Integer number) {
+                                   @RequestParam Integer number) {
         ExamEntity exam = examService.getById(examId);
         if (exam == null || !exam.getEnable()) {
             throw ParameterExceptions.EXAM_NOT_FOUND;
@@ -111,4 +95,5 @@ public class SystemController extends BaseController {
         vo.setSubjectList(answerCardSubjectService.findByExamAndNumber(examId, card.getNumber()));
         return vo;
     }
-}
+
+}

src/main/java/cn/com/qmth/scancentral/controller/admin/AuthController.java

@@ -1,35 +0,0 @@
-package cn.com.qmth.scancentral.controller.admin;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.boot.api.utils.RequestUtil;
-
-import cn.com.qmth.scancentral.controller.BaseController;
-import cn.com.qmth.scancentral.service.AuthService;
-import cn.com.qmth.scancentral.vo.AdminLoginVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@Api(tags = "管理员登录接口")
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/admin")
-public class AuthController extends BaseController {
-
-    @Autowired
-    private AuthService authService;
-
-    @ApiOperation(value = "管理员登录")
-    @PostMapping("/login")
-    public AdminLoginVo login(@RequestParam String loginName, @RequestParam String password,
-            HttpServletRequest request) {
-        return AdminLoginVo.of(authService.adminLogin(loginName, password, RequestUtil.getIpAddress(request)));
-    }
-
-}

src/main/java/cn/com/qmth/scancentral/controller/scan/ScannerAuthController.java

@@ -1,35 +0,0 @@
-package cn.com.qmth.scancentral.controller.scan;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.boot.api.utils.RequestUtil;
-
-import cn.com.qmth.scancentral.bean.ScannerLoginInfo;
-import cn.com.qmth.scancentral.controller.BaseController;
-import cn.com.qmth.scancentral.service.AuthService;
-import cn.com.qmth.scancentral.vo.ScannerLoginVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@Api(tags = "扫描员登录接口")
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/scan")
-public class ScannerAuthController extends BaseController {
-
-    @Autowired
-    private AuthService authService;
-
-    @ApiOperation(value = "扫描员登录")
-    @PostMapping("login")
-    public ScannerLoginVo login(ScannerLoginInfo loginInfo, HttpServletRequest request) {
-        String ip = RequestUtil.getIpAddress(request);
-        return ScannerLoginVo.of(authService.login(ip, loginInfo));
-    }
-
-}