更新结构

f1fb580a · fengshuonan · 8da3370e · f1fb580a · f1fb580a · f1fb580a
Commit f1fb580a authored May 11, 2019 by fengshuonan
45 changed files
--- a/guns-vip-master/README.md
+++ b/guns-vip-master/README.md
--- a/guns-vip-master/pom.xml
+++ b/guns-vip-master/pom.xml
@@ -11,7 +11,7 @@
        <relativePath>../pom.xml</relativePath>
    </parent>
-    <artifactId>guns-vip-master</artifactId>
+    <artifactId>guns-vip-main</artifactId>
    <packaging>jar</packaging>

--- a/guns-vip-master/src/main/docker/docker-assembly.xml
+++ b/guns-vip-master/src/main/docker/docker-assembly.xml
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/GunsApplication.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/GunsApplication.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/GunsServletInitializer.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/GunsServletInitializer.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/config/SchedulingConfig.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/config/SchedulingConfig.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/config/SpringSessionConfig.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/config/SpringSessionConfig.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/config/package-info.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/config/package-info.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/core/package-info.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/core/package-info.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/core/schedue/quartz/SampleQuartzJob.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/core/schedue/quartz/SampleQuartzJob.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/core/schedue/quartz/StartQuartzExample.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/core/schedue/quartz/StartQuartzExample.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/core/schedue/spring/SpringTasks.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/core/schedue/spring/SpringTasks.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/controller/ExcelController.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/controller/ExcelController.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/controller/PdfPreviewController.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/controller/PdfPreviewController.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/controller/TestMultiController.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/controller/TestMultiController.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/entity/ExcelItem.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/entity/ExcelItem.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/service/GunsDbService.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/service/GunsDbService.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/service/OtherDbService.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/service/OtherDbService.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/service/TestMultiDbService.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/service/TestMultiDbService.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/form/controller/EgFormController.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/form/controller/EgFormController.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/form/entity/EgForm.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/form/entity/EgForm.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/form/model/EgFormParam.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/form/model/EgFormParam.java
--- a/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/form/model/EgFormResult.java
+++ b/guns-vip-master/src/main/java/cn/stylefeng/guns/modular/form/model/EgFormResult.java
--- a/guns-vip-master/src/main/resources/META-INF/spring-devtools.properties
+++ b/guns-vip-master/src/main/resources/META-INF/spring-devtools.properties
--- a/guns-vip-master/src/main/resources/application-dev.yml
+++ b/guns-vip-master/src/main/resources/application-dev.yml
--- a/guns-vip-master/src/main/resources/application-local.yml
+++ b/guns-vip-master/src/main/resources/application-local.yml
--- a/guns-vip-master/src/main/resources/application.yml
+++ b/guns-vip-master/src/main/resources/application.yml
--- a/guns-vip-master/src/main/resources/ehcache.xml
+++ b/guns-vip-master/src/main/resources/ehcache.xml
--- a/guns-vip-master/src/main/resources/logback-spring.xml
+++ b/guns-vip-master/src/main/resources/logback-spring.xml
--- a/guns-vip-master/src/main/webapp/assets/demos/excel_import.js
+++ b/guns-vip-master/src/main/webapp/assets/demos/excel_import.js
--- a/guns-vip-master/src/main/webapp/assets/form/egForm.js
+++ b/guns-vip-master/src/main/webapp/assets/form/egForm.js
--- a/guns-vip-master/src/main/webapp/assets/form/egForm_add.js
+++ b/guns-vip-master/src/main/webapp/assets/form/egForm_add.js
--- a/guns-vip-master/src/main/webapp/assets/form/form.css
+++ b/guns-vip-master/src/main/webapp/assets/form/form.css
--- a/guns-vip-master/src/main/webapp/pages/demos/excel_import.html
+++ b/guns-vip-master/src/main/webapp/pages/demos/excel_import.html
--- a/guns-vip-master/src/main/webapp/pages/demos/pdf/pdf.html
+++ b/guns-vip-master/src/main/webapp/pages/demos/pdf/pdf.html
--- a/guns-vip-master/src/main/webapp/pages/form/egForm.html
+++ b/guns-vip-master/src/main/webapp/pages/form/egForm.html
--- a/guns-vip-master/src/main/webapp/pages/form/egForm_add.html
+++ b/guns-vip-master/src/main/webapp/pages/form/egForm_add.html
--- a/guns-vip-master/test/java/cn/stylefeng/guns/base/BaseJunit.java
+++ b/guns-vip-master/test/java/cn/stylefeng/guns/base/BaseJunit.java
--- a/guns-vip-master/test/java/cn/stylefeng/guns/shiro/Base64Test.java
+++ b/guns-vip-master/test/java/cn/stylefeng/guns/shiro/Base64Test.java
--- a/guns-vip-master/test/java/cn/stylefeng/guns/system/BlackBoardTest.java
+++ b/guns-vip-master/test/java/cn/stylefeng/guns/system/BlackBoardTest.java
--- a/guns-vip-master/test/java/cn/stylefeng/guns/system/DeptTest.java
+++ b/guns-vip-master/test/java/cn/stylefeng/guns/system/DeptTest.java
--- a/guns-vip-master/test/java/cn/stylefeng/guns/system/MenuTest.java
+++ b/guns-vip-master/test/java/cn/stylefeng/guns/system/MenuTest.java
--- a/guns-vip-master/test/java/cn/stylefeng/guns/system/UserTest.java
+++ b/guns-vip-master/test/java/cn/stylefeng/guns/system/UserTest.java
--- a/guns-vip-master/test/sql/test.sql
+++ b/guns-vip-master/test/sql/test.sql
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
    <modules>
        <module>guns-vip-base</module>
-        <module>guns-vip-master</module>
+        <module>guns-vip-main</module>
    </modules>
    <properties>