BUG修复

external/README.md

@@ -2,10 +2,15 @@
 
 ### 项目结构
 
+* 因为账户中心提供的rest接口缺一些参数，主要体现在查询的接口上，sso-feign-client的部分查询接口弃用，
+* 这部分查询接口改为使用基于账户中心数据库实现的sso-service
+* sso-service不提供写操作的api
+
 ```
 ├─external
 │  │
-│  ├─bdpush-feign-api-------------------------百度推送rest接口的feign封装  
-│  ├─sso-feign-api----------------------------sso.ubtob.com账户中心接口的feign封装
+│  ├─baidu-push-feign-client------------------百度推送rest接口的feign封装  
+│  ├─sso-feign-client-------------------------sso.ubtob.com账户中心rest接口的feign封装
+│  ├─sso-service------------------------------sso.ubtob.com账户中心基于数据库的实现
 │  │
 ```

runtime/mobile-grpc-server/src/test/java/com/usoftchina/uu/mobile/grpc/test/MobileMessageServiceTest.java

@@ -27,6 +27,7 @@ public class MobileMessageServiceTest extends AbstractGRpcServerTest {
 
     @Test
     public void testA_getConfig() {
+        Authentication.set("uxal6xOGqcMSvvni35npT7I61eqim6yi");
         GetMessageConfigRequest request = GetMessageConfigRequest.newBuilder().build();
         try {
             GetMessageConfigResponse response = messageServiceBlockingStub.getConfig(request);

services/app-service/src/main/java/com/usoftchina/uu/app/service/impl/AppConfigServiceImpl.java

@@ -154,7 +154,7 @@ public class AppConfigServiceImpl implements AppConfigApi {
         if (!CollectionUtils.isEmpty(appConfigVOList)) {
             appConfigVOList = appConfigVOList.stream()
                     .filter(appConfigVO -> {
-                        return appConfigVO.companyRelate().onlyCompany() &&
+                        return !appConfigVO.companyRelate().onlyCompany() &&
                                 null == appConfigVO.getScopeCompanyId();
                     }).collect(Collectors.toList());
             return group(appConfigVOList);
@@ -168,7 +168,7 @@ public class AppConfigServiceImpl implements AppConfigApi {
         if (!CollectionUtils.isEmpty(appConfigVOList)) {
             appConfigVOList = appConfigVOList.stream()
                     .filter(appConfigVO -> {
-                        return appConfigVO.companyRelate().onlyCompany() &&
+                        return !appConfigVO.companyRelate().onlyCompany() &&
                                 null == appConfigVO.getScopeCompanyId();
                     }).collect(Collectors.toList());
             return group(appConfigVOList);

services/home-service/src/main/java/com/usoftchina/uu/home/service/impl/HomeConfigServiceImpl.java

@@ -143,7 +143,7 @@ public class HomeConfigServiceImpl implements HomeConfigApi {
         if (!CollectionUtils.isEmpty(homeConfigDTOList)) {
             return homeConfigDTOList.stream()
                     .filter(homeConfigDTO -> {
-                        return homeConfigDTO.companyRelate().onlyCompany() &&
+                        return !homeConfigDTO.companyRelate().onlyCompany() &&
                                 null == homeConfigDTO.getScopeCompanyId();
                     }).collect(Collectors.toList());
         }
@@ -156,7 +156,7 @@ public class HomeConfigServiceImpl implements HomeConfigApi {
         if (!CollectionUtils.isEmpty(homeConfigDTOList)) {
             return homeConfigDTOList.stream()
                     .filter(homeConfigDTO -> {
-                        return homeConfigDTO.companyRelate().onlyCompany() &&
+                        return !homeConfigDTO.companyRelate().onlyCompany() &&
                                 null == homeConfigDTO.getScopeCompanyId();
                     }).collect(Collectors.toList());
         }

services/message-service/src/main/java/com/usoftchina/uu/message/service/impl/MessageConfigServiceImpl.java

@@ -175,7 +175,7 @@ public class MessageConfigServiceImpl implements MessageConfigApi {
         if (!CollectionUtils.isEmpty(messageConfigDTOList)) {
             return messageConfigDTOList.stream()
                     .filter(messageConfigDTO -> {
-                        return messageConfigDTO.companyRelate().onlyCompany() &&
+                        return !messageConfigDTO.companyRelate().onlyCompany() &&
                                 null == messageConfigDTO.getScopeCompanyId();
                     }).collect(Collectors.toList());
         }
@@ -188,7 +188,7 @@ public class MessageConfigServiceImpl implements MessageConfigApi {
         if (!CollectionUtils.isEmpty(messageConfigDTOList)) {
             return messageConfigDTOList.stream()
                     .filter(messageConfigDTO -> {
-                        return messageConfigDTO.companyRelate().onlyCompany() &&
+                        return !messageConfigDTO.companyRelate().onlyCompany() &&
                                 null == messageConfigDTO.getScopeCompanyId();
                     }).collect(Collectors.toList());
         }

settings.gradle

@@ -37,4 +37,6 @@ include 'runtime:mobile-grpc-server'
 findProject(':runtime:mobile-grpc-server')?.name = 'mobile-grpc-server'
 include 'runtime:admin-server'
 findProject(':runtime:admin-server')?.name = 'admin-server'
+include 'external:sso-service'
+findProject(':external:sso-service')?.name = 'sso-service'