Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/service/impl/ITenantServiceImpl.java
#	edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/impl/ShopWarehouseStaffServiceImpl.java

docker-compose.yml

@@ -196,7 +196,7 @@ services:
       - /Users/a1/vmdata/redis/data:/data # 映射数据目录，宿主机:容器
     restart: always # 容器开机自启
     privileged: true # 获取宿主机root权限
-    command: ["redis-server","/etc/redis/redis.conf"] # 指定配置文件启动redis-server进程
+    command: [ "redis-server","/etc/redis/redis.conf" ] # 指定配置文件启动redis-server进程
   minio:
     image: minio/minio
     container_name: minio

edu-travel-adapter/edu-travel-adapter-commodity/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopAddressAdapter.java

@@ -23,7 +23,8 @@ public class ShopAddressAdapter {
     }
 
     /**
-     *  新增或编辑地址
+     * 新增或编辑地址
+     *
      * @param param
      * @return {@link BaseResponse }<{@link Void }>
      */

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopCategoryAdapter.java

@@ -18,16 +18,19 @@ import java.util.List;
 public class ShopCategoryAdapter {
     @Autowired
     private ShopCategoryRemoteController shopCategoryRemoteController;
+
     @AdapterAnnotation
-    public RPCBaseResponse<List<ShopTypeVo>> getShopType(ShopTypeDto param){
+    public RPCBaseResponse<List<ShopTypeVo>> getShopType(ShopTypeDto param) {
         return shopCategoryRemoteController.getShopType(param);
     }
+
     @AdapterAnnotation
-    public RPCBaseResponse<List<ShopTypeVo>> getLevelToShopType(@SpringQueryMap BaseDto param){
+    public RPCBaseResponse<List<ShopTypeVo>> getLevelToShopType(@SpringQueryMap BaseDto param) {
         return shopCategoryRemoteController.getLevelToShopType(param);
     }
+
     @AdapterAnnotation
-    public RPCBaseResponse<FileWebVo> uploadIcon(MultipartFile file){
+    public RPCBaseResponse<FileWebVo> uploadIcon(MultipartFile file) {
         return shopCategoryRemoteController.uploadIcon(file);
     }
 

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopFavoriteAdapter.java

@@ -1,6 +1,5 @@
 package edu.travel.adapter.service.commodity;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.adapter.annotation.AdapterAnnotation;
 import edu.travel.remote.commodity.ShopFavoriteRemoteController;
@@ -21,13 +20,14 @@ public class ShopFavoriteAdapter {
 
     @Autowired
     private ShopFavoriteRemoteController shopFavoriteRemoteController;
+
     @AdapterAnnotation
-    public RPCBaseResponse<Page<ShopFavoriteVo>> getFavorite(BaseDto baseDto){
+    public RPCBaseResponse<Page<ShopFavoriteVo>> getFavorite(BaseDto baseDto) {
         return shopFavoriteRemoteController.getFavorite(baseDto);
     }
 
     @AdapterAnnotation
-    public RPCBaseResponse<Void> addFavorite(@RequestBody AddFavoriteDto params){
+    public RPCBaseResponse<Void> addFavorite(@RequestBody AddFavoriteDto params) {
         shopFavoriteRemoteController.addFavorite(params);
         return success();
     }
@@ -36,7 +36,7 @@ public class ShopFavoriteAdapter {
      * 移除收藏
      */
     @AdapterAnnotation
-    public RPCBaseResponse<Void> removeFavorite(@RequestBody Set<String> ids){
+    public RPCBaseResponse<Void> removeFavorite(@RequestBody Set<String> ids) {
         shopFavoriteRemoteController.removeFavorite(ids);
         return success();
     }
@@ -45,7 +45,7 @@ public class ShopFavoriteAdapter {
      * 全部移除
      */
     @AdapterAnnotation
-    public RPCBaseResponse<Void> removeAllFavorite(){
+    public RPCBaseResponse<Void> removeAllFavorite() {
         shopFavoriteRemoteController.removeAllFavorite();
         return success();
     }

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopMessageAdapter.java

@@ -18,12 +18,12 @@ public class ShopMessageAdapter {
     private ShopMessageRemoteController shopMessageRemoteController;
 
     @AdapterAnnotation
-    public RPCBaseResponse<Page<MessageVo>> getMessage(@SpringQueryMap MessageDto messageDto){
+    public RPCBaseResponse<Page<MessageVo>> getMessage(@SpringQueryMap MessageDto messageDto) {
         return shopMessageRemoteController.getMessage(messageDto);
     }
 
     @AdapterAnnotation
-    public RPCBaseResponse<Boolean> savaMessage(@RequestBody SaveMessageDto params){
+    public RPCBaseResponse<Boolean> savaMessage(@RequestBody SaveMessageDto params) {
         return shopMessageRemoteController.savaMessage(params);
     }
 

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopOpinionAdapter.java

@@ -16,22 +16,25 @@ import java.util.List;
 public class ShopOpinionAdapter {
     @Autowired
     private ShopOpinionRemoteController shopOpinionRemoteController;
+
     @AdapterAnnotation
-    public RPCBaseResponse<FileWebVo> uploadOpinionImage(MultipartFile file){
+    public RPCBaseResponse<FileWebVo> uploadOpinionImage(MultipartFile file) {
         return shopOpinionRemoteController.uploadOpinionImage(file);
     }
+
     @AdapterAnnotation
-    public RPCBaseResponse<Void> saveFormTarget(ShopOpinionDto shopOpinionDto){
+    public RPCBaseResponse<Void> saveFormTarget(ShopOpinionDto shopOpinionDto) {
         RPCBaseResponse<ShopOpinionVo> result = shopOpinionRemoteController.saveFormTarget(shopOpinionDto);
-        if(result.getCode()!=200){
+        if (result.getCode() != 200) {
             return RPCBaseResponse.error();
         }
         return RPCBaseResponse.success();
     }
+
     @AdapterAnnotation
-    public RPCBaseResponse<Void> deleteTargetFormId(List<String> ids){
+    public RPCBaseResponse<Void> deleteTargetFormId(List<String> ids) {
         RPCBaseResponse<ShopOpinionVo> result = shopOpinionRemoteController.deleteTargetFormId(ids);
-        if(result.getCode()!=200){
+        if (result.getCode() != 200) {
             return RPCBaseResponse.error();
         }
         return RPCBaseResponse.success();

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopOpinionTypeAdapter.java

@@ -13,8 +13,9 @@ import java.util.List;
 public class ShopOpinionTypeAdapter {
     @Autowired
     private ShopOpinionTypeRemoteController shopOpinionTypeRemoteController;
+
     @AdapterAnnotation
-    public RPCBaseResponse<List<OpinionTypeVo>> getType(String languageId){
+    public RPCBaseResponse<List<OpinionTypeVo>> getType(String languageId) {
         return shopOpinionTypeRemoteController.getType(languageId);
     }
 }

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopParametersAdapter.java

@@ -11,9 +11,6 @@ import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
-
-import static edu.travel.rpc.RPCBaseResponse.success;
 
 @Component
 public class ShopParametersAdapter {
@@ -22,19 +19,21 @@ public class ShopParametersAdapter {
 
 
     /**
-     *  获取商品参数
+     * 获取商品参数
+     *
      * @param param
      * @return {@link BaseResponse }<{@link Page }<{@link ShopParametersVo }>>
      */
     @AdapterAnnotation
-    public RPCBaseResponse<Page<ShopParametersVo>> getShopParameters(ProductSpecDto param){
+    public RPCBaseResponse<Page<ShopParametersVo>> getShopParameters(ProductSpecDto param) {
         return shopParametersRemoteController.getShopParameters(param);
     }
+
     /**
      * 获取参数
      */
     @AdapterAnnotation
-    public RPCBaseResponse<Page<ParametersVo>> getAllParameters(ParametersDto param){
+    public RPCBaseResponse<Page<ParametersVo>> getAllParameters(ParametersDto param) {
         return shopParametersRemoteController.getAllParameters(param);
     }
 }

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopProductAdapter.java

@@ -19,25 +19,29 @@ import java.io.IOException;
 public class ShopProductAdapter {
     @Autowired
     private ShopProductRemoteController shopProductRemoteController;
+
     @AdapterAnnotation
-    public RPCBaseResponse<Page<ShopProductVo>> getHotProduct(GetProductByTypeDto param){
+    public RPCBaseResponse<Page<ShopProductVo>> getHotProduct(GetProductByTypeDto param) {
         return shopProductRemoteController.getHotProduct(param);
     }
+
     @AdapterAnnotation
-    public RPCBaseResponse<Page<ShopProductVo>> searchProduct(SearchProductDto param) throws IOException{
+    public RPCBaseResponse<Page<ShopProductVo>> searchProduct(SearchProductDto param) throws IOException {
         return shopProductRemoteController.searchProduct(param);
     }
+
     @AdapterAnnotation
-    public RPCBaseResponse<FileWebVo> uploadProductImage(MultipartFile file){
+    public RPCBaseResponse<FileWebVo> uploadProductImage(MultipartFile file) {
         return shopProductRemoteController.uploadProductImage(file);
     }
+
     @AdapterAnnotation
-    public RPCBaseResponse<Void> insertProduct(InsertProductDto params){
+    public RPCBaseResponse<Void> insertProduct(InsertProductDto params) {
         return shopProductRemoteController.insertProduct(params);
     }
 
     @AdapterAnnotation
-    public RPCBaseResponse<String> getSkuId(){
+    public RPCBaseResponse<String> getSkuId() {
         return shopProductRemoteController.getSkuId();
     }
 

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopProductSkuAdapter.java

@@ -19,29 +19,31 @@ public class ShopProductSkuAdapter {
     private ShopProductSkuRemoteController shopProductSkuRemoteController;
 
     @AdapterAnnotation
-    public RPCBaseResponse<Map<String, List<ShopSkuSpecValueVo>>> getSkuValuesById(Set<String> skuId){
+    public RPCBaseResponse<Map<String, List<ShopSkuSpecValueVo>>> getSkuValuesById(Set<String> skuId) {
         return shopProductSkuRemoteController.getSkuValuesById(skuId);
     }
 
     /**
-     *  商品下单
+     * 商品下单
+     *
      * @param params
      * @return {@link RPCBaseResponse }<{@link String }>
      */
 
     @AdapterAnnotation
-    public RPCBaseResponse<Void> shopProductSku(AddShopOrderDto params){
+    public RPCBaseResponse<Void> shopProductSku(AddShopOrderDto params) {
         return shopProductSkuRemoteController.shopProductSku(params);
     }
 
     /**
-     *  支付商品订单
+     * 支付商品订单
+     *
      * @param payShopOrderDto
      * @return {@link RPCBaseResponse }<{@link String }>
      */
 
     @AdapterAnnotation
-    public RPCBaseResponse<Void> payProductSku(PayShopOrderDto payShopOrderDto){
+    public RPCBaseResponse<Void> payProductSku(PayShopOrderDto payShopOrderDto) {
         return shopProductSkuRemoteController.payProductSku(payShopOrderDto);
     }
 }

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopProductSpecAdapter.java

@@ -6,15 +6,15 @@ import edu.travel.remote.dto.ProductSpecDto;
 import edu.travel.remote.vo.ProductSpecVo;
 import edu.travel.rpc.RPCBaseResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.stereotype.Component;
 
 @Component
 public class ShopProductSpecAdapter {
     @Autowired
     private ShopProductSpecRemoteController shopProductSpecRemoteController;
+
     @AdapterAnnotation
-    public RPCBaseResponse<ProductSpecVo> getShopSpec(ProductSpecDto param){
+    public RPCBaseResponse<ProductSpecVo> getShopSpec(ProductSpecDto param) {
         return shopProductSpecRemoteController.getShopSpec(param);
     }
 }

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopSearchRecordsAdapter.java

@@ -13,13 +13,14 @@ import org.springframework.stereotype.Component;
 public class ShopSearchRecordsAdapter {
     @Autowired
     private ShopSearchRecordsRemoteController shopSearchRecordsRemoteController;
+
     @AdapterAnnotation
-    public RPCBaseResponse<Void> clearProjectSearchRecords(SearchRecordListDto clear){
+    public RPCBaseResponse<Void> clearProjectSearchRecords(SearchRecordListDto clear) {
         return shopSearchRecordsRemoteController.clearProjectSearchRecords(clear);
     }
 
     @AdapterAnnotation
-    public RPCBaseResponse<Page<SearchRecordsVo>> searchRecordList(SearchRecordListDto baseDto){
+    public RPCBaseResponse<Page<SearchRecordsVo>> searchRecordList(SearchRecordListDto baseDto) {
         return shopSearchRecordsRemoteController.searchRecordList(baseDto);
     }
 

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopShoppingCartAdapter.java

@@ -19,8 +19,10 @@ import java.util.Set;
 public class ShopShoppingCartAdapter {
     @Autowired
     private ShopShoppingCartRemoteController shopShoppingCartRemoteController;
+
     /**
-     *  新增购物车
+     * 新增购物车
+     *
      * @param params
      * @return {@link BaseResponse }<{@link Boolean }>
      */
@@ -31,6 +33,7 @@ public class ShopShoppingCartAdapter {
 
     /**
      * 分页查询购物车列表
+     *
      * @param params
      * @return {@link BaseResponse }<{@link Page }<{@link ShopCartListVo }>>
      */
@@ -41,6 +44,7 @@ public class ShopShoppingCartAdapter {
 
     /**
      * 修改购物车信息
+     *
      * @param params
      * @return {@link BaseResponse }<{@link Page }<{@link ShopCartListVo }>>
      */
@@ -48,8 +52,10 @@ public class ShopShoppingCartAdapter {
     public RPCBaseResponse<Boolean> updateCart(UpdateShopCarDto params) {
         return shopShoppingCartRemoteController.updateCart(params);
     }
+
     /**
      * 删除购物车
+     *
      * @param ids
      * @return {@link BaseResponse }<{@link Page }<{@link ShopCartListVo }>>
      */

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopSpecAdapter.java

@@ -15,17 +15,18 @@ public class ShopSpecAdapter {
     private ShopSpecRemoteController shopSpecRemoteController;
 
     @AdapterAnnotation
-    public RPCBaseResponse<Page<SpecVo>> getShopSpec(Long countryId,Integer currentPage,Integer pageSize){
-        return shopSpecRemoteController.getShopSpec(countryId,currentPage,pageSize);
+    public RPCBaseResponse<Page<SpecVo>> getShopSpec(Long countryId, Integer currentPage, Integer pageSize) {
+        return shopSpecRemoteController.getShopSpec(countryId, currentPage, pageSize);
     }
 
     /**
-     *  修改/新增规格
+     * 修改/新增规格
+     *
      * @return {@link RPCBaseResponse }<{@link Page }<{@link SpecVo }>>
      */
 
     @AdapterAnnotation
-    public RPCBaseResponse<Page<SpecVo>> insertOrUpdate(SpecDto specDto){
+    public RPCBaseResponse<Page<SpecVo>> insertOrUpdate(SpecDto specDto) {
         return shopSpecRemoteController.insertOrUpdate(specDto);
     }
 }

edu-travel-adapter/edu-travel-adapter-commodity/src/main/java/edu/travel/adapter/service/commodity/ShopUserSessionAdapter.java

@@ -13,12 +13,12 @@ public class ShopUserSessionAdapter {
     private ShopUserSessionRemoteController shopUserSessionRemoteController;
 
     @AdapterAnnotation
-    public RPCBaseResponse<ShopUserSessionVo> getUserSession(){
+    public RPCBaseResponse<ShopUserSessionVo> getUserSession() {
         return shopUserSessionRemoteController.getUserSession();
     }
 
     @AdapterAnnotation
-    public RPCBaseResponse<ShopUserSessionVo> getSessionInfo(String sessionId){
+    public RPCBaseResponse<ShopUserSessionVo> getSessionInfo(String sessionId) {
         return shopUserSessionRemoteController.getSessionInfo(sessionId);
     }
 

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

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-adapter/edu-travel-adapter-country/src/main/java/edu/travel/adapter/service/country/CountryAdapter.java

@@ -11,33 +11,38 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 @Component
-public class CountryAdapter  {
+public class CountryAdapter {
     @Autowired
     private BaseCountryServeRemoteController baseCountryServeRemoteController;
+
     @AdapterAnnotation
     public RPCBaseResponse<List<BaseCountryServeVo>> getCountryServeTree() {
-      return   baseCountryServeRemoteController.getCountryServeTree();
+        return baseCountryServeRemoteController.getCountryServeTree();
     }
 
     @AdapterAnnotation
     public RPCBaseResponse<BaseCountryServeVo> getFormId(String id) {
         return baseCountryServeRemoteController.getFormId(id);
     }
+
     @AdapterAnnotation
 
     public RPCBaseResponse<BaseCountryServeVo> updateTargetFormId(BaseCountryServeDto entity) {
         return baseCountryServeRemoteController.updateTargetFormId(entity);
     }
+
     @AdapterAnnotation
 
     public RPCBaseResponse<BaseCountryServeVo> saveFormTarget(BaseCountryServeDto entity) {
         return baseCountryServeRemoteController.saveFormTarget(entity);
     }
+
     @AdapterAnnotation
 
     public RPCBaseResponse<BaseCountryServeVo> deleteTargetFormId(List<String> ids) {
         return baseCountryServeRemoteController.deleteTargetFormId(ids);
     }
+
     @AdapterAnnotation
 
     public RPCBaseResponse<List<BaseCountryServeVo>> getAllForm() {

edu-travel-adapter/edu-travel-adapter-country/src/main/java/edu/travel/adapter/service/country/CurrencyAdapter.java

@@ -10,31 +10,38 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+
 @Component
 public class CurrencyAdapter {
     @Autowired
     private ShopCurrencyRemoteController currencyRemoteController;
+
     //分页
     @AdapterAnnotation
     public RPCBaseResponse<IPage<ShopCurrencyVo>> getCurrencyPage(ShopCurrencyDto dto) {
         return currencyRemoteController.getCurrencyPage(dto);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<ShopCurrencyVo> getFormId(String id) {
         return currencyRemoteController.getFormId(id);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<ShopCurrencyVo> updateTargetFormId(ShopCurrencyDto entity) {
         return currencyRemoteController.updateTargetFormId(entity);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<ShopCurrencyVo> deleteTargetFormId(List<String> ids) {
         return currencyRemoteController.deleteTargetFormId(ids);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<List<ShopCurrencyVo>> getAllForm() {
         return currencyRemoteController.getAllForm();
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<ShopCurrencyVo> saveFormTarget(ShopCurrencyDto entity) {
         return currencyRemoteController.saveFormTarget(entity);

edu-travel-adapter/edu-travel-adapter-country/src/main/java/edu/travel/adapter/service/country/LanguageAdapter.java

@@ -10,7 +10,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class LanguageAdapter {
     @Autowired
-    private ShopLanguageRemoteController  shopLanguageRemoteController;
+    private ShopLanguageRemoteController shopLanguageRemoteController;
+
     @AdapterAnnotation
     public RPCBaseResponse<ShopLanguageVo> getFormId(String id) {
         return shopLanguageRemoteController.getFormId(id);

edu-travel-adapter/edu-travel-adapter-order/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-adapter/edu-travel-adapter-order/src/main/java/edu/travel/adapter/service/order/OrderAdapter.java

@@ -13,19 +13,22 @@ import org.springframework.stereotype.Component;
 public class OrderAdapter {
     @Autowired
     private ShopOrderRemoteController shopOrderRemoteController;
+
     @AdapterAnnotation
     public RPCBaseResponse<Void> addShopOrder(AddOrderDto params) {
-       return shopOrderRemoteController.addShopOrder(params);
+        return shopOrderRemoteController.addShopOrder(params);
     }
 
     @AdapterAnnotation
     public RPCBaseResponse<ShowOrderInfoVo> orderInfoByOrderNum(String orderNum) {
         return shopOrderRemoteController.orderInfoByOrderNum(orderNum);
     }
+
     @AdapterAnnotation
-    public RPCBaseResponse<Void> changeOrderState(String orderNum,String state) {
-        return shopOrderRemoteController.changeOrderState(orderNum,state);
+    public RPCBaseResponse<Void> changeOrderState(String orderNum, String state) {
+        return shopOrderRemoteController.changeOrderState(orderNum, state);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<ShopOrderVo> getFormId(String orderId) {
         return shopOrderRemoteController.getFormId(orderId);

edu-travel-adapter/edu-travel-adapter-order/src/main/java/edu/travel/adapter/service/order/OrderItemAdapter.java

@@ -1,7 +1,6 @@
 package edu.travel.adapter.service.order;
 
 import edu.travel.adapter.annotation.AdapterAnnotation;
-import edu.travel.remote.dto.AddOrderDto;
 import edu.travel.remote.dto.AddOrderItemDto;
 import edu.travel.remote.dto.GetOrderItemDto;
 import edu.travel.remote.order.ShopOrderItemRemoteController;
@@ -21,6 +20,7 @@ public class OrderItemAdapter {
     public RPCBaseResponse<OrderItemVo> getOrderItemVo(GetOrderItemDto params) {
         return shopOrderItemRemoteController.getOrderItemVo(params);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<Void> addShopOrderItem(List<AddOrderItemDto> params) {
         return shopOrderItemRemoteController.addShopOrderItem(params);

edu-travel-adapter/edu-travel-adapter-order/src/main/java/edu/travel/adapter/service/order/ShopOrderLogAdapter.java

@@ -11,7 +11,7 @@ public class ShopOrderLogAdapter {
     @Autowired
     private ShopOrderTypeChangeRemoteController shopOrderTypeChangeRemoteController;
 
-    public RPCBaseResponse<Void> addOrderLog(AddOrderLogDto params){
+    public RPCBaseResponse<Void> addOrderLog(AddOrderLogDto params) {
         return shopOrderTypeChangeRemoteController.addOrderLog(params);
     }
 }

edu-travel-adapter/edu-travel-adapter-tenant/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-adapter/edu-travel-adapter-tenant/src/main/java/edu/travel/adapter/service/tenant/SysRoleAdapter.java

@@ -7,15 +7,19 @@ import edu.travel.tenant.SysRoleRemoteController;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+
 @Component
 public class SysRoleAdapter {
     @Resource
     private SysRoleRemoteController sysRoleRemoteController;
+
     /**
      * 通过id查找角色
      */
     @AdapterAnnotation
-    public RPCBaseResponse<SysRoleVo> getFormId(String id){
+    public RPCBaseResponse<SysRoleVo> getFormId(String id) {
         return sysRoleRemoteController.getFormId(id);
-    };
+    }
+
+    ;
 }

edu-travel-adapter/edu-travel-adapter-tenant/src/main/java/edu/travel/adapter/service/tenant/SysUserRoleAdapter.java

@@ -12,8 +12,9 @@ import java.util.List;
 public class SysUserRoleAdapter {
     @Autowired
     private SysUserRoleRemoteController sysUserRoleRemoteController;
+
     @AdapterAnnotation
-    public RPCBaseResponse<List<String>> getAdmins(){
+    public RPCBaseResponse<List<String>> getAdmins() {
         return sysUserRoleRemoteController.getAdmins();
     }
 }

edu-travel-adapter/edu-travel-adapter-tenant/src/main/java/edu/travel/adapter/service/tenant/TenantAdapter.java

@@ -7,7 +7,6 @@ import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.tenant.TenantRemoteController;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -22,13 +21,17 @@ public class TenantAdapter {
     public RPCBaseResponse<EduTenantVo> getTenantById(Long id) {
         return tenantRemoteController.getTenantById(id);
     }
+
     /**
      * 根据用户id获取用户角色列表(未分页)
      */
     @AdapterAnnotation
-    public BaseResponse<List<SysRoleVo>> getRoleListByUserId(String userId){
+    public BaseResponse<List<SysRoleVo>> getRoleListByUserId(String userId) {
         return tenantRemoteController.getRoleListByUserId(userId);
-    };
+    }
+
+    ;
+
     /**
      * 通过id查询商城用户信息
      */

edu-travel-adapter/edu-travel-adapter-upload/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-adapter/edu-travel-adapter-upload/src/main/java/edu/travel/adapter/service/upload/UploadAdapter.java

@@ -17,59 +17,71 @@ import java.io.IOException;
 import java.util.List;
 
 @Component
-public class UploadAdapter  {
+public class UploadAdapter {
     @Autowired
     private UploadRemoteController uploadRemoteController;
+
     @AdapterAnnotation
-    public RPCBaseResponse<String> initializeUpload(){
+    public RPCBaseResponse<String> initializeUpload() {
         RPCBaseResponse rpcBaseResponse = uploadRemoteController.initializeUpload();
         return rpcBaseResponse;
     }
+
     @AdapterAnnotation
     public RPCBaseResponse exitsFile(String md5) {
         RPCBaseResponse rpcBaseResponse = uploadRemoteController.exitsFile(md5);
         return rpcBaseResponse;
     }
+
     @AdapterAnnotation
     public RPCBaseResponse exitsBlob(String md5) {
         RPCBaseResponse rpcBaseResponse = uploadRemoteController.exitsBlob(md5);
         return rpcBaseResponse;
     }
+
     @AdapterAnnotation
     public RPCBaseResponse uploadBigFile(EduFileBlobDTO dto, MultipartFile file) throws IOException {
-        RPCBaseResponse rpcBaseResponse = uploadRemoteController.uploadBigFile(dto,file);
+        RPCBaseResponse rpcBaseResponse = uploadRemoteController.uploadBigFile(dto, file);
         return rpcBaseResponse;
     }
+
     @AdapterAnnotation
     public RPCBaseResponse mergeFile(EduFileDTO eduFileDTO) {
         RPCBaseResponse rpcBaseResponse = uploadRemoteController.mergeFile(eduFileDTO);
         return rpcBaseResponse;
     }
+
     @AdapterAnnotation
-    public RPCBaseResponse uploadFile(EduFileDTO eduFileDTO,MultipartFile file) throws IOException {
-        RPCBaseResponse rpcBaseResponse = uploadRemoteController.uploadFile(JSON.toJSONString(eduFileDTO),file);
+    public RPCBaseResponse uploadFile(EduFileDTO eduFileDTO, MultipartFile file) throws IOException {
+        RPCBaseResponse rpcBaseResponse = uploadRemoteController.uploadFile(JSON.toJSONString(eduFileDTO), file);
         return rpcBaseResponse;
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<FileVo> uploadFilePath(EduFileDTO eduFileDTO, MultipartFile file) throws IOException {
-        return uploadRemoteController.uploadFilePath(JSON.toJSONString(eduFileDTO),file);
+        return uploadRemoteController.uploadFilePath(JSON.toJSONString(eduFileDTO), file);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<EduFileVo> getFormId(@RequestParam("id") String id) {
         return uploadRemoteController.getFormId(id);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<EduFileVo> updateTargetFormId(EduFileDTO entity) {
         return uploadRemoteController.updateTargetFormId(entity);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<EduFileVo> saveFormTarget(EduFileDTO entity) {
         return uploadRemoteController.saveFormTarget(entity);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<EduFileVo> deleteTargetFormId(List<String> ids) {
         return uploadRemoteController.deleteTargetFormId(ids);
     }
+
     @AdapterAnnotation
     public RPCBaseResponse<List<EduFileVo>> getAllForm() {
         return uploadRemoteController.getAllForm();

edu-travel-adapter/edu-travel-adapter-warehouse/src/main/java/edu/travel/adapter/service/warehouse/WarehouseAdapter.java

@@ -41,13 +41,13 @@ public class WarehouseAdapter {
     //库房连表新增
     @AdapterAnnotation
     public RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request) {
-        return shopWarehouseRemoteController.saveAllForm(entity,request);
+        return shopWarehouseRemoteController.saveAllForm(entity, request);
     }
 
     //库房连表修改
     @AdapterAnnotation
-    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity,HttpServletRequest request) {
-        return shopWarehouseRemoteController.updateWarehouse(entity,request);
+    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request) {
+        return shopWarehouseRemoteController.updateWarehouse(entity, request);
     }
 
     //查询库房详情

edu-travel-adapter/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-api/edu-travel-api-admin/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-api/edu-travel-api-admin/src/main/java/edu/travel/AdminApplication.java

@@ -4,19 +4,15 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
 /**
  * Hello world!
- *
  */
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-public class AdminApplication
-{
-    public static void main( String[] args )
-    {
-       SpringApplication.run(AdminApplication.class, args);
+public class AdminApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(AdminApplication.class, args);
     }
 }

edu-travel-api/edu-travel-api-admin/src/main/java/edu/travel/config/MyAccessDeniedHandler.java

@@ -11,7 +11,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-public class MyAccessDeniedHandler  implements AccessDeniedHandler {
+public class MyAccessDeniedHandler implements AccessDeniedHandler {
     @Override
     public void handle(HttpServletRequest req, HttpServletResponse resp, AccessDeniedException e) throws IOException, ServletException {
         resp.setContentType("application/json;charset=UTF-8");

edu-travel-api/edu-travel-api-admin/src/main/java/edu/travel/config/ResourceServerConfig.java

@@ -12,7 +12,7 @@ import org.springframework.security.oauth2.provider.token.TokenStore;
 @Configuration
 @EnableResourceServer
 public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
-    private static  final String RESOURCE_ID = "admin";
+    private static final String RESOURCE_ID = "admin";
 
     @Autowired
     private TokenStore tokenStore;

edu-travel-api/edu-travel-api-admin/src/main/java/edu/travel/config/TokenConfig.java

@@ -18,10 +18,12 @@ public class TokenConfig {
     private String key;
     @Value("${PRIVATE_KEY}")
     private String privateKey;
+
     @Bean
-    public PasswordEncoder passwordEncoder(){
+    public PasswordEncoder passwordEncoder() {
         return NoOpPasswordEncoder.getInstance();
     }
+
     @Bean
     public TokenStore tokenStore() {
         //JWT令牌存储方案
@@ -39,7 +41,7 @@ public class TokenConfig {
             converter.setSigningKey(decrypt);
             return converter;
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }

edu-travel-api/edu-travel-api-admin/src/main/java/edu/travel/controller/UploadController.java

@@ -7,7 +7,6 @@ import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,11 +18,13 @@ import java.io.IOException;
 
 @RestController
 @RequestMapping("/upload")
-public class UploadController  {
+public class UploadController {
     @Autowired
     private UploadAdapter uploadAdapter;
+
     /**
      * 文件是否存在
+     *
      * @param
      * @return
      */
@@ -38,6 +39,7 @@ public class UploadController  {
 
     /**
      * 文件是否存在
+     *
      * @param md5
      * @return
      */
@@ -46,15 +48,17 @@ public class UploadController  {
     public BaseResponse exitsFile(String md5) {
         RPCBaseResponse rpcBaseResponse = uploadAdapter.exitsFile(md5);
         if (rpcBaseResponse != null) {
-            if (rpcBaseResponse.getCode() == HttpStatus.OK.value()){
-                return new BaseResponse(HttpStatus.OK.value(),"success",rpcBaseResponse.getData());
+            if (rpcBaseResponse.getCode() == HttpStatus.OK.value()) {
+                return new BaseResponse(HttpStatus.OK.value(), "success", rpcBaseResponse.getData());
             }
-            return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(),"request is error",null);
+            return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "request is error", null);
         }
-        return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(),"request is error",null);
+        return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "request is error", null);
     }
+
     /**
      * 上传过哪些分片
+     *
      * @param md5
      * @return
      */
@@ -63,32 +67,36 @@ public class UploadController  {
     public BaseResponse exitsBlob(String md5) {
         RPCBaseResponse rpcBaseResponse = uploadAdapter.exitsBlob(md5);
         if (rpcBaseResponse != null) {
-            if (rpcBaseResponse.getCode() == HttpStatus.OK.value()){
-                return new BaseResponse(HttpStatus.OK.value(), "success",rpcBaseResponse.getData());
+            if (rpcBaseResponse.getCode() == HttpStatus.OK.value()) {
+                return new BaseResponse(HttpStatus.OK.value(), "success", rpcBaseResponse.getData());
             }
-            return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(),"request is error",null);
+            return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "request is error", null);
         }
-        return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(),"request is error",null);
+        return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "request is error", null);
     }
+
     /**
      * 上传大文件分片
+     *
      * @param file
      * @return
      */
     @PostMapping(value = "/uploadBlob")
     @PreAuthorize("permitAll()")
     public BaseResponse uploadBigFile(EduFileBlobDTO dto, MultipartFile file) throws IOException {
-        RPCBaseResponse rpcBaseResponse = uploadAdapter.uploadBigFile(dto,file);
+        RPCBaseResponse rpcBaseResponse = uploadAdapter.uploadBigFile(dto, file);
         if (rpcBaseResponse != null) {
-            if (rpcBaseResponse.getCode() == HttpStatus.OK.value()){
-                return new BaseResponse(HttpStatus.OK.value(),"success",rpcBaseResponse.getData());
+            if (rpcBaseResponse.getCode() == HttpStatus.OK.value()) {
+                return new BaseResponse(HttpStatus.OK.value(), "success", rpcBaseResponse.getData());
             }
-            return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(),"request is error",null);
+            return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "request is error", null);
         }
-        return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(),"request is error",null);
+        return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "request is error", null);
     }
+
     /**
      * 合并大文件
+     *
      * @param eduFileDTO
      * @return
      */
@@ -97,21 +105,23 @@ public class UploadController  {
     public BaseResponse mergeFile(EduFileDTO eduFileDTO) {
         RPCBaseResponse rpcBaseResponse = uploadAdapter.mergeFile(eduFileDTO);
         if (rpcBaseResponse != null) {
-            if (rpcBaseResponse.getCode() == HttpStatus.OK.value()){
-                return new BaseResponse(HttpStatus.OK.value(),"success",rpcBaseResponse.getData());
+            if (rpcBaseResponse.getCode() == HttpStatus.OK.value()) {
+                return new BaseResponse(HttpStatus.OK.value(), "success", rpcBaseResponse.getData());
             }
-            return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(),"request is error",null);
+            return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "request is error", null);
         }
-        return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(),"request is error",null);
+        return new BaseResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "request is error", null);
     }
+
     /**
      * 上传小文件
+     *
      * @param file
      * @return
      */
     @PostMapping(value = "/upload")
     @PreAuthorize("permitAll()")
-    public BaseResponse uploadFile(EduFileDTO eduFile,MultipartFile file) throws IOException {
+    public BaseResponse uploadFile(EduFileDTO eduFile, MultipartFile file) throws IOException {
         return null;
 //        RPCBaseResponse rpcBaseResponse = uploadAdapter.uploadFile(eduFile,file);
 //        if (rpcBaseResponse != null) {

edu-travel-api/edu-travel-api-admin/src/main/java/edu/travel/filter/TokenAuthenticationFilter.java

@@ -25,22 +25,23 @@ import java.io.IOException;
 public class TokenAuthenticationFilter extends OncePerRequestFilter {
     @Autowired
     private RedisTemplate redisTemplate;
+
     @Override
     protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException {
         String token = httpServletRequest.getHeader("token");
 //token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsiYWRtaW4iXSwiZXhwIjoxNzQwMjAyNTcyLCJ1c2VyX25hbWUiOiIxNTk5ODk1NzA3NCIsImp0aSI6IjM0M2JjNGUzLTk5ZjMtNGE4Zi1iMmIxLTI1ZjRkMzBmNmJmYyIsImNsaWVudF9pZCI6ImFkbWluIiwic2NvcGUiOlsic2VydmVyIl19.MYoFq8gg832DQMX-wVMLN0JlIaWeuQZvl1z1NUNFspQ";
-        if (StringUtils.isNotBlank(token)){
+        if (StringUtils.isNotBlank(token)) {
             String json = EncryptUtil.decodeUTF8StringBase64(token);
             //将token转成json对象
             JSONObject jsonObject = JSON.parseObject(json);
             //用户身份信息
-            String username  = jsonObject.getString("principal");
+            String username = jsonObject.getString("principal");
             Object object = redisTemplate.opsForValue().get(username + "_info");
-            if (object == null){
+            if (object == null) {
                 JSONObject resultObject = new JSONObject();
-                resultObject.put("code",401);
-                resultObject.put("msg","not found user");
-                resultObject.put("data",null);
+                resultObject.put("code", 401);
+                resultObject.put("msg", "not found user");
+                resultObject.put("data", null);
                 httpServletResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
                 httpServletResponse.setContentType("application/json;charset=utf-8");
                 httpServletResponse.getWriter().write(resultObject.toJSONString());
@@ -56,6 +57,6 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
             //将authenticationToken填充到安全上下文
             SecurityContextHolder.getContext().setAuthentication(authenticationToken);
         }
-        filterChain.doFilter(httpServletRequest,httpServletResponse);
+        filterChain.doFilter(httpServletRequest, httpServletResponse);
     }
 }

edu-travel-api/edu-travel-api-web/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/WebApplication.java

@@ -8,10 +8,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-public class WebApplication
-{
-    public static void main( String[] args )
-    {
+public class WebApplication {
+    public static void main(String[] args) {
         SpringApplication.run(WebApplication.class, args);
     }
 }

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/config/MyAccessDeniedHandler.java

@@ -11,7 +11,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-public class MyAccessDeniedHandler  implements AccessDeniedHandler {
+public class MyAccessDeniedHandler implements AccessDeniedHandler {
     @Override
     public void handle(HttpServletRequest req, HttpServletResponse resp, AccessDeniedException e) throws IOException, ServletException {
         resp.setContentType("application/json;charset=UTF-8");

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/config/ResourceServerConfig.java

@@ -12,7 +12,7 @@ import org.springframework.security.oauth2.provider.token.TokenStore;
 @Configuration
 @EnableResourceServer
 public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
-    private static  final String RESOURCE_ID = "admin";
+    private static final String RESOURCE_ID = "admin";
 
     @Autowired
     private TokenStore tokenStore;

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/config/TokenConfig.java

@@ -18,10 +18,12 @@ public class TokenConfig {
     private String key;
     @Value("${PRIVATE_KEY}")
     private String privateKey;
+
     @Bean
-    public PasswordEncoder passwordEncoder(){
+    public PasswordEncoder passwordEncoder() {
         return NoOpPasswordEncoder.getInstance();
     }
+
     @Bean
     public TokenStore tokenStore() {
         //JWT令牌存储方案
@@ -39,7 +41,7 @@ public class TokenConfig {
             converter.setSigningKey(decrypt);
             return converter;
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopAddressController.java

@@ -11,20 +11,22 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
-* 地址表(shop_address)表控制层
-*
-* @author xxxxx
-*/
+ * 地址表(shop_address)表控制层
+ *
+ * @author xxxxx
+ */
 @RestController
 @RequestMapping("/shopAddress")
-public class ShopAddressController{
-/**
-* 服务对象
-*/
+public class ShopAddressController {
+    /**
+     * 服务对象
+     */
     @Autowired
     private ShopAddressAdapter shopAddressAdapter;
 
-    /** 查询登录用户的地址信息
+    /**
+     * 查询登录用户的地址信息
+     *
      * @param dto
      * @return {@link BaseResponse }<{@link Page }<{@link ShopAddressVo }>>
      */
@@ -34,7 +36,8 @@ public class ShopAddressController{
     }
 
     /**
-     *  新增或编辑地址
+     * 新增或编辑地址
+     *
      * @param param
      * @return {@link BaseResponse }<{@link Void }>
      */

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopCategoryController.java

@@ -35,7 +35,7 @@ public class ShopCategoryController {
      * @return {@link BaseResponse }<{@link ShopTypeVo }>
      */
     @GetMapping("/getShopType")
-    public RPCBaseResponse<List<ShopTypeVo>> getShopType(ShopTypeDto param){
+    public RPCBaseResponse<List<ShopTypeVo>> getShopType(ShopTypeDto param) {
         return shopCategoryAdapter.getShopType(param);
     }
 
@@ -45,7 +45,7 @@ public class ShopCategoryController {
      * @return {@link BaseResponse }<{@link ShopTypeVo }>
      */
     @GetMapping("/getLevelToShopType")
-    public RPCBaseResponse<List<ShopTypeVo>> getLevelToShopType(BaseDto param){
+    public RPCBaseResponse<List<ShopTypeVo>> getLevelToShopType(BaseDto param) {
         return shopCategoryAdapter.getLevelToShopType(param);
     }
 

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopFavoriteController.java

@@ -26,23 +26,25 @@ public class ShopFavoriteController {
     private ShopFavoriteAdapter shopFavoriteAdapter;
 
     /**
-     *  获取收藏商品
+     * 获取收藏商品
+     *
      * @return {@link RPCBaseResponse }<{@link Page }<{@link ShopFavoriteVo }>>
      */
     @GetMapping("/getFavorite")
-    public RPCBaseResponse<Page<ShopFavoriteVo>> getFavorite(BaseDto baseDto){
+    public RPCBaseResponse<Page<ShopFavoriteVo>> getFavorite(BaseDto baseDto) {
         return shopFavoriteAdapter.getFavorite(baseDto);
     }
 
 
     /**
-     *  添加收藏
+     * 添加收藏
+     *
      * @param params
      * @return {@link RPCBaseResponse }<{@link Void }>
      */
 
     @PostMapping("/addFavorite")
-    public RPCBaseResponse<Void> addFavorite(@RequestBody AddFavoriteDto params){
+    public RPCBaseResponse<Void> addFavorite(@RequestBody AddFavoriteDto params) {
         shopFavoriteAdapter.addFavorite(params);
         return success();
     }
@@ -51,7 +53,7 @@ public class ShopFavoriteController {
      * 移除收藏
      */
     @PostMapping("/removeFavorite")
-    public RPCBaseResponse<Void> removeFavorite(@RequestBody Set<String> ids){
+    public RPCBaseResponse<Void> removeFavorite(@RequestBody Set<String> ids) {
         shopFavoriteAdapter.removeFavorite(ids);
         return success();
     }
@@ -60,7 +62,7 @@ public class ShopFavoriteController {
      * 全部移除
      */
     @PostMapping("/removeAllFavorite")
-    public RPCBaseResponse<Void> removeAllFavorite(){
+    public RPCBaseResponse<Void> removeAllFavorite() {
         shopFavoriteAdapter.removeAllFavorite();
         return success();
     }

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopOpinionController.java

@@ -3,11 +3,12 @@ package edu.travel.controller;
 import edu.travel.adapter.service.commodity.ShopOpinionAdapter;
 import edu.travel.remote.dto.ShopOpinionDto;
 import edu.travel.remote.vo.FileWebVo;
-import edu.travel.remote.vo.ShopOpinionVo;
 import edu.travel.rpc.RPCBaseResponse;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -23,6 +24,7 @@ public class ShopOpinionController {
 
     @Autowired
     private ShopOpinionAdapter shopOpinionAdapter;
+
     /**
      * 新增意见
      */

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopOpinionTypeController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+
 /**
  * 意见类型(shop_opinion_type)表控制层
  *
@@ -19,11 +20,12 @@ import java.util.List;
 public class ShopOpinionTypeController {
     @Autowired
     private ShopOpinionTypeAdapter shopOpinionTypeAdapter;
+
     /**
-     *  根据语言ID查询意见类型
+     * 根据语言ID查询意见类型
      */
     @GetMapping("/getType")
-    public RPCBaseResponse<List<OpinionTypeVo>> getType(String languageId){
+    public RPCBaseResponse<List<OpinionTypeVo>> getType(String languageId) {
         return shopOpinionTypeAdapter.getType(languageId);
     }
 

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopParametersController.java

@@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import static edu.travel.rpc.RPCBaseResponse.success;
-
 /**
  * 商品参数(shop_parameters)表控制层
  *
@@ -25,20 +23,23 @@ import static edu.travel.rpc.RPCBaseResponse.success;
 public class ShopParametersController {
     @Autowired
     private ShopParametersAdapter shopParametersAdapter;
+
     /**
-     *  获取商品参数
+     * 获取商品参数
+     *
      * @param param
      * @return {@link BaseResponse }<{@link Page }<{@link ShopParametersVo }>>
      */
     @GetMapping("getShopParameters")
-    public RPCBaseResponse<Page<ShopParametersVo>> getShopParameters(ProductSpecDto param){
+    public RPCBaseResponse<Page<ShopParametersVo>> getShopParameters(ProductSpecDto param) {
         return shopParametersAdapter.getShopParameters(param);
     }
+
     /**
      * 获取参数
      */
     @GetMapping("getAllParameters")
-    public RPCBaseResponse<Page<ParametersVo>> getAllParameters(ParametersDto param){
+    public RPCBaseResponse<Page<ParametersVo>> getAllParameters(ParametersDto param) {
         return shopParametersAdapter.getAllParameters(param);
     }
 

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopProductController.java

@@ -1,17 +1,10 @@
 package edu.travel.controller;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileTypeUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.adapter.service.commodity.ShopProductAdapter;
 import edu.travel.remote.dto.GetProductByTypeDto;
 import edu.travel.remote.dto.InsertProductDto;
 import edu.travel.remote.dto.SearchProductDto;
-import edu.travel.remote.upload.dto.EduFileDTO;
-import edu.travel.remote.upload.vo.FileVo;
 import edu.travel.remote.vo.FileWebVo;
 import edu.travel.remote.vo.ShopProductVo;
 import edu.travel.resp.BaseResponse;
@@ -21,12 +14,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.Date;
 import java.util.List;
 
-import static edu.travel.rpc.RPCBaseResponse.error;
-import static edu.travel.rpc.RPCBaseResponse.success;
-
 /**
  * 商品表(shop_product)表控制层
  *
@@ -37,18 +26,21 @@ import static edu.travel.rpc.RPCBaseResponse.success;
 public class ShopProductController {
     @Autowired
     private ShopProductAdapter shopProductAdapter;
+
     /**
-     *  首页获取热门类别的热门商品
+     * 首页获取热门类别的热门商品
+     *
      * @param param 类型
      * @return {@link BaseResponse }<{@link List }<{@link ShopProductVo }>>
      */
     @GetMapping("/getHotProduct")
-    public RPCBaseResponse<Page<ShopProductVo>> getHotProduct(GetProductByTypeDto param){
+    public RPCBaseResponse<Page<ShopProductVo>> getHotProduct(GetProductByTypeDto param) {
         return shopProductAdapter.getHotProduct(param);
     }
 
     /**
-     *  搜索商品
+     * 搜索商品
+     *
      * @param param 类型
      * @return {@link BaseResponse }<{@link List }<{@link ShopProductVo }>>
      */
@@ -59,35 +51,38 @@ public class ShopProductController {
 
 
     /**
-     *  上传商品图片
+     * 上传商品图片
+     *
      * @param file
      * @return {@link RPCBaseResponse }<{@link String }>
      */
 
     @PostMapping("/uploadProductImage")
-    public RPCBaseResponse<FileWebVo> uploadProductImage(MultipartFile file){
+    public RPCBaseResponse<FileWebVo> uploadProductImage(MultipartFile file) {
         return shopProductAdapter.uploadProductImage(file);
     }
 
 
     /**
-     *  新增商品
+     * 新增商品
+     *
      * @param params
      * @return {@link RPCBaseResponse }<{@link Void }>
      */
 
     @PostMapping("/insertProduct")
-    public RPCBaseResponse<Void> insertProduct(@RequestBody InsertProductDto params){
+    public RPCBaseResponse<Void> insertProduct(@RequestBody InsertProductDto params) {
         return shopProductAdapter.insertProduct(params);
     }
 
     /**
-     *  获取SkuId
+     * 获取SkuId
+     *
      * @return {@link RPCBaseResponse }<{@link String }>
      */
 
     @GetMapping("/getSkuId")
-    public RPCBaseResponse<String> getSkuId(){
+    public RPCBaseResponse<String> getSkuId() {
         return shopProductAdapter.getSkuId();
     }
 }

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopProductSkuController.java

@@ -22,36 +22,40 @@ import java.util.Set;
 public class ShopProductSkuController {
     @Autowired
     private ShopProductSkuAdapter shopProductSkuAdapter;
+
     /**
-     *  通过sku查询sku规格值
+     * 通过sku查询sku规格值
+     *
      * @param skuId
      * @return {@link RPCBaseResponse }<{@link Map }<{@link String }, {@link List }<{@link ShopSkuSpecValueVo }>>>
      */
 
     @GetMapping("/getSkuValuesById")
-    public RPCBaseResponse<Map<String, List<ShopSkuSpecValueVo>>> getSkuValuesById(@RequestParam("skuId") Set<String> skuId){
+    public RPCBaseResponse<Map<String, List<ShopSkuSpecValueVo>>> getSkuValuesById(@RequestParam("skuId") Set<String> skuId) {
         return shopProductSkuAdapter.getSkuValuesById(skuId);
     }
 
     /**
-     *  商品下单
+     * 商品下单
+     *
      * @param params
      * @return {@link RPCBaseResponse }<{@link String }>
      */
 
     @PostMapping("/shopProductSku")
-    public RPCBaseResponse<Void> shopProductSku(@RequestBody AddShopOrderDto params){
+    public RPCBaseResponse<Void> shopProductSku(@RequestBody AddShopOrderDto params) {
         return shopProductSkuAdapter.shopProductSku(params);
     }
 
     /**
-     *  支付商品订单
+     * 支付商品订单
+     *
      * @param payShopOrderDto
      * @return {@link RPCBaseResponse }<{@link String }>
      */
 
     @PostMapping("/payProductSku")
-    public RPCBaseResponse<Void> payProductSku(@RequestBody PayShopOrderDto payShopOrderDto){
+    public RPCBaseResponse<Void> payProductSku(@RequestBody PayShopOrderDto payShopOrderDto) {
         return shopProductSkuAdapter.payProductSku(payShopOrderDto);
     }
 

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopProductSpecController.java

@@ -26,11 +26,12 @@ public class ShopProductSpecController {
 
     /**
      * 查询商品详情
+     *
      * @param param
      * @return {@link BaseResponse }<{@link List }<{@link ProductSpecVo }>>
      */
     @GetMapping("/getShopSpec")
-    public RPCBaseResponse<ProductSpecVo> getShopSpec(ProductSpecDto param){
+    public RPCBaseResponse<ProductSpecVo> getShopSpec(ProductSpecDto param) {
         return shopProductSpecAdapter.getShopSpec(param);
     }
 }

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopReviewController.java

@@ -21,6 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
 public class ShopReviewController {
     @Autowired
     private ShopReviewAdapter shopReviewService;
+
     /**
      * 获取商品评论
      *

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopSearchRecordsController.java

@@ -19,23 +19,26 @@ import org.springframework.web.bind.annotation.*;
 public class ShopSearchRecordsController {
     @Autowired
     private ShopSearchRecordsAdapter shopSearchRecordsAdapter;
+
     /**
      * 清空历史搜索记录（searchType:1）
+     *
      * @return 结果
      */
     @PostMapping("/clearSearchRecord")
-    public RPCBaseResponse<Void> clearProjectSearchRecords(@RequestBody SearchRecordListDto clear){
+    public RPCBaseResponse<Void> clearProjectSearchRecords(@RequestBody SearchRecordListDto clear) {
         return shopSearchRecordsAdapter.clearProjectSearchRecords(clear);
     }
 
 
     /**
      * 获取搜索记录列表
+     *
      * @param baseDto 参数DTO对象
      * @return 结果
      */
     @GetMapping("/searchRecordList")
-    public RPCBaseResponse<Page<SearchRecordsVo>> searchRecordList(SearchRecordListDto baseDto){
+    public RPCBaseResponse<Page<SearchRecordsVo>> searchRecordList(SearchRecordListDto baseDto) {
         return shopSearchRecordsAdapter.searchRecordList(baseDto);
     }
 

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopShoppingCartController.java

@@ -26,7 +26,8 @@ public class ShopShoppingCartController {
 
 
     /**
-     *  新增购物车
+     * 新增购物车
+     *
      * @param params
      * @return {@link BaseResponse }<{@link Boolean }>
      */
@@ -37,6 +38,7 @@ public class ShopShoppingCartController {
 
     /**
      * 分页查询购物车列表
+     *
      * @param params
      * @return {@link BaseResponse }<{@link Page }<{@link ShopCartListVo }>>
      */
@@ -48,6 +50,7 @@ public class ShopShoppingCartController {
 
     /**
      * 修改购物车信息
+     *
      * @param params
      * @return {@link BaseResponse }<{@link Page }<{@link ShopCartListVo }>>
      */
@@ -56,8 +59,10 @@ public class ShopShoppingCartController {
     public RPCBaseResponse<Boolean> updateCart(@RequestBody UpdateShopCarDto params) {
         return shopShoppingCartAdapter.updateCart(params);
     }
+
     /**
      * 删除购物车
+     *
      * @param ids
      * @return {@link BaseResponse }<{@link Page }<{@link ShopCartListVo }>>
      */

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopSpecController.java

@@ -18,25 +18,28 @@ import org.springframework.web.bind.annotation.*;
 public class ShopSpecController {
     @Autowired
     private ShopSpecAdapter shopSpecAdapter;
+
     /**
-     *  分页查询规格
+     * 分页查询规格
+     *
      * @param currentPage
      * @param pageSize
      * @return {@link RPCBaseResponse }<{@link Page }<{@link SpecVo }>>
      */
 
     @GetMapping("/getShopSpec")
-    public RPCBaseResponse<Page<SpecVo>> getShopSpec(@RequestParam("countryId")Long countryId, @RequestParam("currentPage")Integer currentPage, @RequestParam("pgeSize")Integer pageSize){
-        return shopSpecAdapter.getShopSpec(countryId,currentPage,pageSize);
+    public RPCBaseResponse<Page<SpecVo>> getShopSpec(@RequestParam("countryId") Long countryId, @RequestParam("currentPage") Integer currentPage, @RequestParam("pgeSize") Integer pageSize) {
+        return shopSpecAdapter.getShopSpec(countryId, currentPage, pageSize);
     }
 
     /**
-     *  修改/新增规格
+     * 修改/新增规格
+     *
      * @return {@link RPCBaseResponse }<{@link Page }<{@link SpecVo }>>
      */
 
     @PostMapping("/insertOrUpdate")
-    public RPCBaseResponse<Page<SpecVo>> insertOrUpdate(@RequestBody SpecDto specDto){
+    public RPCBaseResponse<Page<SpecVo>> insertOrUpdate(@RequestBody SpecDto specDto) {
         return shopSpecAdapter.insertOrUpdate(specDto);
     }
 }

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopUserSessionController.java

@@ -19,26 +19,28 @@ import org.springframework.web.bind.annotation.RestController;
 public class ShopUserSessionController {
     @Autowired
     private ShopUserSessionAdapter shopUserSessionAdapter;
+
     /**
-     *  获取用户客服关联
+     * 获取用户客服关联
+     *
      * @param
      * @return {@link RPCBaseResponse }<{@link String }>
      */
 
     @GetMapping("/getUserSession")
-    public RPCBaseResponse<ShopUserSessionVo> getUserSession()
-    {
+    public RPCBaseResponse<ShopUserSessionVo> getUserSession() {
         return shopUserSessionAdapter.getUserSession();
     }
 
     /**
-     *  获取会话详情
+     * 获取会话详情
+     *
      * @param sessionId
      * @return {@link RPCBaseResponse }<{@link ShopUserSessionVo }>
      */
 
     @GetMapping("/getSessionInfo")
-    public RPCBaseResponse<ShopUserSessionVo> getSessionInfo(@RequestParam("sessionId") String sessionId){
+    public RPCBaseResponse<ShopUserSessionVo> getSessionInfo(@RequestParam("sessionId") String sessionId) {
         return shopUserSessionAdapter.getSessionInfo(sessionId);
     }
 }

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/filter/TokenAuthenticationFilter.java

@@ -25,22 +25,23 @@ import java.io.IOException;
 public class TokenAuthenticationFilter extends OncePerRequestFilter {
     @Autowired
     private RedisTemplate redisTemplate;
+
     @Override
     protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException {
         String token = httpServletRequest.getHeader("token");
 //token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsiYWRtaW4iXSwiZXhwIjoxNzQwMjAyNTcyLCJ1c2VyX25hbWUiOiIxNTk5ODk1NzA3NCIsImp0aSI6IjM0M2JjNGUzLTk5ZjMtNGE4Zi1iMmIxLTI1ZjRkMzBmNmJmYyIsImNsaWVudF9pZCI6ImFkbWluIiwic2NvcGUiOlsic2VydmVyIl19.MYoFq8gg832DQMX-wVMLN0JlIaWeuQZvl1z1NUNFspQ";
-        if (StringUtils.isNotBlank(token)){
+        if (StringUtils.isNotBlank(token)) {
             String json = EncryptUtil.decodeUTF8StringBase64(token);
             //将token转成json对象
             JSONObject jsonObject = JSON.parseObject(json);
             //用户身份信息
-            String username  = jsonObject.getString("principal");
+            String username = jsonObject.getString("principal");
             Object object = redisTemplate.opsForValue().get(username + "_info");
-            if (object == null){
+            if (object == null) {
                 JSONObject resultObject = new JSONObject();
-                resultObject.put("code",401);
-                resultObject.put("msg","not found user");
-                resultObject.put("data",null);
+                resultObject.put("code", 401);
+                resultObject.put("msg", "not found user");
+                resultObject.put("data", null);
                 httpServletResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
                 httpServletResponse.setContentType("application/json;charset=utf-8");
                 httpServletResponse.getWriter().write(resultObject.toJSONString());
@@ -56,6 +57,6 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
             //将authenticationToken填充到安全上下文
             SecurityContextHolder.getContext().setAuthentication(authenticationToken);
         }
-        filterChain.doFilter(httpServletRequest,httpServletResponse);
+        filterChain.doFilter(httpServletRequest, httpServletResponse);
     }
 }

edu-travel-api/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-common/edu-travel-common-adapter/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-common/edu-travel-common-adapter/src/main/java/edu/travel/adapter/aspect/AdapterAspect.java

@@ -12,8 +12,10 @@ import org.springframework.stereotype.Component;
 @Component
 public class AdapterAspect {
     Logger logger = LoggerFactory.getLogger(AdapterAspect.class);
+
     @Pointcut("@annotation(edu.travel.adapter.annotation.AdapterAnnotation)")
-    public void pointcut() {}
+    public void pointcut() {
+    }
 
     @Around("pointcut()")
     public Object around(ProceedingJoinPoint joinPoint) throws Throwable {

edu-travel-common/edu-travel-common-cache/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-common/edu-travel-common-cache/src/main/java/edu/travel/cache/annotation/EnableRedis.java

@@ -2,7 +2,6 @@ package edu.travel.cache.annotation;
 
 import edu.travel.cache.config.RedisConfig;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.redis.connection.RedisConfiguration;
 
 import java.lang.annotation.*;
 

edu-travel-common/edu-travel-common-cache/src/main/java/edu/travel/cache/annotation/EnableRedisCache.java

@@ -3,7 +3,6 @@ package edu.travel.cache.annotation;
 import edu.travel.cache.config.EduTravelCacheConfig;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.redis.cache.RedisCacheConfiguration;
 
 import java.lang.annotation.*;
 

edu-travel-common/edu-travel-common-cache/src/main/java/edu/travel/cache/aspects/CacheAspects.java

@@ -8,9 +8,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.CacheManager;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
@@ -24,24 +22,25 @@ public class CacheAspects {
 
     // 定义切点，例如拦截所有service层的方法
     @Pointcut("@annotation(edu.travel.cache.annotation.ClearAndReloadCache)")
-    public void cachePointcut() {}
+    public void cachePointcut() {
+    }
 
     @Around("cachePointcut()")
     public Object cacheAround(ProceedingJoinPoint joinPoint) throws Throwable {
         Signature signature = joinPoint.getSignature();
         Object result = null;
         if (signature instanceof MethodSignature) {
-            MethodSignature methodSignature = (MethodSignature)signature;
+            MethodSignature methodSignature = (MethodSignature) signature;
             Method targetMethod = methodSignature.getMethod();//方法对象
             ClearAndReloadCache annotation = targetMethod.getAnnotation(ClearAndReloadCache.class);
             boolean value = annotation.value();
             String pattern;
             if (value) {
                 Set keys;
-                if (annotation.prefixFactory()){
+                if (annotation.prefixFactory()) {
                     keys = getKeys(annotation.cachePrefix());
                     pattern = annotation.cachePrefix();
-                }else {
+                } else {
                     keys = getKeys(annotation.cacheSuffix());
                     pattern = annotation.cacheSuffix();
                 }
@@ -50,12 +49,12 @@ public class CacheAspects {
                 pattern = null;
             }
             result = joinPoint.proceed(joinPoint.getArgs());
-            new Thread(()->{
+            new Thread(() -> {
                 try {
                     Thread.sleep(1000);
                     Set keys = getKeys(pattern);
                     redisTemplate.delete(keys);
-                }catch (Exception e){
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }).start();
@@ -64,6 +63,6 @@ public class CacheAspects {
     }
 
     private Set getKeys(String pattern) {
-        return redisTemplate.keys("*"+pattern+"*");
+        return redisTemplate.keys("*" + pattern + "*");
     }
 }

edu-travel-common/edu-travel-common-cache/src/main/java/edu/travel/cache/config/EduTravelCacheConfig.java

@@ -1,34 +1,19 @@
-
-
 package edu.travel.cache.config;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.script.DefaultRedisScript;
-import org.springframework.data.redis.core.script.RedisScript;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-import org.springframework.data.redis.serializer.*;
-import org.springframework.scripting.support.ResourceScriptSource;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
 
 @Configuration
 public class EduTravelCacheConfig {
-//    @Autowired
+    //    @Autowired
 //    private RedisTemplate redisTemplate;
 //    @Autowired
 //    private RedisConnectionFactory redisConnectionFactory;
     @Bean
-    public RedisCacheConfiguration redisCacheConfiguration(){
+    public RedisCacheConfiguration redisCacheConfiguration() {
         RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig();
 //设置redis缓存值的序列化方式，此处采用json方式序列化
         redisCacheConfiguration = redisCacheConfiguration.
@@ -38,7 +23,6 @@ public class EduTravelCacheConfig {
     }
 
 
-
 //    @Bean
 //    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory factory) {
 //        redisTemplate.setConnectionFactory(factory);

edu-travel-common/edu-travel-common-cache/src/main/java/edu/travel/cache/config/RedisLock.java

@@ -12,10 +12,9 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class RedisLock {
 
-    private final StringRedisTemplate redisTemplate;
-
     // 锁键的前缀，可根据业务自定义
     private static final String LOCK_PREFIX = "lock:";
+    private final StringRedisTemplate redisTemplate;
 
     public RedisLock(StringRedisTemplate redisTemplate) {
         this.redisTemplate = redisTemplate;
@@ -23,8 +22,9 @@ public class RedisLock {
 
     /**
      * 获取分布式锁（使用SETNX和过期时间，保证原子性）
-     * @param lockKey   锁的键
-     * @param expire    锁的过期时间（秒）
+     *
+     * @param lockKey 锁的键
+     * @param expire  锁的过期时间（秒）
      * @return 锁的唯一标识（用于释放锁）
      */
     public String acquireLock(String lockKey, long expire) {
@@ -38,6 +38,7 @@ public class RedisLock {
 
     /**
      * 释放分布式锁（使用Lua脚本保证原子性）
+     *
      * @param lockKey   锁的键
      * @param lockValue 锁的唯一标识
      * @return 是否释放成功
@@ -46,8 +47,8 @@ public class RedisLock {
         if (lockValue == null) return false;
         String key = LOCK_PREFIX + lockKey;
         String script = "if redis.call('get', KEYS[1]) == ARGV[1] then " +
-                        "return redis.call('del', KEYS[1]) " +
-                        "else return 0 end";
+                "return redis.call('del', KEYS[1]) " +
+                "else return 0 end";
         RedisScript<Long> redisScript = new DefaultRedisScript<>(script, Long.class);
         Long result = redisTemplate.execute(redisScript, Collections.singletonList(key), lockValue);
         return result != null && result == 1;

edu-travel-common/edu-travel-common-constant/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-common/edu-travel-common-constant/src/main/java/edu/travel/RPCStatus.java

@@ -2,9 +2,9 @@ package edu.travel;
 
 public interface RPCStatus {
 
-     final Integer RESOURCES_NOT_FOUND = 404;
+    final Integer RESOURCES_NOT_FOUND = 404;
 
-     final Integer RESOURCES_SUCCESS = 200;
+    final Integer RESOURCES_SUCCESS = 200;
 
-     final Integer RESOURCES_ERROR = 500;
+    final Integer RESOURCES_ERROR = 500;
 }

edu-travel-common/edu-travel-common-core/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/errors/ErrorPO.java

@@ -3,19 +3,24 @@ package edu.travel.errors;
 public class ErrorPO {
     Integer errorCode;
     String errorMessage;
+
     public ErrorPO(Integer errorCode, String errorMessage) {
         this.errorCode = errorCode;
         this.errorMessage = errorMessage;
     }
+
     public Integer getErrorCode() {
         return errorCode;
     }
+
     public void setErrorCode(Integer errorCode) {
         this.errorCode = errorCode;
     }
+
     public String getErrorMessage() {
         return errorMessage;
     }
+
     public void setErrorMessage(String errorMessage) {
         this.errorMessage = errorMessage;
     }

edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/utils/tree/CustomDeepCopy.java

@@ -1,11 +1,7 @@
 package edu.travel.utils.tree;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.toolkit.SerializationUtils;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.converters.DateConverter;
-import java.util.Date;
+
 import java.util.List;
 
 public class CustomDeepCopy {
@@ -13,6 +9,7 @@ public class CustomDeepCopy {
         String jsonString = JSON.toJSONString(source);
         return JSON.parseObject(jsonString, targetClass);
     }
+
     public static <T> List<T> toObject(Object source, Class<T> targetClass) {
         String jsonString = JSON.toJSONString(source);
         return JSON.parseArray(jsonString, targetClass);

edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/utils/tree/ModelMapperUtil.java

@@ -31,6 +31,7 @@ public final class ModelMapperUtil {
 
     /**
      * 禁止实列化该类
+     *
      * @throws InstantiationException 不能实列化
      */
     private ModelMapperUtil() throws InstantiationException {
@@ -39,10 +40,11 @@ public final class ModelMapperUtil {
 
     /**
      * 将对象转换为指定class类型对象。
-     * @param source 源对象
+     *
+     * @param source      源对象
      * @param targetClass 转换目标类型
+     * @param <Target>    目标类型
      * @return 转换后对象
-     * @param <Target> 目标类型
      */
     public static <Target> Target map(Object source, Class<Target> targetClass) {
         return source == null ? null : MODEL_MAPPER.map(source, targetClass);
@@ -51,6 +53,7 @@ public final class ModelMapperUtil {
 
     /**
      * 将源对象中的属性转换到目标对象中,源对象与目标对象属性名相同的则转换
+     *
      * @param source 源对象
      * @param target 目标对象
      */
@@ -64,11 +67,12 @@ public final class ModelMapperUtil {
 
     /**
      * 将对象转换为指定class类型对象,并对转换后对象进行处理
-     * @param source 源对象
+     *
+     * @param source      源对象
      * @param targetClass 转换目标类型
-     * @param consumer 对转换后对象进行消费处理
+     * @param consumer    对转换后对象进行消费处理
+     * @param <Target>    目标类型
      * @return 转换后对象
-     * @param <Target> 目标类型
      */
     public static <Target> Target map(Object source, Class<Target> targetClass, Consumer<Target> consumer) {
         Target target = source == null ? null : MODEL_MAPPER.map(source, targetClass);
@@ -80,12 +84,13 @@ public final class ModelMapperUtil {
 
     /**
      * 将对象转换为指定class类型对象,并对转换后对象进行处理
-     * @param source 源对象
+     *
+     * @param source      源对象
      * @param targetClass 转换目标类型
-     * @param consumer 对转换后对象进行消费处理
+     * @param consumer    对转换后对象进行消费处理
+     * @param <Source>    源对象类型
+     * @param <Target>    目标类型
      * @return 转换后对象
-     * @param <Source> 源对象类型
-     * @param <Target> 目标类型
      */
     public static <Source, Target> Target map(Source source, Class<Target> targetClass, BiConsumer<Source, Target> consumer) {
         Target target = source == null ? null : MODEL_MAPPER.map(source, targetClass);
@@ -97,11 +102,12 @@ public final class ModelMapperUtil {
 
     /**
      * 将集合中的元素抓换为指定类型
-     * @param sourceList 源集合
+     *
+     * @param sourceList  源集合
      * @param targetClass 转换目标类型
+     * @param <TSource>   源类型
+     * @param <Target>    目标类型
      * @return 转换后的目标类型集合
-     * @param <TSource> 源类型
-     * @param <Target> 目标类型
      */
     public static <TSource, Target> List<Target> mapList(Collection<TSource> sourceList, Class<Target> targetClass) {
 
@@ -121,12 +127,13 @@ public final class ModelMapperUtil {
 
     /**
      * 将集合中的元素抓换为指定类型,并对转换后的元素处理
-     * @param sourceList 源集合
+     *
+     * @param sourceList  源集合
      * @param targetClass 转换目标类型
-     * @param consumer 对转换后元素处理
+     * @param consumer    对转换后元素处理
+     * @param <TSource>   源类型
+     * @param <Target>    目标类型
      * @return 转换后的集合
-     * @param <TSource> 源类型
-     * @param <Target> 目标类型
      */
     public static <TSource, Target> List<Target> mapList(Collection<TSource> sourceList, Class<Target> targetClass, Consumer<Target> consumer) {
 
@@ -150,12 +157,13 @@ public final class ModelMapperUtil {
 
     /**
      * 将集合中的元素抓换为指定类型,并对转换后的元素处理
-     * @param sourceList 源集合
+     *
+     * @param sourceList  源集合
      * @param targetClass 转换目标类型
-     * @param consumer 对转换后元素处理
+     * @param consumer    对转换后元素处理
+     * @param <TSource>   源类型
+     * @param <Target>    目标类型
      * @return 转换后的集合
-     * @param <TSource> 源类型
-     * @param <Target> 目标类型
      */
     public static <TSource, Target> List<Target> mapList(Collection<TSource> sourceList, Class<Target> targetClass, BiConsumer<TSource, Target> consumer) {
 

edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/utils/tree/MyTreeUtil.java

@@ -5,7 +5,6 @@ import java.util.stream.Collectors;
 
 /**
  * 树形菜单构建工具
- *
  */
 public class MyTreeUtil {
     /**

edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/utils/tree/TreeNode.java

@@ -7,35 +7,18 @@ import java.util.Objects;
 
 /**
  * 树结点
- *
  */
 public abstract class TreeNode {
     /**
-     * 获取当前节点id
-     *
-     * @return 节点id
-     */
-    public abstract String getId();
-
-    /**
-     * 获取父级节点id
-     *
-     * @return 父级节点id
-     */
-    public abstract String getParentId();
-
-    /**
      * 是否根节点
      */
     @Getter
     private Boolean rootNode;
-
     /**
      * 是否叶子节点
      **/
     @Getter
     private Boolean leafNode;
-
     /**
      * 子节点数据
      **/
@@ -43,6 +26,20 @@ public abstract class TreeNode {
     private List<TreeNode> children;
 
     /**
+     * 获取当前节点id
+     *
+     * @return 节点id
+     */
+    public abstract String getId();
+
+    /**
+     * 获取父级节点id
+     *
+     * @return 父级节点id
+     */
+    public abstract String getParentId();
+
+    /**
      * 设置子节点数据，设置为protected禁止外部调用
      **/
     protected void setChildren(List<TreeNode> children) {

edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/web/BaseApiController.java

@@ -5,10 +5,10 @@ import org.springframework.validation.Errors;
 
 import java.util.List;
 
-public  abstract  class BaseApiController<T> {
+public abstract class BaseApiController<T> {
     public abstract BaseResponse getList();
 
-    public abstract BaseResponse updateTargetById(T target,Errors errors);
+    public abstract BaseResponse updateTargetById(T target, Errors errors);
 
     public abstract BaseResponse deleteById(List<String> ids);
 

edu-travel-common/edu-travel-common-datasource/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/Test.java

@@ -3,7 +3,8 @@ package edu.travel;
 import java.util.HashMap;
 import java.util.Map;
 
-public final class Test{;
+public final class Test {
+    ;
     /**
      * 自动审核通过。
      */
@@ -12,12 +13,14 @@ public final class Test{;
      * 自动审核未通过。
      */
     public static final int REJECT = 2;
-    private final static  Map<Integer, String> testMap = new HashMap<Integer, String>();
+    private final static Map<Integer, String> testMap = new HashMap<Integer, String>();
+
+    private Test() {
+        testMap.put(AGREE, "是");
+        testMap.put(REJECT, "否");
+    }
+
     public Object getValue(Integer key) {
         return testMap.get(key);
     }
-    private Test(){
-        testMap.put(AGREE,"是");
-        testMap.put(REJECT,"否");
-    }
 }

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/annotation/LinkConst.java

@@ -4,7 +4,7 @@ import java.lang.annotation.*;
 
 /**
  * @author 畅
- *  常量字典注解
+ * 常量字典注解
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
@@ -13,12 +13,14 @@ import java.lang.annotation.*;
 public @interface LinkConst {
     /**
      * 字典类
+     *
      * @return
      */
-    Class clazz() ;
+    Class clazz();
 
     /**
      * 需要字典翻译字段
+     *
      * @return
      */
     String fieldName();

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/annotation/LinkMany.java

@@ -1,7 +1,5 @@
 package edu.travel.annotation;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import java.lang.annotation.*;
 
 /**
@@ -15,18 +13,21 @@ import java.lang.annotation.*;
 public @interface LinkMany {
     /**
      * 主表字段
+     *
      * @return
      */
-    String linkField() ;
+    String linkField();
 
     /**
      * 使用哪个mapper来关联查询
+     *
      * @return
      */
     Class linkMapper();
 
     /**
      * 从表关联字段
+     *
      * @return
      */
     String linkPrimaryField();

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/annotation/LinkOne.java

@@ -1,7 +1,5 @@
 package edu.travel.annotation;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import java.lang.annotation.*;
 
 /**
@@ -13,19 +11,22 @@ import java.lang.annotation.*;
 @Inherited
 public @interface LinkOne {
     /**
-     *  主表关联字段
+     * 主表关联字段
+     *
      * @return
      */
     String linkField();
 
     /**
      * 使用哪个mapper来关联查询
+     *
      * @return
      */
     Class linkMapper();
 
     /**
      * 从表关联字段
+     *
      * @return
      */
     String linkPrimaryField();

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/annotation/ManyToMany.java

@@ -8,8 +8,12 @@ import java.lang.annotation.*;
 @Inherited
 public @interface ManyToMany {
     String primaryField();
+
     Class linkMiddleMapper();
+
     String middleField();
+
     Class finalMapper();
+
     String finalField();
 }

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/config/FieldMetaObjectHandler.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
@@ -12,12 +11,11 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
  * @author 畅
- *  通用字段处理
+ * 通用字段处理
  */
 @Component
 public class FieldMetaObjectHandler implements MetaObjectHandler {
@@ -27,6 +25,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
     private final static String CREATE_TIME = "createTime";
     private final static String PROJECT = "project";
     private final static String DELETE_FLAG = "deleteFlag";
+
     @Override
     public void insertFill(MetaObject metaObject) {
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
@@ -50,7 +49,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
         if (metaObject.hasSetter(CREATE_TIME)) {
             this.strictInsertFill(metaObject, CREATE_TIME, Date.class, new Date());
         }
-        if (metaObject.hasSetter(PROJECT)){
+        if (metaObject.hasSetter(PROJECT)) {
             this.strictInsertFill(metaObject, PROJECT, String.class, request.getHeader("project"));
         }
         if (metaObject.hasSetter(DELETE_FLAG)) {
@@ -63,7 +62,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
         Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(principal));
         if (metaObject.hasSetter(UPDATE_USER_ID)) {
-            this.strictInsertFill(metaObject, UPDATE_USER_ID, String.class,  jsonObject.getLong("id").toString());
+            this.strictInsertFill(metaObject, UPDATE_USER_ID, String.class, jsonObject.getLong("id").toString());
         }
         if (metaObject.hasSetter(UPDATE_TIME)) {
             this.strictInsertFill(metaObject, UPDATE_TIME, Date.class, new Date());

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/config/MybatisPlusConfig.java

@@ -1,7 +1,6 @@
 package edu.travel.config;
 
 import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/config/MysqlConfig.java

@@ -11,6 +11,7 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * 处理mysql兼容问题
+ *
  * @Author 处理mysql兼容问题
  */
 @Configuration

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/config/PGConfig.java

@@ -11,6 +11,7 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * 处理pgsql 兼容问题
+ *
  * @Author 畅
  */
 @Configuration

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/datasource/ProjectInterceptor.java

@@ -1,27 +1,22 @@
 package edu.travel.datasource;
 
-import cn.hutool.core.util.ReflectUtil;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.Statement;
-import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SelectBody;
-import net.sf.jsqlparser.statement.update.Update;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.mapping.SqlCommandType;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 import org.slf4j.Logger;
@@ -30,23 +25,22 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Field;
 import java.sql.SQLException;
-import java.util.ArrayList;
 
 /**
  * @anthor 畅
- *  处理基础架构中统一带上 project 字段
+ * 处理基础架构中统一带上 project 字段
  */
 public class ProjectInterceptor implements InnerInterceptor {
     Logger logger = LoggerFactory.getLogger(ProjectInterceptor.class);
+
     private String convertDeleteToUpdate(String originalSql) {
         // 示例：将DELETE FROM table WHERE ... 转为 UPDATE table SET deleted=1 WHERE ...
         String newUPDATE = originalSql.replaceFirst("DELETE FROM", "UPDATE");
-        if (newUPDATE.contains("where")||newUPDATE.contains("WHERE")) {
-           newUPDATE =  newUPDATE.replace("WHERE", "SET delete_flag=1 WHERE ");
-        }else {
-            newUPDATE =  "";
+        if (newUPDATE.contains("where") || newUPDATE.contains("WHERE")) {
+            newUPDATE = newUPDATE.replace("WHERE", "SET delete_flag=1 WHERE ");
+        } else {
+            newUPDATE = "";
         }
         return newUPDATE;
 
@@ -57,23 +51,23 @@ public class ProjectInterceptor implements InnerInterceptor {
 //        BoundSql boundSql = ms.getBoundSql(parameter);
 //        if (ms.getSqlCommandType().equals(SqlCommandType.DELETE)) {
 //
-////            // 转换DELETE为UPDATE，此处需复杂处理，示例简化
-////            // 实际需解析原始SQL并替换，此处仅为思路
-////            String newSql = convertDeleteToUpdate(boundSql.getSql());
-////            // 反射修改BoundSql中的SQL
-////            Class<? extends BoundSql> aClass = boundSql.getClass();
-////            Field declaredField = null;
-////            try {
-////                declaredField = aClass.getDeclaredField("sql");
-////                declaredField.setAccessible(true);
-////                declaredField.set(boundSql,newSql);
-////            } catch (Exception e) {
-////                throw new RuntimeException(e);
-////            }
+
+    /// /            // 转换DELETE为UPDATE，此处需复杂处理，示例简化
+    /// /            // 实际需解析原始SQL并替换，此处仅为思路
+    /// /            String newSql = convertDeleteToUpdate(boundSql.getSql());
+    /// /            // 反射修改BoundSql中的SQL
+    /// /            Class<? extends BoundSql> aClass = boundSql.getClass();
+    /// /            Field declaredField = null;
+    /// /            try {
+    /// /                declaredField = aClass.getDeclaredField("sql");
+    /// /                declaredField.setAccessible(true);
+    /// /                declaredField.set(boundSql,newSql);
+    /// /            } catch (Exception e) {
+    /// /                throw new RuntimeException(e);
+    /// /            }
 //
 //        }
 //    }
-
     @Override
     public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
@@ -107,14 +101,14 @@ public class ProjectInterceptor implements InnerInterceptor {
                 String plainSelectString = plainSelect.toString();
                 if (!plainSelectString.contains("project = ")) {
                     if (plainSelectString.contains("where") || plainSelectString.contains("WHERE")) {
-                        AndExpression andExpression = new AndExpression(projectEq,where);
+                        AndExpression andExpression = new AndExpression(projectEq, where);
                         plainSelect.setWhere(andExpression);
-                    }else {
+                    } else {
                         plainSelect.setWhere(projectEq);
                     }
 
                     targetSql = plainSelect.toString();
-                }else {
+                } else {
                     targetSql = plainSelect.toString();
                 }
 

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/service/SysServiceImpl.java

@@ -12,26 +12,30 @@ import edu.travel.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 扩展mbp ServiceImpl
+ *
  * @param <M>
  * @param <T>
  * @author 忠畅
  */
-public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T> implements IService<T> {
+public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements IService<T> {
     private ApplicationContext applicationContext;
+    private JdbcTemplate jdbcTemplate;
+
     @Autowired
     public void setApplicationContext(ApplicationContext applicationContext) {
         this.applicationContext = applicationContext;
     }
-    private JdbcTemplate jdbcTemplate;
+
     @Autowired
     public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
@@ -39,6 +43,7 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
 
     /**
      * 一对一字典查询处理
+     *
      * @param queryWrapper
      * @return
      */
@@ -53,6 +58,7 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
 
     /**
      * 一对多字典查询处理
+     *
      * @param queryWrapper
      * @return
      */
@@ -67,13 +73,14 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
 
     /**
      * 分页查询处理
+     *
      * @param queryWrapper
      * @param page
      * @return
      */
-    public IPage<T> getPageLink(Wrapper<T> queryWrapper,IPage<T> page) {
+    public IPage<T> getPageLink(Wrapper<T> queryWrapper, IPage<T> page) {
         IPage<T> iPage = super.page(page, queryWrapper);
-        if (iPage == null ) {
+        if (iPage == null) {
             return new Page();
         }
         List<T> records = iPage.getRecords();
@@ -81,12 +88,14 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
         iPage.setRecords(records);
         return iPage;
     }
+
     /**
      * 一对一字典查询处理
+     *
      * @param queryWrapper
      * @return
      */
-    public T getOneLinkSQL(Wrapper<T> queryWrapper,Object... params) {
+    public T getOneLinkSQL(Wrapper<T> queryWrapper, Object... params) {
         T one = super.getOne(queryWrapper);
         if (one == null) {
             return null;
@@ -94,37 +103,43 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
         doOneLink(one, params);
         return one;
     }
+
     /**
      * 一对多字典查询处理
+     *
      * @param queryWrapper
      * @return
      */
-    public List<T> getListLinkSQL(Wrapper<T> queryWrapper,Object... params) {
+    public List<T> getListLinkSQL(Wrapper<T> queryWrapper, Object... params) {
         List<T> list = super.list(queryWrapper);
         if (list == null || list.isEmpty()) {
             return list;
         }
-        doManyLink(list,params);
+        doManyLink(list, params);
         return list;
     }
+
     /**
      * 分页查询处理
+     *
      * @param queryWrapper
      * @param page
      * @return
      */
-    public IPage<T> getPageLinkSQL(Wrapper<T> queryWrapper,IPage<T> page,Object... params) {
+    public IPage<T> getPageLinkSQL(Wrapper<T> queryWrapper, IPage<T> page, Object... params) {
         IPage<T> iPage = super.page(page, queryWrapper);
-        if (iPage == null ) {
+        if (iPage == null) {
             return new Page();
         }
         List<T> records = iPage.getRecords();
-        doManyLink(records,params);
+        doManyLink(records, params);
         iPage.setRecords(records);
         return iPage;
     }
+
     /**
      * 多对多查询字典处理
+     *
      * @param list
      */
     private void doManyLink(List<T> list) {
@@ -132,18 +147,21 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
             doOneLink(many);
         }
     }
+
     /**
      * 多对多查询字典处理
+     *
      * @param list
      */
-    private void doManyLink(List<T> list,Object... params) {
+    private void doManyLink(List<T> list, Object... params) {
         for (T many : list) {
-            doOneLink(many,params);
+            doOneLink(many, params);
         }
     }
 
     /**
      * 单个字典处理
+     *
      * @param one
      */
     private void doOneLink(T one) {
@@ -152,28 +170,29 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
         for (Field field : declaredFields) {
             field.setAccessible(true);
             doLinkOneToOne(one, field);
-            doLinkOneToMany(one,field);
-            doConst(one,field);
-            doManyToMany(one,field);
+            doLinkOneToMany(one, field);
+            doConst(one, field);
+            doManyToMany(one, field);
             try {
-                doLinkSQL(one,null,field);
-            }catch (Exception e){
+                doLinkSQL(one, null, field);
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
     }
-    private void doOneLink(T one,Object... params) {
+
+    private void doOneLink(T one, Object... params) {
         Class<?> clazz = one.getClass();
         Field[] declaredFields = clazz.getDeclaredFields();
         for (Field field : declaredFields) {
             field.setAccessible(true);
             doLinkOneToOne(one, field);
-            doLinkOneToMany(one,field);
-            doConst(one,field);
-            doManyToMany(one,field);
+            doLinkOneToMany(one, field);
+            doConst(one, field);
+            doManyToMany(one, field);
             try {
-                doLinkSQL(one,params,field);
-            }catch (Exception e){
+                doLinkSQL(one, params, field);
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
@@ -181,10 +200,11 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
 
     /**
      * 常量字典处理
+     *
      * @param one
      * @param field
      */
-    private void doConst(T one,Field field) {
+    private void doConst(T one, Field field) {
         try {
             LinkConst linkConst = field.getAnnotation(LinkConst.class);
             if (linkConst != null) {
@@ -202,11 +222,11 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
                     throw new RuntimeException("常量字典没有这个类");
                 }
                 ConcurrentHashMap objectObjectHashMap = new ConcurrentHashMap();
-                objectObjectHashMap.put("key",Integer.valueOf(declaredField.get(one).toString()));
+                objectObjectHashMap.put("key", Integer.valueOf(declaredField.get(one).toString()));
                 objectObjectHashMap.put("value", getValue);
                 field.set(one, objectObjectHashMap);
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
@@ -214,6 +234,7 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
 
     /**
      * 处理一对多字典情况
+     *
      * @param one
      * @param field
      */
@@ -231,16 +252,16 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
                     if (applicationContextBean != null) {
                         List<Map> oneToManyResult = applicationContextBean.selectMaps(new QueryWrapper<T>().eq(linkMany.linkPrimaryField(), object));
                         if (oneToManyResult != null && !oneToManyResult.isEmpty()) {
-                            field.set(one,oneToManyResult);
+                            field.set(one, oneToManyResult);
                         }
-                    }   else {
+                    } else {
                         return;
                     }
-                }else {
+                } else {
                     return;
                 }
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return;
         }
@@ -249,10 +270,11 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
 
     /**
      * 处理一对一字典情况
+     *
      * @param one
      * @param field
      */
-    private void doLinkOneToOne(T one,Field field) {
+    private void doLinkOneToOne(T one, Field field) {
         try {
             LinkOne linkOne = field.getAnnotation(LinkOne.class);
             if (linkOne != null) {
@@ -267,16 +289,16 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
                         List<Map> list = applicationContextBean.selectMaps(new QueryWrapper<T>().eq(linkOne.linkPrimaryField(), object));
                         if (list != null && !list.isEmpty()) {
                             Object oneToOneResult = list.get(0);
-                            field.set(one,oneToOneResult);
+                            field.set(one, oneToOneResult);
                         }
-                    }   else {
+                    } else {
                         return;
                     }
                 } else {
                     return;
                 }
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return;
         }
@@ -284,7 +306,7 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
     }
 
 
-    public void doManyToMany(T one,Field field) {
+    public void doManyToMany(T one, Field field) {
         ManyToMany annotation = field.getAnnotation(ManyToMany.class);
         if (annotation == null) {
             return;
@@ -304,31 +326,30 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
                     Class finalMapperClass = annotation.finalMapper();
                     Object finalMapper = applicationContext.getBean(finalMapperClass);
                     if (finalMapper instanceof BaseMapper) {
-                        BaseMapper<T> finallyMapper = (BaseMapper<T>)finalMapper;
+                        BaseMapper<T> finallyMapper = (BaseMapper<T>) finalMapper;
                         String finalField = annotation.finalField();
                         List<T> selectList = finallyMapper.selectList(new QueryWrapper<T>().select(finalField).in(finalField, list));
-                        field.set(one,selectList);
-                    }else {
+                        field.set(one, selectList);
+                    } else {
                         throw new RuntimeException("mapper 转换异常");
                     }
 
                 } else {
                     return;
                 }
-            }else {
+            } else {
                 throw new RuntimeException("mapper 转换异常");
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
 
-
     }
 
 
-    public void doLinkSQL(T one,Object[] params,Field field) throws IllegalAccessException {
+    public void doLinkSQL(T one, Object[] params, Field field) throws IllegalAccessException {
         LinkSQL linkSQL = field.getAnnotation(LinkSQL.class);
         if (linkSQL == null) {
             return;
@@ -337,14 +358,13 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
         if (StringUtils.isBlank(value)) {
             return;
         }
-        List<Map<String, Object>> maps = jdbcTemplate.queryForList(value,params);
+        List<Map<String, Object>> maps = jdbcTemplate.queryForList(value, params);
         if (maps != null && !maps.isEmpty()) {
-            field.set(one,maps);
-        }else {
-            field.set(one,new ArrayList<>());
+            field.set(one, maps);
+        } else {
+            field.set(one, new ArrayList<>());
         }
 
 
-
     }
 }

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/web/BaseController.java

@@ -4,27 +4,20 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.baomidou.mybatisplus.extension.service.IService;
-import edu.travel.interfaces.InsertGroups;
-import edu.travel.interfaces.UpdateGroups;
-import edu.travel.resp.BaseResponse;
-import edu.travel.resp.PageResponse;
 import edu.travel.rpc.RPCBaseResponse;
-import edu.travel.rpc.RPCPageResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.Errors;
-import org.springframework.validation.ObjectError;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.List;
 
@@ -32,8 +25,9 @@ public class BaseController<T> {
     Logger logger = LoggerFactory.getLogger(BaseController.class);
     @Autowired
     private IService<T> service;
+
     @GetMapping("/download")
-    public void download(T clazz,HttpServletResponse response) throws IOException {
+    public void download(T clazz, HttpServletResponse response) throws IOException {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
         String fileName = URLEncoder.encode("导出数据.xlsx", "UTF-8").replaceAll("\\+", "%20");
@@ -43,20 +37,21 @@ public class BaseController<T> {
                 .sheet("数据")
                 .doWrite(list);
     }
+
     @PostMapping("/upload/excel")
-    public RPCBaseResponse uploadExcel(@RequestBody T clazz ,@RequestPart("file") MultipartFile file) throws IOException {
-        EasyExcel.read(file.getInputStream(),clazz.getClass(),new ReadListener<T>(){
+    public RPCBaseResponse uploadExcel(@RequestBody T clazz, @RequestPart("file") MultipartFile file) throws IOException {
+        EasyExcel.read(file.getInputStream(), clazz.getClass(), new ReadListener<T>() {
 
-            @Override
-            public void invoke(T t, AnalysisContext analysisContext) {
-                saveTarget(t);
-            }
+                    @Override
+                    public void invoke(T t, AnalysisContext analysisContext) {
+                        saveTarget(t);
+                    }
 
-            @Override
-            public void doAfterAllAnalysed(AnalysisContext analysisContext) {
-                logger.debug("读取完成");
-            }
-        })
+                    @Override
+                    public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+                        logger.debug("读取完成");
+                    }
+                })
                 .sheet()
                 .doRead();
         return RPCBaseResponse.success();
@@ -67,45 +62,48 @@ public class BaseController<T> {
         T byId = service.getById(id);
         return new RPCBaseResponse(HttpStatus.OK.value(), HttpStatus.OK.getReasonPhrase(), byId);
     }
+
     @PostMapping("/updateById")
     @Transactional
     public RPCBaseResponse<T> updateTargetById(@RequestBody T entity) {
         boolean update = service.updateById(entity);
         if (update) {
-            return new RPCBaseResponse<>(200,"success",entity);
+            return new RPCBaseResponse<>(200, "success", entity);
         }
-        return new RPCBaseResponse(500,"error",entity);
+        return new RPCBaseResponse(500, "error", entity);
     }
+
     @PostMapping("/save")
     @Transactional
     public RPCBaseResponse<T> saveTarget(@RequestBody T entity) {
         boolean save = service.save(entity);
         if (save) {
-            return new RPCBaseResponse<>(200,"success",entity);
+            return new RPCBaseResponse<>(200, "success", entity);
         }
-        return new RPCBaseResponse<>(500,"error",entity);
+        return new RPCBaseResponse<>(500, "error", entity);
     }
+
     @PostMapping("/deleteById")
     @Transactional
     public RPCBaseResponse<T> deleteTargetById(@RequestBody List<String> ids) {
         if (ids == null || ids.isEmpty()) {
-            return new RPCBaseResponse<>(404,"error,not found delete data",null);
+            return new RPCBaseResponse<>(404, "error,not found delete data", null);
         }
         boolean byIds = service.removeByIds(ids);
         if (byIds) {
-            return new RPCBaseResponse<>(200,"success",null);
+            return new RPCBaseResponse<>(200, "success", null);
         }
-        return new RPCBaseResponse<>(500,"error, delete data error",null);
+        return new RPCBaseResponse<>(500, "error, delete data error", null);
     }
+
     @GetMapping("/list")
     public RPCBaseResponse<List<T>> listAll() {
         List<T> list = service.list();
         if (list.isEmpty()) {
-            return new RPCBaseResponse<>(404,"error,not found delete data",null);
+            return new RPCBaseResponse<>(404, "error,not found delete data", null);
         }
-        return new RPCBaseResponse<>(200,"success",list);
+        return new RPCBaseResponse<>(200, "success", list);
     }
 
 
-
 }

edu-travel-common/edu-travel-common-debezium/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-common/edu-travel-common-debezium/src/main/java/edu/travel/debezium/config/DebeziumConnectorConfig.java

@@ -14,23 +14,23 @@ public class DebeziumConnectorConfig {
     public io.debezium.config.Configuration customerConnector(Environment env) throws IOException {
         File offsetStorageTempFile = File.createTempFile("offsets_", ".dat");
         return io.debezium.config.Configuration.create()
-            .with("name", "customer_postgres_connector")
-            .with("connector.class", "io.debezium.connector.postgresql.PostgresConnector")
-            .with("offset.storage", "org.apache.kafka.connect.storage.FileOffsetBackingStore")
-            .with("offset.storage.file.filename", offsetStorageTempFile.getAbsolutePath())
-            .with("offset.flush.interval.ms", "60000")
-            .with("database.hostname", env.getProperty("customer.datasource.host"))
-            .with("database.port", env.getProperty("customer.datasource.port")) // defaults to 5432
-            .with("database.user", env.getProperty("customer.datasource.username"))
-            .with("database.password", env.getProperty("customer.datasource.password"))
-            .with("database.dbname", env.getProperty("customer.datasource.database"))
-            .with("database.server.id", "10181")
-            .with("database.server.name", "customer-postgres-db-server")
-            .with("database.history", "io.debezium.relational.history.MemoryDatabaseHistory")
-            .with("table.include.list", "public.shop_address")
-            .with("publication.autocreate.mode", "filtered")
-            .with("plugin.name", "pgoutput")
-            .with("slot.name", "dbz_customerdb_listener")
-            .build();
+                .with("name", "customer_postgres_connector")
+                .with("connector.class", "io.debezium.connector.postgresql.PostgresConnector")
+                .with("offset.storage", "org.apache.kafka.connect.storage.FileOffsetBackingStore")
+                .with("offset.storage.file.filename", offsetStorageTempFile.getAbsolutePath())
+                .with("offset.flush.interval.ms", "60000")
+                .with("database.hostname", env.getProperty("customer.datasource.host"))
+                .with("database.port", env.getProperty("customer.datasource.port")) // defaults to 5432
+                .with("database.user", env.getProperty("customer.datasource.username"))
+                .with("database.password", env.getProperty("customer.datasource.password"))
+                .with("database.dbname", env.getProperty("customer.datasource.database"))
+                .with("database.server.id", "10181")
+                .with("database.server.name", "customer-postgres-db-server")
+                .with("database.history", "io.debezium.relational.history.MemoryDatabaseHistory")
+                .with("table.include.list", "public.shop_address")
+                .with("publication.autocreate.mode", "filtered")
+                .with("plugin.name", "pgoutput")
+                .with("slot.name", "dbz_customerdb_listener")
+                .build();
     }
 }

edu-travel-common/edu-travel-common-debezium/src/main/java/edu/travel/debezium/config/DebeziumListener.java

@@ -26,16 +26,16 @@ public class DebeziumListener {
 
     public DebeziumListener(Configuration customerConnectorConfiguration) {
         this.debeziumEngine = DebeziumEngine.create(ChangeEventFormat.of(Connect.class))
-            .using(customerConnectorConfiguration.asProperties())
-            .notifying(this::handleChangeEvent)
-            .build();
+                .using(customerConnectorConfiguration.asProperties())
+                .notifying(this::handleChangeEvent)
+                .build();
     }
 
     private void handleChangeEvent(RecordChangeEvent<SourceRecord> sourceRecordRecordChangeEvent) {
         SourceRecord sourceRecord = sourceRecordRecordChangeEvent.record();
         log.info("Key = {}, Value = {}", sourceRecord.key(), sourceRecord.value());
-        Object sourceRecordChangeValue= (Struct) sourceRecord.value();
-        log.info("SourceRecordChangeValue = '{}'",sourceRecordChangeValue);
+        Object sourceRecordChangeValue = (Struct) sourceRecord.value();
+        log.info("SourceRecordChangeValue = '{}'", sourceRecordChangeValue);
         // if (sourceRecordChangeValue != null) {
         //     Operation operation = Operation.forCode((String) sourceRecordChangeValue.get(OPERATION));
 

edu-travel-common/edu-travel-common-elastic/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-common/edu-travel-common-elastic/src/main/java/edu/travel/elastic/ElasticsearchConfig.java

@@ -2,31 +2,18 @@ package edu.travel.elastic;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestClientBuilder;
-import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * restHighLevelClient 客户端配置类
- *
  */
 @Slf4j
 @Data
 @Configuration
 @ConfigurationProperties(prefix = "elasticsearch")
 public class ElasticsearchConfig {
- 
+
     /**
      * es host ip 地址（集群）
      */
@@ -63,7 +50,6 @@ public class ElasticsearchConfig {
      * es 每个路由的最大连接数
      */
     private int maxConnectNumPerRoute;
- 
- 
+
 
 }

edu-travel-common/edu-travel-common-elastic/src/main/java/edu/travel/elastic/EsClient.java

@@ -11,14 +11,15 @@ import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 @Configuration
 public class EsClient {
     @Autowired
     private ElasticsearchConfig elasticsearchConfig;
+
     /**
      * 如果@Bean没有指定bean的名称，那么方法名就是bean的名称
      */

edu-travel-common/edu-travel-common-elastic/src/main/java/edu/travel/elastic/EsIndexOperation.java

@@ -14,21 +14,19 @@ import org.elasticsearch.common.xcontent.XContentType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 
 /**
  * 操作ES索引
- *
  */
 @Slf4j
 @Service
 public class EsIndexOperation {
- 
+
+    private final RequestOptions options = RequestOptions.DEFAULT;
     @Autowired
     private RestHighLevelClient restHighLevelClient;
-    private final RequestOptions options = RequestOptions.DEFAULT;
- 
+
     /**
      * 判断索引是否存在
      */
@@ -40,7 +38,7 @@ public class EsIndexOperation {
         }
         return Boolean.FALSE;
     }
- 
+
     /**
      * 创建索引
      *
@@ -65,25 +63,25 @@ public class EsIndexOperation {
                 return false;
             }
         }
- 
+
         if (checkIndex(indexName)) {
             log.error("createIndex indexName:[{}]已存在", indexName);
             return false;
         }
- 
+
         CreateIndexRequest request = new CreateIndexRequest(indexName);
         if ((StringUtils.isNotBlank(aliases))) {
             request.aliases(aliases, XContentType.JSON);
         }
- 
+
         if (StringUtils.isNotBlank(mappings)) {
             request.mapping(mappings, XContentType.JSON);
         }
- 
+
         if (StringUtils.isNotBlank(settings)) {
             request.settings(settings, XContentType.JSON);
         }
- 
+
         try {
             this.restHighLevelClient.indices().create(request, options);
             return true;
@@ -92,7 +90,7 @@ public class EsIndexOperation {
             return false;
         }
     }
- 
+
     /**
      * 删除索引
      */

edu-travel-common/edu-travel-common-elastic/src/main/java/edu/travel/elastic/FileUtils.java

@@ -11,7 +11,7 @@ import java.io.IOException;
  */
 @Slf4j
 public class FileUtils {
- 
+
     /**
      * 读取项目resources文件夹下的文件
      *
@@ -26,20 +26,20 @@ public class FileUtils {
             while ((line = reader.readLine()) != null) {
                 stringBuilder.append(line);
             }
- 
+
             reader.close();
             return stringBuilder.toString();
         } catch (IOException e) {
             log.error("readFileContent error.", e);
         }
- 
+
         return null;
     }
-    
- 
+
+
     public static void main(String[] args) {
         String filePath = "src/main/resources/es/mappings_test20231216.txt";
         String fileContent = readFileContent(filePath);
     }
- 
+
 }

edu-travel-common/edu-travel-common-excel/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>

edu-travel-common/edu-travel-common-guava/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>