yangzian 3 anos atrás
pai
commit
a360b38ad6

+ 0 - 33
jeecg-boot-starter/jeecg-boot-starter-cloud/src/main/resources/bootstrap.yml

@@ -1,33 +0,0 @@
-spring:
-  profiles:
-    # 当前激活环境
-    active: @profile.name@
-  cloud:
-    #配置Bus id(远程推送事件)
-    bus:
-      id: ${spring.application.name}:${server.port}
-    nacos:
-      config:
-        # Nacos 认证用户
-        username: nacos
-        # Nacos 认证密码
-        password: nacos
-        # 命名空间 常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等
-        namespace: @config.namespace@
-        # 配置中心地址
-        server-addr: @config.server-addr@
-        # 配置对应的分组
-        group: @config.group@
-        # 配置文件后缀
-        file-extension: yaml
-        prefix: @prefix.name@
-        # 支持多个共享 Data Id 的配置,优先级小于extension-configs,自定义 Data Id 配置 属性是个集合,内部由 Config POJO 组成。Config 有 3 个属性,分别是 dataId, group 以及 refresh
-        #shared-configs[0]:
-          #data-id: @prefix.name@-common.yaml # 配置文件名-Data Id
-          #group: @config.group@   # 默认为DEFAULT_GROUP
-          #refresh: false   # 是否动态刷新,默认为false
-      discovery:
-        namespace: @config.namespace@
-        server-addr: @config.server-addr@
-        watch:
-          enabled: false

+ 1 - 0
jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java

@@ -14,6 +14,7 @@ import javax.annotation.Resource;
 /**
  * @author jeecg
  */
+@EnableFeignClients
 @EnableDiscoveryClient
 @SpringBootApplication
 public class JeecgGatewayApplication  implements CommandLineRunner {

+ 4 - 0
jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml

@@ -5,9 +5,13 @@ spring:
     name: jeecg-gateway
   cloud:
     nacos:
+      config:
+        password:
+        username:
       discovery:
         server-addr: 127.0.0.1:8848
         service: jeecg-gateway
+        namespace:
     gateway:
       discovery:
         locator:

+ 1 - 1
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: prod
+    active: @activatedProperties@
   cloud:
     nacos:
       discovery: