From a17dcf143c90c8a34773f3be40e5d807eb558950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 16 Oct 2024 08:56:28 +0800
Subject: [PATCH] 'commit'
---
dsBase/pom.xml | 24 +--
dsBase/src/main/resources/package.xml | 67 +++++++
dsBuild/pom.xml | 167 ------------------
dsBuild/dsBuild.iml => dsUtils/dsUtils.iml | 0
dsUtils/pom.xml | 142 +++++++++++----
.../src/main/java/com/dsideal}/Publish.java | 5 +-
.../java/com/dsideal/Utils}/ProjectBean.java | 2 +-
.../java/com/dsideal/Utils}/PublishUtil.java | 2 +-
.../main/java/com/dsideal/Utils}/SSHUtil.java | 2 +-
.../src/main/resources/.kube/config | 0
.../src/main/resources/publishImage.json | 0
dsUtils/target/classes/.kube/config | 19 ++
dsUtils/target/classes/publishImage.json | 6 +
.../compile/default-compile/createdFiles.lst | 0
.../compile/default-compile/inputFiles.lst | 5 -
pom.xml | 5 +-
16 files changed, 214 insertions(+), 232 deletions(-)
create mode 100644 dsBase/src/main/resources/package.xml
delete mode 100644 dsBuild/pom.xml
rename dsBuild/dsBuild.iml => dsUtils/dsUtils.iml (100%)
rename {dsBuild/src/main/java => dsUtils/src/main/java/com/dsideal}/Publish.java (95%)
rename {dsBuild/src/main/java/Util => dsUtils/src/main/java/com/dsideal/Utils}/ProjectBean.java (92%)
rename {dsBuild/src/main/java/Util => dsUtils/src/main/java/com/dsideal/Utils}/PublishUtil.java (97%)
rename {dsBuild/src/main/java/Util => dsUtils/src/main/java/com/dsideal/Utils}/SSHUtil.java (96%)
rename {dsBuild => dsUtils}/src/main/resources/.kube/config (100%)
rename {dsBuild => dsUtils}/src/main/resources/publishImage.json (100%)
create mode 100644 dsUtils/target/classes/.kube/config
create mode 100644 dsUtils/target/classes/publishImage.json
delete mode 100644 dsUtils/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
delete mode 100644 dsUtils/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index 2513caa5..fbe2d67b 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -5,10 +5,6 @@
4.0.0
dsBase
1.0
-
- dsBase
- jar
-
com.dsideal
dsProject
@@ -240,15 +236,10 @@
- dsRes
+
+ dsBase
+
-
- src/main/java
-
- **/*.sql
- **/*.class
-
-
src/main/resources
@@ -267,19 +258,20 @@
-parameters
+
org.apache.maven.plugins
maven-assembly-plugin
- 2.5.5
+ 3.3.0
+
+ src/main/resources/package.xml
+
com.dsideal.base.BaseApplication
-
- jar-with-dependencies
-
diff --git a/dsBase/src/main/resources/package.xml b/dsBase/src/main/resources/package.xml
new file mode 100644
index 00000000..b759bd85
--- /dev/null
+++ b/dsBase/src/main/resources/package.xml
@@ -0,0 +1,67 @@
+
+
+
+ bin
+
+
+ zip
+
+
+
+
+
+
+ false
+
+ lib
+
+ false
+
+
+
+
+
+
+
+
+ ${project.basedir}/src/main/resources/${env}
+ /config
+
+
+
+
+ *.*
+
+
+
+
+
+ ${project.basedir}/src/main/resources/${env}
+
+
+ scf*.xml
+
+
+
+
+
+ ${project.build.directory}
+
+
+ *.jar
+
+
+
+
+
+ ${project.build.directory}/jar
+
+
+ lib/*.jar
+
+
+ *.jar
+
+
+
+
\ No newline at end of file
diff --git a/dsBuild/pom.xml b/dsBuild/pom.xml
deleted file mode 100644
index d6181c86..00000000
--- a/dsBuild/pom.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
- 4.0.0
- dsBuild
- 1.0
-
- com.dsideal
- dsProject
- 1.0
-
-
-
- UTF-8
- 21
- 21
-
-
-
-
-
- com.jfinal
- jfinal
- ${jfinal.version}
-
-
-
- com.jfinal
- jfinal-undertow
- ${jfinal-undertow.version}
-
-
-
- com.jfinal
- cos
- ${jfinal-cos.version}
-
-
-
- cn.smallbun.screw
- screw-core
- 1.0.5
-
-
-
- mysql
- mysql-connector-java
- ${mysql.version}
-
-
-
-
-
- cn.hutool
- hutool-all
- ${hutool.version}
-
-
-
- com.alibaba
- fastjson
- ${fastjson.version}
-
-
-
-
- org.jsoup
- jsoup
- 1.17.2
-
-
-
-
- com.google.code.gson
- gson
- 2.10.1
-
-
- commons-io
- commons-io
- 2.14.0
-
-
- org.apache.commons
- commons-email
- 1.5
-
-
- org.apache.commons
- commons-lang3
- 3.12.0
-
-
- org.dom4j
- dom4j
- 2.1.4
-
-
-
-
- org.apache.httpcomponents
- httpmime
- 4.5.14
-
-
-
- org.apache.logging.log4j
- log4j-core
- 2.20.0
-
-
-
- org.apache.logging.log4j
- log4j-api
- 2.20.0
-
-
-
-
- org.slf4j
- slf4j-simple
- 1.7.36
-
-
-
- com.fasterxml.jackson.core
- jackson-core
- 2.17.2
-
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.17.2
-
-
-
-
- com.github.mwiede
- jsch
- 0.2.19
-
-
- ch.qos.logback
- logback-classic
- 1.5.8
- runtime
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.6.1
-
- 21
- 21
- UTF-8
-
- -parameters
-
-
-
-
-
\ No newline at end of file
diff --git a/dsBuild/dsBuild.iml b/dsUtils/dsUtils.iml
similarity index 100%
rename from dsBuild/dsBuild.iml
rename to dsUtils/dsUtils.iml
diff --git a/dsUtils/pom.xml b/dsUtils/pom.xml
index fecf78c6..d9da69a7 100644
--- a/dsUtils/pom.xml
+++ b/dsUtils/pom.xml
@@ -1,9 +1,10 @@
-
+
+
4.0.0
dsUtils
1.0
- jar
com.dsideal
dsProject
@@ -35,12 +36,11 @@
cos
${jfinal-cos.version}
-
-
+
- com.zaxxer
- HikariCP
- ${HikariCP.version}
+ cn.smallbun.screw
+ screw-core
+ 1.0.5
@@ -49,49 +49,119 @@
${mysql.version}
-
+
+
- org.freemarker
- freemarker
- 2.3.33
+ cn.hutool
+ hutool-all
+ ${hutool.version}
+
+
+
+ com.alibaba
+ fastjson
+ ${fastjson.version}
-
+
- ch.qos.logback
- logback-classic
- 1.5.6
+ org.jsoup
+ jsoup
+ 1.17.2
+
+
- org.slf4j
- slf4j-nop
- 1.7.30
+ com.google.code.gson
+ gson
+ 2.10.1
+
+
+ commons-io
+ commons-io
+ 2.14.0
+
+
+ org.apache.commons
+ commons-email
+ 1.5
+
+
+ org.apache.commons
+ commons-lang3
+ 3.12.0
+
+
+ org.dom4j
+ dom4j
+ 2.1.4
-
-
+
- cn.hutool
- hutool-all
- ${hutool.version}
+ org.apache.httpcomponents
+ httpmime
+ 4.5.14
-
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.20.0
+
+
- org.projectlombok
- lombok
- 1.18.34
- provided
+ org.apache.logging.log4j
+ log4j-api
+ 2.20.0
+
+
+ org.slf4j
+ slf4j-simple
+ 1.7.36
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ 2.17.2
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.17.2
+
+
+
+
+ com.github.mwiede
+ jsch
+ 0.2.19
+
+
+ ch.qos.logback
+ logback-classic
+ 1.5.8
+ runtime
+
+
+
+ org.freemarker
+ freemarker
+ 2.3.33
+
+
+
+
+ com.zaxxer
+ HikariCP
+ ${HikariCP.version}
+
-
-
- src/main/resources
-
-
-
org.apache.maven.plugins
maven-compiler-plugin
@@ -106,4 +176,4 @@
-
+
\ No newline at end of file
diff --git a/dsBuild/src/main/java/Publish.java b/dsUtils/src/main/java/com/dsideal/Publish.java
similarity index 95%
rename from dsBuild/src/main/java/Publish.java
rename to dsUtils/src/main/java/com/dsideal/Publish.java
index 66c1bca6..3f997c00 100644
--- a/dsBuild/src/main/java/Publish.java
+++ b/dsUtils/src/main/java/com/dsideal/Publish.java
@@ -1,10 +1,13 @@
+package com.dsideal;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import Util.*;
import cn.hutool.core.io.FileUtil;
import com.jfinal.kit.Kv;
+import com.dsideal.Utils.ProjectBean;
+import com.dsideal.Utils.PublishUtil;
public class Publish {
diff --git a/dsBuild/src/main/java/Util/ProjectBean.java b/dsUtils/src/main/java/com/dsideal/Utils/ProjectBean.java
similarity index 92%
rename from dsBuild/src/main/java/Util/ProjectBean.java
rename to dsUtils/src/main/java/com/dsideal/Utils/ProjectBean.java
index e4d892a8..92840d34 100644
--- a/dsBuild/src/main/java/Util/ProjectBean.java
+++ b/dsUtils/src/main/java/com/dsideal/Utils/ProjectBean.java
@@ -1,4 +1,4 @@
-package Util;
+package com.dsideal.Utils;
public class ProjectBean {
private String devProjectName;
diff --git a/dsBuild/src/main/java/Util/PublishUtil.java b/dsUtils/src/main/java/com/dsideal/Utils/PublishUtil.java
similarity index 97%
rename from dsBuild/src/main/java/Util/PublishUtil.java
rename to dsUtils/src/main/java/com/dsideal/Utils/PublishUtil.java
index ddd07fc0..fc01439c 100644
--- a/dsBuild/src/main/java/Util/PublishUtil.java
+++ b/dsUtils/src/main/java/com/dsideal/Utils/PublishUtil.java
@@ -1,4 +1,4 @@
-package Util;
+package com.dsideal.Utils;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ZipUtil;
diff --git a/dsBuild/src/main/java/Util/SSHUtil.java b/dsUtils/src/main/java/com/dsideal/Utils/SSHUtil.java
similarity index 96%
rename from dsBuild/src/main/java/Util/SSHUtil.java
rename to dsUtils/src/main/java/com/dsideal/Utils/SSHUtil.java
index 93390a8e..09b18f6f 100644
--- a/dsBuild/src/main/java/Util/SSHUtil.java
+++ b/dsUtils/src/main/java/com/dsideal/Utils/SSHUtil.java
@@ -1,4 +1,4 @@
-package Util;
+package com.dsideal.Utils;
import com.jcraft.jsch.*;
import com.jfinal.kit.Kv;
diff --git a/dsBuild/src/main/resources/.kube/config b/dsUtils/src/main/resources/.kube/config
similarity index 100%
rename from dsBuild/src/main/resources/.kube/config
rename to dsUtils/src/main/resources/.kube/config
diff --git a/dsBuild/src/main/resources/publishImage.json b/dsUtils/src/main/resources/publishImage.json
similarity index 100%
rename from dsBuild/src/main/resources/publishImage.json
rename to dsUtils/src/main/resources/publishImage.json
diff --git a/dsUtils/target/classes/.kube/config b/dsUtils/target/classes/.kube/config
new file mode 100644
index 00000000..d9277637
--- /dev/null
+++ b/dsUtils/target/classes/.kube/config
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+ certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lJQ3pNUkpBbEJVSzB3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TkRBNU1URXdPREUyTlRSYUZ3MHpOREE1TURrd09ESXhOVFJhTUJVeApFekFSQmdOVkJBTVRDbXQxWW1WeWJtVjBaWE13Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLCkFvSUJBUUNobzZhakc4RVFiNktyUDhnd3BpOEoyMFFNRGxRNGYvYkJJSGVCVS9mN28yc3ZjcmRPUktvVGxDVnQKMHpvWmJuZHhrd0pNaURBZVJ4Z3R2NHBQTnFwNlV4M2tMZ1NqRE55Mnl4NThUOXdEc3M5YkJvNUlza01GZ2JNUQp3K3NGWEVCelN5R3B0aVA2L3FKbU5mYVlQcWhIRkRpdlJkRjFqTVJKK2JpNlNTakhPSmJ6aXhnd2VjSFMxdVY0CmZldkczNWROckZCZEI4WVNmczY0cGwvOXdiWC84S0s5M1ovWUF1K1RVNUF4T0FhY0c5U3FKWEZQajJoS01QT3gKcHYwc1ExTVIxSmduazF1MEx6T2RoWDdOOTkydThRRVZHQ1hwQmRjOWxVQSt4MmhPc2lUWjE1WW1GWmxQdStmYgo4UjhvYitNZ0NIdGNkUUtzOXFFSnB3L1h3aU1qQWdNQkFBR2pXVEJYTUE0R0ExVWREd0VCL3dRRUF3SUNwREFQCkJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJUZk9hNWlyRmJBSGdxaVZkMFFnRURia2s1QlpEQVYKQmdOVkhSRUVEakFNZ2dwcmRXSmxjbTVsZEdWek1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQWpzQ3pXUTFnKwprc0lvNTg5Y1ZncFVOSFlIaWhVRXlpcDhUbE1ySGR3eFBuU0dOaFNyS0haTGJkVWZnWWorR2x3QlRHcXVrL3JzCmR0dWZWUmxaNXA1ZlUzZSs2SW5CY0xmWFdEaGRRMFlvSUpzSU4rbUZCL01haDBjQkxlQzZqOWN1eXArcWllUXAKMml6ZDJzb1F6cjN2TmlQM3l1T0NOU0dGdFBvdXRHUis5YWJzVC9lYUMzVTJvcFo4Tm5KenVFb2ljQnV4ZWt2SApIZVZadHhCT3l5QkpWbzEyZzdmTVhuSm1PRlR6TmhCdVpzVFZ1cndTZTdPTmtLOUVsbHBXeCtWcGRhOXdPZ3NOCmFId010Qkc1YUJVTDU0T0Fac004eXpJaldtb0dPZzBySkl1Mjk0YTNXTjJhR2UrMHFWdVdpV2U4N2k1SWVNcHAKSE05amswUVBrbjFaCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+ server: https://10.10.14.200:6443
+ name: kubernetes
+contexts:
+- context:
+ cluster: kubernetes
+ user: kubernetes-admin
+ name: kubernetes-admin@kubernetes
+current-context: kubernetes-admin@kubernetes
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+ user:
+ client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLVENDQWhHZ0F3SUJBZ0lJWmVoaXMzR3dHVUF3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TkRBNU1URXdPREUyTlRSYUZ3MHlOVEE1TVRFd09ESXlNREJhTUR3eApIekFkQmdOVkJBb1RGbXQxWW1WaFpHMDZZMngxYzNSbGNpMWhaRzFwYm5NeEdUQVhCZ05WQkFNVEVHdDFZbVZ5CmJtVjBaWE10WVdSdGFXNHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEcDFvNzcKNzJaOWhERVdJQWVldm5YYXVWRG5aZkdlNGF2Ly90cDhudjlHTHBNd2hOT0JaaEpZNE55SkhhQTdYVTAvVTVBYwpSWG01VVNJb0NaRU9FQXpjNW9kOGNZNm5sOE9qMUhxa0dDZG1ZcllpMUVKRElDdnJ4d1phQ2RCRVYxNzJ1WFJYCitSY1hxaDdlcWRPRDJ4SHl0N2ZBZXFHQ3NSVjNnbFJ3ak5DMUovalFnRmtYUGs3NXdXZDRDcXh4VVEvcXdNeUUKVVRlVTg0SHFTZzRzVzRpU1gwbm83YnBlNTZNRG8rMnZYTmVDQzQwZGNJMVRWZDAyc21PbEx6VGhtd1M4U05PSAo3bUdlSkJWZ2hlaXRyR3kwSjlWT1NXdyszVHl1NEdQZm1YbmhPeU5DUVR6UVMzUDNQNmlyNzR4UGRUci9JT2JrCno3bGE3SjdIdjV6MGZUcnhBZ01CQUFHalZqQlVNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUsKQmdnckJnRUZCUWNEQWpBTUJnTlZIUk1CQWY4RUFqQUFNQjhHQTFVZEl3UVlNQmFBRk44NXJtS3NWc0FlQ3FKVgozUkNBUU51U1RrRmtNQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUI5dzRmd2RhS1R3L3YxODlhK01LbHM3c3NTCml5SnNDd0RDQUtHMnY4UmhNTXl6N2JkaTM0M1JOMFJHQnU5bGZKWk0zNWlpNXA1c29nK2NGcnlBb1FYVVI5cmEKS0NBS1VXNUg5eE90Qm95S3hYaXFkNTd6WWs5VVlUNDdEYkh4VllSaVgwNWZpaWM0NVNxT0pBNUdzUGNDdmlObwowYVo0MnFISTkrVnB5WXN5TGN1eGd3U1lkR1h5VjdiR1liclVDZmpwNk5USnVOTEh0NTl4VGtaNWNsZzdCTEFNCkVPV2E3WWVZWDE3VUdHbmh6YUN1WngvNzJZaXBWdkNLdjR5VXRTZVJpMm1HRnpZWXBoSmpXdm9wR1VoQUM5MWYKTlFUWEE1ZU9VTTZpOFo2OG5YRE9WUWFTb3BNbnZvZGM2UDlwSFR6YkVHdGdmdW82czI2dkoyRTZsUlVUCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+ client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBNmRhTysrOW1mWVF4RmlBSG5yNTEycmxRNTJYeG51R3IvLzdhZko3L1JpNlRNSVRUCmdXWVNXT0RjaVIyZ08xMU5QMU9RSEVWNXVWRWlLQW1SRGhBTTNPYUhmSEdPcDVmRG85UjZwQmduWm1LMkl0UkMKUXlBcjY4Y0dXZ25RUkZkZTlybDBWL2tYRjZvZTNxblRnOXNSOHJlM3dIcWhnckVWZDRKVWNJelF0U2Y0MElCWgpGejVPK2NGbmVBcXNjVkVQNnNETWhGRTNsUE9CNmtvT0xGdUlrbDlKNk8yNlh1ZWpBNlB0cjF6WGdndU5IWENOClUxWGROckpqcFM4MDRac0V2RWpUaCs1aG5pUVZZSVhvcmF4c3RDZlZUa2xzUHQwOHJ1QmozNWw1NFRzalFrRTgKMEV0ejl6K29xKytNVDNVNi95RG01TSs1V3V5ZXg3K2M5SDA2OFFJREFRQUJBb0lCQVFDcklpNlVyTmxLUk9PVAp1Szg2KzFMUFYwNmhleGRBMnhJQkVTZ2ZpbEZ5c0lWaVBlTjQwUlhlVy9xcWtyY0FtMEQ4ZHBDQ1VFcE1XTmR4Cmk4YlFEdWtMQmQva01FdGgxZzBGS216ekNRWlV4U3RkQkJEV2hZWC9VVElSMVJySjJWT1RwNWhCQmZoamhrcC8KVkxTS3pGb3ZVMHMwbjhyeUZkMkxFQ1B5RnV4cmxzWWk3dlAwSmIyMllFTTJqZXBaZ1dVU3FyR2xQWmo3YmZ2SApZbC9MSGZ3bmM5cU1VUzJHV2tDeUR5bWdCSVJ1SnA1S0FSTTNRaHd1UlhsekFiT1hSUFZyd3FXKzlEdHpzT0x3CkRITDNXYytYVG90QkJmZ2RkdG1leHNlRmp2TFF1QlQ5ZUI1RHg1dDRGQU9lRUM2T09Fa0R1RHM2dWpmYUNIK3IKa0s5RE56TTlBb0dCQU82dGkyS0xjaEkvYUZEQ3ZDcGJpUWl3RUg1QnhNeU5rTVFnbDAxbUg4Vi9VckFxUTZxawpRcTRkSkZzYnl5NC9tVjZNTGE3eDRGM1c2Z04rQ1lvZEh3WmlDOGQzM3o5RzRFYjVrZUFZTml2VUR3bHRGYU54Clp4M0hRQ0RYV05LRzV4U2NVRmxIOU1iQjAyM2h3d2Y2ZmNEa0N6c2pHanJlWHpYOVJzT2dHOGF6QW9HQkFQclAKR0N6QXJ0QUh1YUVhbUVBMm9SN1kzWDJwaEdxQ3p4eWR5VWdNb1Zab0w5S0hhdmZqb3h3UW5leElMcDlZSnpXegpSUHlKRm5qK2JmU1VWYUdxMWNGTWhyVGZUL1NOSTZadUxEbmhybzczaWNnbXNIZG5lVURidUt4Nkg5NSs3Q1RkCmRJY1dxWXpBMncxOWk1UXlyMlM4RU91K0Fmb0QzREp0dk1OM3pDbkxBb0dBZEdGQzJlWk0xUUQrQ0lNcjVTdUYKQWl0M24xaktjVU9HRjF3YzZxeWxTVlB3S2Q0eDZINzMxSlo1SjhQQnF1ZHdEVjRrMkcwd2poRkJRanF1eEIyMwpCeEcvMUo5cXlCdnpPQ2h4TE9naFlmV2c3Mk8xYldEYWV2YXhHbEpuQ1NDbWhMSkRxNFVlb2R2WkVIZEk5aGI2ClFwZnZzZ0pIdy9TeVVFMFR1RWZWdzJrQ2dZQVQwOTFvWkU4dG1QNiswcmhva3lrSHBFTldWTmxvQmpGVFpOSHQKeFRuWDkrS1g5U2FxdEM5SDM3UnNZb1IxQ21ZSEk4WDNaT3NHNDY1VG9JcG9mblhwa3lBdkdseGF5L0dlamFVbgpha1QvZm1oQkQzWHg2cGMyWG1ocUVqbUV3R253dkNVakxOSjRreUorSFllMFRwRjVHRGtLT2ZvMEJxd1l2SDRvCndjYTlJd0tCZ0RPLzVxcnFzZFZOdHljZFduQ1BhU1orR3QyMGIyMDI1QzFXZXBraVd4ZWs4eTEzNDRkWnRQaWYKOFhoTVZpNzBhYkt3QWNBeVdlWmdKNXM5bm41NlFFcHlCRFN1L2o0Tk5CczZieGNwbUZ4d3phaTFJdkd5NGRVRwpialorZ2NXMXVFQTZDQ3FrYnQ0Smh2RkVEVUZmUUlQMUZaZ1JNc2g4OFpnZ2FjV2YrRktMCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
diff --git a/dsUtils/target/classes/publishImage.json b/dsUtils/target/classes/publishImage.json
new file mode 100644
index 00000000..6e6528b2
--- /dev/null
+++ b/dsUtils/target/classes/publishImage.json
@@ -0,0 +1,6 @@
+{
+ "host": "10.10.14.212",
+ "user": "root",
+ "pwd": "dsideal",
+ "port": 22
+}
diff --git a/dsUtils/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dsUtils/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index e69de29b..00000000
diff --git a/dsUtils/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dsUtils/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index ce451ce4..00000000
--- a/dsUtils/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-D:\dsWork\dsProject\dsUtils\src\main\java\com\dsideal\GenerateCode\AutoCreatedEntityName.java
-D:\dsWork\dsProject\dsUtils\src\main\java\com\dsideal\GenerateCode\FileNameManager.java
-D:\dsWork\dsProject\dsUtils\src\main\java\com\dsideal\dsKit.java
-D:\dsWork\dsProject\dsUtils\src\main\java\com\dsideal\GenerateCode\AutoCreatedModelFile.java
-D:\dsWork\dsProject\dsUtils\src\main\java\com\dsideal\GenerateCode\DataBeasTypeToJavaType.java
diff --git a/pom.xml b/pom.xml
index a6cf91a8..1140014c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,10 +10,9 @@
dsGw
dsBase
- dsBuild
+ dsUtils
dsRes
dsPay
- dsUtils
@@ -59,10 +58,8 @@
23.4
19.3
22.7.1
-
5.2.5
-
2.3