Merge pull request #130 from FederatedAI/develop-1.8.0

Merge from develop-1.8.0
FederatedAI · Apr 15, 2022 · 72f231b · 72f231b
2 parents 0c4f24c + 0ffac38
commit 72f231b
Show file tree

Hide file tree

Showing 110 changed files with 1,081 additions and 863 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,33 @@
+name: compile the source code
+
+on:
+  push:
+    branches:
+      - '**'
+    tags:
+      - '**'
+
+  workflow_dispatch: {}
+
+jobs:
+  build:
+    name: compile the source code
+    runs-on: ubuntu-latest
+    steps:
+      - name: check out the repo
+        uses: actions/checkout@v2
+
+      - name: compile node.js code
+        working-directory: resources-front-end
+        run: |
+          npm install
+          npm run build
+
+      - name: compile java code
+        run: mvn clean package
+
+      - name: archive artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: target
+          path: target/fateboard-[0-9].[0-9].[0-9].jar
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ yarn-debug.log*
 yarn-error.log*
 package-lock.json
 yarn.lock
+application-*.properties
 
 # Editor directories and files
 .idea
@@ -18,5 +19,4 @@ yarn.lock
 *.sln
 *.zip
 *.7z
-/.idea/
 *.iml
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,15 @@
+# Release 1.8.0
+
+#### Major Features and Improvements
+**Major Features**
+
+* Support GBDTMO mode for Secureboost
+* Add SSHE Linr component
+* Add Writer component
+* Delete data-output port for data-statistic compoent
+* Fix display bug and optimize transport protocal support
+
+
 # Release 1.7.2.2
 
 #### Major Features and Improvements

diff --git a/deploy/FATE-Board_deploy_guide_CN.md b/deploy/FATE-Board_deploy_guide_CN.md
@@ -21,134 +21,54 @@
 
 1. 修改文件 FATE-Board/src/main/resources/application.properties.
 
-   | 配置项                              | 说明               | 默认值                                                       |
-   | :---------------------------------- | :----------------- | :----------------------------------------------------------- |
-   | server.port                         | FATE-Board的端口   | 8080                                                         |
-   | fateflow.url                        | fate_flow服务的url | 无                                                           |
-   | spring.datasource.driver-Class-Name | 数据库驱动         | com.mysql.cj.jdbc.Driver                                     |
-   | spring.http.encoding.charset        | code set for http  | UTF-8                                                        |
-   | spring.http.encoding.enabled        | http编码开关       | true                                                         |
-   | server.tomcat.uri-encoding          | tomcat编码         | UTF-8                                                        |
-   | fateboard.datasource.jdbc-url       | 数据库url          | jdbc:mysql://localhost:3306/fate_flow?characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT%2B8 |
-   | fateboard.datasource.username       | 数据库用户名       | 无                                                           |
-   | fateboard.datasource.password       | 数据库密码         | 无                                                           |
-   | server.tomcat.max-threads           | tomcat最大线程数   | 1000                                                         |
-   | server.tomcat.max-connections       | tomcat最大连接数   | 2000                                                         |
-   | spring.servlet.multipart.max-file-size |最大上传文件大小|10MB|
-   |spring.servlet.multipart.max-request-size|单次请求的文件的总大小|100MB|
-   |spring.datasource.druid.filter.config.enabled|Druid配置|false|
-   |spring.datasource.druid.web-stat-filter.enabled|Druid配置|false|
-   |spring.datasource.druid.stat-view-servlet.enabled|Druid配置|false|
-   |server.compression.enabled|是否开启压缩|true|
-   |server.compression.mime-types|要压缩的MIME type|application/json,application/xml,text/html,text/xml,text/plain|
-   |server.board.login.username|用户名|admin|
-   |server.board.login.password|用户密码|admin|
-   |management.endpoints.web.exposure.exclude|http方式排除需要公开的端点|*|
-   |spring.session.store-type|开启spring session|jdbc|
-   |spring.session.jdbc.initialize-schema|初始化spring session|always|
-   |#server.ssl.key-store=classpath:|证书仓库路径||
-   |#server.ssl.key-store-password=|证书仓库密码||
-   |#server.ssl.key-password=|证书密码||
-   |#server.ssl.key-alias=|证书别名||
-   |#HTTP_APP_KEY=|APP_KEY||
-   |#HTTP_SECRET_KEY=|与flow的HTTP_SECRET_KEY保持一致||
-
-
-   - 例子1(数据库: mysql)
-
-     ```
-     server.port=8080
-     fateflow.url=http://localhost:9380
-     spring.http.encoding.charset=UTF-8
-     spring.http.encoding.enabled=true
-     server.tomcat.uri-encoding=UTF-8
-     spring.datasource.driver-Class-Name=com.mysql.cj.jdbc.Driver
-     fateboard.datasource.jdbc-url=jdbc:mysql://localhost:3306/fate_flow?characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT%2B8
-     fateboard.datasource.username=fate_dev
-     fateboard.datasource.password=fate_dev
-     server.tomcat.max-threads=1000
-     server.tomcat.max-connections=20000
-     spring.servlet.multipart.max-file-size=10MB
-     spring.servlet.multipart.max-request-size=100MB
-     spring.datasource.druid.filter.config.enabled=false
-     spring.datasource.druid.web-stat-filter.enabled=false
-     spring.datasource.druid.stat-view-servlet.enabled=false
-     server.compression.enabled=true
-     server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain
-     server.board.login.username=admin
-     server.board.login.password=admin
-     management.endpoints.web.exposure.exclude=*
-     spring.session.store-type=jdbc
-     spring.session.jdbc.initialize-schema=always
-     #server.ssl.key-store=classpath:
-     #server.ssl.key-store-password=
-     #server.ssl.key-password=
-     #server.ssl.key-alias=
-     #HTTP_APP_KEY=
-     #HTTP_SECRET_KEY=
-     ```
-
-   - 例子2(数据库: sqlite)
-
-     ```
-     server.port=8080
-     fateflow.url=http://localhost:9380
-     spring.http.encoding.charset=UTF-8
-     spring.http.encoding.enabled=true
-     server.tomcat.uri-encoding=UTF-8
-     spring.datasource.driver-class-name=org.sqlite.JDBC
-     fateboard.datasource.jdbc-url=jdbc:sqlite:/fate/fate_flow/fate_flow_sqlite.db
-     fateboard.datasource.username=
-     fateboard.datasource.password=
-     server.tomcat.max-threads=1000
-     server.tomcat.max-connections=20000
-     spring.servlet.multipart.max-file-size=10MB
-     spring.servlet.multipart.max-request-size=100MB
-     spring.datasource.druid.filter.config.enabled=false
-     spring.datasource.druid.web-stat-filter.enabled=false
-     spring.datasource.druid.stat-view-servlet.enabled=false
-     server.compression.enabled=true
-     server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain
-     server.board.login.username=admin
-     server.board.login.password=admin
-     management.endpoints.web.exposure.exclude=*
-     spring.session.store-type=jdbc
-     spring.session.jdbc.initialize-schema=always
-     #server.ssl.key-store=classpath:
-     #server.ssl.key-store-password=
-     #server.ssl.key-password=
-     #server.ssl.key-alias=
-     #HTTP_APP_KEY=
-     #HTTP_SECRET_KEY=
-     ```
-
-     
-
-2. 修改文件 FATE-Board/src/main/resources/ssh.properties.
-
-   格式: ip=username|password|port
-
-   | 配置项   | 说明               |
-   | -------- | ------------------ |
-   | ip       | FATE其他服务所在ip |
-   | username | 操作系统用户名     |
-   | password | 操作系统密码       |
-   | port     | ssh远程连接端口    |
-
-   例子:
+   | 配置项                                            | 说明                            | 默认值                                                       |
+   | :------------------------------------------------ | :------------------------------ | :----------------------------------------------------------- |
+   | server.port                                       | FATE-Board的端口                | 8080                                                         |
+   | fateflow.url                                      | fate_flow服务的url              | 无                                                           |
+   | spring.http.encoding.charset                      | code set for http               | UTF-8                                                        |
+   | spring.http.encoding.enabled                      | http编码开关                    | true                                                         |
+   | server.tomcat.uri-encoding                        | tomcat编码                      | UTF-8                                                        |
+   | server.tomcat.max-threads                         | tomcat最大线程数                | 1000                                                         |
+   | server.tomcat.max-connections                     | tomcat最大连接数                | 2000                                                         |
+   | spring.servlet.multipart.max-file-size            | 最大上传文件大小                | 10MB                                                         |
+   | spring.servlet.multipart.max-request-size         | 单次请求的文件的总大小          | 100MB                                                        |
+   | server.compression.enabled                        | 是否开启压缩                    | true                                                         |
+   | server.compression.mime-types                     | 要压缩的MIME type               | application/json,application/xml,text/html,text/xml,text/plain |
+   | server.board.login.username                       | 用户名                          | admin                                                        |
+   | server.board.login.password                       | 用户密码                        | admin                                                        |
+   | management.endpoints.web.exposure.exclude         | http方式排除需要公开的端点      | *                                                            |
+   | spring.session.store-type                         | 开启spring session              | jdbc                                                         |
+   | spring.session.jdbc.initialize-schema             | 初始化spring session            | always                                                       |
+
+- 示例
 
    ```
-   192.168.xxx.xxx=app|app|22
+   server.port=8080
+   fateflow.url=http://localhost:9380
+   spring.http.encoding.charset=UTF-8
+   spring.http.encoding.enabled=true
+   server.tomcat.uri-encoding=UTF-8
+   server.tomcat.max-threads=1000
+   server.tomcat.max-connections=20000
+   spring.servlet.multipart.max-file-size=10MB
+   spring.servlet.multipart.max-request-size=100MB
+   server.compression.enabled=true
+   server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain
+   server.board.login.username=admin
+   server.board.login.password=admin
+   management.endpoints.web.exposure.exclude=*
+   spring.session.store-type=jdbc
+   spring.session.jdbc.initialize-schema=always
    ```
-
-3. 打包
+   
+2. 打包
 
    ```
    cd FATE-Board/
    mvn clean package -DskipTests
    ```
 
-4. 启动服务
+3. 启动服务
 
    命令行说明:
 
@@ -165,7 +85,7 @@
    nohup java -Dspring.config.location=FATE/fateboard/src/main/resources/application.properties -Dssh_config_file=FATE-Board/src/main/resources/  -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError  -jar FATE-Board/target/fateboard-${version}.jar  >/dev/null 2>&1 &
    ```
 
-5. 停止服务
+4. 停止服务
 
    获取FATE-Board服务 pid: