Merge remote-tracking branch 'origin/main'

edu-travel-remote/edu-travel-remote-country/pom.xml

@@ -0,0 +1,65 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>edu.travel</groupId>
+        <artifactId>edu-travel-remote</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>edu-travel-remote-country</artifactId>
+    <packaging>jar</packaging>
+
+    <name>edu-travel-remote-country</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-resp</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-openfeign</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-model-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.13.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-remote-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/commodity/dto/BaseCountryDto.java → edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/dto/BaseCountryDto.java

@@ -1,4 +1,4 @@
-package edu.travel.commodity.dto;
+package edu.travel.dto;
 
 import edu.travel.po.PagePO;
 import lombok.Data;

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/commodity/dto/BaseCountryServeDTO.java → edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/dto/BaseCountryServeDTO.java

@@ -1,4 +1,4 @@
-package edu.travel.commodity.dto;
+package edu.travel.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/commodity/remote/BaseCountryRemoteController.java → edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryRemoteController.java

@@ -1,4 +1,4 @@
-package edu.travel.commodity.remote;
+package edu.travel.remote;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import edu.travel.commodity.dto.BaseCountryDto;

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/commodity/remote/BaseCountryServeRemoteController.java → edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryServeRemoteController.java

@@ -1,16 +1,12 @@
-package edu.travel.commodity.remote;
+package edu.travel.remote;
 
 import edu.travel.commodity.dto.BaseCountryDto;
 import edu.travel.commodity.dto.BaseCountryServeDTO;
 import edu.travel.commodity.vo.BaseCountryServeVo;
 import edu.travel.remote.base.RemoteBaseController;
-import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.Errors;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(path = "/base_country_serve",name = "commodity")

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/commodity/vo/BaseCountryServeVo.java → edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/BaseCountryServeVo.java

@@ -1,4 +1,4 @@
-package edu.travel.commodity.vo;
+package edu.travel.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/commodity/vo/BaseCountryVo.java → edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/BaseCountryVo.java

@@ -1,4 +1,4 @@
-package edu.travel.commodity.vo;
+package edu.travel.vo;
 
 import edu.travel.entity.BaseEntity;
 import lombok.Data;

edu-travel-remote/pom.xml

@@ -17,6 +17,7 @@
         <module>edu-travel-remote-upload</module>
         <module>edu-travel-remote-base</module>
         <module>edu-travel-remote-commodity</module>
+        <module>edu-travel-remote-country</module>
     </modules>
 
     <properties>

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/BaseCountryServeService.java

@@ -1,7 +1,6 @@
 package edu.travel.commodity.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.dto.BaseCountryServeDTO;
 import edu.travel.commodity.entity.BaseCountryServe;
 import com.baomidou.mybatisplus.extension.service.IService;

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/impl/BaseCountryServeServiceImpl.java

@@ -3,13 +3,11 @@ package edu.travel.commodity.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import edu.travel.commodity.dto.BaseCountryServeDTO;
 import edu.travel.commodity.entity.BaseCountryServe;
 import edu.travel.commodity.mapper.BaseCountryServeMapper;
 import edu.travel.commodity.service.BaseCountryServeService;
 import edu.travel.rpc.RPCBaseResponse;
-import edu.travel.rpc.RPCPageResponse;
 import edu.travel.service.SysServiceImpl;
 import org.springframework.stereotype.Service;
 

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/dto/BaseCountryDto.java → edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/dto/BaseCountryDto.java

@@ -1,14 +1,7 @@
-package edu.travel.commodity.dto;
+package edu.travel.country.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import edu.travel.entity.BaseEntity;
 import edu.travel.po.PagePO;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * 国家表

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/dto/BaseCountryServeDTO.java → edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/dto/BaseCountryServeDTO.java

@@ -1,16 +1,11 @@
-package edu.travel.commodity.dto;
+package edu.travel.country.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import edu.travel.po.PagePO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 服务国家表

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/vo/BaseCountryVo.java → edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/dto/vo/BaseCountryVo.java

@@ -1,4 +1,4 @@
-package edu.travel.commodity.vo;
+package edu.travel.country.dto.vo;
 
 import edu.travel.entity.BaseEntity;
 import lombok.Data;

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/service/impl/BaseCountryServiceImpl.java

@@ -7,9 +7,7 @@ import edu.travel.commodity.dto.BaseCountryDto;
 import edu.travel.commodity.vo.BaseCountryVo;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.service.SysServiceImpl;
-import edu.travel.utils.tree.CustomDeepCopy;
 import org.springframework.beans.BeanUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import edu.travel.country.entity.BaseCountry;
 import edu.travel.country.mapper.BaseCountryMapper;
 import edu.travel.country.service.BaseCountryService;

edu-travel-service/pom.xml

@@ -12,8 +12,10 @@
     <modules>
         <module>edu-travel-service-tenement</module>
         <module>edu-travel-service-warehouse</module>
+        <module>edu-travel-service-country</module>
         <module>edu-travel-service-commodity</module>
         <module>edu-travel-service-order</module>
+        <module>edu-travel-service-pay</module>
         <module>edu-travel-service-upload</module>
         <module>edu-travel-service-debezium</module>
         <module>edu-travel-service-country</module>