xignzi006 发布系统代码

businesscentral-app/businesscentral-app-businesscentral/src/main/resources/application-businesscentral-prod.yml

@@ -251,5 +251,25 @@ zuul:
       path: /subjects/**
       serviceId: ${ibiz.ref.service.ibizbusinesscentral-centralapi:ibizbusinesscentral-centralapi}
       stripPrefix: false
+    loginv7:
+      path: /v7/login
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    changepwd:
+      path: /v7/changepwd
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    uaa:
+      path: /uaa/**
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    config:
+      path: /config/**
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    oucore:
+      path: /ibzorganizations/**
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
+      stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

businesscentral-boot/src/main/resources/application-dev.yml

@@ -12,5 +12,25 @@ zuul:
         path: /psaaccounts/**
         serviceId: ${ibiz.ref.service.ibizprojectoperations-poejectoperationsapi:ibizprojectoperations-poejectoperationsapi}
         stripPrefix: false
+      loginv7:
+        path: /v7/login
+        serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+        stripPrefix: false
+      changepwd:
+        path: /v7/changepwd
+        serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+        stripPrefix: false
+      uaa:
+        path: /uaa/**
+        serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+        stripPrefix: false
+      config:
+        path: /config/**
+        serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+        stripPrefix: false
+      oucore:
+        path: /ibzorganizations/**
+        serviceId: ${ibiz.ref.service.ou:ibzou-api}
+        stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/security/SimpleTokenUtil.java

@@ -19,7 +19,7 @@ import java.util.Optional;
 import java.util.function.Function;
 
 @Component
-@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.token.util:SimpleTokenUtil}'.equals('SimpleTokenUtil')")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.token.util:UAATokenUtil}'.equals('SimpleTokenUtil')")
 public class SimpleTokenUtil implements AuthTokenUtil,Serializable {
 
     private static final long serialVersionUID = -3301605591108950415L;

businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/security/UAATokenUtil.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.function.Function;
 
 @Component
-@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.token.util:SimpleTokenUtil}'.equals('UAATokenUtil')")
+@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.token.util:UAATokenUtil}'.equals('UAATokenUtil')")
 public class UAATokenUtil implements AuthTokenUtil, Serializable {
 
     private static final long serialVersionUID = -3301605591108950415L;

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

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

businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/service/IBZConfigService.java

@@ -26,7 +26,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
     @Value("${ibiz.admin.userid:0100}")
     private String adminuserid;
 
-    @Cacheable( value="businesscentral_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
+    @Cacheable( value="ibzrt_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
     public JSONObject getConfig(String cfgType,String targetType,String userId)
     {
         if(StringUtils.isEmpty(userId)||StringUtils.isEmpty(cfgType)||StringUtils.isEmpty(targetType))
@@ -41,7 +41,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
         return JSON.parseObject(config.getCfg());
     }
 
-    @CacheEvict( value="businesscentral_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
+    @CacheEvict( value="ibzrt_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
     public boolean saveConfig(String cfgType,String targetType,String userId,JSONObject config)
     {
         if(StringUtils.isEmpty(userId)||StringUtils.isEmpty(cfgType)||StringUtils.isEmpty(targetType))
@@ -52,7 +52,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
         return this.saveOrUpdate(IBZConfig.builder().systemId(systemId).cfgType(cfgType).targetType(targetType).userId(userId).cfg(cfg).updateDate(DataObject.getNow()).build());
     }
 
-    @CacheEvict( value="businesscentral_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
+    @CacheEvict( value="ibzrt_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
     public void resetConfig(String cfgType,String targetType,String userId)
     {
         if(StringUtils.isEmpty(userId)||StringUtils.isEmpty(cfgType)||StringUtils.isEmpty(targetType))

businesscentral-util/src/main/java/cn/ibizlab/businesscentral/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

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

@@ -20,7 +20,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
  * 实体[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}")

businesscentral-util/src/main/java/cn/ibizlab/businesscentral/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

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

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