diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 981de07..6f5b47b 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 @@ -86,7 +86,6 @@ spring-boot-starter-tomcat - provided javax.servlet @@ -109,9 +108,15 @@ /config/*-*.yml - /config/*/* **/MockController.class + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -122,15 +127,7 @@ **/MockController.class - - org.springframework.boot - spring-boot-maven-plugin - - - true - true - - + maven-assembly-plugin diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 981de07..6f5b47b 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 @@ -86,7 +86,6 @@ spring-boot-starter-tomcat - provided javax.servlet @@ -109,9 +108,15 @@ /config/*-*.yml - /config/*/* **/MockController.class + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -122,15 +127,7 @@ **/MockController.class - - org.springframework.boot - spring-boot-maven-plugin - - - true - true - - + maven-assembly-plugin diff --git "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" "b/casic-web/src/main/bin/\345\220\257\345\212\250.bat" deleted file mode 100644 index 91b2856..0000000 --- "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar casic-web-1.0.0-SNAPSHOT.jar -@pause diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 981de07..6f5b47b 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 @@ -86,7 +86,6 @@ spring-boot-starter-tomcat - provided javax.servlet @@ -109,9 +108,15 @@ /config/*-*.yml - /config/*/* **/MockController.class + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -122,15 +127,7 @@ **/MockController.class - - org.springframework.boot - spring-boot-maven-plugin - - - true - true - - + maven-assembly-plugin diff --git "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" "b/casic-web/src/main/bin/\345\220\257\345\212\250.bat" deleted file mode 100644 index 91b2856..0000000 --- "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar casic-web-1.0.0-SNAPSHOT.jar -@pause diff --git a/casic-web/src/main/build/bin/start.bat b/casic-web/src/main/build/bin/start.bat new file mode 100644 index 0000000..1db4e88 --- /dev/null +++ b/casic-web/src/main/build/bin/start.bat @@ -0,0 +1,4 @@ +@echo off +title ${project.build.finalName} +java -jar ./lib/${project.build.finalName}.jar +@pause diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 981de07..6f5b47b 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 @@ -86,7 +86,6 @@ spring-boot-starter-tomcat - provided javax.servlet @@ -109,9 +108,15 @@ /config/*-*.yml - /config/*/* **/MockController.class + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -122,15 +127,7 @@ **/MockController.class - - org.springframework.boot - spring-boot-maven-plugin - - - true - true - - + maven-assembly-plugin diff --git "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" "b/casic-web/src/main/bin/\345\220\257\345\212\250.bat" deleted file mode 100644 index 91b2856..0000000 --- "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar casic-web-1.0.0-SNAPSHOT.jar -@pause diff --git a/casic-web/src/main/build/bin/start.bat b/casic-web/src/main/build/bin/start.bat new file mode 100644 index 0000000..1db4e88 --- /dev/null +++ b/casic-web/src/main/build/bin/start.bat @@ -0,0 +1,4 @@ +@echo off +title ${project.build.finalName} +java -jar ./lib/${project.build.finalName}.jar +@pause diff --git a/casic-web/src/main/build/bin/start.sh b/casic-web/src/main/build/bin/start.sh new file mode 100644 index 0000000..c00b1ef --- /dev/null +++ b/casic-web/src/main/build/bin/start.sh @@ -0,0 +1,2 @@ +java -jar ./lib/${project.build.finalName}.jar + diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 981de07..6f5b47b 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 @@ -86,7 +86,6 @@ spring-boot-starter-tomcat - provided javax.servlet @@ -109,9 +108,15 @@ /config/*-*.yml - /config/*/* **/MockController.class + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -122,15 +127,7 @@ **/MockController.class - - org.springframework.boot - spring-boot-maven-plugin - - - true - true - - + maven-assembly-plugin diff --git "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" "b/casic-web/src/main/bin/\345\220\257\345\212\250.bat" deleted file mode 100644 index 91b2856..0000000 --- "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar casic-web-1.0.0-SNAPSHOT.jar -@pause diff --git a/casic-web/src/main/build/bin/start.bat b/casic-web/src/main/build/bin/start.bat new file mode 100644 index 0000000..1db4e88 --- /dev/null +++ b/casic-web/src/main/build/bin/start.bat @@ -0,0 +1,4 @@ +@echo off +title ${project.build.finalName} +java -jar ./lib/${project.build.finalName}.jar +@pause diff --git a/casic-web/src/main/build/bin/start.sh b/casic-web/src/main/build/bin/start.sh new file mode 100644 index 0000000..c00b1ef --- /dev/null +++ b/casic-web/src/main/build/bin/start.sh @@ -0,0 +1,2 @@ +java -jar ./lib/${project.build.finalName}.jar + diff --git a/casic-web/src/main/build/package.xml b/casic-web/src/main/build/package.xml index 04ebf8b..a2bff56 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -3,28 +3,40 @@ package zip + tar.gz true + + + true + true + lib + runtime + + - src/main/bin + src/main/build/bin + + start.bat + start.sh + + true + 0744 / src/main/resources/config - / + true + + *.yml + /*/* + + /config src/main/resources/i18n / - - ${project.build.directory} - / - - *.jar - - - \ No newline at end of file diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 981de07..6f5b47b 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 @@ -86,7 +86,6 @@ spring-boot-starter-tomcat - provided javax.servlet @@ -109,9 +108,15 @@ /config/*-*.yml - /config/*/* **/MockController.class + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -122,15 +127,7 @@ **/MockController.class - - org.springframework.boot - spring-boot-maven-plugin - - - true - true - - + maven-assembly-plugin diff --git "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" "b/casic-web/src/main/bin/\345\220\257\345\212\250.bat" deleted file mode 100644 index 91b2856..0000000 --- "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar casic-web-1.0.0-SNAPSHOT.jar -@pause diff --git a/casic-web/src/main/build/bin/start.bat b/casic-web/src/main/build/bin/start.bat new file mode 100644 index 0000000..1db4e88 --- /dev/null +++ b/casic-web/src/main/build/bin/start.bat @@ -0,0 +1,4 @@ +@echo off +title ${project.build.finalName} +java -jar ./lib/${project.build.finalName}.jar +@pause diff --git a/casic-web/src/main/build/bin/start.sh b/casic-web/src/main/build/bin/start.sh new file mode 100644 index 0000000..c00b1ef --- /dev/null +++ b/casic-web/src/main/build/bin/start.sh @@ -0,0 +1,2 @@ +java -jar ./lib/${project.build.finalName}.jar + diff --git a/casic-web/src/main/build/package.xml b/casic-web/src/main/build/package.xml index 04ebf8b..a2bff56 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -3,28 +3,40 @@ package zip + tar.gz true + + + true + true + lib + runtime + + - src/main/bin + src/main/build/bin + + start.bat + start.sh + + true + 0744 / src/main/resources/config - / + true + + *.yml + /*/* + + /config src/main/resources/i18n / - - ${project.build.directory} - / - - *.jar - - - \ No newline at end of file diff --git a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx deleted file mode 100644 index 62df0d4..0000000 --- a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx +++ /dev/null Binary files differ