Эх сурвалжийг харах

feat:管理员角色不可以登录小程序并修改提示信息

shc 4 сар өмнө
parent
commit
2bf8c22c54

+ 1 - 1
hnqz-common/hnqz-common-security/src/main/java/com/qunzhixinxi/hnqz/common/security/component/HnqzWebResponseExceptionTranslator.java

@@ -54,7 +54,7 @@ public class HnqzWebResponseExceptionTranslator implements WebResponseExceptionT
 		if (ase != null) {
 			String msg = SpringSecurityMessageSource.getAccessor().getMessage(
 					"AbstractUserDetailsAuthenticationProvider.badCredentials", ase.getMessage(), Locale.CHINA);
-			return handleOAuth2Exception(new InvalidException(msg, ase));
+			return handleOAuth2Exception(new InvalidException(msg + "(含角色不支持)", ase));
 		}
 
 		ase = (HttpRequestMethodNotSupportedException) throwableAnalyzer

+ 1 - 1
hnqz-common/hnqz-common-security/src/main/resources/org/springframework/security/messages_zh_CN.properties

@@ -17,7 +17,7 @@
 AbstractAccessDecisionManager.accessDenied=\u6743\u9650\u4E0D\u8DB3,\u4E0D\u5141\u8BB8\u8BBF\u95EE
 AbstractLdapAuthenticationProvider.emptyPassword=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A
 AbstractSecurityInterceptor.authenticationNotFound=\u672A\u5728SecurityContext\u4E2D\u67E5\u627E\u5230\u8BA4\u8BC1\u5BF9\u8C61
-AbstractUserDetailsAuthenticationProvider.badCredentials=\u7528\u6237\u540D\u4E0D\u5B58\u5728\u6216\u8005\u5BC6\u7801\u9519\u8BEF
+AbstractUserDetailsAuthenticationProvider.badCredentials=\u7528\u6237\u540D\u4E0D\u5B58\u5728\u6216\u8005\u5BC6\u7801\u9519\u8BEF(\u542b\u89d2\u8272\u4e0d\u652f\u6301)
 AbstractUserDetailsAuthenticationProvider.noopBindAccount=\u672A\u7ED1\u5B9A\u767B\u5F55\u8D26\u53F7\uFF0C\u8BF7\u4F7F\u7528\u5BC6\u7801\u767B\u5F55\u540E\u7ED1\u5B9A
 AbstractUserDetailsAuthenticationProvider.credentialsExpired=\u7528\u6237\u51ED\u8BC1\u5DF2\u8FC7\u671F
 AbstractUserDetailsAuthenticationProvider.disabled=\u7528\u6237\u672A\u6FC0\u6D3B

+ 3 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/user/SysUserController.java

@@ -104,7 +104,8 @@ public class SysUserController {
     private final SysRoleService roleService;
 
     private static final List<Integer> SALESMAN_ROLE_ID = ListUtil.of(5, 6);
-    private static final List<Integer> ADMIN_ROLE_ID = ListUtil.of(1, 2, 7, 19, 27, 34, 35, 44, 45, 46, 47, 48, 49);
+//    private static final List<Integer> ADMIN_ROLE_ID = ListUtil.of(1, 2, 7, 19, 27, 34, 35, 44, 45, 46, 47, 48, 49);
+    private static final List<Integer> ADMIN_ROLE_ID = Collections.emptyList();
 
 
     /**
@@ -162,8 +163,7 @@ public class SysUserController {
 
         Set<Integer> roleIds = Arrays.stream(roles).collect(Collectors.toSet());
 
-
-        return !CollUtil.containsAny(roleIds, ADMIN_ROLE_ID);
+        return CollUtil.containsAny(roleIds, ADMIN_ROLE_ID);
     }
 
     /**