diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml index c32888bf..e5dd7461 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml @@ -52,10 +52,10 @@ spring: config: server-addr: 10.0.2.15:8848 file-extension: yml - group: jeesite-cloud-42 + group: jeesite-cloud-43 ext-config: - data-id: application.yml - group: jeesite-cloud-42 + group: jeesite-cloud-43 ]]> \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml index 798af45c..c3b058f4 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml @@ -12,9 +12,9 @@ com.jeesite - jeesite-cloud-parent + jeesite-cloud-parent-web ${jeesiteVersion}-SNAPSHOT - ../../../parent/pom.xml + ../../../parent/web/pom.xml jeesite-cloud-module-${module.moduleCode} @@ -39,41 +39,18 @@ - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - org.springframework.cloud - spring-cloud-starter-zipkin - - - + com.jeesite - jeesite-module-swagger + jeesite-cloud-module-core-client + \${project.parent.version} + + + + + com.jeesite + jeesite-cloud-module-${module.moduleCode}-client \${project.parent.version} @@ -89,19 +66,6 @@ \${project.parent.version} --> - - - com.jeesite - jeesite-cloud-module-core-client - \${project.parent.version} - - - - com.jeesite - jeesite-cloud-module-${module.moduleCode}-client - \${project.parent.version} - - - - diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml index 5f65a2f3..948a4651 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml @@ -10,9 +10,10 @@ package com.jeesite.modules; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; /** @@ -20,7 +21,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @author ThinkGem * @version ${@DateUtils.getDate()} */ -@SpringCloudApplication +@SpringBootApplication +@EnableDiscoveryClient @EnableFeignClients(basePackages={"com.jeesite.modules"}) public class ${@StringUtils.cap(module.moduleCode)}Application extends SpringBootServletInitializer { diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml index 082a7312..0468fe39 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml @@ -68,10 +68,10 @@ spring: config: server-addr: 127.0.0.1:8848 file-extension: yml - group: jeesite-cloud-42 + group: jeesite-cloud-43 ext-config: - data-id: application.yml - group: jeesite-cloud-42 + group: jeesite-cloud-43 # 打印横幅 main: diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml index ed84c5fd..27f26cef 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml @@ -15,6 +15,8 @@ + +