Merge pull request #204 from FederatedAI/dev-2.1.7

Dev 2.1.7

Author: dylan-fan

document/docs/service/adapter.md

@@ -40,8 +40,10 @@ Context为上下文信息，用于传递请求所需参数，featureIds用于传
 #在host方的配置文件serving-server.properties中将其配置成自定义的类的全路径，如下所示
 feature.single.adaptor=com.webank.ai.fate.serving.adaptor.dataaccess.CustomAdapter
 feature.batch.adaptor=com.webank.ai.fate.serving.adaptor.dataaccess.CustomBatchAdapter
+feature.batch.single.adatpor=com.webank.ai.fate.serving.adaptor.dataaccess.CustomAdapter
 ```
 可以根据需要实现Adapter中的逻辑，并修改serving-server.properties中feature.single.adaptor或feature.batch.adaptor配置项为新增Adapter的全类名即可。可以参考源码中的MockAdaptor
+注: feature.batch.single.adatpor与feature.batch.adatpor配套使用，feature.batch.single.adatpor可根据用户场景自行实现,fate-serving中目前支持httpAdaptor
 
 ## fate-serving-extension
 为了更好的代码解耦合，代码中将自定义adapter分离到fate-serving-extension模块中。用户可在此模块中开发自定义的adapter。
@@ -69,7 +71,7 @@ x0:1,x1:5,x2:13,x3:58,x4:95,x5:352,x6:418,x7:833,x8:888,x9:937,x10:32776
 
 #### HttpAdapter
 在serving-server.properties文件中配置属性feature.single.adaptor和http.adapter.url，feature.single.adaptor为继承AbstractSingleFeatureDataAdaptor
-接口，url为调用获取数据接口地址。  
+接口，url为调用获取数据接口地址。http.adapter.url中标明的用户接口，返回格式请定义为 {"code": 200, "data": xxx}标准格式即可，httpAdapter中会根据接口返回状态码是否为200判断用户数据拉取接口是否执行成功。
 ```yaml
 feature.single.adaptor=com.webank.ai.fate.serving.adaptor.dataaccess.HttpAdapter
 http.adapter.url=http://127.0.0.1:9380/v1/http/adapter/getFeature

document/docs/service/admin.md

@@ -5,6 +5,8 @@ serving-admin提供了FATE-Serving集群的可视化操作界面，依赖zookeep
 ### 功能介绍
 #### 用户管理
 默认用户：admin，默认密码：admin，用户可在[conf/application.properties](config/admin.md)中修改预设用户。    
+除此之外serving-admin提供一个基本的登录密码加解密功能，用户可在[conf/application.properties](config/application.properties)
+中通过设置admin.isEncrypt参数为true（默认为false关闭），同时根据spring.security中的BCryptPasswordEncoder库对密码进行提前处理并预设为默认密码。
 serving-admin仅实现简单的用户登录，用户可业务需求，自行实现登录逻辑，或接入第三方平台。
 
 #### 节点管理

fate-serving-admin-ui/README.md

@@ -4,7 +4,7 @@ fate-serving定制联邦服务管理端
 ## Build Setup
 
 # Install dependencies
-npm install
+npm install --force
 
 # Serve with hot reload at localhost:8080
 npm run serve

fate-serving-admin-ui/package.json

@@ -48,6 +48,7 @@
     "svg-sprite-loader": "^3.9.2",
     "vue-template-compiler": "^2.6.10",
     "webpack-bundle-analyzer": ">=3.3.2",
-    "webpack-cli": "^3.2.3"
+    "webpack-cli": "^3.2.3",
+    "webpack": "^4.0.0"
   }
 }

fate-serving-admin-ui/pom.xml

@@ -55,7 +55,7 @@
                             <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v9.11.1</nodeVersion>
+                            <nodeVersion>v16.20.2</nodeVersion>
                         </configuration>
                     </execution>
                     <!-- Install all project dependencies -->
@@ -68,7 +68,7 @@
                         <phase>generate-resources</phase>
                         <!-- Optional configuration which provides for running any npm command -->
                         <configuration>
-                            <arguments>install</arguments>
+                            <arguments>install --force</arguments>
                         </configuration>
                     </execution>
                     <!-- Build and minify static files -->

fate-serving-admin/bin/service.sh

@@ -24,7 +24,7 @@ basepath=$(cd `dirname $0`;pwd)
 configpath=$(cd $basepath/conf;pwd)
 module=serving-admin
 main_class=com.webank.ai.fate.serving.admin.Bootstrap
-module_version=2.1.6
+module_version=2.1.7
 
 case "$1" in
     start)

fate-serving-admin/pom.xml

@@ -51,6 +51,11 @@
             <version>${fate.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
 
 
         <!--<dependency>

fate-serving-admin/src/main/java/com/webank/ai/fate/serving/admin/Bootstrap.java

@@ -119,6 +119,7 @@ public void stop() {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
+            tryNum++;
         }
     }
 }

fate-serving-admin/src/main/java/com/webank/ai/fate/serving/admin/bean/ServiceConfiguration.java

@@ -44,8 +44,7 @@ public static boolean isAllowModify(String project, String config) {
             return Boolean.FALSE;
         }
 
-        boolean match = Arrays.asList(value.config).contains(config);
-        return match;
+        return Arrays.asList(value.config).contains(config);
     }
 
 }

fate-serving-admin/src/main/java/com/webank/ai/fate/serving/admin/config/WebConfig.java

@@ -72,8 +72,7 @@ public Cache cache() {
         Integer maxSize = MetaInfo.PROPERTY_LOCAL_CACHE_MAXSIZE;
         Integer expireTime = MetaInfo.PROPERTY_LOCAL_CACHE_EXPIRE;
         Integer interval = MetaInfo.PROPERTY_LOCAL_CACHE_INTERVAL;
-        ExpiringLRUCache lruCache = new ExpiringLRUCache(maxSize, expireTime, interval);
-        return lruCache;
+        return new ExpiringLRUCache(maxSize, expireTime, interval);
     }