系统优化

vehicle-client/pom.xml

@@ -14,4 +14,21 @@
     <groupId>com.chelvc.cloud</groupId>
     <artifactId>vehicle-client</artifactId>
     <version>1.0.0-SNAPSHOT</version>
+
+    <properties>
+        <user-client.version>1.0.0-SNAPSHOT</user-client.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.chelvc.cloud</groupId>
+            <artifactId>user-client</artifactId>
+            <version>${user-client.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+    </dependencies>
 </project>

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/AssessRecoverDto.java

@@ -1,13 +1,14 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
 import java.io.Serializable;
 import java.util.Date;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
 /**
  * @author valley
  * @date 2024/02/03 15:45

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/AttentionUserDTO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.uc.api.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.UserDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/CategoryDTO.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import com.chelvc.cloud.vehicle.api.constant.CategoryType;
+import com.chelvc.cloud.vehicle.client.constant.CategoryType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/CommentDTO.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import com.chelvc.cloud.uc.api.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.UserDTO;
 import com.chelvc.framework.common.model.File;
 import lombok.AllArgsConstructor;
 import lombok.Data;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/CouponDTO.java

@@ -3,8 +3,8 @@ package com.chelvc.cloud.vehicle.client.dto;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.chelvc.cloud.vehicle.api.constant.CouponStatus;
-import com.chelvc.cloud.vehicle.api.constant.CouponType;
+import com.chelvc.cloud.vehicle.client.constant.CouponStatus;
+import com.chelvc.cloud.vehicle.client.constant.CouponType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/DynamicCommentDTO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.uc.api.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.UserDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/DynamicContentDTO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.uc.api.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.UserDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/FavoriteDTO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.vehicle.api.constant.FavoriteType;
+import com.chelvc.cloud.vehicle.client.constant.FavoriteType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/GoodsDTO.java

@@ -3,8 +3,8 @@ package com.chelvc.cloud.vehicle.client.dto;
 import java.io.Serializable;
 import java.util.List;
 
-import com.chelvc.cloud.vehicle.api.constant.CategoryType;
-import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
+import com.chelvc.cloud.vehicle.client.constant.CategoryType;
+import com.chelvc.cloud.vehicle.client.constant.GoodsStatus;
 import com.chelvc.framework.common.model.File;
 import lombok.AllArgsConstructor;
 import lombok.Data;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/MerchantDTO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.vehicle.api.constant.MerchantStatus;
+import com.chelvc.cloud.vehicle.client.constant.MerchantStatus;
 import com.chelvc.framework.common.model.File;
 import lombok.AllArgsConstructor;
 import lombok.Data;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/MerchantDetailDTO.java

@@ -3,7 +3,7 @@ package com.chelvc.cloud.vehicle.client.dto;
 import java.io.Serializable;
 import java.util.List;
 
-import com.chelvc.cloud.vehicle.api.constant.CategoryType;
+import com.chelvc.cloud.vehicle.client.constant.CategoryType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/MerchantRankDTO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.vehicle.api.constant.MerchantStatus;
+import com.chelvc.cloud.vehicle.client.constant.MerchantStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/ReservationDTO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.vehicle.api.constant.ReserveStatus;
+import com.chelvc.cloud.vehicle.client.constant.ReserveStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/UserCouponDTO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.vehicle.api.constant.CouponType;
+import com.chelvc.cloud.vehicle.client.constant.CouponType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/AddDynamicContentParam.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.DynamicContentType;
+import com.chelvc.cloud.vehicle.client.constant.DynamicContentType;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/AddDynamicEvaluateRecordParam.java

@@ -1,8 +1,8 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.ActionType;
-import com.chelvc.cloud.vehicle.api.constant.DynamicStatusType;
-import com.chelvc.cloud.vehicle.api.constant.RecordType;
+import com.chelvc.cloud.vehicle.client.constant.ActionType;
+import com.chelvc.cloud.vehicle.client.constant.DynamicStatusType;
+import com.chelvc.cloud.vehicle.client.constant.RecordType;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/CategoryModifyParam.java

@@ -6,7 +6,7 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import com.chelvc.cloud.vehicle.api.constant.CategoryType;
+import com.chelvc.cloud.vehicle.client.constant.CategoryType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/CouponModifyParam.java

@@ -1,7 +1,7 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.CouponStatus;
-import com.chelvc.cloud.vehicle.api.constant.CouponType;
+import com.chelvc.cloud.vehicle.client.constant.CouponStatus;
+import com.chelvc.cloud.vehicle.client.constant.CouponType;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/CouponPagingParam.java

@@ -1,8 +1,8 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.CouponClaimType;
-import com.chelvc.cloud.vehicle.api.constant.CouponStatus;
-import com.chelvc.cloud.vehicle.api.constant.CouponType;
+import com.chelvc.cloud.vehicle.client.constant.CouponClaimType;
+import com.chelvc.cloud.vehicle.client.constant.CouponStatus;
+import com.chelvc.cloud.vehicle.client.constant.CouponType;
 import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/ExamineDynamicParam.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.ExamineType;
+import com.chelvc.cloud.vehicle.client.constant.ExamineType;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/FavoritePagingParam.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.FavoriteType;
+import com.chelvc.cloud.vehicle.client.constant.FavoriteType;
 import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/FavoriteQueryParam.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.FavoriteType;
+import com.chelvc.cloud.vehicle.client.constant.FavoriteType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/GoodsModifyParam.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.param;
-import com.chelvc.cloud.vehicle.api.constant.CategoryType;
-import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
+import com.chelvc.cloud.vehicle.client.constant.CategoryType;
+import com.chelvc.cloud.vehicle.client.constant.GoodsStatus;
 import com.chelvc.framework.common.model.File;
 import lombok.*;
 import lombok.experimental.SuperBuilder;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/GoodsPagingParam.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
+import com.chelvc.cloud.vehicle.client.constant.GoodsStatus;
 import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/GoodsQueryParam.java

@@ -4,8 +4,8 @@ import java.io.Serializable;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
-import com.chelvc.cloud.vehicle.api.constant.CategoryType;
-import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
+import com.chelvc.cloud.vehicle.client.constant.CategoryType;
+import com.chelvc.cloud.vehicle.client.constant.GoodsStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/MerchantPagingParam.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import com.chelvc.cloud.vehicle.api.constant.MerchantStatus;
+import com.chelvc.cloud.vehicle.client.constant.MerchantStatus;
 import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/MerchantQueryParam.java

@@ -5,7 +5,7 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import com.chelvc.cloud.vehicle.api.constant.Sort;
+import com.chelvc.cloud.vehicle.client.constant.Sort;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/OrderQueryParam.java

@@ -5,7 +5,7 @@ import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
-import com.chelvc.cloud.vehicle.api.constant.OrderStatus;
+import com.chelvc.cloud.vehicle.client.constant.OrderStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/QueryAttentionParam.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.AttentionType;
+import com.chelvc.cloud.vehicle.client.constant.AttentionType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/QueryDynamicContentParam.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.DynamicType;
+import com.chelvc.cloud.vehicle.client.constant.DynamicType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/ReservationQueryParam.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.ReserveStatus;
+import com.chelvc.cloud.vehicle.client.constant.ReserveStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/UserCouponModifyParam.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.CouponType;
+import com.chelvc.cloud.vehicle.client.constant.CouponType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/UserCouponPagingParam.java

@@ -1,7 +1,7 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.CouponType;
-import com.chelvc.cloud.vehicle.api.constant.UserCouponStatus;
+import com.chelvc.cloud.vehicle.client.constant.CouponType;
+import com.chelvc.cloud.vehicle.client.constant.UserCouponStatus;
 import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/UserCouponQueryParam.java

@@ -1,7 +1,7 @@
 package com.chelvc.cloud.vehicle.client.param;
 
-import com.chelvc.cloud.vehicle.api.constant.CouponType;
-import com.chelvc.cloud.vehicle.api.constant.UserCouponStatus;
+import com.chelvc.cloud.vehicle.client.constant.CouponType;
+import com.chelvc.cloud.vehicle.client.constant.UserCouponStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-server/src/main/resources/application.yml

@@ -52,10 +52,8 @@ dubbo:
     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

vehicle-server/src/main/resources/logback-spring.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<contextName>vehicle</contextName>
-
-	<springProperty name="LOG_PATH" source="logging.path" defaultValue="./"/>
+	<property name="app" value="vehicle"/>
+	<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}/vehicle.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}/vehicle-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+			<fileNamePattern>${path}/${app}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
 			<maxFileSize>10MB</maxFileSize>
 			<maxHistory>7</maxHistory>
 		</rollingPolicy>