瀏覽代碼

更新配置

woody 1 年之前
父節點
當前提交
729bcf6abc

+ 1 - 1
pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>com.chelvc.framework</groupId>
-        <artifactId>framework-cloud</artifactId>
+        <artifactId>framework-cloud-nacos-dubbo</artifactId>
         <version>1.0.0-RELEASE</version>
         <relativePath/>
     </parent>

+ 24 - 28
src/main/resources/application-dev.yml

@@ -38,31 +38,27 @@ nacos:
   config:
     server-addr: 47.108.128.78:6848
 
-rocketmq:
-  name-server: http://47.108.128.78:9876
-
-platform:
-  oauth:
-    token:
-      secret: oauth.token.secret@chelvc!@#2023
-      recheck: true
-    client:
-      secret: chelvc@secret#2023!
-      iv: chelvc@iv#2023@
-  upload:
-    standard:
-      path: /home/chelvc/upload
-      domain: http://file.chelvc.com
-  location:
-    tencent:
-      key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
-  wechat:
-    appid: wx593877b3c990b15c
-    secret: 19ab92afb193b0f3c25e57ec32a3dd37
-  sms:
-    aliyun:
-      key: LTAI5tAnS3tQqjpHdT1KqeUw
-      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
-      signature: 车旅程
-    captcha:
-      template: SMS_274640619
+oauth:
+  token:
+    secret: oauth.token.secret@chelvc!@#2023
+    recheck: true
+  client:
+    secret: chelvc@secret#2023!
+    iv: chelvc@iv#2023@
+upload:
+  standard:
+    path: /home/chelvc/upload
+    domain: http://file.chelvc.com
+location:
+  tencent:
+    key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+wechat:
+  appid: wx593877b3c990b15c
+  secret: 19ab92afb193b0f3c25e57ec32a3dd37
+sms:
+  aliyun:
+    key: LTAI5tAnS3tQqjpHdT1KqeUw
+    secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+    signature: 车旅程
+  captcha:
+    template: SMS_274640619

+ 24 - 28
src/main/resources/application-pre.yml

@@ -38,31 +38,27 @@ nacos:
   config:
     server-addr: 127.0.0.1:6848
 
-rocketmq:
-  name-server: http://127.0.0.1:9876
-
-platform:
-  oauth:
-    token:
-      secret: oauth.token.secret@chelvc!@#2023
-      recheck: true
-    client:
-      secret: chelvc@secret#2023!
-      iv: chelvc@iv#2023@
-  upload:
-    standard:
-      path: /home/chelvc/upload
-      domain: http://file.chelvc.com
-  location:
-    tencent:
-      key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
-  wechat:
-    appid: wx593877b3c990b15c
-    secret: 19ab92afb193b0f3c25e57ec32a3dd37
-  sms:
-    aliyun:
-      key: LTAI5tAnS3tQqjpHdT1KqeUw
-      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
-      signature: 车旅程
-    captcha:
-      template: SMS_274640619
+oauth:
+  token:
+    secret: oauth.token.secret@chelvc!@#2023
+    recheck: true
+  client:
+    secret: chelvc@secret#2023!
+    iv: chelvc@iv#2023@
+upload:
+  standard:
+    path: /home/chelvc/upload
+    domain: http://file.chelvc.com
+location:
+  tencent:
+    key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+wechat:
+  appid: wx593877b3c990b15c
+  secret: 19ab92afb193b0f3c25e57ec32a3dd37
+sms:
+  aliyun:
+    key: LTAI5tAnS3tQqjpHdT1KqeUw
+    secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+    signature: 车旅程
+  captcha:
+    template: SMS_274640619

+ 24 - 28
src/main/resources/application-prod.yml

@@ -38,31 +38,27 @@ nacos:
   config:
     server-addr: 127.0.0.1:6848
 
-rocketmq:
-  name-server: http://127.0.0.1:9876
-
-platform:
-  oauth:
-    token:
-      secret: oauth.token.secret@chelvc!@#2023
-      recheck: true
-    client:
-      secret: chelvc@secret#2023!
-      iv: chelvc@iv#2023@
-  upload:
-    standard:
-      path: /home/chelvc/upload
-      domain: http://file.chelvc.com
-  location:
-    tencent:
-      key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
-  wechat:
-    appid: wx593877b3c990b15c
-    secret: 19ab92afb193b0f3c25e57ec32a3dd37
-  sms:
-    aliyun:
-      key: LTAI5tAnS3tQqjpHdT1KqeUw
-      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
-      signature: 车旅程
-    captcha:
-      template: SMS_274640619
+oauth:
+  token:
+    secret: oauth.token.secret@chelvc!@#2023
+    recheck: true
+  client:
+    secret: chelvc@secret#2023!
+    iv: chelvc@iv#2023@
+upload:
+  standard:
+    path: /home/chelvc/upload
+    domain: http://file.chelvc.com
+location:
+  tencent:
+    key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+wechat:
+  appid: wx593877b3c990b15c
+  secret: 19ab92afb193b0f3c25e57ec32a3dd37
+sms:
+  aliyun:
+    key: LTAI5tAnS3tQqjpHdT1KqeUw
+    secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+    signature: 车旅程
+  captcha:
+    template: SMS_274640619

+ 0 - 67
src/main/resources/application-qizai.yml

@@ -1,67 +0,0 @@
-spring:
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 47.108.128.78:6848
-  datasource:
-    dynamic:
-      primary: com.chelvc.cloud.uc.server
-      datasource:
-        "[com.chelvc.cloud.uc.server]":
-          url: jdbc:mysql://47.108.128.78:6180/uc?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
-          username: uc
-          password: Chelvc@uc!2023#
-          hikari:
-            driver-class-name: com.mysql.cj.jdbc.Driver
-            pool-name: chelvc
-            max-pool-size: 10
-            max-lifetime: 120000
-        "[com.chelvc.cloud.vehicle.server]":
-          url: jdbc:mysql://47.108.128.78:6180/vehicle?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
-          username: vehicle
-          password: Chelvc@vehicle!2023#
-          hikari:
-            driver-class-name: com.mysql.cj.jdbc.Driver
-            pool-name: chelvc
-            max-pool-size: 10
-            max-lifetime: 120000
-  redis:
-    host: 47.108.128.78
-    port: 7031
-    password: Chelvc@2023
-
-dubbo:
-  registry:
-    address: nacos://47.108.128.78:6848
-
-nacos:
-  config:
-    server-addr: 47.108.128.78:6848
-
-rocketmq:
-  name-server: http://47.108.128.78:9876
-
-platform:
-  oauth:
-    token:
-      secret: oauth.token.secret@chelvc!@#2023
-    client:
-      secret: chelvc@secret#2023!
-      iv: chelvc@iv#2023@
-  upload:
-    standard:
-      path: /home/chelvc/upload
-      domain: http://file.chelvc.com
-  location:
-    tencent:
-      key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
-  wechat:
-    appid: wx593877b3c990b15c
-    secret: 19ab92afb193b0f3c25e57ec32a3dd37
-  sms:
-    aliyun:
-      key: LTAI5tAnS3tQqjpHdT1KqeUw
-      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
-      signature: 车旅程
-    captcha:
-      template: SMS_274640619

+ 24 - 28
src/main/resources/application-test.yml

@@ -38,31 +38,27 @@ nacos:
   config:
     server-addr: 127.0.0.1:6848
 
-rocketmq:
-  name-server: http://127.0.0.1:9876
-
-platform:
-  oauth:
-    token:
-      secret: oauth.token.secret@chelvc!@#2023
-      recheck: true
-    client:
-      secret: chelvc@secret#2023!
-      iv: chelvc@iv#2023@
-  upload:
-    standard:
-      path: /home/chelvc/upload
-      domain: http://file.chelvc.com
-  location:
-    tencent:
-      key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
-  wechat:
-    appid: wx593877b3c990b15c
-    secret: 19ab92afb193b0f3c25e57ec32a3dd37
-  sms:
-    aliyun:
-      key: LTAI5tAnS3tQqjpHdT1KqeUw
-      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
-      signature: 车旅程
-    captcha:
-      template: SMS_274640619
+oauth:
+  token:
+    secret: oauth.token.secret@chelvc!@#2023
+    recheck: true
+  client:
+    secret: chelvc@secret#2023!
+    iv: chelvc@iv#2023@
+upload:
+  standard:
+    path: /home/chelvc/upload
+    domain: http://file.chelvc.com
+location:
+  tencent:
+    key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+wechat:
+  appid: wx593877b3c990b15c
+  secret: 19ab92afb193b0f3c25e57ec32a3dd37
+sms:
+  aliyun:
+    key: LTAI5tAnS3tQqjpHdT1KqeUw
+    secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+    signature: 车旅程
+  captcha:
+    template: SMS_274640619

+ 6 - 12
src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   main:
     allow-bean-definition-overriding: true
   profiles:
-    active: qizai
+    active: dev
   application:
     name: chelvc
   jackson:
@@ -32,11 +32,6 @@ nacos:
   config:
     namespace: ${spring.profiles.active}
 
-rocketmq:
-  producer:
-    group: chelvc_group
-    send-message-timeout: 300000
-
 dubbo:
   protocol:
     name: dubbo
@@ -53,9 +48,8 @@ dubbo:
     timeout: 10000
     retries: 0
 
-platform:
-  oauth:
-    resource:
-      login: /uc/oauth/token
-      logout: /uc/logout
-      permit: "/**/sms/**,/**/index,/**/configuration,/**/categories"
+oauth:
+  resource:
+    login: /uc/oauth/token
+    logout: /uc/logout
+    permit: "/**/sms/**,/**/index,/**/configuration,/**/categories"

+ 2 - 2
src/main/resources/logback-spring.xml

@@ -4,9 +4,8 @@
 
 	<springProperty name="LOG_PATH" source="logging.path" defaultValue="./"/>
 
-	<turboFilter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
-
 	<appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
+		<filter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger: %msg%n</pattern>
 			<charset>UTF-8</charset>
@@ -15,6 +14,7 @@
 
 	<appender name="FILE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${LOG_PATH}/chelvc.log</file>
+		<filter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger: %msg%n</pattern>
 			<charset>UTF-8</charset>