summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhanghongqing <[email protected]>2021-08-12 10:25:57 +0800
committerzhanghongqing <[email protected]>2021-08-12 10:25:57 +0800
commit85bfaa05b734b3d17d71132d85fb6320eeac8c20 (patch)
tree77b4d7f39f0c2d7c710f6ac1e9c1473846b8993b
parent1be13db39cb78add6bf7940f1050845175cd1a0c (diff)
合并eal4分支,解决IO漏洞
-rw-r--r--galaxy-job-admin/src/main/resources/application.properties2
-rw-r--r--galaxy-job-core/pom.xml11
-rw-r--r--galaxy-job-executor/pom.xml2
-rw-r--r--galaxy-job-executor/src/main/resources/application.properties2
-rw-r--r--pom.xml2
5 files changed, 15 insertions, 4 deletions
diff --git a/galaxy-job-admin/src/main/resources/application.properties b/galaxy-job-admin/src/main/resources/application.properties
index bf7bca9..b53bc4b 100644
--- a/galaxy-job-admin/src/main/resources/application.properties
+++ b/galaxy-job-admin/src/main/resources/application.properties
@@ -3,7 +3,7 @@ nacos.config.type=properties
#配置中心地址
nacos.config.server-addr=192.168.44.12:8848
#命名空间
-nacos.config.namespace=e9f176b1-0132-49ae-9310-3c504b0a3087
+nacos.config.namespace=dev
#数据集ID
nacos.config.data-id=galaxy-job-admin
#开启自动刷新
diff --git a/galaxy-job-core/pom.xml b/galaxy-job-core/pom.xml
index 922a5c1..03b8e92 100644
--- a/galaxy-job-core/pom.xml
+++ b/galaxy-job-core/pom.xml
@@ -70,6 +70,17 @@
<scope>provided</scope>
</dependency>
+ <!-- commons-io -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.5.2</version>
+ </dependency>
</dependencies>
<build>
diff --git a/galaxy-job-executor/pom.xml b/galaxy-job-executor/pom.xml
index 2c8d78b..0e425fe 100644
--- a/galaxy-job-executor/pom.xml
+++ b/galaxy-job-executor/pom.xml
@@ -107,7 +107,7 @@
<goal>build</goal>
</goals>
<!-- <phase>package</phase>-->
- <phase>install</phase>
+ <phase>package</phase>
<configuration>
<password>111111</password>
<excludes>
diff --git a/galaxy-job-executor/src/main/resources/application.properties b/galaxy-job-executor/src/main/resources/application.properties
index c041d98..c7ce746 100644
--- a/galaxy-job-executor/src/main/resources/application.properties
+++ b/galaxy-job-executor/src/main/resources/application.properties
@@ -3,7 +3,7 @@ nacos.config.type=properties
#配置中心地址
nacos.config.server-addr=192.168.44.12:8848
#命名空间
-nacos.config.namespace=e9f176b1-0132-49ae-9310-3c504b0a3087
+nacos.config.namespace=dev
#数据集ID
nacos.config.data-id=galaxy-job-executor
#开启自动刷新
diff --git a/pom.xml b/pom.xml
index 7b5c453..8856894 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
<goals>
<goal>strip-jar</goal>
</goals>
- <phase>install</phase>
+ <phase>package</phase>
</execution>
</executions>
</plugin>