woody 1 год назад
Родитель
Сommit
32f9ac76e0

+ 1 - 7
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>
@@ -18,7 +18,6 @@
     <properties>
         <uc-api.version>1.0.0-SNAPSHOT</uc-api.version>
         <vehicle-api.version>1.0.0-SNAPSHOT</vehicle-api.version>
-        <framework-dubbo.version>1.0.0-RELEASE</framework-dubbo.version>
         <framework-redis.version>1.0.0-RELEASE</framework-redis.version>
         <framework-oauth.version>1.0.0-RELEASE</framework-oauth.version>
         <framework-security.version>1.0.0-RELEASE</framework-security.version>
@@ -35,11 +34,6 @@
             <artifactId>vehicle-api</artifactId>
             <version>${vehicle-api.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.chelvc.framework</groupId>
-            <artifactId>framework-dubbo</artifactId>
-            <version>${framework-dubbo.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.chelvc.framework</groupId>
             <artifactId>framework-redis</artifactId>

+ 4 - 5
src/main/resources/application-dev.yml

@@ -16,8 +16,7 @@ nacos:
   config:
     server-addr: 47.108.128.78:6848
 
-platform:
-  oauth:
-    token:
-      secret: oauth.token.secret@chelvc!@#2023
-      recheck: true
+oauth:
+  token:
+    secret: oauth.token.secret@chelvc!@#2023
+    recheck: true

+ 4 - 5
src/main/resources/application-pre.yml

@@ -16,8 +16,7 @@ nacos:
   config:
     server-addr: 127.0.0.1:6848
 
-platform:
-  oauth:
-    token:
-      secret: oauth.token.secret@chelvc!@#2023
-      recheck: true
+oauth:
+  token:
+    secret: oauth.token.secret@chelvc!@#2023
+    recheck: true

+ 4 - 5
src/main/resources/application-prod.yml

@@ -16,8 +16,7 @@ nacos:
   config:
     server-addr: 127.0.0.1:6848
 
-platform:
-  oauth:
-    token:
-      secret: oauth.token.secret@chelvc!@#2023
-      recheck: true
+oauth:
+  token:
+    secret: oauth.token.secret@chelvc!@#2023
+    recheck: true

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

@@ -1,22 +0,0 @@
-spring:
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 47.108.128.78:6848
-  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
-
-platform:
-  oauth:
-    token:
-      secret: oauth.token.secret@chelvc!@#2023

+ 4 - 5
src/main/resources/application-test.yml

@@ -16,8 +16,7 @@ nacos:
   config:
     server-addr: 127.0.0.1:6848
 
-platform:
-  oauth:
-    token:
-      secret: oauth.token.secret@chelvc!@#2023
-      recheck: true
+oauth:
+  token:
+    secret: oauth.token.secret@chelvc!@#2023
+    recheck: true

+ 1 - 1
src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   main:
     allow-bean-definition-overriding: true
   profiles:
-    active: qizai
+    active: dev
   application:
     name: admin
   jackson:

+ 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}/admin.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>