Browse Source

修改配置文件

songyh 3 years ago
parent
commit
4de0990a9e

+ 25 - 0
jeecg-cloud-module/jeecg-cloud-gateway/pom.xml

@@ -89,4 +89,29 @@
             </resource>
             </resource>
         </resources>
         </resources>
     </build>
     </build>
+
+    <!-- 环境 -->
+    <profiles>
+        <!-- 开发 -->
+        <profile>
+            <id>dev-bak</id>
+            <properties>
+                <activatedProperties>dev-bak</activatedProperties>
+            </properties>
+        </profile>
+        <!-- 测试 -->
+        <profile>
+            <id>test</id>
+            <properties>
+                <activatedProperties>test</activatedProperties>
+            </properties>
+        </profile>
+        <!-- 生产 -->
+        <profile>
+            <id>prod</id>
+            <properties>
+                <activatedProperties>prod</activatedProperties>
+            </properties>
+        </profile>
+    </profiles>
 </project>
 </project>

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

@@ -0,0 +1,48 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        password:
+        username:
+      discovery:
+        server-addr: 172.30.0.7:8848
+        service: jeecg-gateway
+        namespace:
+    gateway:
+      discovery:
+        locator:
+          enabled: true
+      globalcors:
+        cors-configurations:
+          '[/**]':
+            allowCredentials: true
+            allowedOrigins: "*"
+            allowedMethods: "*"
+            allowedHeaders: "*"
+      routes:
+      - id: jeecg-system
+#        uri: http://localhost:7001
+        uri: lb://jeecg-system
+        predicates:
+          - Path=/jeecg-boot/**
+      - id: jeecg-bytedance-ad
+        uri: lb://jeecg-bytedance-ad
+        predicates:
+          - Path=/bytedance/ad/**
+# hystrix 信号量隔离,3秒后自动超时
+hystrix:
+  enabled: true
+  shareSecurityContext: true
+  command:
+    default:
+      execution:
+        isolation:
+          strategy: SEMAPHORE
+          thread:
+            timeoutInMilliseconds: 3000
+jeecg:
+  route:
+    config:
+      data-id: mate-gateway-router
+      group: DEFAULT_GROUP
+      data-type: yml

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

@@ -0,0 +1,48 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        password:
+        username:
+      discovery:
+        server-addr: 172.30.0.7:8848
+        service: jeecg-gateway
+        namespace:
+    gateway:
+      discovery:
+        locator:
+          enabled: true
+      globalcors:
+        cors-configurations:
+          '[/**]':
+            allowCredentials: true
+            allowedOrigins: "*"
+            allowedMethods: "*"
+            allowedHeaders: "*"
+      routes:
+      - id: jeecg-system
+#        uri: http://localhost:7001
+        uri: lb://jeecg-system
+        predicates:
+          - Path=/jeecg-boot/**
+      - id: jeecg-bytedance-ad
+        uri: lb://jeecg-bytedance-ad
+        predicates:
+          - Path=/bytedance/ad/**
+# hystrix 信号量隔离,3秒后自动超时
+hystrix:
+  enabled: true
+  shareSecurityContext: true
+  command:
+    default:
+      execution:
+        isolation:
+          strategy: SEMAPHORE
+          thread:
+            timeoutInMilliseconds: 3000
+jeecg:
+  route:
+    config:
+      data-id: mate-gateway-router
+      group: DEFAULT_GROUP
+      data-type: yml

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

@@ -0,0 +1,48 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        password:
+        username:
+      discovery:
+        server-addr: 172.30.0.7:8848
+        service: jeecg-gateway
+        namespace:
+    gateway:
+      discovery:
+        locator:
+          enabled: true
+      globalcors:
+        cors-configurations:
+          '[/**]':
+            allowCredentials: true
+            allowedOrigins: "*"
+            allowedMethods: "*"
+            allowedHeaders: "*"
+      routes:
+      - id: jeecg-system
+#        uri: http://localhost:7001
+        uri: lb://jeecg-system
+        predicates:
+          - Path=/jeecg-boot/**
+      - id: jeecg-bytedance-ad
+        uri: lb://jeecg-bytedance-ad
+        predicates:
+          - Path=/bytedance/ad/**
+# hystrix 信号量隔离,3秒后自动超时
+hystrix:
+  enabled: true
+  shareSecurityContext: true
+  command:
+    default:
+      execution:
+        isolation:
+          strategy: SEMAPHORE
+          thread:
+            timeoutInMilliseconds: 3000
+jeecg:
+  route:
+    config:
+      data-id: mate-gateway-router
+      group: DEFAULT_GROUP
+      data-type: yml

+ 2 - 47
jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml

@@ -3,50 +3,5 @@ server:
 spring:
 spring:
   application:
   application:
     name: jeecg-gateway
     name: jeecg-gateway
-  cloud:
-    nacos:
-      config:
-        password:
-        username:
-      discovery:
-        server-addr: 127.0.0.1:8848
-        service: jeecg-gateway
-        namespace:
-    gateway:
-      discovery:
-        locator:
-          enabled: true
-      globalcors:
-        cors-configurations:
-          '[/**]':
-            allowCredentials: true
-            allowedOrigins: "*"
-            allowedMethods: "*"
-            allowedHeaders: "*"
-      routes:
-      - id: jeecg-system
-#        uri: http://localhost:7001
-        uri: lb://jeecg-system
-        predicates:
-          - Path=/jeecg-boot/**
-      - id: jeecg-bytedance-ad
-        uri: lb://jeecg-bytedance-ad
-        predicates:
-          - Path=/bytedance/ad/**
-# hystrix 信号量隔离,3秒后自动超时
-hystrix:
-  enabled: true
-  shareSecurityContext: true
-  command:
-    default:
-      execution:
-        isolation:
-          strategy: SEMAPHORE
-          thread:
-            timeoutInMilliseconds: 3000
-jeecg:
-  route:
-    config:
-      data-id: mate-gateway-router
-      group: DEFAULT_GROUP
-      data-type: yml
+  profiles:
+    active: @activatedProperties@

+ 24 - 0
jeecg-cloud-module/jeecg-cloud-nacos/pom.xml

@@ -70,4 +70,28 @@
         </plugins>
         </plugins>
     </build>
     </build>
 
 
+    <!-- 环境 -->
+    <profiles>
+        <!-- 开发 -->
+        <profile>
+            <id>dev-bak</id>
+            <properties>
+                <activatedProperties>dev-bak</activatedProperties>
+            </properties>
+        </profile>
+        <!-- 测试 -->
+        <profile>
+            <id>test</id>
+            <properties>
+                <activatedProperties>test</activatedProperties>
+            </properties>
+        </profile>
+        <!-- 生产 -->
+        <profile>
+            <id>prod</id>
+            <properties>
+                <activatedProperties>prod</activatedProperties>
+            </properties>
+        </profile>
+    </profiles>
 </project>
 </project>

+ 46 - 0
jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application-dev.yml

@@ -0,0 +1,46 @@
+spring:
+  datasource:
+    platform: mysql
+db:
+  num: 1
+  password:
+    '0': hcst@2021
+  url:
+    '0': jdbc:mysql://139.186.27.96:4000/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+  user:
+    '0': data
+management:
+  metrics:
+    export:
+      elastic:
+        enabled: false
+      influx:
+        enabled: false
+nacos:
+  core:
+    auth:
+      caching:
+        enabled: true
+      default:
+        token:
+          expire:
+            seconds: 18000
+          secret:
+            key: SecretKey012345678901234567890123456789012345678901234567890123456789
+      enabled: false
+      system:
+        type: nacos
+  istio:
+    mcp:
+      server:
+        enabled: false
+  naming:
+    empty-service:
+      auto-clean: true
+      clean:
+        initial-delay-ms: 50000
+        period-time-ms: 30000
+  security:
+    ignore:
+      urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
+  standalone: true

+ 46 - 0
jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application-prod.yml

@@ -0,0 +1,46 @@
+spring:
+  datasource:
+    platform: mysql
+db:
+  num: 1
+  password:
+    '0': hcst@2021
+  url:
+    '0': jdbc:mysql://139.186.27.96:4000/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+  user:
+    '0': data
+management:
+  metrics:
+    export:
+      elastic:
+        enabled: false
+      influx:
+        enabled: false
+nacos:
+  core:
+    auth:
+      caching:
+        enabled: true
+      default:
+        token:
+          expire:
+            seconds: 18000
+          secret:
+            key: SecretKey012345678901234567890123456789012345678901234567890123456789
+      enabled: false
+      system:
+        type: nacos
+  istio:
+    mcp:
+      server:
+        enabled: false
+  naming:
+    empty-service:
+      auto-clean: true
+      clean:
+        initial-delay-ms: 50000
+        period-time-ms: 30000
+  security:
+    ignore:
+      urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
+  standalone: true

+ 46 - 0
jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application-test.yml

@@ -0,0 +1,46 @@
+spring:
+  datasource:
+    platform: mysql
+db:
+  num: 1
+  password:
+    '0': hcst@2021
+  url:
+    '0': jdbc:mysql://139.186.27.96:4000/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+  user:
+    '0': data
+management:
+  metrics:
+    export:
+      elastic:
+        enabled: false
+      influx:
+        enabled: false
+nacos:
+  core:
+    auth:
+      caching:
+        enabled: true
+      default:
+        token:
+          expire:
+            seconds: 18000
+          secret:
+            key: SecretKey012345678901234567890123456789012345678901234567890123456789
+      enabled: false
+      system:
+        type: nacos
+  istio:
+    mcp:
+      server:
+        enabled: false
+  naming:
+    empty-service:
+      auto-clean: true
+      clean:
+        initial-delay-ms: 50000
+        period-time-ms: 30000
+  security:
+    ignore:
+      urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
+  standalone: true

+ 4 - 45
jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application.yml

@@ -8,48 +8,7 @@ server:
       pattern: '%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i'
       pattern: '%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i'
     basedir: ''
     basedir: ''
 spring:
 spring:
-  datasource:
-    platform: mysql
-db:
-  num: 1
-  password:
-    '0': hcst@2021
-  url:
-    '0': jdbc:mysql://139.186.27.96:4000/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
-  user:
-    '0': data
-management:
-  metrics:
-    export:
-      elastic:
-        enabled: false
-      influx:
-        enabled: false
-nacos:
-  core:
-    auth:
-      caching:
-        enabled: true
-      default:
-        token:
-          expire:
-            seconds: 18000
-          secret:
-            key: SecretKey012345678901234567890123456789012345678901234567890123456789
-      enabled: false
-      system:
-        type: nacos
-  istio:
-    mcp:
-      server:
-        enabled: false
-  naming:
-    empty-service:
-      auto-clean: true
-      clean:
-        initial-delay-ms: 50000
-        period-time-ms: 30000
-  security:
-    ignore:
-      urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
-  standalone: true
+  application:
+    name: nacos
+  profiles:
+    active: @activatedProperties@

+ 5 - 0
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-dev.yml

@@ -20,6 +20,11 @@ management:
       exposure:
       exposure:
         include: metrics,httptrace
         include: metrics,httptrace
 spring:
 spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+        service: jeecg-system
   servlet:
   servlet:
     multipart:
     multipart:
       max-file-size: -1
       max-file-size: -1

+ 6 - 2
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-prod.yml

@@ -1,10 +1,9 @@
-
 dubbo:
 dubbo:
   application:
   application:
     id: sys-center-dubbo-prodiver
     id: sys-center-dubbo-prodiver
     name: sys-center-dubbo-prodiver
     name: sys-center-dubbo-prodiver
   registry:
   registry:
-    address: nacos://127.0.0.1:8848
+    address: nacos://172.30.0.7:8848
   protocol:
   protocol:
     name: dubbo
     name: dubbo
     port: 20880
     port: 20880
@@ -21,6 +20,11 @@ management:
       exposure:
       exposure:
         include: metrics,httptrace
         include: metrics,httptrace
 spring:
 spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 172.30.0.7:8848
+        service: jeecg-system
   servlet:
   servlet:
     multipart:
     multipart:
       max-file-size: -1
       max-file-size: -1

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

@@ -1,4 +1,3 @@
-
 server:
 server:
   port: 7001
   port: 7001
   servlet:
   servlet: