woody 1 anno fa
parent
commit
e8f401d289

+ 10 - 22
pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>com.chelvc.framework</groupId>
-        <artifactId>framework-cloud-nacos-dubbo</artifactId>
+        <artifactId>framework-cloud-nacos-feign</artifactId>
         <version>1.0.0-RELEASE</version>
         <relativePath/>
     </parent>
@@ -18,12 +18,10 @@
     <properties>
         <admin.version>1.0.0-SNAPSHOT</admin.version>
         <maintain.version>1.0.0-SNAPSHOT</maintain.version>
-        <uc-api.version>1.0.0-SNAPSHOT</uc-api.version>
-        <uc-server.version>1.0.0-SNAPSHOT</uc-server.version>
-        <vehicle-api.version>1.0.0-SNAPSHOT</vehicle-api.version>
+        <user-client.version>1.0.0-SNAPSHOT</user-client.version>
+        <user-server.version>1.0.0-SNAPSHOT</user-server.version>
+        <vehicle-client.version>1.0.0-SNAPSHOT</vehicle-client.version>
         <vehicle-server.version>1.0.0-SNAPSHOT</vehicle-server.version>
-        <framework-dubbo.version>1.0.0-RELEASE</framework-dubbo.version>
-        <framework-feign.version>1.0.0-RELEASE</framework-feign.version>
     </properties>
 
     <dependencies>
@@ -39,34 +37,24 @@
         </dependency>
         <dependency>
             <groupId>com.chelvc.cloud</groupId>
-            <artifactId>uc-api</artifactId>
-            <version>${uc-api.version}</version>
+            <artifactId>user-client</artifactId>
+            <version>${user-client.version}</version>
         </dependency>
         <dependency>
             <groupId>com.chelvc.cloud</groupId>
-            <artifactId>uc-server</artifactId>
-            <version>${uc-server.version}</version>
+            <artifactId>user-server</artifactId>
+            <version>${user-server.version}</version>
         </dependency>
         <dependency>
             <groupId>com.chelvc.cloud</groupId>
-            <artifactId>vehicle-api</artifactId>
-            <version>${vehicle-api.version}</version>
+            <artifactId>vehicle-client</artifactId>
+            <version>${vehicle-client.version}</version>
         </dependency>
         <dependency>
             <groupId>com.chelvc.cloud</groupId>
             <artifactId>vehicle-server</artifactId>
             <version>${vehicle-server.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-feign</artifactId>
-            <version>${framework-feign.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>

+ 1 - 3
src/main/java/com/chelvc/cloud/chelvc/Server.java

@@ -2,13 +2,12 @@ package com.chelvc.cloud.chelvc;
 
 import com.chelvc.cloud.admin.AdminServer;
 import com.chelvc.cloud.maintain.MaintainServer;
-import com.chelvc.cloud.uc.server.UserServer;
+import com.chelvc.cloud.user.server.UserServer;
 import com.chelvc.cloud.vehicle.server.VehicleServer;
 import com.chelvc.framework.base.config.BeanFullnameGenerator;
 import com.chelvc.framework.base.config.MultiserverMvcConfigurer;
 import com.chelvc.framework.database.interceptor.DynamicDatasourceInterceptor;
 import com.chelvc.framework.nacos.config.MultiserverNacosConfigurer;
-import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -25,7 +24,6 @@ import org.springframework.context.annotation.Import;
  * @date 2021/10/20
  */
 @EnableDiscoveryClient
-@EnableDubbo(scanBasePackages = "com.chelvc")
 @EnableFeignClients(basePackages = "com.chelvc")
 @MapperScan(basePackages = "com.chelvc.cloud.**.dao", nameGenerator = BeanFullnameGenerator.class)
 @SpringBootApplication(scanBasePackages = "com.chelvc", nameGenerator = BeanFullnameGenerator.class)

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

@@ -30,16 +30,13 @@ spring:
     port: 7031
     password: Chelvc@2023
 
-dubbo:
-  registry:
-    address: nacos://47.108.128.78:6848
-
 nacos:
   config:
     server-addr: 47.108.128.78:6848
 
 oauth:
   secret: oauth.token.secret@chelvc!@#2023
+  ignores: /user/**,/vehicle/**
   clients:
     - id: chelvc_client
       secret: chelvc@secret#2023!

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

@@ -30,16 +30,13 @@ spring:
     port: 7031
     password: Chelvc@2023
 
-dubbo:
-  registry:
-    address: nacos://127.0.0.1:6848
-
 nacos:
   config:
     server-addr: 127.0.0.1:6848
 
 oauth:
   secret: oauth.token.secret@chelvc!@#2023
+  ignores: /user/**,/vehicle/**
   clients:
     - id: chelvc_client
       secret: chelvc@secret#2023!

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

@@ -30,16 +30,13 @@ spring:
     port: 7031
     password: Chelvc@2023
 
-dubbo:
-  registry:
-    address: nacos://127.0.0.1:6848
-
 nacos:
   config:
     server-addr: 127.0.0.1:6848
 
 oauth:
   secret: oauth.token.secret@chelvc!@#2023
+  ignores: /user/**,/vehicle/**
   clients:
     - id: chelvc_client
       secret: chelvc@secret#2023!

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

@@ -30,16 +30,13 @@ spring:
     port: 7031
     password: Chelvc@2023
 
-dubbo:
-  registry:
-    address: nacos://127.0.0.1:6848
-
 nacos:
   config:
     server-addr: 127.0.0.1:6848
 
 oauth:
   secret: oauth.token.secret@chelvc!@#2023
+  ignores: /user/**,/vehicle/**
   clients:
     - id: chelvc_client
       secret: chelvc@secret#2023!

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

@@ -28,6 +28,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        group: woody
         namespace: ${spring.profiles.active}
   servlet:
     multipart:
@@ -35,28 +36,12 @@ spring:
       max-file-size: 40MB
       max-request-size: 40MB
 
-mybatis-plus:
-  mapper-locations: classpath*:mapper/*.xml
-  global-config:
-    db-config:
-      update-strategy: ignored
-
 nacos:
   config:
     namespace: ${spring.profiles.active}
 
-dubbo:
-  protocol:
-    name: dubbo
-    port: 21000
-  application:
-    name: ${spring.application.name}
-    register-mode: instance
-  provider:
-    group: ${spring.profiles.active}
-    filter: -exception,customException
-  consumer:
-    group: ${spring.profiles.active}
-    check: false
-    timeout: 10000
-    retries: 0
+mybatis-plus:
+  mapper-locations: classpath*:mapper/*.xml
+  global-config:
+    db-config:
+      update-strategy: ignored

+ 0 - 0
src/main/resources/config.properties


+ 4 - 5
src/main/resources/logback-spring.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<contextName>chelvc</contextName>
-
-	<springProperty name="LOG_PATH" source="logging.path" defaultValue="./"/>
+	<property name="app" value="chelvc"/>
+	<springProperty name="path" source="logging.path" defaultValue="./"/>
 
 	<turboFilter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
 
@@ -14,13 +13,13 @@
 	</appender>
 
 	<appender name="FILE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${LOG_PATH}/chelvc.log</file>
+		<file>${path}/${app}.log</file>
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger: %msg%n</pattern>
 			<charset>UTF-8</charset>
 		</encoder>
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${LOG_PATH}/chelvc-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+			<fileNamePattern>${path}/${app}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
 			<maxFileSize>10MB</maxFileSize>
 			<maxHistory>7</maxHistory>
 		</rollingPolicy>