武大考务数据对接-权限问题

src/main/java/com/qmth/eds/api/BasicSchoolController.java

@@ -1,7 +1,5 @@
 package com.qmth.eds.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.eds.service.BasicSchoolService;
 import com.qmth.eds.util.Result;
@@ -23,7 +21,6 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/basic_school")
-@Aac(auth = BOOL.FALSE)
 public class BasicSchoolController {
 
     @Resource

src/main/java/com/qmth/eds/api/ExamDownloadRecordController.java

@@ -1,7 +1,5 @@
 package com.qmth.eds.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.eds.contant.SystemConstant;
 import com.qmth.eds.enums.UseSceneEnum;
@@ -20,7 +18,6 @@ import javax.validation.constraints.Min;
 
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/exam_download_record")
-@Aac(auth = BOOL.FALSE)
 public class ExamDownloadRecordController {
 
     @Resource
@@ -56,8 +53,9 @@ public class ExamDownloadRecordController {
 
     /**
      * 标记用途
-     * @param id id
-     * @param used 是否使用
+     *
+     * @param id       id
+     * @param used     是否使用
      * @param useScene 下载用途
      */
     @ApiOperation(value = "标记用途")

src/main/java/com/qmth/eds/api/ExamScheduleTaskController.java

@@ -1,7 +1,5 @@
 package com.qmth.eds.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.eds.contant.SystemConstant;
 import com.qmth.eds.entity.ExamScheduleTask;
@@ -20,7 +18,6 @@ import javax.validation.constraints.Min;
 
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/exam_schedule_task")
-@Aac(auth = BOOL.FALSE)
 public class ExamScheduleTaskController {
 
     @Resource

src/main/java/com/qmth/eds/api/ExamSemesterController.java

@@ -1,7 +1,5 @@
 package com.qmth.eds.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.eds.service.ExamSemesterService;
 import com.qmth.eds.util.Result;
@@ -16,7 +14,6 @@ import javax.annotation.Resource;
 
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/exam_semester")
-@Aac(auth = BOOL.FALSE)
 public class ExamSemesterController {
 
     @Resource

src/main/java/com/qmth/eds/api/ExamSyncTotalController.java

@@ -1,7 +1,5 @@
 package com.qmth.eds.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.eds.contant.SystemConstant;
 import com.qmth.eds.job.service.JobService;
@@ -21,7 +19,6 @@ import javax.validation.constraints.Min;
 
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/exam_sync_total")
-@Aac(auth = BOOL.FALSE)
 public class ExamSyncTotalController {
 
     @Resource
@@ -48,7 +45,7 @@ public class ExamSyncTotalController {
     /**
      * 下载
      *
-     * @param id id
+     * @param id       id
      * @param writeLog 是否写入日志（考务数据列表下载需要，下载列表下载不需要）
      */
     @ApiOperation(value = "下载")

src/main/java/com/qmth/eds/api/ExamTypeController.java

@@ -1,7 +1,5 @@
 package com.qmth.eds.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.eds.service.ExamTypeService;
 import com.qmth.eds.util.Result;
@@ -15,7 +13,6 @@ import javax.annotation.Resource;
 
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/exam_type")
-@Aac(auth = BOOL.FALSE)
 public class ExamTypeController {
 
     @Resource

src/main/java/com/qmth/eds/api/SysController.java

@@ -93,10 +93,9 @@ public class SysController {
     @ApiOperation(value = "登出")
     @PostMapping("/logout")
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    @Aac(auth = BOOL.FALSE)
-    public Result logout() {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        teachcloudCommonService.removeUserInfo(sysUser.getId(), false);
+    public Result logout() throws NoSuchAlgorithmException {
+        Long userId = ServletUtil.getRequestUserId();
+        teachcloudCommonService.removeUserInfo(userId, false);
         return ResultUtil.ok();
     }
 

src/main/java/com/qmth/eds/service/impl/SysUserServiceImpl.java

@@ -39,7 +39,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         Page<SysUser> page = new Page<>(pageNumber, pageSize);
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(loginName)) {
-            queryWrapper.lambda().eq(SysUser::getLoginName, loginName);
+            queryWrapper.lambda().like(SysUser::getLoginName, loginName);
         }
         if (StringUtils.isNotBlank(realName)) {
             queryWrapper.lambda().like(SysUser::getRealName, realName);

src/main/resources/db/eds-v1.0.0.sql

@@ -557,6 +557,34 @@ CREATE TABLE `sys_privilege`  (
   UNIQUE INDEX `privilege_index`(`name`, `url`, `type`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
 
+-- ----------------------------
+-- Records of sys_privilege
+-- ----------------------------
+INSERT INTO `sys_privilege` VALUES (1, '用户管理', 'UserManage', 'MENU', NULL, 1, NULL, NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (2, '用户管理-查询', '/api/sys_user/page', 'URL', 1, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (3, '用户管理-新增/修改', '/api/sys_user/save', 'URL', 1, 2, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (4, '用户管理-启用/禁用', '/api/sys_user/enable', 'URL', 1, 3, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (5, '用户管理-重置密码', '/api/sys_user/reset_password', 'URL', 1, 4, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (6, '设置定时任务', 'ScheduleManage', 'MENU', NULL, 2, NULL, NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (7, '设置定时任务-查询', '/api/exam_schedule_task/page', 'URL', 6, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (8, '设置定时任务-新增/修改', '/api/exam_schedule_task/save', 'URL', 6, 2, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (9, '考务数据列表', 'ExamSyncTotal', 'MENU', NULL, 3, NULL, NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (10, '考务数据列表-查询', '/api/exam_sync_total/page', 'URL', 9, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (11, '考务数据列表-下载', '/api/exam_sync_total/download', 'URL', 9, 2, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (12, '考务数据列表-人工同步', '/api/exam_sync_total/manual_sync', 'URL', 9, 3, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (13, '下载列表', 'DownloadRecordManage', 'MENU', NULL, 4, NULL, NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (14, '下载列表-查询', '/api/exam_download_record/page', 'URL', 13, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (15, '下载列表-标记用途', '/api/exam_download_record/used', 'URL', 13, 2, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (16, '下载列表-标记用途', '/api/exam_download_record/list_use_scene', 'URL', 13, 3, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (17, '学期管理', 'SemesterManage', 'MENU', NULL, 5, NULL, NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (18, '学期管理-查询', '/api/exam_semester/list', 'URL', 17, 1, 'SYS', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (19, '用户登录', 'UserLogin', 'MENU', NULL, 6, NULL, NULL, 0, 1, 1);
+INSERT INTO `sys_privilege` VALUES (20, '用户登出', '/api/common/logout', 'URL', 19, 1, 'SYS', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (21, '考试类型管理', 'ExamTypeManage', 'MENU', NULL, 7, NULL, NULL, 0, 1, 1);
+INSERT INTO `sys_privilege` VALUES (22, '考试类型管理-查询', '/api/exam_type/list', 'URL', 21, 1, 'SYS', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (23, '学校管理', 'SchoolManage', 'MENU', NULL, 8, NULL, NULL, 0, 1, 1);
+INSERT INTO `sys_privilege` VALUES (24, '学校管理-查询', '/api/basic_school/list', 'URL', 23, 1, 'SYS', NULL, 1, 1, 1);
+
 -- ----------------------------
 -- Table structure for sys_role
 -- ----------------------------
@@ -594,6 +622,23 @@ CREATE TABLE `sys_role_privilege`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = Dynamic;
 
+INSERT INTO `sys_role_privilege` VALUES (1, 1, 1, 1);
+INSERT INTO `sys_role_privilege` VALUES (2, 1, 2, 1);
+INSERT INTO `sys_role_privilege` VALUES (3, 1, 3, 1);
+INSERT INTO `sys_role_privilege` VALUES (4, 1, 4, 1);
+INSERT INTO `sys_role_privilege` VALUES (5, 1, 5, 1);
+INSERT INTO `sys_role_privilege` VALUES (6, 2, 6, 1);
+INSERT INTO `sys_role_privilege` VALUES (7, 2, 7, 1);
+INSERT INTO `sys_role_privilege` VALUES (8, 2, 8, 1);
+INSERT INTO `sys_role_privilege` VALUES (9, 2, 9, 1);
+INSERT INTO `sys_role_privilege` VALUES (10, 2, 10, 1);
+INSERT INTO `sys_role_privilege` VALUES (11, 2, 11, 1);
+INSERT INTO `sys_role_privilege` VALUES (12, 2, 12, 1);
+INSERT INTO `sys_role_privilege` VALUES (13, 2, 13, 1);
+INSERT INTO `sys_role_privilege` VALUES (14, 2, 14, 1);
+INSERT INTO `sys_role_privilege` VALUES (15, 2, 15, 1);
+INSERT INTO `sys_role_privilege` VALUES (16, 2, 16, 1);
+
 -- ----------------------------
 -- Table structure for sys_user
 -- ----------------------------