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

# Conflicts:
#	edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/commodity/remote/BaseCountryServeRemoteController.java
#	edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/BaseCountryServeController.java

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

@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>edu.travel</groupId>
+        <artifactId>edu-travel-adapter</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>edu-travel-adapter-upload</artifactId>
+    <packaging>jar</packaging>
+
+    <name>edu-travel-adapter-upload</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-remote-upload</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-adapter</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>

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

@@ -0,0 +1,39 @@
+package edu.travel.adapter.service.upload;
+
+import edu.travel.adapter.annotation.AdapterAnnotation;
+import edu.travel.remote.UploadRemoteController;
+import edu.travel.rpc.RPCBaseResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+@Component
+public class UploadAdapter  {
+    @Autowired
+    private UploadRemoteController uploadRemoteController;
+    @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(MultipartFile file) {
+        RPCBaseResponse rpcBaseResponse = uploadRemoteController.uploadBigFile(file);
+        return rpcBaseResponse;
+    }
+    @AdapterAnnotation
+    public RPCBaseResponse mergeFile(String json) {
+        RPCBaseResponse rpcBaseResponse = uploadRemoteController.mergeFile(json);
+        return rpcBaseResponse;
+    }
+    @AdapterAnnotation
+    public RPCBaseResponse uploadFile(MultipartFile file) {
+        RPCBaseResponse rpcBaseResponse = uploadRemoteController.uploadFile(file);
+        return rpcBaseResponse;
+    }
+}

edu-travel-adapter/pom.xml

@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>edu.travel</groupId>
+        <artifactId>EduTravel</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>edu-travel-adapter</artifactId>
+    <packaging>pom</packaging>
+
+    <name>edu-travel-adapter</name>
+    <url>http://maven.apache.org</url>
+    <modules>
+        <module>edu-travel-adapter-upload</module>
+    </modules>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+</project>

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

@@ -105,16 +105,6 @@
         </dependency>
         <dependency>
             <groupId>edu.travel</groupId>
-            <artifactId>edu-travel-remote-tenant</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>edu.travel</groupId>
-            <artifactId>edu-travel-remote-upload</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>edu.travel</groupId>
             <artifactId>edu-travel-common-util</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -138,5 +128,10 @@
             <artifactId>edu-travel-common-cache</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-adapter-upload</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -4,6 +4,7 @@ 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!

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

@@ -0,0 +1,104 @@
+package edu.travel.controller;
+
+import edu.travel.adapter.service.upload.UploadAdapter;
+import edu.travel.resp.BaseResponse;
+import edu.travel.rpc.RPCBaseResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@RestController
+@RequestMapping("/upload")
+public class UploadController  {
+    @Autowired
+    private UploadAdapter uploadAdapter;
+    /**
+     * 文件是否存在
+     * @param md5
+     * @return
+     */
+    @GetMapping("/exits/md5")
+    @PreAuthorize("permitAll()")
+    public BaseResponse exitsFile(String md5) {
+        RPCBaseResponse rpcBaseResponse = uploadAdapter.exitsFile(md5);
+        if (rpcBaseResponse != null) {
+            if (rpcBaseResponse.getCode() == 200){
+                return new BaseResponse(200,"success",rpcBaseResponse.getData());
+            }
+            return new BaseResponse(500,"request is error",null);
+        }
+        return new BaseResponse(500,"request is error",null);
+    }
+    /**
+     * 上传过哪些分片
+     * @param md5
+     * @return
+     */
+    @GetMapping("/exits/blob")
+    @PreAuthorize("permitAll()")
+    public BaseResponse exitsBlob(String md5) {
+        RPCBaseResponse rpcBaseResponse = uploadAdapter.exitsBlob(md5);
+        if (rpcBaseResponse != null) {
+            if (rpcBaseResponse.getCode() == 200){
+                return new BaseResponse(200,"success",rpcBaseResponse.getData());
+            }
+            return new BaseResponse(500,"request is error",null);
+        }
+        return new BaseResponse(500,"request is error",null);
+    }
+    /**
+     * 上传大文件分片
+     * @param file
+     * @return
+     */
+    @PostMapping(value = "/uploadBlob")
+    @PreAuthorize("permitAll()")
+    public BaseResponse uploadBigFile(MultipartFile file) {
+        RPCBaseResponse rpcBaseResponse = uploadAdapter.uploadBigFile(file);
+        if (rpcBaseResponse != null) {
+            if (rpcBaseResponse.getCode() == 200){
+                return new BaseResponse(200,"success",rpcBaseResponse.getData());
+            }
+            return new BaseResponse(500,"request is error",null);
+        }
+        return new BaseResponse(500,"request is error",null);
+    }
+    /**
+     * 合并大文件
+     * @param json
+     * @return
+     */
+    @PostMapping(value = "/mergeFile")
+    @PreAuthorize("permitAll()")
+    public BaseResponse mergeFile(String json) {
+        RPCBaseResponse rpcBaseResponse = uploadAdapter.mergeFile(json);
+        if (rpcBaseResponse != null) {
+            if (rpcBaseResponse.getCode() == 200){
+                return new BaseResponse(200,"success",rpcBaseResponse.getData());
+            }
+            return new BaseResponse(500,"request is error",null);
+        }
+        return new BaseResponse(500,"request is error",null);
+    }
+    /**
+     * 上传小文件
+     * @param file
+     * @return
+     */
+    @PostMapping(value = "/upload")
+    @PreAuthorize("permitAll()")
+    public BaseResponse uploadFile(MultipartFile file) {
+        RPCBaseResponse rpcBaseResponse = uploadAdapter.uploadFile(file);
+        if (rpcBaseResponse != null) {
+            if (rpcBaseResponse.getCode() == 200){
+                return new BaseResponse(200,"success",rpcBaseResponse.getData());
+            }
+            return new BaseResponse(500,"request is error",null);
+        }
+        return new BaseResponse(500,"request is error",null);
+    }
+}

edu-travel-api/edu-travel-api-admin/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,21 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.1.44:8848,192.168.1.44:8849,192.168.1.44:8858
+        namespace: edu-@env@
+      config:
+        file-extension: yaml
+        server-addr: 192.168.1.44:8848,192.168.1.44:8849,192.168.1.44:8858
+        refresh-enabled: true
+        namespace: edu-@env@
+        shared-configs:
+          - data-id: reids-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: system-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: zipkin.yml
+            group: DEFAULT_GROUP
+            refresh: true

edu-travel-api/edu-travel-api-admin/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,21 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.1.44:8848,192.168.1.44:8849,192.168.1.44:8858
+        namespace: edu-@env@
+      config:
+        file-extension: yaml
+        server-addr: 192.168.1.44:8848,192.168.1.44:8849,192.168.1.44:8858
+        refresh-enabled: true
+        namespace: edu-@env@
+        shared-configs:
+          - data-id: reids-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: system-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: zipkin.yml
+            group: DEFAULT_GROUP
+            refresh: true

edu-travel-api/edu-travel-api-admin/src/main/resources/bootstrap.yml

@@ -0,0 +1,9 @@
+server:
+  port: 10005
+spring:
+  application:
+    name: admin-api-@env@
+  profiles:
+    active: @env@
+  main:
+    allow-bean-definition-overriding: true

edu-travel-api/edu-travel-api-admin/src/test/java/edu/travel/AppTest.java

@@ -1,38 +0,0 @@
-package edu.travel;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

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

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>edu.travel</groupId>
+        <artifactId>edu-travel-common</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>edu-travel-common-adapter</artifactId>
+    <packaging>jar</packaging>
+
+    <name>edu-travel-common-adapter</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>

edu-travel-common/edu-travel-common-adapter/src/main/java/edu/travel/adapter/annotation/AdapterAnnotation.java

@@ -0,0 +1,10 @@
+package edu.travel.adapter.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Inherited
+public @interface AdapterAnnotation {
+}

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

@@ -0,0 +1,20 @@
+package edu.travel.adapter.aspect;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+public class AdapterAspect {
+    @Pointcut("@annotation(edu.travel.adapter.annotation.AdapterAnnotation)")
+    public void pointcut() {}
+
+    @Around("pointcut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        Object proceed = joinPoint.proceed(joinPoint.getArgs());
+        return proceed;
+    }
+}

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

@@ -54,6 +54,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

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

@@ -37,6 +37,7 @@
             <groupId>edu.travel</groupId>
             <artifactId>edu-travel-common-resp</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

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

@@ -5,7 +5,6 @@ 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.Parenthesis;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
@@ -20,6 +19,8 @@ import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -31,12 +32,20 @@ import java.sql.SQLException;
  *  处理基础架构中统一带上 project 字段
  */
 public class ProjectInterceptor implements InnerInterceptor {
+    Logger logger = LoggerFactory.getLogger(ProjectInterceptor.class);
     @Override
     public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
         String project = request.getHeader("project");
         if (StringUtils.isNotBlank(project)) {
             String originSql = boundSql.getSql();
+            logger.debug("origin sql: " + originSql);
+//            Map parameterMap = (Map) parameter;
+//            // QueryWrapper，实际上就是 在 代码查询的地方创建的QueryWrapper。
+//            Object obj = parameterMap.get("ew");
+//            QueryWrapper queryWrapper = (QueryWrapper) obj;
+//            queryWrapper.eq("project", project);
+//            queryWrapper.eq("delete_flag",0);
             //获取 Statement 执行sql的对象
             Statement statement = null;
             try {
@@ -61,24 +70,24 @@ public class ProjectInterceptor implements InnerInterceptor {
                 deleteFlag.setLeftExpression(new Column("delete_flag"));
                 deleteFlag.setRightExpression(new StringValue("0"));
                 String plainSelectString = plainSelect.toString();
-                if (plainSelectString.contains("project") && plainSelectString.contains("delete_flag")) {
-
-                }else {
-                    if (where != null) {
-                        AndExpression targetExpression = new AndExpression(projectEq, deleteFlag);
+                if (!plainSelectString.contains("project = ") && !plainSelectString.contains("delete_flag = ")) {
+                    AndExpression targetExpression = new AndExpression(projectEq, deleteFlag);
+                    if (plainSelectString.contains("where") || plainSelectString.contains("WHERE")) {
                         AndExpression andExpression = new AndExpression(where, targetExpression);
                         plainSelect.setWhere(andExpression);
                     }else {
-                        AndExpression targetExpression = new AndExpression(projectEq, deleteFlag);
                         plainSelect.setWhere(targetExpression);
                     }
 
                     targetSql = plainSelect.toString();
+                }else {
+                    targetSql = plainSelect.toString();
                 }
 
             }
             // 修改完成的sql 再设置回去
             PluginUtils.MPBoundSql mpBoundSql = PluginUtils.mpBoundSql(boundSql);
+            System.out.println(targetSql);
             mpBoundSql.sql(targetSql);
 
         }

edu-travel-common/edu-travel-common-resp/src/main/java/edu/travel/rpc/RPCBaseResponse.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 public class RPCBaseResponse<T> implements Serializable {
-    private int code;
+    private Integer code;
     private String msg;
     private T data;
 }

edu-travel-common/pom.xml

@@ -25,6 +25,7 @@
         <module>edu-travel-common-upload</module>
         <module>edu-travel-common-elastic</module>
         <module>edu-travel-common-debezium</module>
+        <module>edu-travel-common-adapter</module>
     </modules>
 
     <properties>

edu-travel-gateway/src/main/resources/bootstrap-dev.yml

@@ -2,13 +2,13 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848,localhost:8849,localhost:8858
-        namespace: edu-@env@
+        server-addr: 192.168.1.44:8848,192.168.1.44:8849,192.168.1.44:8858
+        namespace: yangzheng-@env@
       config:
         file-extension: yaml
-        server-addr: localhost:8848,localhost:8849,localhost:8858
+        server-addr: 192.168.1.44:8848,192.168.1.44:8849,192.168.1.44:8858
         refresh-enabled: true
-        namespace: edu-@env@
+        namespace: yangzheng-@env@
         shared-configs:
           - data-id: system-config-dev.yaml
             group: DEFAULT_GROUP

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

@@ -3,14 +3,17 @@ package edu.travel.commodity.remote;
 import edu.travel.commodity.dto.BaseCountryServeDTO;
 import edu.travel.commodity.vo.BaseCountryServeVo;
 import edu.travel.resp.BaseResponse;
+import edu.travel.rpc.RPCBaseResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.Errors;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(path = "/base_country_serve",name = "commodity")
 public interface BaseCountryServeRemoteController {
-    @PostMapping("/updateCountryById")
-    public BaseResponse<BaseCountryServeVo> updateTargetById(@RequestBody BaseCountryServeDTO entity);
+    @GetMapping("/getByControlId")
+    RPCBaseResponse getByControlId( @RequestBody String id);
+
 }

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

@@ -19,7 +19,6 @@ public class BaseCountryServeServiceImpl extends SysServiceImpl<BaseCountryServe
     public RPCBaseResponse<IPage<BaseCountryServe>> getCountryServePage(BaseCountryServeDTO dto) {
         Page<BaseCountryServe> baseCountryServePage = new Page<>(dto.getCurrentPage(), dto.getPageSize());
         IPage<BaseCountryServe> pageLink = super.getPageLink(new LambdaQueryWrapper<BaseCountryServe>(), baseCountryServePage);
-        Page<BaseCountryServe> page = this.page(baseCountryServePage, new LambdaQueryWrapper<BaseCountryServe>());
         RPCBaseResponse<IPage<BaseCountryServe>> pageRPCPageResponse = new RPCBaseResponse<>(200,"SUCCESS",pageLink);
         return pageRPCPageResponse;
     }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/BaseCountryServeController.java

@@ -21,8 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 * @author xxxxx
 */
 @RestController
-@RequestMapping("/baseCountryServe")
-public class BaseCountryServeController  extends BaseController implements BaseCountryServeRemoteController {
+@RequestMapping("/base_country_serve")
+public class BaseCountryServeController  extends BaseController<BaseCountryServe>  implements BaseCountryServeRemoteController {
     @Autowired
     private BaseCountryServeService baseCountryServeService;
 
@@ -32,8 +32,11 @@ public class BaseCountryServeController  extends BaseController implements BaseC
     }
 
     @Override
-    @PostMapping("/updateCountryById")
-    public BaseResponse<BaseCountryServeVo> updateTargetById(@RequestBody BaseCountryServeDTO entity) {
-        return super.updateTargetById(entity);
+    @GetMapping("/getByControlId")
+    public RPCBaseResponse getByControlId(String id) {
+        BaseResponse baseResponse = super.getById(id);
+        RPCBaseResponse<Object> objectRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(baseResponse, objectRPCBaseResponse);
+        return objectRPCBaseResponse;
     }
 }

edu-travel-service/edu-travel-service-commodity/src/main/resources/bootstrap-dev.yml

@@ -3,12 +3,12 @@ spring:
     nacos:
       discovery:
         server-addr: 192.168.1.44:8848,192.168.1.44:8849,192.168.1.44:8858
-        namespace: zhangwei-@env@
+        namespace: yangzheng-@env@
       config:
         file-extension: yaml
         server-addr: 192.168.1.44:8848,192.168.1.44:8849,192.168.1.44:8858
         refresh-enabled: true
-        namespace: zhangwei-@env@
+        namespace: yangzheng-@env@
         shared-configs:
           - data-id: mybatis-config-dev.yaml
             group: DEFAULT_GROUP

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

@@ -101,11 +101,6 @@
         </dependency>
         <dependency>
             <groupId>edu.travel</groupId>
-            <artifactId>edu-travel-remote-tenant</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>edu.travel</groupId>
             <artifactId>edu-travel-common-upload</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -145,6 +140,11 @@
             <version>1.2.6</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-remote-upload</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <!--        <dependency>-->
         <!--            <groupId>jakarta.validation</groupId>-->
         <!--            <artifactId>jakarta.validation-api</artifactId>-->

edu-travel-service/edu-travel-service-upload/src/main/java/edu/travel/UploadApplication.java

@@ -11,7 +11,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableDiscoveryClient
 @EnableFeignClients
 @EnableRedisCache
-@MapperScan
+@MapperScan("edu.travel.mapper")
 public class UploadApplication
 {
     public static void main( String[] args )

edu-travel-service/edu-travel-service-upload/src/main/java/edu/travel/web/UploadController.java

@@ -0,0 +1,69 @@
+package edu.travel.web;
+
+import edu.travel.remote.UploadRemoteController;
+import edu.travel.rpc.RPCBaseResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+@RestController
+@RequestMapping("/upload")
+public class UploadController implements UploadRemoteController {
+    /**
+     * 文件是否存在
+     * @param md5
+     * @return
+     */
+    @Override
+    @GetMapping("/exits/md5")
+    @PreAuthorize("permitAll()")
+    public RPCBaseResponse exitsFile(String md5) {
+        return null;
+    }
+    /**
+     * 上传过哪些分片
+     * @param md5
+     * @return
+     */
+    @Override
+    @GetMapping("/exits/blob")
+    @PreAuthorize("permitAll()")
+    public RPCBaseResponse exitsBlob(String md5) {
+        return null;
+    }
+    /**
+     * 上传大文件分片
+     * @param file
+     * @return
+     */
+    @Override
+    @PostMapping(value = "/uploadBlob",headers = {"content-type=multipart/form-data"})
+    @PreAuthorize("permitAll()")
+    public RPCBaseResponse uploadBigFile(MultipartFile file) {
+        return null;
+    }
+    /**
+     * 合并大文件
+     * @param json
+     * @return
+     */
+    @Override
+    @PostMapping(value = "/mergeFile")
+    @PreAuthorize("permitAll()")
+    public RPCBaseResponse mergeFile(String json) {
+        return null;
+    }
+    /**
+     * 上传小文件
+     * @param file
+     * @return
+     */
+    @Override
+    @PostMapping(value = "/upload",headers = {"content-type=multipart/form-data"})
+    @PreAuthorize("permitAll()")
+    public RPCBaseResponse uploadFile(MultipartFile file) {
+        return null;
+    }
+}

pom.xml

@@ -14,6 +14,7 @@
     <module>edu-travel-oauth</module>
     <module>edu-travel-model</module>
       <module>edu-travel-api</module>
+      <module>edu-travel-adapter</module>
   </modules>
   <parent>
     <groupId>org.springframework.boot</groupId>