Skip to content

Commit cd19687

Browse files
wmqwxbwmqwxb
committed
add pr branch to handle loss sign-off
Signed-off-by: wmqwxb <[email protected]>
1 parent 6115c7e commit cd19687

File tree

488 files changed

+40006
-362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

488 files changed

+40006
-362
lines changed

‎README-CN.md‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,10 @@ FATEBoard是联邦学习建模的可视化工具，旨在帮助用户简单而
1212

1313
# **使用** #
1414

15-
**数据库配置**
16-
17-
集群版本FATEBoard默认的数据库是mysql，如果你使用单机版FATEBoard，那么你需要用sqlite数据库。只要用sqlite参数更新这个文件：FATEBoard/src/main/resources/application.properties。你需要更新的参数如下：
18-
spring.datasource.driver-Class-Name=org.sqlite.JDBC
19-
20-
fateboard.datasource.jdbc-url=xxx
21-
22-
fateboard.datasource.username=
23-
24-
fateboard.datasource.password=
25-
26-
2715
**启动FATEBoard**
2816

2917
FATEBoard代码使用spring-boot框架并嵌入在tomcat容器中，默认的网络端口是8080。在启动前，需要检查机器的8080端口是否被占用，如果端口被占用，FATEBoard将会启动失败。
3018

31-
FATEBoard通过访问mysql数据库来获得任务列表，如果没有正确安装数据库，那么任务获取就会失败。
32-
3319
FATEBoard通过HTTP协议来访问FATEFlow。如果没有正常启动FATEFlow，FATEBoard将无法呈现任务图表。
3420

3521
你可以通过 http://{FATEBoard-ip}:8080来访问FATEBoard。
@@ -89,6 +75,6 @@ FATEBoard通过给FATE-Flow发送Http请求获得每个算法模块的输出数
8975

9076
**FATEBoard没有显示算法模块运行日志**
9177

92-
FATEBoard通过查询数据库展示所有的算法任务以及他们的详细信息。
78+
FATEBoard通过查询FATEFLOW展示所有的算法任务以及他们的详细信息。
9379
在单机版中,FATEBoard查询本地日志文件，并通过websocket协议在前端展示。所以如果日志无法显示，请确认日志文件是否正常生成。
9480
在集群版中，FATEBoard通过ssh方式读取不同机器上的日志文件，通过websocket协议推送到前端。默认的日志路径是/data/projects/fate/logs。如果日志无法展示，那么可能是ssh的连接信息错误，你可以点击页面右上角的设置按钮重新设置正确的ssh连接信息。

‎README.md‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,10 @@ As a built-in visualization tool for FATE, FATEBoard presents abundant data visu
1212

1313
# **Usage** #
1414

15-
**Database Configuration**
16-
17-
The default database for FATEBoard for cluster version is mysql. If you want to use standalone version, you should use sqlite databse. Just update the file : FATEBoard/src/main/resources/application.properties with right parameters of sqlite. The parameters you should update are below:
18-
19-
spring.datasource.driver-Class-Name=org.sqlite.JDBC
20-
21-
fateboard.datasource.jdbc-url=xxx
22-
23-
fateboard.datasource.username=
24-
25-
fateboard.datasource.password=
26-
2715
**Starting FATEBoard**
2816

2917
The FATEBoard source code uses the spring-boot framework and the embedded tomcat container. The default web port provided is 8080. Before starting, it is necessary to check whether port 8080 of the machine is already occupied. If the port is occupied, FATEBoard will fail to start.
3018

31-
FATEBoard gets job list through accessing MySQL database. If the database is not installed properly, the job list query will fail.
3219
FATEBoard access FATE-Flow through HTTP protocol. If FATE-Flow is not started properly, FATEBoard will not display charts.
3320

3421
You can access FATEBoard by visiting http://{fateboard-ip}:8080.
@@ -89,6 +76,6 @@ FATEBoard sends a request to access FATE-Flow via HTTP to obtain all the data ne
8976

9077
**My FATEBoard isn’t showing any log！**
9178

92-
FATEBoard gets the list of jobs and details by querying MySQL.
79+
FATEBoard gets the list of jobs and details by querying fateflow.
9380
In a stand-alone environment, FATEBoard reads the local log file and returns it to the user through WebSocekt. If the log file cannot be displayed, you can first check whether the local log file has been generated.
9481
In a clustered environment, FATEBoard could access log files on different machines with SSH, and push them to the browser through WebSocket. The default log lookup path is /data/projects/fate/logs. If you cannot view the logs, it may be an error in SSH information in the cluster. you can set the correct SSH information by clicking the button in the upper right corner of the page.

‎RELEASE.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# Release 2.0.0
2+
3+
#### Major Features and Improvements
4+
**Major Features**
5+
6+
* Refactoring DAG components, adding support for stage status, and displaying dynamic ports.
7+
* Update the cache structure to optimize issues such as user timeout handling and duplicate storage of configuration information.
8+
* Optimize some interactive functions.
9+
* Update the style theme.
10+
111
# Release 1.11.2
212

313
#### Major Features and Improvements

‎bin/service.sh‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,35 @@ configpath=$(
2323
cd $basepath/conf
2424
pwd
2525
)
26+
libpath=$(
27+
cd $basepath/lib
28+
pwd
29+
)
2630
fatepath=$(
2731
cd $basepath/..
2832
pwd
2933
)
3034

31-
if test -f "${fatepath}/bin/init_env.sh";then
32-
source ${fatepath}/bin/init_env.sh
35+
cd $basepath
36+
37+
main_class=org.fedai.fate.board.bootstrap.Bootstrap
38+
module=fateboard
39+
version=2.0.0
40+
41+
42+
if test -f "${fatepath}/fate_flow/bin/init_env.sh";then
43+
source ${fatepath}/fate_flow/bin/init_env.sh
3344
echo "JAVA_HOME=$JAVA_HOME"
3445
else
35-
echo "file not found:${fatepath}/bin/init_env.sh"
46+
echo "file not found:${fatepath}/fate_flow/bin/init_env.sh"
3647
exit
3748
fi
3849

3950

40-
module=fateboard
51+
4152

4253
getpid() {
43-
pid=$(ps -ef | grep java | grep ${basepath}/fateboard.jar | grep -v grep | awk '{print $2}')
54+
pid=$(ps -ef | grep java | grep ${basepath}/fateboard-${version}.jar | grep -v grep | awk '{print $2}')
4455

4556
if [[ -n ${pid} ]]; then
4657
return 1
@@ -72,9 +83,9 @@ start() {
7283
if [[ $? -eq 0 ]]; then
7384
mklogsdir
7485
if [[ $1 == "front" ]]; then
75-
exec $JAVA_HOME/bin/java -Dspring.config.location=$configpath/application.properties -Dssh_config_file=$basepath/ssh/ -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -jar $basepath/${module}.jar >/dev/null 2>&1
86+
exec $JAVA_HOME/bin/java -Dspring.config.location=$configpath/application.properties -Dssh_config_file=$basepath/ssh/ -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -cp $libpath/*:$basepath/${module}-${version}.jar ${main_class} >/dev/null 2>&1
7687
else
77-
nohup $JAVA_HOME/bin/java -Dspring.config.location=$configpath/application.properties -Dssh_config_file=$basepath/ssh/ -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -jar $basepath/${module}.jar >/dev/null 2>&1 &
88+
nohup $JAVA_HOME/bin/java -Dspring.config.location=$configpath/application.properties -Dssh_config_file=$basepath/ssh/ -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -cp $libpath/*:$basepath/${module}-${version}.jar ${main_class} >/dev/null 2>&1 &
7889

7990
fi
8091

‎package.xml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<!--
2+
~ Copyright 2019 The FATE Authors. All Rights Reserved.
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
17+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd">
18+
<id>release</id>
19+
20+
<formats>
21+
<format>zip</format>
22+
</formats>
23+
24+
<includeBaseDirectory>false</includeBaseDirectory>
25+
<fileSets>
26+
<fileSet>
27+
<outputDirectory>/</outputDirectory>
28+
<directory>target</directory>
29+
<includes>
30+
<include>*.jar</include>
31+
</includes>
32+
</fileSet>
33+
34+
35+
<fileSet>
36+
<outputDirectory>/lib</outputDirectory>
37+
<directory>target/lib</directory>
38+
<includes>
39+
<include>*.jar</include>
40+
</includes>
41+
</fileSet>
42+
43+
<fileSet>
44+
<outputDirectory>/</outputDirectory>
45+
<directory>bin</directory>
46+
<includes>
47+
<include>*.sh</include>
48+
</includes>
49+
<fileMode>755</fileMode>
50+
<lineEnding>unix</lineEnding>
51+
</fileSet>
52+
53+
<fileSet>
54+
<outputDirectory>/dag</outputDirectory>
55+
<directory>static</directory>
56+
<includes>
57+
<include>*.yaml</include>
58+
</includes>
59+
<fileMode>755</fileMode>
60+
<lineEnding>unix</lineEnding>
61+
</fileSet>
62+
63+
<fileSet>
64+
<outputDirectory>/conf</outputDirectory>
65+
<directory>src/main/resources</directory>
66+
<includes>
67+
<include>*</include>
68+
</includes>
69+
</fileSet>
70+
71+
</fileSets>
72+
</assembly>

‎pom.xml‎

Lines changed: 72 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>fateboard</groupId>
77
<artifactId>fateboard</artifactId>
8-
<version>1.11.2</version>
8+
<version>2.0.0</version>
99

1010
<parent>
1111
<groupId>org.springframework.boot</groupId>
1212
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>2.7.10</version>
13+
<version>2.7.18</version>
1414
<relativePath/>
1515
</parent>
1616

@@ -36,11 +36,23 @@
3636
<dependency>
3737
<groupId>org.springframework.boot</groupId>
3838
<artifactId>spring-boot-starter-web</artifactId>
39+
<exclusions>
40+
<exclusion>
41+
<groupId>org.springframework.boot</groupId>
42+
<artifactId>spring-boot-starter-logging</artifactId>
43+
</exclusion>
44+
</exclusions>
3945
</dependency>
46+
47+
<dependency>
48+
<groupId>org.springframework.boot</groupId>
49+
<artifactId>spring-boot-starter-log4j2</artifactId>
50+
</dependency>
51+
4052
<dependency>
4153
<groupId>org.springframework</groupId>
4254
<artifactId>spring-webmvc</artifactId>
43-
<version>5.3.26</version>
55+
<version>5.3.27</version>
4456
<scope>compile</scope>
4557
</dependency>
4658

@@ -154,6 +166,37 @@
154166
<groupId>org.springframework.cloud</groupId>
155167
<artifactId>spring-cloud-starter-openfeign</artifactId>
156168
</dependency>
169+
170+
<dependency>
171+
<groupId>org.apache.curator</groupId>
172+
<artifactId>curator-framework</artifactId>
173+
<version>2.13.0</version>
174+
</dependency>
175+
176+
<dependency>
177+
<groupId>org.apache.curator</groupId>
178+
<artifactId>curator-recipes</artifactId>
179+
<version>2.13.0</version>
180+
181+
</dependency>
182+
<dependency>
183+
<groupId>org.apache.zookeeper</groupId>
184+
<artifactId>zookeeper</artifactId>
185+
<version>3.7.2</version>
186+
<exclusions>
187+
<exclusion>
188+
<groupId>org.slf4j</groupId>
189+
<artifactId>slf4j-reload4j</artifactId>
190+
</exclusion>
191+
</exclusions>
192+
</dependency>
193+
194+
<dependency>
195+
<groupId>com.github.ben-manes.caffeine</groupId>
196+
<artifactId>caffeine</artifactId>
197+
<version>2.9.3</version>
198+
</dependency>
199+
157200
</dependencies>
158201

159202
<dependencyManagement>
@@ -299,11 +342,10 @@
299342
<configuration>
300343
<resources>
301344
<resource>
302-
<directory>resources-front-end/dist</directory>
345+
<directory>resources-front-end/packages/fate-board/dist</directory>
303346
<includes>
304-
<include>static/**</include>
305-
<include>index.html</include>
306-
<include>FATE_logo.png</include>
347+
<include>*</include>
348+
<include>*/**</include>
307349
</includes>
308350
</resource>
309351
</resources>
@@ -324,42 +366,48 @@
324366
</plugin>
325367

326368
<plugin>
327-
<groupId>org.springframework.boot</groupId>
328-
<artifactId>spring-boot-maven-plugin</artifactId>
329-
<configuration>
330-
<fork>true</fork>
331-
<mainClass>com.webank.ai.fate.board.bootstrap.Bootstrap</mainClass>
332-
</configuration>
333-
369+
<groupId>org.apache.maven.plugins</groupId>
370+
<artifactId>maven-dependency-plugin</artifactId>
371+
<version>2.10</version>
334372
<executions>
335373
<execution>
374+
<id>copy-dependencies</id>
375+
<phase>package</phase>
336376
<goals>
337-
<goal>repackage</goal>
377+
<goal>copy-dependencies</goal>
338378
</goals>
379+
<configuration>
380+
<outputDirectory>${project.build.directory}/lib</outputDirectory>
381+
</configuration>
339382
</execution>
340383
</executions>
341384
</plugin>
342385

343386
<plugin>
344387
<groupId>org.apache.maven.plugins</groupId>
345-
<artifactId>maven-dependency-plugin</artifactId>
346-
<version>2.10</version>
388+
<artifactId>maven-assembly-plugin</artifactId>
389+
<version>2.2.1</version>
390+
<configuration>
391+
<descriptors>
392+
<descriptor>${project.basedir}/package.xml</descriptor>
393+
</descriptors>
394+
<archive>
395+
<manifest>
396+
<mainClass>org.fedai.fate.board.bootstrap.Bootstrap</mainClass>
397+
</manifest>
398+
</archive>
399+
</configuration>
347400
<executions>
348401
<execution>
349-
<id>copy-dependencies</id>
402+
<id>make-assembly</id>
350403
<phase>package</phase>
351404
<goals>
352-
<goal>copy-dependencies</goal>
405+
<goal>single</goal>
353406
</goals>
354-
<configuration>
355-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
356-
357-
</configuration>
358407
</execution>
359408
</executions>
360409
</plugin>
361410

362-
363411
</plugins>
364412
</build>
365413
</project>

0 commit comments

Comments
 (0)