diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml index 38c9687f..0a332e9c 100644 --- a/jeecg-module-system/jeecg-system-biz/pom.xml +++ b/jeecg-module-system/jeecg-system-biz/pom.xml @@ -34,25 +34,7 @@ org.jeecgframework.jimureport jimureport-spring-boot-starter - - - org.jeecgframework.boot - jeecg-module-demo - ${jeecgboot.version} - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - ${skip.springboot.maven} - - - - + diff --git a/jeecg-module-system/jeecg-system-start/README.md b/jeecg-module-system/jeecg-system-start/README.md new file mode 100644 index 00000000..11fdb818 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/README.md @@ -0,0 +1,12 @@ +# 注意:这个是单体启动项目 +项目: jeecg-module-system/jeecg-system-start +启动类:jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java + +端口:8080 +访问地址:http://localhost:8080/jeecg-boot +账号密码:admin/123456 + + +# 微服务启动项目在这里 +项目: jeecg-server-cloud/jeecg-system-cloud-start +启动类:jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-start/pom.xml b/jeecg-module-system/jeecg-system-start/pom.xml new file mode 100644 index 00000000..d7b08dd5 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/pom.xml @@ -0,0 +1,38 @@ + + + + jeecg-module-system + org.jeecgframework.boot + 3.4.0 + + 4.0.0 + + jeecg-system-start + + + + + org.jeecgframework.boot + jeecg-system-biz + ${jeecgboot.version} + + + + org.jeecgframework.boot + jeecg-module-demo + ${jeecgboot.version} + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/JeecgSystemApplication.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/JeecgSystemApplication.java rename to jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/JeecgOneGUI.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneGUI.java similarity index 90% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/JeecgOneGUI.java rename to jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneGUI.java index 2cb18011..b4aa18a0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/JeecgOneGUI.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneGUI.java @@ -1,4 +1,4 @@ -package org.jeecg; +package org.jeecg.codegenerate; import org.jeecgframework.codegenerate.window.CodeWindow; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/JeecgOneToMainUtil.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneToMainUtil.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/JeecgOneToMainUtil.java rename to jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneToMainUtil.java index 1e493a9f..39b74eef 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/JeecgOneToMainUtil.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneToMainUtil.java @@ -1,4 +1,4 @@ -package org.jeecg; +package org.jeecg.codegenerate; import java.util.ArrayList; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/resources/application-dev.yml rename to jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-dm8.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dm8.yml similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/resources/application-dm8.yml rename to jeecg-module-system/jeecg-system-start/src/main/resources/application-dm8.yml diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/resources/application-prod.yml rename to jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-test.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/resources/application-test.yml rename to jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/application.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/resources/application.yml rename to jeecg-module-system/jeecg-system-start/src/main/resources/application.yml diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/banner.txt b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/resources/banner.txt rename to jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/jeecg_config.properties b/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties similarity index 92% rename from jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/jeecg_config.properties rename to jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties index 57f44dcf..44618ab8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/jeecg_config.properties +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties @@ -1,5 +1,5 @@ #code_generate_project_path -project_path=E:\\eclipse2018-workspace\\jeecg-boot +project_path=E:\\workspace\\jeecg-boot #bussi_package[User defined] bussi_package=org.jeecg.modules.demo diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/jeecg_database.properties b/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/jeecg_database.properties rename to jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/logback-spring.xml b/jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/resources/logback-spring.xml rename to jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml diff --git a/jeecg-module-system/jeecg-system-biz/src/test/java/org/jeecg/SampleTest.java b/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/SampleTest.java similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/test/java/org/jeecg/SampleTest.java rename to jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/SampleTest.java diff --git a/jeecg-module-system/jeecg-system-biz/src/test/java/org/jeecg/TestMain.java b/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/TestMain.java similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/test/java/org/jeecg/TestMain.java rename to jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/TestMain.java diff --git a/jeecg-module-system/jeecg-system-biz/src/test/java/org/jeecg/modules/system/test/SysUserTest.java b/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/test/java/org/jeecg/modules/system/test/SysUserTest.java rename to jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java diff --git a/jeecg-module-system/pom.xml b/jeecg-module-system/pom.xml index 73f80129..c8692e8f 100644 --- a/jeecg-module-system/pom.xml +++ b/jeecg-module-system/pom.xml @@ -15,6 +15,7 @@ jeecg-system-api jeecg-system-biz + jeecg-system-start diff --git a/pom.xml b/pom.xml index aa5ee4b5..0b531d1a 100644 --- a/pom.xml +++ b/pom.xml @@ -425,10 +425,6 @@ SpringCloud - - - true - jeecg-server-cloud