bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Compare commits

base: bonus:eea5aac6ff58a05c9fe8712aff6960e2c8ed08aa
Branches Tags
bonus:main
bonus:bonus_anjiju
bonus:AnHui-RentalPlatform
bonus:bonus-jyy-smart-canteen
bonus:shanxi-RentalPlatform
bonus:ah-sbd-h5
bonus:ah-sbd-h5-yjst
bonus:bonus-jyy-canteen
bonus:test0519
bonus:ah-sms
bonus:bonus-houqin
bonus:yn-img-tool
bonus:deleteIdnext
bonus:rolecanteentype0318
bonus:smart-canteen
bonus:cust-auth
bonus:test-canteen
bonus:ultra
bonus:smsconfig
bonus:addcompany0105
bonus:feature-zhgd
bonus:hc_tempTwo
bonus:hcTemp
bonus:dev
bonus:deptusertree20241101
bonus:bonus-ai-cloud
bonus:getbyuserids
bonus:deptusertree20241016
bonus:rudy20240923
bonus:cwy_branch
bonus:V24.11.0
bonus:V24.10.0
bonus:v24.7.1
bonus:v1.1
bonus:v1.0
...
compare: bonus:d2f7924b54a1b503ee95063e0db5f75f274fbf9f
Branches Tags
bonus:bonus_anjiju
bonus:AnHui-RentalPlatform
bonus:bonus-jyy-smart-canteen
bonus:shanxi-RentalPlatform
bonus:ah-sbd-h5
bonus:ah-sbd-h5-yjst
bonus:bonus-jyy-canteen
bonus:test0519
bonus:ah-sms
bonus:main
bonus:bonus-houqin
bonus:yn-img-tool
bonus:deleteIdnext
bonus:rolecanteentype0318
bonus:smart-canteen
bonus:cust-auth
bonus:test-canteen
bonus:ultra
bonus:smsconfig
bonus:addcompany0105
bonus:feature-zhgd
bonus:hc_tempTwo
bonus:hcTemp
bonus:dev
bonus:deptusertree20241101
bonus:bonus-ai-cloud
bonus:getbyuserids
bonus:deptusertree20241016
bonus:rudy20240923
bonus:cwy_branch
bonus:V24.11.0
bonus:V24.10.0
bonus:v24.7.1
bonus:v1.1
bonus:v1.0

2 Commits
eea5aac6ff ... d2f7924b54

Author SHA1 Message Date
weiweiw d2f7924b54 Merge remote-tracking branch 'origin/main' 2024-12-16 09:21:48 +08:00
weiweiw 40d3e27774 将公共微服务代码版本更新到24.12.0-SNAPSHOT 和修改RequiresPermissionsOrInnerAuth 不生效的问题 2024-12-16 09:21:38 +08:00
28 changed files with 51 additions and 41 deletions
Show Stats Expand all files Collapse all files

2
bonus-api/bonus-api-system/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-api</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-api/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
bonus-auth/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -87,7 +87,7 @@
<dependency>
<groupId>com.bonus</groupId>
<artifactId>bonus-common-config</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>

2
bonus-common/bonus-common-config/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-common</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-common/bonus-common-core/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-common</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-common/bonus-common-datascope/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-common</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-common/bonus-common-datasource/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-common</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-common/bonus-common-log/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-common</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-common/bonus-common-redis/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-common</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-common/bonus-common-seata/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-common</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-common/bonus-common-security/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-common</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

12
bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/annotation/RequiresPermissionsOrInnerAuth.java
View File

@ -1,17 +1,15 @@
package com.bonus.common.security.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.annotation.*;
/**
* @author wangvivi
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.METHOD, ElementType.TYPE })
@Documented
public @interface RequiresPermissionsOrInnerAuth {
InnerAuth innerAuth() default @InnerAuth();
RequiresPermissions requiresPermissions() default @RequiresPermissions();
InnerAuth innerAuth() default @InnerAuth(isUser = false);
RequiresPermissions requiresPermissions() default @RequiresPermissions(value = {});
}

23
bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/aspect/PermisssionOrInnerAuthAspect.java → bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/aspect/PermissionOrInnerAuthAspect.java
View File

@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.core.Ordered;
import org.springframework.stereotype.Component;
@ -24,13 +25,14 @@ import java.lang.reflect.Method;
*/
@Aspect
@Component
@Slf4j
public class PermisssionOrInnerAuthAspect
public class PermissionOrInnerAuthAspect
{
@Around("@annotation(RequiresPermissionsOrInnerAuth)")
public Object innerAround(ProceedingJoinPoint point, RequiresPermissionsOrInnerAuth permissionsOrInnerAuth) throws Throwable
@Pointcut("@annotation(com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth)")
public void permissionOrInnerAuthAspect() {}
@Around("permissionOrInnerAuthAspect()")
public Object innerAround(ProceedingJoinPoint point) throws Throwable
{
log.info("******************RequiresPermissionsOrInnerAuth**********");
MethodSignature signature = (MethodSignature) point.getSignature();
RequiresPermissionsOrInnerAuth auth = signature.getMethod().getAnnotation(RequiresPermissionsOrInnerAuth.class);
@ -56,7 +58,7 @@ public class PermisssionOrInnerAuthAspect
try {
AuthUtil.checkInnerAuth(innerAuth);
} catch (InnerAuthException e){
log.error("内部认证失败:{}",e.getMessage());
// log.error("内部认证失败:{}",e.getMessage());
return false;
}
return true;
@ -66,4 +68,13 @@ public class PermisssionOrInnerAuthAspect
AuthUtil.checkPermi(requiresPermissions,point);
return true;
}
// /**
// * 确保在权限认证aop执行前执行
// */
// @Override
// public int getOrder()
// {
// return Ordered.HIGHEST_PRECEDENCE + 2;
// }
}

2
bonus-common/bonus-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -4,6 +4,8 @@ com.bonus.common.security.config.VerificationCodeConfig
com.bonus.common.security.service.TokenService
com.bonus.common.security.service.SmsService
com.bonus.common.security.service.EmailService
com.bonus.common.security.aspect.PermissionOrInnerAuthAspect
com.bonus.common.security.aspect.PreAuthorizeAspect
com.bonus.common.security.aspect.InnerAuthAspect
com.bonus.common.security.aspect.PreventRepeatSubmitAspect
com.bonus.common.security.handler.GlobalExceptionHandler

2
bonus-common/bonus-common-sensitive/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-common</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-common/bonus-common-swagger/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-common</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-common/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-gateway/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-modules/bonus-face/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-modules</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-modules/bonus-file/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-modules</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-modules/bonus-gen/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-modules</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-modules/bonus-job/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-modules</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-modules/bonus-system/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-modules</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

3
bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
View File

@ -24,7 +24,6 @@ import com.bonus.system.service.*;
import com.bonus.system.warning.WebSocketHandler;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -77,7 +76,7 @@ public class SysUserController extends BaseController {
/**
* 获取用户列表
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list"))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("system:user:list"))
@GetMapping("/list")
@PreventRepeatSubmit
@SysLog(title = "用户管理", businessType = OperaType.QUERY, logType = 0, module = "系统管理->用户管理", details = "查询用户列表")

2
bonus-modules/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-visual/bonus-monitor/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus-visual</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bonus-visual/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.bonus</groupId>
<artifactId>bonus</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
pom.xml
View File

@ -6,14 +6,14 @@
<groupId>com.bonus</groupId>
<artifactId>bonus</artifactId>
<version>24.11.0-SNAPSHOT</version>
<version>24.12.0-SNAPSHOT</version>
<name>bonus</name>
<url>http://www.ahbonus.cn</url>
<description>博诺思微服务系统</description>
<properties>
<bonus.version>24.11.0-SNAPSHOT</bonus.version>
<bonus.version>24.12.0-SNAPSHOT</bonus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>