diff --git a/dsBase/Dockerfile b/dsBase/Dockerfile index 1fc8b71c..5f1951fe 100644 --- a/dsBase/Dockerfile +++ b/dsBase/Dockerfile @@ -9,7 +9,9 @@ ENV TZ=Asia/Shanghai # 让容器内部正常显示中文 ENV LANG C.UTF-8 -COPY ./dsBase /root/dsBase +# 将target文件夹下的jar包gw-charge.jar复制到容器的/root目录下 +COPY ./lib /root/lib +COPY ./target /root/target #设置这个环境变量后，您可以在Docker容器中启动Java应用程序时使用这些参数。 ENV JAVA_OPTS="-Xms1024m -Xmx2048m" @@ -17,4 +19,4 @@ ENV JAVA_OPTS="-Xms1024m -Xmx2048m" # 标识为生产环境 ENV WORKING_ENV="pro" -ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/dsBase/lib/* -jar dsBase.jar" ] +ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.base.BaseApplication" ] diff --git a/dsPay/lib/bcmail-jdk14-138.jar b/dsPay/lib/bcmail-jdk14-138.jar new file mode 100644 index 00000000..ab606b5f Binary files /dev/null and b/dsPay/lib/bcmail-jdk14-138.jar differ diff --git a/dsPay/lib/bcprov-jdk14-138.jar b/dsPay/lib/bcprov-jdk14-138.jar new file mode 100644 index 00000000..d1befb7f Binary files /dev/null and b/dsPay/lib/bcprov-jdk14-138.jar differ diff --git a/dsPay/lib/core-renderer-R8pre2.jar b/dsPay/lib/core-renderer-R8pre2.jar new file mode 100644 index 00000000..6312bce3 Binary files /dev/null and b/dsPay/lib/core-renderer-R8pre2.jar differ diff --git a/dsPay/lib/cos-2022.2.jar b/dsPay/lib/cos-2022.2.jar new file mode 100644 index 00000000..b1523f46 Binary files /dev/null and b/dsPay/lib/cos-2022.2.jar differ diff --git a/dsPay/lib/echarts-java-1.0.7.jar b/dsPay/lib/echarts-java-1.0.7.jar new file mode 100644 index 00000000..d1cc477d Binary files /dev/null and b/dsPay/lib/echarts-java-1.0.7.jar differ diff --git a/dsPay/lib/gson-2.8.9.jar b/dsPay/lib/gson-2.8.9.jar new file mode 100644 index 00000000..3351867c Binary files /dev/null and b/dsPay/lib/gson-2.8.9.jar differ diff --git a/dsPay/lib/handlebars-4.2.1.jar b/dsPay/lib/handlebars-4.2.1.jar new file mode 100644 index 00000000..78aab118 Binary files /dev/null and b/dsPay/lib/handlebars-4.2.1.jar differ diff --git a/dsPay/lib/itext-2.0.8.jar b/dsPay/lib/itext-2.0.8.jar new file mode 100644 index 00000000..aaf6296a Binary files /dev/null and b/dsPay/lib/itext-2.0.8.jar differ diff --git a/dsPay/lib/javax.servlet-api-4.0.1.jar b/dsPay/lib/javax.servlet-api-4.0.1.jar new file mode 100644 index 00000000..844ec7f1 Binary files /dev/null and b/dsPay/lib/javax.servlet-api-4.0.1.jar differ diff --git a/dsPay/lib/jboss-logging-3.4.1.Final.jar b/dsPay/lib/jboss-logging-3.4.1.Final.jar new file mode 100644 index 00000000..42cd1e0a Binary files /dev/null and b/dsPay/lib/jboss-logging-3.4.1.Final.jar differ diff --git a/dsPay/lib/jboss-threads-3.1.0.Final.jar b/dsPay/lib/jboss-threads-3.1.0.Final.jar new file mode 100644 index 00000000..b23b4583 Binary files /dev/null and b/dsPay/lib/jboss-threads-3.1.0.Final.jar differ diff --git a/dsPay/lib/jfinal-5.2.3.jar b/dsPay/lib/jfinal-5.2.3.jar new file mode 100644 index 00000000..c71b0ee3 Binary files /dev/null and b/dsPay/lib/jfinal-5.2.3.jar differ diff --git a/dsPay/lib/jfinal-undertow-3.6.jar b/dsPay/lib/jfinal-undertow-3.6.jar new file mode 100644 index 00000000..4d0c4a7a Binary files /dev/null and b/dsPay/lib/jfinal-undertow-3.6.jar differ diff --git a/dsPay/lib/slf4j-api-1.7.30.jar b/dsPay/lib/slf4j-api-1.7.30.jar new file mode 100644 index 00000000..29ac26fb Binary files /dev/null and b/dsPay/lib/slf4j-api-1.7.30.jar differ diff --git a/dsPay/lib/slf4j-simple-1.7.25.jar b/dsPay/lib/slf4j-simple-1.7.25.jar new file mode 100644 index 00000000..a7260f3d Binary files /dev/null and b/dsPay/lib/slf4j-simple-1.7.25.jar differ diff --git a/dsPay/lib/undertow-core-2.2.33.Final.jar b/dsPay/lib/undertow-core-2.2.33.Final.jar new file mode 100644 index 00000000..800d3c3a Binary files /dev/null and b/dsPay/lib/undertow-core-2.2.33.Final.jar differ diff --git a/dsPay/lib/undertow-servlet-2.2.33.Final.jar b/dsPay/lib/undertow-servlet-2.2.33.Final.jar new file mode 100644 index 00000000..af1cb97d Binary files /dev/null and b/dsPay/lib/undertow-servlet-2.2.33.Final.jar differ diff --git a/dsPay/lib/wildfly-client-config-1.0.1.Final.jar b/dsPay/lib/wildfly-client-config-1.0.1.Final.jar new file mode 100644 index 00000000..370e8c7f Binary files /dev/null and b/dsPay/lib/wildfly-client-config-1.0.1.Final.jar differ diff --git a/dsPay/lib/wildfly-common-1.5.4.Final.jar b/dsPay/lib/wildfly-common-1.5.4.Final.jar new file mode 100644 index 00000000..a5b5892e Binary files /dev/null and b/dsPay/lib/wildfly-common-1.5.4.Final.jar differ diff --git a/dsPay/lib/xhtmlrenderer-1.0.0.jar b/dsPay/lib/xhtmlrenderer-1.0.0.jar new file mode 100644 index 00000000..99194df7 Binary files /dev/null and b/dsPay/lib/xhtmlrenderer-1.0.0.jar differ diff --git a/dsPay/lib/xnio-api-3.8.16.Final.jar b/dsPay/lib/xnio-api-3.8.16.Final.jar new file mode 100644 index 00000000..b3388111 Binary files /dev/null and b/dsPay/lib/xnio-api-3.8.16.Final.jar differ diff --git a/dsPay/lib/xnio-nio-3.8.16.Final.jar b/dsPay/lib/xnio-nio-3.8.16.Final.jar new file mode 100644 index 00000000..084d29a2 Binary files /dev/null and b/dsPay/lib/xnio-nio-3.8.16.Final.jar differ diff --git a/dsUtils/lib/HikariCP-5.1.0.jar b/dsUtils/lib/HikariCP-5.1.0.jar new file mode 100644 index 00000000..0aa1c9fb Binary files /dev/null and b/dsUtils/lib/HikariCP-5.1.0.jar differ diff --git a/dsUtils/lib/activation-1.1.jar b/dsUtils/lib/activation-1.1.jar new file mode 100644 index 00000000..53f82a1c Binary files /dev/null and b/dsUtils/lib/activation-1.1.jar differ diff --git a/dsUtils/lib/commons-codec-1.11.jar b/dsUtils/lib/commons-codec-1.11.jar new file mode 100644 index 00000000..22451206 Binary files /dev/null and b/dsUtils/lib/commons-codec-1.11.jar differ diff --git a/dsUtils/lib/commons-email-1.5.jar b/dsUtils/lib/commons-email-1.5.jar new file mode 100644 index 00000000..291bd194 Binary files /dev/null and b/dsUtils/lib/commons-email-1.5.jar differ diff --git a/dsUtils/lib/commons-io-2.14.0.jar b/dsUtils/lib/commons-io-2.14.0.jar new file mode 100644 index 00000000..4273f322 Binary files /dev/null and b/dsUtils/lib/commons-io-2.14.0.jar differ diff --git a/dsUtils/lib/commons-lang-2.6.jar b/dsUtils/lib/commons-lang-2.6.jar new file mode 100644 index 00000000..98467d3a Binary files /dev/null and b/dsUtils/lib/commons-lang-2.6.jar differ diff --git a/dsUtils/lib/commons-lang3-3.12.0.jar b/dsUtils/lib/commons-lang3-3.12.0.jar new file mode 100644 index 00000000..4d434a2a Binary files /dev/null and b/dsUtils/lib/commons-lang3-3.12.0.jar differ diff --git a/dsUtils/lib/commons-logging-1.2.jar b/dsUtils/lib/commons-logging-1.2.jar new file mode 100644 index 00000000..93a3b9f6 Binary files /dev/null and b/dsUtils/lib/commons-logging-1.2.jar differ diff --git a/dsUtils/lib/cos-2022.2.jar b/dsUtils/lib/cos-2022.2.jar new file mode 100644 index 00000000..b1523f46 Binary files /dev/null and b/dsUtils/lib/cos-2022.2.jar differ diff --git a/dsUtils/lib/dom4j-2.1.4.jar b/dsUtils/lib/dom4j-2.1.4.jar new file mode 100644 index 00000000..0769bed9 Binary files /dev/null and b/dsUtils/lib/dom4j-2.1.4.jar differ diff --git a/dsUtils/lib/fastjson-2.0.52.jar b/dsUtils/lib/fastjson-2.0.52.jar new file mode 100644 index 00000000..35a110fb Binary files /dev/null and b/dsUtils/lib/fastjson-2.0.52.jar differ diff --git a/dsUtils/lib/fastjson2-2.0.52.jar b/dsUtils/lib/fastjson2-2.0.52.jar new file mode 100644 index 00000000..40386575 Binary files /dev/null and b/dsUtils/lib/fastjson2-2.0.52.jar differ diff --git a/dsUtils/lib/fastjson2-extension-2.0.52.jar b/dsUtils/lib/fastjson2-extension-2.0.52.jar new file mode 100644 index 00000000..a44ea9a4 Binary files /dev/null and b/dsUtils/lib/fastjson2-extension-2.0.52.jar differ diff --git a/dsUtils/lib/freemarker-2.3.33.jar b/dsUtils/lib/freemarker-2.3.33.jar new file mode 100644 index 00000000..16069b15 Binary files /dev/null and b/dsUtils/lib/freemarker-2.3.33.jar differ diff --git a/dsUtils/lib/gson-2.10.1.jar b/dsUtils/lib/gson-2.10.1.jar new file mode 100644 index 00000000..a88c5bd9 Binary files /dev/null and b/dsUtils/lib/gson-2.10.1.jar differ diff --git a/dsUtils/lib/httpclient-4.5.14.jar b/dsUtils/lib/httpclient-4.5.14.jar new file mode 100644 index 00000000..2bb7c073 Binary files /dev/null and b/dsUtils/lib/httpclient-4.5.14.jar differ diff --git a/dsUtils/lib/httpcore-4.4.16.jar b/dsUtils/lib/httpcore-4.4.16.jar new file mode 100644 index 00000000..f0bdebeb Binary files /dev/null and b/dsUtils/lib/httpcore-4.4.16.jar differ diff --git a/dsUtils/lib/httpmime-4.5.14.jar b/dsUtils/lib/httpmime-4.5.14.jar new file mode 100644 index 00000000..331e95cf Binary files /dev/null and b/dsUtils/lib/httpmime-4.5.14.jar differ diff --git a/dsUtils/lib/hutool-all-5.8.29.jar b/dsUtils/lib/hutool-all-5.8.29.jar new file mode 100644 index 00000000..13e345b8 Binary files /dev/null and b/dsUtils/lib/hutool-all-5.8.29.jar differ diff --git a/dsUtils/lib/jackson-annotations-2.17.2.jar b/dsUtils/lib/jackson-annotations-2.17.2.jar new file mode 100644 index 00000000..c13bcb91 Binary files /dev/null and b/dsUtils/lib/jackson-annotations-2.17.2.jar differ diff --git a/dsUtils/lib/jackson-core-2.17.2.jar b/dsUtils/lib/jackson-core-2.17.2.jar new file mode 100644 index 00000000..34be9026 Binary files /dev/null and b/dsUtils/lib/jackson-core-2.17.2.jar differ diff --git a/dsUtils/lib/jackson-databind-2.17.2.jar b/dsUtils/lib/jackson-databind-2.17.2.jar new file mode 100644 index 00000000..3750b8c1 Binary files /dev/null and b/dsUtils/lib/jackson-databind-2.17.2.jar differ diff --git a/dsUtils/lib/javax.mail-1.5.6.jar b/dsUtils/lib/javax.mail-1.5.6.jar new file mode 100644 index 00000000..b10788ec Binary files /dev/null and b/dsUtils/lib/javax.mail-1.5.6.jar differ diff --git a/dsUtils/lib/javax.servlet-api-4.0.1.jar b/dsUtils/lib/javax.servlet-api-4.0.1.jar new file mode 100644 index 00000000..844ec7f1 Binary files /dev/null and b/dsUtils/lib/javax.servlet-api-4.0.1.jar differ diff --git a/dsUtils/lib/jboss-logging-3.4.1.Final.jar b/dsUtils/lib/jboss-logging-3.4.1.Final.jar new file mode 100644 index 00000000..42cd1e0a Binary files /dev/null and b/dsUtils/lib/jboss-logging-3.4.1.Final.jar differ diff --git a/dsUtils/lib/jboss-threads-3.1.0.Final.jar b/dsUtils/lib/jboss-threads-3.1.0.Final.jar new file mode 100644 index 00000000..b23b4583 Binary files /dev/null and b/dsUtils/lib/jboss-threads-3.1.0.Final.jar differ diff --git a/dsUtils/lib/jfinal-5.2.3.jar b/dsUtils/lib/jfinal-5.2.3.jar new file mode 100644 index 00000000..c71b0ee3 Binary files /dev/null and b/dsUtils/lib/jfinal-5.2.3.jar differ diff --git a/dsUtils/lib/jfinal-undertow-3.6.jar b/dsUtils/lib/jfinal-undertow-3.6.jar new file mode 100644 index 00000000..4d0c4a7a Binary files /dev/null and b/dsUtils/lib/jfinal-undertow-3.6.jar differ diff --git a/dsUtils/lib/jsch-0.2.19.jar b/dsUtils/lib/jsch-0.2.19.jar new file mode 100644 index 00000000..9a4e581f Binary files /dev/null and b/dsUtils/lib/jsch-0.2.19.jar differ diff --git a/dsUtils/lib/jsoup-1.17.2.jar b/dsUtils/lib/jsoup-1.17.2.jar new file mode 100644 index 00000000..52ae16d8 Binary files /dev/null and b/dsUtils/lib/jsoup-1.17.2.jar differ diff --git a/dsUtils/lib/log4j-api-2.20.0.jar b/dsUtils/lib/log4j-api-2.20.0.jar new file mode 100644 index 00000000..29d1b52a Binary files /dev/null and b/dsUtils/lib/log4j-api-2.20.0.jar differ diff --git a/dsUtils/lib/log4j-core-2.20.0.jar b/dsUtils/lib/log4j-core-2.20.0.jar new file mode 100644 index 00000000..54dafcd0 Binary files /dev/null and b/dsUtils/lib/log4j-core-2.20.0.jar differ diff --git a/dsUtils/lib/logback-classic-1.5.8.jar b/dsUtils/lib/logback-classic-1.5.8.jar new file mode 100644 index 00000000..0789d3e0 Binary files /dev/null and b/dsUtils/lib/logback-classic-1.5.8.jar differ diff --git a/dsUtils/lib/logback-core-1.5.8.jar b/dsUtils/lib/logback-core-1.5.8.jar new file mode 100644 index 00000000..4cc2ebf7 Binary files /dev/null and b/dsUtils/lib/logback-core-1.5.8.jar differ diff --git a/dsUtils/lib/mysql-connector-java-8.0.28.jar b/dsUtils/lib/mysql-connector-java-8.0.28.jar new file mode 100644 index 00000000..ac8904ee Binary files /dev/null and b/dsUtils/lib/mysql-connector-java-8.0.28.jar differ diff --git a/dsUtils/lib/protobuf-java-3.11.4.jar b/dsUtils/lib/protobuf-java-3.11.4.jar new file mode 100644 index 00000000..7224d23d Binary files /dev/null and b/dsUtils/lib/protobuf-java-3.11.4.jar differ diff --git a/dsUtils/lib/screw-core-1.0.5.jar b/dsUtils/lib/screw-core-1.0.5.jar new file mode 100644 index 00000000..c81e6c03 Binary files /dev/null and b/dsUtils/lib/screw-core-1.0.5.jar differ diff --git a/dsUtils/lib/slf4j-api-1.7.30.jar b/dsUtils/lib/slf4j-api-1.7.30.jar new file mode 100644 index 00000000..29ac26fb Binary files /dev/null and b/dsUtils/lib/slf4j-api-1.7.30.jar differ diff --git a/dsUtils/lib/slf4j-simple-1.7.36.jar b/dsUtils/lib/slf4j-simple-1.7.36.jar new file mode 100644 index 00000000..ef831a8a Binary files /dev/null and b/dsUtils/lib/slf4j-simple-1.7.36.jar differ diff --git a/dsUtils/lib/undertow-core-2.2.33.Final.jar b/dsUtils/lib/undertow-core-2.2.33.Final.jar new file mode 100644 index 00000000..800d3c3a Binary files /dev/null and b/dsUtils/lib/undertow-core-2.2.33.Final.jar differ diff --git a/dsUtils/lib/undertow-servlet-2.2.33.Final.jar b/dsUtils/lib/undertow-servlet-2.2.33.Final.jar new file mode 100644 index 00000000..af1cb97d Binary files /dev/null and b/dsUtils/lib/undertow-servlet-2.2.33.Final.jar differ diff --git a/dsUtils/lib/wildfly-client-config-1.0.1.Final.jar b/dsUtils/lib/wildfly-client-config-1.0.1.Final.jar new file mode 100644 index 00000000..370e8c7f Binary files /dev/null and b/dsUtils/lib/wildfly-client-config-1.0.1.Final.jar differ diff --git a/dsUtils/lib/wildfly-common-1.5.4.Final.jar b/dsUtils/lib/wildfly-common-1.5.4.Final.jar new file mode 100644 index 00000000..a5b5892e Binary files /dev/null and b/dsUtils/lib/wildfly-common-1.5.4.Final.jar differ diff --git a/dsUtils/lib/xnio-api-3.8.16.Final.jar b/dsUtils/lib/xnio-api-3.8.16.Final.jar new file mode 100644 index 00000000..b3388111 Binary files /dev/null and b/dsUtils/lib/xnio-api-3.8.16.Final.jar differ diff --git a/dsUtils/lib/xnio-nio-3.8.16.Final.jar b/dsUtils/lib/xnio-nio-3.8.16.Final.jar new file mode 100644 index 00000000..084d29a2 Binary files /dev/null and b/dsUtils/lib/xnio-nio-3.8.16.Final.jar differ diff --git a/dsUtils/src/main/java/com/dsideal/Publish.java b/dsUtils/src/main/java/com/dsideal/Publish.java index 3f997c00..d09d28af 100644 --- a/dsUtils/src/main/java/com/dsideal/Publish.java +++ b/dsUtils/src/main/java/com/dsideal/Publish.java @@ -65,10 +65,10 @@ public class Publish { System.out.println("测试运行一下容器吧"); if (ret.getStr("project_port") != null) { String port = ret.getStr("project_port"); - System.out.println("docker run --name " + ret.getStr("projectName").split(":")[0] + " -p " + port + ":" + port + " -d " + ret.getStr("projectName")); + System.out.println("docker run -it -p " + port + ":" + port + " " + ret.getStr("projectName")); //System.out.println("docker exec -it 替换我为容器ID /bin/bash"); }else{ - System.out.println("docker run --name " + ret.getStr("projectName").split(":")[0] + " -p 80:80 -d " + ret.getStr("projectName")); + System.out.println("docker run -it -p 80:80 " + ret.getStr("projectName")); } } } diff --git a/dsUtils/src/main/java/com/dsideal/Utils/PublishUtil.java b/dsUtils/src/main/java/com/dsideal/Utils/PublishUtil.java index fc01439c..8f91a9ff 100644 --- a/dsUtils/src/main/java/com/dsideal/Utils/PublishUtil.java +++ b/dsUtils/src/main/java/com/dsideal/Utils/PublishUtil.java @@ -386,7 +386,7 @@ public class PublishUtil { if (projectBean.getId() == choiceProject) { System.out.println("您选择的项目是：" + projectBean.getDevProjectName()); String basedir = new File(System.getProperty("user.dir")).getCanonicalPath() + "\\"; - String directoryPath = basedir + projectBean.getDevProjectName() + "\\src\\main\\resource\\"; + String directoryPath = basedir + projectBean.getDevProjectName() + "\\src\\main\\resources\\"; // 创建一个 File 对象，代表目录 File directory = new File(directoryPath); // 获取目录下的所有文件和子目录