Merge pull request #135 from FederatedAI/develop

Upgrade SpringBoot dependent version
FederatedAI · Jan 20, 2022 · f0959d4 · f0959d4
2 parents ef7edb1 + 4caccd8
commit f0959d4
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 14 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,7 @@
+# Release 2.1.4
+## Major Features and Improvements
+* Upgrade SpringBoot dependent version.
+
 # Release 2.1.3
 ## Major Features and Improvements
 * Fix the HttpAdapter thread leakage problem.

diff --git a/document/docs/algo/base.md b/document/docs/algo/base.md
@@ -21,7 +21,7 @@ public interface MergeInferenceAware {
 ```
 
 ### HeteroSecureBoost 在线推理
-HeteroSecureBoost 为纵向联邦SecureBoost在线推理的实现过程，与离线不同的是，目前serving只支持单个host的预测。  
+HeteroSecureBoost 为纵向联邦SecureBoost在线推理的实现过程,  
 它主要包含3个文件"HeteroSecureBoost", "HeteroSecureBoostingTreeGuest", "HeteroSecureBoostingTreeHost"，下面对这三个文件展开说明
 
 #### HeteroSecureBoost

diff --git a/document/docs/quickstart/quickstart.md b/document/docs/quickstart/quickstart.md
@@ -15,9 +15,9 @@ $ mvn clean package
 随后拷贝，比如 serving-server/target/fate-serving-server-{version}-release.zip 到想要部署的路径下，并解压。（version为当前版本号）
 
 用户也可选择下载已编译好的版本，链接如下:   
-•	[fate-serving-server-2.1.3-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-server-2.1.3-release.zip)  
-•	[fate-serving-proxy-2.1.3-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-proxy-2.1.3-release.zip)    
-•	[fate-serving-admin-2.1.3-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-admin-2.1.3-release.zip)  
+•	[fate-serving-server-2.1.4-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-server-2.1.4-release.zip)  
+•	[fate-serving-proxy-2.1.4-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-proxy-2.1.4-release.zip)    
+•	[fate-serving-admin-2.1.4-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-admin-2.1.4-release.zip)  
 
 
 ### zookeeper部署

diff --git a/document/docs/release/change_log.md b/document/docs/release/change_log.md
@@ -1,3 +1,8 @@
+## FATE-SERVING 2.1.4
+```text
+1.升级SpringBoot依赖版本。
+```
+
 ## FATE-SERVING 2.1.3
 ```text
 1.修复内置HttpAdapter线程泄露问题。

diff --git a/document/docs/service/client.md b/document/docs/service/client.md
@@ -1,12 +1,12 @@
 FATE-Serving提供了fate-serving-client工具
 ### 下载对应版本的fate-serving-client
->linux版本：[fate-serving-client-2.1.3-linux.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.3-linux.tar.gz )     
->mac版本：[fate-serving-client-2.1.3-darwin.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.3-darwin.tar.gz)
+>linux版本：[fate-serving-client-2.1.4-linux.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.4-linux.tar.gz )     
+>mac版本：[fate-serving-client-2.1.4-darwin.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.4-darwin.tar.gz)
 
-需要先确认下载解压出来的文件有没有可执行权限，没有权限就执行 `chmod +777 fate-serving-client-2.1.3-linux`授权。
+需要先确认下载解压出来的文件有没有可执行权限，没有权限就执行 `chmod +777 fate-serving-client-2.1.4-linux`授权。
 
 ### 启动client    
-在终端中使用`./fate-serving-client-2.1.3-linux`启动client  
+在终端中使用`./fate-serving-client-2.1.4-linux`启动client  
 ![connect](../img/client-connect.jpg)
 
 ### 提供了以下几种指令   

diff --git a/fate-serving-admin-ui/package.json b/fate-serving-admin-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "FATE-Serving",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "private": true,
   "author": "FATE Serving",
   "scripts": {

diff --git a/fate-serving-admin/bin/service.sh b/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.3
+module_version=2.1.4
 
 case "$1" in
     start)

diff --git a/fate-serving-admin/src/main/resources/application.properties b/fate-serving-admin/src/main/resources/application.properties
@@ -29,3 +29,4 @@ zk.url=localhost:2181,localhost:2182,localhost:2183
 admin.username=admin
 admin.password=admin
 
+spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
diff --git a/fate-serving-proxy/bin/service.sh b/fate-serving-proxy/bin/service.sh
@@ -24,7 +24,7 @@ basepath=$(cd `dirname $0`;pwd)
 configpath=$(cd $basepath/conf;pwd)
 module=serving-proxy
 main_class=com.webank.ai.fate.serving.proxy.bootstrap.Bootstrap
-module_version=2.1.3
+module_version=2.1.4
 
 
 case "$1" in

diff --git a/fate-serving-server/bin/service.sh b/fate-serving-server/bin/service.sh
@@ -24,7 +24,7 @@ basepath=$(cd `dirname $0`;pwd)
 configpath=$(cd $basepath/conf;pwd)
 module=serving-server
 main_class=com.webank.ai.fate.serving.Bootstrap
-module_version=2.1.3
+module_version=2.1.4
 
 
 case "$1" in

diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
     </modules>
 
     <properties>
-        <fate.version>2.1.3</fate.version>
+        <fate.version>2.1.4</fate.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -47,7 +47,7 @@
         <junit.version>4.13.1</junit.version>
         <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
         <os-maven-plugin.version>1.6.1</os-maven-plugin.version>
-        <spring.boot.version>2.2.0.RELEASE</spring.boot.version>
+        <spring.boot.version>2.6.2</spring.boot.version>
         <jackson.version>2.10.0</jackson.version>
         <jedis.version>2.9.0</jedis.version>
         <log4j2.version>2.17.0</log4j2.version>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,3 +29,4 @@ zk.url=localhost:2181,localhost:2182,localhost:2183
		admin.username=admin
		admin.password=admin

		spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER