feat 主流云存储均以支持

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

@@ -31,6 +31,11 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-remote-commodity</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>

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

@@ -0,0 +1,38 @@
+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-core/src/main/java/edu/travel/model/PageDto.java

@@ -1,24 +0,0 @@
-package edu.travel.model;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * PageDto 类。
- * <p>
- * 描述：分页参数
- *
- * @author huangwenwen
- * @date 2025/2/10
- */
-
-@Data
-public class PageDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-//    @NotNull(message = "当前页码不能为空")
-    private Integer pageNum = 1;
-//    @NotNull(message = "每页显示条数不能为空")
-    private Integer pageSize = 10;
-}

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

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

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

@@ -0,0 +1,66 @@
+package edu.travel.commodity.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 服务国家表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseCountryServeDTO {
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 所属洲
+     */
+    private Long parentId;
+
+    /**
+     * 关联国家id
+     */
+    private Long countryId;
+
+    /**
+     * 服务费比率
+     */
+    private BigDecimal serviceChargeValue;
+
+    /**
+     * 结算显示方式 -0 CNY100 -1 ¥100 -2 100RMB
+     */
+    private Integer payViewWay;
+
+    /**
+     * 中文国家/洲名称
+     */
+    private String countryNameZh;
+
+    /**
+     * 英文国家/洲名称
+     */
+    private String countryNameEn;
+
+    /**
+     * 本地国家/洲名称
+     */
+    private String countryNameLocal;
+
+    /**
+     * 服务状态，默认0,-0未开通，-1开通
+     */
+    private Integer serveEnable;
+
+
+    /**
+     * 货币表id
+     */
+    private Long currencyId;
+}

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

@@ -0,0 +1,17 @@
+package edu.travel.commodity.remote;
+
+import edu.travel.commodity.dto.BaseCountryServeDTO;
+import edu.travel.commodity.vo.BaseCountryServeVo;
+import edu.travel.interfaces.UpdateGroups;
+import edu.travel.resp.BaseResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.Errors;
+import org.springframework.validation.annotation.Validated;
+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("/updateById")
+    public BaseResponse<BaseCountryServeVo> updateTargetById(@Validated(UpdateGroups.class) @RequestBody BaseCountryServeDTO entity,Errors errors);
+}

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

@@ -0,0 +1,66 @@
+package edu.travel.commodity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 服务国家表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseCountryServeVo {
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 所属洲
+     */
+    private Long parentId;
+
+    /**
+     * 关联国家id
+     */
+    private Long countryId;
+
+    /**
+     * 服务费比率
+     */
+    private BigDecimal serviceChargeValue;
+
+    /**
+     * 结算显示方式 -0 CNY100 -1 ¥100 -2 100RMB
+     */
+    private Integer payViewWay;
+
+    /**
+     * 中文国家/洲名称
+     */
+    private String countryNameZh;
+
+    /**
+     * 英文国家/洲名称
+     */
+    private String countryNameEn;
+
+    /**
+     * 本地国家/洲名称
+     */
+    private String countryNameLocal;
+
+    /**
+     * 服务状态，默认0,-0未开通，-1开通
+     */
+    private Integer serveEnable;
+
+
+    /**
+     * 货币表id
+     */
+    private Long currencyId;
+}

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/dto/tenant/EduTenantPageDto.java

@@ -1,6 +1,6 @@
 package edu.travel.remote.feign.mode.dto.tenant;
 
-import edu.travel.model.PageDto;
+import edu.travel.po.PagePO;
 import lombok.Data;
 
 import java.util.Date;
@@ -15,7 +15,7 @@ import java.util.Date;
  */
 
 @Data
-public class EduTenantPageDto extends PageDto {
+public class EduTenantPageDto extends PagePO {
 
     /**
      * 主键

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/dto/tenant/SysMenuPageDto.java

@@ -1,5 +1,5 @@
 package edu.travel.remote.feign.mode.dto.tenant;
-import edu.travel.model.PageDto;
+import edu.travel.po.PagePO;
 import lombok.Data;
 
 /**
@@ -12,7 +12,7 @@ import lombok.Data;
  */
 
 @Data
-public class SysMenuPageDto extends PageDto {
+public class SysMenuPageDto extends PagePO {
 
     /**
      * 主键id

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/dto/tenant/SysRolePageDto.java

@@ -3,7 +3,7 @@ package edu.travel.remote.feign.mode.dto.tenant;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import edu.travel.model.PageDto;
+import edu.travel.po.PagePO;
 import lombok.Data;
 
 /**
@@ -16,7 +16,7 @@ import lombok.Data;
  */
 
 @Data
-public class SysRolePageDto extends PageDto {
+public class SysRolePageDto extends PagePO {
     /**
      * 主键id
      */

edu-travel-remote/pom.xml

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

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

@@ -139,6 +139,11 @@
             <version>1.2.6</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-remote-commodity</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <!--        <dependency>-->
         <!--            <groupId>jakarta.validation</groupId>-->
         <!--            <artifactId>jakarta.validation-api</artifactId>-->

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import edu.travel.po.PagePO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,7 +18,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class BaseCountryServeDTO extends BaseDto{
+public class BaseCountryServeDTO extends PagePO {
     /**
      * ID
      */

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/dto/BaseDto.java

@@ -1,7 +1,6 @@
 package edu.travel.commodity.dto;
 
 import edu.travel.entity.BaseEntity;
-import edu.travel.model.PageDto;
 import edu.travel.po.PagePO;
 import lombok.Data;
 

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

@@ -3,9 +3,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.dto.BaseCountryServeDTO;
 import edu.travel.commodity.entity.BaseCountryServe;
+import edu.travel.commodity.remote.BaseCountryServeRemoteController;
 import edu.travel.commodity.service.BaseCountryServeService;
+import edu.travel.commodity.vo.BaseCountryServeVo;
+import edu.travel.interfaces.UpdateGroups;
+import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.web.BaseController;
+import org.springframework.validation.Errors;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 */
 @RestController
 @RequestMapping("/base_country_serve")
-public class BaseCountryServeController  extends BaseController {
+public class BaseCountryServeController  extends BaseController  implements BaseCountryServeRemoteController {
     @Autowired
     private BaseCountryServeService baseCountryServeService;
 
@@ -26,4 +32,9 @@ public class BaseCountryServeController  extends BaseController {
         return baseCountryServeService.getCountryServePage(dto);
     }
 
+    @Override
+    @PostMapping("/updateById")
+    public BaseResponse<BaseCountryServeVo> updateTargetById(@Validated(UpdateGroups.class) @RequestBody BaseCountryServeDTO entity, Errors errors) {
+        return super.updateTargetById(entity, errors);
+    }
 }

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/service/adpter/UploadAdpter.java

@@ -1,20 +1,19 @@
-package edu.travel.tenant.service.adpter;
-
-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 UploadAdpter {
-    @Autowired
-    private UploadRemoteController uploadRemoteController;
-
-    public RPCBaseResponse uploadAdpter(MultipartFile file) {
-        //性能打印
-        //参数转换
-        RPCBaseResponse rpcBaseResponse = uploadRemoteController.uploadBigFile(file);
-        return rpcBaseResponse;
-    }
-}
+//package edu.travel.tenant.service.adpter;
+//
+//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 UploadAdpter {
+//
+//
+//    public RPCBaseResponse uploadAdpter(MultipartFile file) {
+//        //性能打印
+//        //参数转换
+//        RPCBaseResponse rpcBaseResponse = uploadRemoteController.uploadBigFile(file);
+//        return rpcBaseResponse;
+//    }
+//}

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/web/SysMenuController.java

@@ -84,7 +84,7 @@ public class SysMenuController extends BaseController<SysMenu> implements SysMen
     @GetMapping("/getMenuTreeListAll")
 //@PreAuthorize("hasRole('超级管理员')")
     public BaseResponse<List<MenuTreeVo>> getMenuTreeListAll(SysMenuPageDto sysMenuPageDto) {
-        IPage<SysMenu> page = new Page<>(sysMenuPageDto.getPageNum(), sysMenuPageDto.getPageSize());
+        IPage<SysMenu> page = new Page<>(sysMenuPageDto.getCurrentPage(), sysMenuPageDto.getPageSize());
         IPage<SysMenu> sysMenuIPage = sysMenuService.page(page, new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getDeleteFlag, 0).like(StringUtils.isNotBlank(sysMenuPageDto.getName()),SysMenu::getName,sysMenuPageDto.getName()));
         List<MenuTreeVo> treeList= sysMenuService.getMenuTreeListAll(sysMenuIPage.getRecords());
         return PageResponse.out(200, "success", treeList, (int) sysMenuIPage.getTotal(), (int) sysMenuIPage.getSize());

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/web/SysRoleController.java

@@ -119,7 +119,7 @@ public class SysRoleController extends BaseController<SysRole> implements SysRol
     @GetMapping("/getRolePageList")
 //    @PreAuthorize("hasRole('超级管理员')")
     public BaseResponse<List<SysRoleVo>> getRolePageList(SysRolePageDto sysRolePageDto) {
-        IPage<SysRole> page = new Page<>(sysRolePageDto.getPageNum(), sysRolePageDto.getPageSize());
+        IPage<SysRole> page = new Page<>(sysRolePageDto.getCurrentPage(), sysRolePageDto.getPageSize());
         IPage<SysRole> tenantIPage = sysRoleService.page(page, new LambdaQueryWrapper<SysRole>().eq(SysRole::getDeleteFlag, 0)
                 .like(StringUtils.isNotBlank(sysRolePageDto.getName()),SysRole::getName, sysRolePageDto.getName()));
         List<SysRoleVo> sysRoleVos = BeanUtil.copyToList(tenantIPage.getRecords(), SysRoleVo.class);

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/web/TenantController.java

@@ -142,7 +142,7 @@ public class TenantController  extends BaseController<EduTenant>  {
 //    @PreAuthorize("hasRole('超级管理员')")
     public BaseResponse<List<EduTenantVo>> getTenantList( EduTenantPageDto tenantDto) {
 
-        IPage<EduTenant> page = new Page<>(tenantDto.getPageNum(), tenantDto.getPageSize());
+        IPage<EduTenant> page = new Page<>(tenantDto.getCurrentPage(), tenantDto.getPageSize());
 
         LambdaQueryWrapper<EduTenant> queryWrapper = new LambdaQueryWrapper<EduTenant>()
                 .eq(EduTenant::getDeleteFlag, 0)