diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 5349c60..6619d81 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -102,33 +102,7 @@ ehcache-core - - org.apache.poi - poi - 3.17 - - - - org.apache.poi - poi-scratchpad - 3.17 - - - org.apache.poi - poi-ooxml - 3.17 - - - org.apache.poi - poi-excelant - 3.17 - - - org.apache.poi - poi-ooxml-schemas - 3.17 - org.apache.poi @@ -142,23 +116,9 @@ true - - org.hswebframework - hsweb-utils - 3.0.2 - - - org.hswebframework - hsweb-expands-script - 3.0.2 - - - org.hswebframework - hsweb-expands-office - 3.0.2 - + org.springframework spring-context diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 5349c60..6619d81 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -102,33 +102,7 @@ ehcache-core - - org.apache.poi - poi - 3.17 - - - - org.apache.poi - poi-scratchpad - 3.17 - - - org.apache.poi - poi-ooxml - 3.17 - - - org.apache.poi - poi-excelant - 3.17 - - - org.apache.poi - poi-ooxml-schemas - 3.17 - org.apache.poi @@ -142,23 +116,9 @@ true - - org.hswebframework - hsweb-utils - 3.0.2 - - - org.hswebframework - hsweb-expands-script - 3.0.2 - - - org.hswebframework - hsweb-expands-office - 3.0.2 - + org.springframework spring-context diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 166b2a6..a921fe7 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -241,17 +241,18 @@ org.apache.commons commons-lang3 - - com.oracle - ojdbc6 - ${oracle.version} - + org.codehaus.groovy groovy-all true - + + org.springframework.boot + spring-boot-starter-tomcat + + @@ -266,18 +267,16 @@ - /config/** + /config/*-*.yml **/MockController.class - - - - org.springframework.boot - spring-boot-maven-plugin - - - true - true + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -349,5 +348,4 @@ - - + \ No newline at end of file diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 5349c60..6619d81 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -102,33 +102,7 @@ ehcache-core - - org.apache.poi - poi - 3.17 - - - - org.apache.poi - poi-scratchpad - 3.17 - - - org.apache.poi - poi-ooxml - 3.17 - - - org.apache.poi - poi-excelant - 3.17 - - - org.apache.poi - poi-ooxml-schemas - 3.17 - org.apache.poi @@ -142,23 +116,9 @@ true - - org.hswebframework - hsweb-utils - 3.0.2 - - - org.hswebframework - hsweb-expands-script - 3.0.2 - - - org.hswebframework - hsweb-expands-office - 3.0.2 - + org.springframework spring-context diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 166b2a6..a921fe7 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -241,17 +241,18 @@ org.apache.commons commons-lang3 - - com.oracle - ojdbc6 - ${oracle.version} - + org.codehaus.groovy groovy-all true - + + org.springframework.boot + spring-boot-starter-tomcat + + @@ -266,18 +267,16 @@ - /config/** + /config/*-*.yml **/MockController.class - - - - org.springframework.boot - spring-boot-maven-plugin - - - true - true + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -349,5 +348,4 @@ - - + \ No newline at end of file diff --git "a/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" "b/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" deleted file mode 100644 index 7d4813e..0000000 --- "a/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar guns-web-1.0.0-SNAPSHOT.jar -@pause diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 5349c60..6619d81 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -102,33 +102,7 @@ ehcache-core - - org.apache.poi - poi - 3.17 - - - - org.apache.poi - poi-scratchpad - 3.17 - - - org.apache.poi - poi-ooxml - 3.17 - - - org.apache.poi - poi-excelant - 3.17 - - - org.apache.poi - poi-ooxml-schemas - 3.17 - org.apache.poi @@ -142,23 +116,9 @@ true - - org.hswebframework - hsweb-utils - 3.0.2 - - - org.hswebframework - hsweb-expands-script - 3.0.2 - - - org.hswebframework - hsweb-expands-office - 3.0.2 - + org.springframework spring-context diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 166b2a6..a921fe7 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -241,17 +241,18 @@ org.apache.commons commons-lang3 - - com.oracle - ojdbc6 - ${oracle.version} - + org.codehaus.groovy groovy-all true - + + org.springframework.boot + spring-boot-starter-tomcat + + @@ -266,18 +267,16 @@ - /config/** + /config/*-*.yml **/MockController.class - - - - org.springframework.boot - spring-boot-maven-plugin - - - true - true + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -349,5 +348,4 @@ - - + \ No newline at end of file diff --git "a/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" "b/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" deleted file mode 100644 index 7d4813e..0000000 --- "a/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar guns-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-alarm/pom.xml b/casic-alarm/pom.xml index 5349c60..6619d81 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -102,33 +102,7 @@ ehcache-core - - org.apache.poi - poi - 3.17 - - - - org.apache.poi - poi-scratchpad - 3.17 - - - org.apache.poi - poi-ooxml - 3.17 - - - org.apache.poi - poi-excelant - 3.17 - - - org.apache.poi - poi-ooxml-schemas - 3.17 - org.apache.poi @@ -142,23 +116,9 @@ true - - org.hswebframework - hsweb-utils - 3.0.2 - - - org.hswebframework - hsweb-expands-script - 3.0.2 - - - org.hswebframework - hsweb-expands-office - 3.0.2 - + org.springframework spring-context diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 166b2a6..a921fe7 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -241,17 +241,18 @@ org.apache.commons commons-lang3 - - com.oracle - ojdbc6 - ${oracle.version} - + org.codehaus.groovy groovy-all true - + + org.springframework.boot + spring-boot-starter-tomcat + + @@ -266,18 +267,16 @@ - /config/** + /config/*-*.yml **/MockController.class - - - - org.springframework.boot - spring-boot-maven-plugin - - - true - true + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -349,5 +348,4 @@ - - + \ No newline at end of file diff --git "a/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" "b/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" deleted file mode 100644 index 7d4813e..0000000 --- "a/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar guns-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-alarm/pom.xml b/casic-alarm/pom.xml index 5349c60..6619d81 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -102,33 +102,7 @@ ehcache-core - - org.apache.poi - poi - 3.17 - - - - org.apache.poi - poi-scratchpad - 3.17 - - - org.apache.poi - poi-ooxml - 3.17 - - - org.apache.poi - poi-excelant - 3.17 - - - org.apache.poi - poi-ooxml-schemas - 3.17 - org.apache.poi @@ -142,23 +116,9 @@ true - - org.hswebframework - hsweb-utils - 3.0.2 - - - org.hswebframework - hsweb-expands-script - 3.0.2 - - - org.hswebframework - hsweb-expands-office - 3.0.2 - + org.springframework spring-context diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 166b2a6..a921fe7 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -241,17 +241,18 @@ org.apache.commons commons-lang3 - - com.oracle - ojdbc6 - ${oracle.version} - + org.codehaus.groovy groovy-all true - + + org.springframework.boot + spring-boot-starter-tomcat + + @@ -266,18 +267,16 @@ - /config/** + /config/*-*.yml **/MockController.class - - - - org.springframework.boot - spring-boot-maven-plugin - - - true - true + + + com.casic.missiles.CasicApplication + true + ./ + + @@ -349,5 +348,4 @@ - - + \ No newline at end of file diff --git "a/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" "b/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" deleted file mode 100644 index 7d4813e..0000000 --- "a/casic-web/src/main/bin/\346\231\272\346\205\247\351\227\270\344\272\225.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar guns-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 68b7576..a2bff56 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -3,24 +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 - ${project.build.directory} + src/main/resources/i18n / - - *.jar - - \ No newline at end of file