diff --git a/pom.xml b/pom.xml index 92d137e..758908d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 pom springboot-parent 杭州铁晟科技有限公司基础依赖 @@ -58,61 +58,61 @@ com.tiesheng.springboot-parent springboot-database - 2.0.0.rc35 + 2.0.0.rc36 com.tiesheng.springboot-parent springboot-login - 2.0.0.rc35 + 2.0.0.rc36 com.tiesheng.springboot-parent springboot-web - 2.0.0.rc35 + 2.0.0.rc36 com.tiesheng.springboot-parent springboot-util - 2.0.0.rc35 + 2.0.0.rc36 com.tiesheng.springboot-parent springboot-platform - 2.0.0.rc35 + 2.0.0.rc36 com.tiesheng.springboot-parent springboot-message - 2.0.0.rc35 + 2.0.0.rc36 com.tiesheng.springboot-parent springboot-encrypt - 2.0.0.rc35 + 2.0.0.rc36 com.tiesheng.springboot-parent springboot-role - 2.0.0.rc35 + 2.0.0.rc36 com.tiesheng.springboot-parent springboot-annotation - 2.0.0.rc35 + 2.0.0.rc36 com.tiesheng.springboot-parent springboot-poi - 2.0.0.rc35 + 2.0.0.rc36 diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml index 52ae021..86d6f89 100644 --- a/springboot-ademo/pom.xml +++ b/springboot-ademo/pom.xml @@ -6,11 +6,11 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-ademo - 2.0.0.rc35 + 2.0.0.rc36 8 diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml index 4f1403e..84bc3f0 100644 --- a/springboot-annotation/pom.xml +++ b/springboot-annotation/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-annotation diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml index fb68ecd..2fdd167 100644 --- a/springboot-database/pom.xml +++ b/springboot-database/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-database diff --git a/springboot-encrypt/pom.xml b/springboot-encrypt/pom.xml index 80846f8..a905ba2 100644 --- a/springboot-encrypt/pom.xml +++ b/springboot-encrypt/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-encrypt diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml index d1131d8..7b416c6 100644 --- a/springboot-login/pom.xml +++ b/springboot-login/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-login diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml index af0b165..b5aaea9 100644 --- a/springboot-message/pom.xml +++ b/springboot-message/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-message diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml index c19a972..af2e315 100644 --- a/springboot-platform/pom.xml +++ b/springboot-platform/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-platform diff --git a/springboot-poi/pom.xml b/springboot-poi/pom.xml index cddbbee..0b833eb 100644 --- a/springboot-poi/pom.xml +++ b/springboot-poi/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-poi diff --git a/springboot-role/pom.xml b/springboot-role/pom.xml index 726095a..a92e09f 100644 --- a/springboot-role/pom.xml +++ b/springboot-role/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-role diff --git a/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java b/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java index f4c242f..1eae4a3 100644 --- a/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java +++ b/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java @@ -18,11 +18,13 @@ import com.tiesheng.role.pojos.dao.CoreRoleUser; import com.tiesheng.role.pojos.dto.GroupRxUpdateDTO; import com.tiesheng.role.pojos.dto.OwnerMenuDTO; import com.tiesheng.role.pojos.vo.ServiceMenuVO; +import com.tiesheng.util.config.GlobalConfig; import com.tiesheng.util.exception.ApiException; import com.tiesheng.util.service.TsCacheService; import com.tiesheng.util.service.TsServiceBase; import com.tiesheng.util.service.role.TsAuthorityHandler; import org.springframework.aop.support.AopUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; @@ -48,6 +50,8 @@ public class CoreRoleService extends TsServiceBase() + .ne("service", globalConfig.getService()) .ne("version", version) .eq("source", "auto") ); diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml index 8918811..c686076 100644 --- a/springboot-util/pom.xml +++ b/springboot-util/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-util diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml index 66d10dc..07d7e7d 100644 --- a/springboot-web/pom.xml +++ b/springboot-web/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.0.rc35 + 2.0.0.rc36 springboot-web