zhouweidong@lab.ibiz5.com 发布系统代码

ibzou-app/ibzou-app-web/src/main/resources/application-web-prod.yml

@@ -19,5 +19,9 @@ zuul:
       path: /ibzorganizations/**
       serviceId: ibzou-api
       stripPrefix: false
+    loginv7:
+      path: /v7/login
+      serviceId: ibzuaa-api
+      stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

ibzou-util/src/main/java/cn/ibizlab/util/service/AuthenticationUserService.java

@@ -15,12 +15,12 @@ public interface AuthenticationUserService extends UserDetailsService {
 
 
     @Override
-    @Cacheable( value="ibzou_users",key = "'getByUsername:'+#p0")
+    @Cacheable( value="ibzuaa_users",key = "'getByUsername:'+#p0")
     AuthenticationUser loadUserByUsername(String username);
 
-    @Cacheable( value="ibzou_users",key = "'getByUsername:'+#p0")
+    @Cacheable( value="ibzuaa_users",key = "'getByUsername:'+#p0")
     AuthenticationUser loadUserByLogin(String username,String password);
 
-    @CacheEvict( value="ibzou_users",key = "'getByUsername:'+#p0")
+    @CacheEvict( value="ibzuaa_users",key = "'getByUsername:'+#p0")
     void resetByUsername(String username);
 }

ibzou-util/src/main/java/cn/ibizlab/util/service/IBZUAAUserService.java

@@ -18,7 +18,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
  * 实体[IBZUSER] 服务对象接口实现
  */
 @Service("IBZUAAUserService")
-@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:SimpleUserService}'.equals('IBZUAAUserService')")
+@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:IBZUAAUserService}'.equals('IBZUAAUserService')")
 public class IBZUAAUserService implements AuthenticationUserService{
 
 	@Autowired

ibzou-util/src/main/java/cn/ibizlab/util/service/IBZUSERServiceImpl.java

@@ -19,7 +19,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
  * 实体[IBZUSER] 服务对象接口实现
  */
 @Service("IBZUSERService")
-@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:SimpleUserService}'.equals('IBZUSERService')")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUAAUserService}'.equals('IBZUSERService')")
 public class IBZUSERServiceImpl extends ServiceImpl<IBZUSERMapper, IBZUSER> implements IBZUSERService,AuthenticationUserService{
 
 	@Value("${ibiz.auth.pwencrymode:0}")

ibzou-util/src/main/java/cn/ibizlab/util/service/SimpleUserService.java

@@ -18,7 +18,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 @Primary
 @Service("SimpleUserService")
-@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:SimpleUserService}'.equals('SimpleUserService')")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUAAUserService}'.equals('SimpleUserService')")
 public class SimpleUserService implements AuthenticationUserService{
 
 	@Override

ibzou-util/src/main/resources/application-sys.yml

@@ -82,6 +82,6 @@ ribbon:
 #系统是否开启权限验证、是否开启缓存
 #缓存级别：无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
 ibiz:
-  enablePermissionValid: false
+  enablePermissionValid: true
   cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存