wuheng 1 жил өмнө
parent
commit
48d937c8b6

+ 1 - 1
common/src/main/java/com/koobietech/eas/common/utils/SecurityManager.java

@@ -46,7 +46,7 @@ public class SecurityManager {
         boolean isStudent = false;
         UserDetailPojo principal = getPrincipal();
         if (Objects.nonNull(principal)) {
-            if ( principal.getUserType().equals(UserType.MEMBER) ) {
+            if ( principal.getUserType().equals(UserType.member) ) {
                 isStudent = true;
             }
         }

+ 6 - 17
controller/src/main/resources/application.yaml

@@ -29,12 +29,11 @@ knife4j:
 security:
   url:
     ignored:
-      - /**
-#      - /login/adminLogin
-#      - /login/studentLogin
-#      - /login/verify/get
-#      - /login/verify/check
-#      - /favicon.ico
+      - /login/adminLogin
+      - /login/studentLogin
+      - /login/verify/get
+      - /login/verify/check
+      - /favicon.ico
 project:
   path: ${user.home}/archivesFiles
 
@@ -48,16 +47,6 @@ eas:
   jwt-secret-key: 123456
   jwt-expires-date: 2
   password-sign-key: eas-key-password
-  authority:
-    authorization:
-      - /login/getUserInfo
-    student:
-      - /login/getUserInfo
-    teacher:
-      - /login/getUserInfo
-    easgroup:
-      - /login/getUserInfo
-    admin:
-      - /**
+
 authority:
   path: ${user.home}/authorityFile/authority.json

+ 1 - 1
dao/src/main/java/com/koobietech/eas/dao/constant/UserType.java

@@ -5,5 +5,5 @@ package com.koobietech.eas.dao.constant;
  */
 
 public enum UserType {
-    TEACHER, MEMBER, ADMIN
+    teacher, member, admin
 }

+ 2 - 2
service/src/main/java/com/koobietech/eas/service/impl/EasSysAdminLoginServiceImpl.java

@@ -114,9 +114,9 @@ public class EasSysAdminLoginServiceImpl implements EasSysAdminLoginService {
 
 
         // 此处的用户类型 主要给前端构建菜单用, 后台配置菜单太麻烦了
-        UserType userType = UserType.TEACHER;
+        UserType userType = UserType.teacher;
         if (userDetailPojoInRedis.getUsername().equals("admin")) {
-            userType = UserType.ADMIN;
+            userType = UserType.admin;
         }
         userDetailPojoInRedis.setUserType(userType);
 

+ 3 - 3
service/src/main/java/com/koobietech/eas/service/impl/EasSysStudentLoginServiceImpl.java

@@ -119,12 +119,12 @@ public class EasSysStudentLoginServiceImpl implements EasSysStudentLoginService
             catch (InvocationTargetException | IllegalAccessException ignored) {}
         });
 
-        userDetailPojo.setUserType(UserType.MEMBER);
+        userDetailPojo.setUserType(UserType.member);
         // 生成token
         JwtUserPojo jwtUserPojo = new JwtUserPojo(userDetailPojo.getUsername(),
-                userDetailPojo.getId(), UserType.MEMBER, JwtType.TOKEN);
+                userDetailPojo.getId(), UserType.member, JwtType.TOKEN);
         JwtUserPojo refJwtUserPojo = new JwtUserPojo(userDetailPojo.getUsername(),
-                userDetailPojo.getId(), UserType.MEMBER, JwtType.REF_TOKEN);
+                userDetailPojo.getId(), UserType.member, JwtType.REF_TOKEN);
 
         String token = jwtManager.createJwt(jwtUserPojo, token_expires);