Skip to content

fix(PermissionMetaCollector): 修复 PermissionMeta 注解未生效的问题 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 13, 2020
Merged

fix(PermissionMetaCollector): 修复 PermissionMeta 注解未生效的问题 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a82fc5b
fix(PermissionMetaCollector): 修复 PermissionMeta 注解未生效的问题
juzi214032 Jul 13, 2020
7b5ea1c
chore(pom.xml): 升级版本号 0.2.0-RC1 => 0.2.0-RC2
juzi214032 Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>io.github.talelin</groupId>
<artifactId>lin-cms-core</artifactId>
<version>0.2.0-RC1</version>
<version>0.2.0-RC2</version>
<packaging>jar</packaging>
<name>lin-cms-core</name>
<url>https://github.com/TaleLin/lin-cms-java-core</url>
Expand Down
4 changes: 2 additions & 2 deletions lin-cms-spring-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>io.github.talelin</groupId>
<artifactId>lin-cms-spring-boot-autoconfigure</artifactId>
<version>0.2.0-RC1</version>
<version>0.2.0-RC2</version>
<name>lin-cms-spring-boot-autoconfigure</name>
<description>autoconfigure project for lin cms</description>
<url>https://github.com/TaleLin/lin-cms-java-core</url>
Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>io.github.talelin</groupId>
<artifactId>lin-cms-core</artifactId>
<version>0.2.0-RC1</version>
<version>0.2.0-RC2</version>
</dependency>

<dependency>
Expand Down
6 changes: 2 additions & 4 deletions ...configure/src/main/java/io/github/talelin/autoconfigure/bean/PermissionMetaCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,9 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) {
*/
@Override
public Object postProcessAfterInitialization(Object bean, String beanName) {
Controller controllerAnnotation = bean.getClass().getAnnotation(Controller.class);
RestController restControllerAnnotation =
bean.getClass().getAnnotation(RestController.class);
Controller controllerAnnotation = AnnotationUtils.findAnnotation(bean.getClass(), Controller.class);
// 非 Controller 类，无需检查权限信息
if (controllerAnnotation == null && restControllerAnnotation == null) {
if (controllerAnnotation == null) {
return bean;
}

Expand Down
4 changes: 2 additions & 2 deletions lin-cms-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>io.github.talelin</groupId>
<artifactId>lin-cms-spring-boot-starter</artifactId>
<version>0.2.0-RC1</version>
<version>0.2.0-RC2</version>
<name>lin-cms-spring-boot-starter</name>
<description>starter project for lin cms</description>
<url>https://github.com/TaleLin/lin-cms-java-core</url>
Expand All @@ -29,7 +29,7 @@
<dependency>
<groupId>io.github.talelin</groupId>
<artifactId>lin-cms-spring-boot-autoconfigure</artifactId>
<version>0.2.0-RC1</version>
<version>0.2.0-RC2</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.github.talelin</groupId>
<artifactId>cms</artifactId>
<version>0.2.0-RC1</version>
<version>0.2.0-RC2</version>

<modules>
<module>core</module>
Expand Down