Merge remote-tracking branch 'origin/main'

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

@@ -0,0 +1,40 @@
+package edu.travel.remote.feign.mode.dto.tenant;
+
+import lombok.Data;
+
+@Data
+public class BannerDto {
+    /**
+     * 轮播图ID
+     */
+    private String id;
+
+    /**
+     * 图片/视频
+     */
+    private String url;
+
+    /**
+     * 判断图片/视频,默认0,0图片,1视频
+     */
+    private Integer urlType;
+
+    /**
+     * 名称
+     */
+    private String content;
+    /**
+     * 国家
+     */
+    private String countryId;
+
+    /**
+     * 链接地址
+     */
+    private String linkUrl;
+    /**
+     * mode 0 首页轮播图
+     */
+    private String mode;
+
+}

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/romote/ShopBannerRemoteController.java

@@ -0,0 +1,18 @@
+package edu.travel.remote.feign.mode.romote;
+
+import edu.travel.remote.base.RemoteBaseController;
+import edu.travel.remote.feign.mode.dto.tenant.BannerDto;
+import edu.travel.remote.feign.mode.vo.banner.BannerVo;
+import edu.travel.rpc.RPCBaseResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+import static edu.travel.rpc.RPCBaseResponse.success;
+
+@FeignClient(path = "/shopBanner", name = "tenant-dev")
+public interface ShopBannerRemoteController extends RemoteBaseController<BannerVo, BannerDto> {
+    @GetMapping("/getBanner")
+    public RPCBaseResponse<List<BannerVo>> getBanner(BannerDto banner);
+}

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

@@ -30,7 +30,7 @@ public class ShopOpinionServiceImpl extends SysServiceImpl<ShopOpinionMapper, Sh
     @Override
     public RPCBaseResponse<IPage<ShopOpinionVo>> getAllFormPage(ShopOpinionDto dto) {
         // 创建分页对象
-        Page<ShopOpinionVo> shopOpinionPage = new Page<>(dto.getCurrentPage(), dto.getPageSize());
+//        Page<ShopOpinionVo> shopOpinionPage = new Page<>(dto.getCurrentPage(), dto.getPageSize());
 
         // 查询意见数据，确保返回类型正确
         List<ShopOpinionVo> shopOpinions = shopOpinionMapper.selectOpinionsWithCountry(
@@ -79,7 +79,6 @@ public class ShopOpinionServiceImpl extends SysServiceImpl<ShopOpinionMapper, Sh
         ShopOpinionVo vo = new ShopOpinionVo();
         vo.setId(shopOpinion.getId());
         vo.setCountryId(shopOpinion.getCountryId());
-        // 其他字段的设置...
         return vo;
     }
     //查询国家信息

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/web/BaseCountryController.java

@@ -64,7 +64,7 @@ public class BaseCountryController extends BaseController<BaseCountry> implement
      * 更新国家信息
      */
     @Override
-    @PostMapping("/updateCountryFormId")
+    @PostMapping("/updateTargetFormId")
     public RPCBaseResponse<BaseCountryVo> updateTargetFormId(@RequestBody BaseCountryDto entity) {
         BaseCountry baseCountry = new BaseCountry();
         BeanUtils.copyProperties(entity, baseCountry);
@@ -78,7 +78,7 @@ public class BaseCountryController extends BaseController<BaseCountry> implement
      * 新增国家信息
      */
     @Override
-    @PostMapping("/saveCountryForm")
+    @PostMapping("/saveFormTarget")
     public RPCBaseResponse<BaseCountryVo> saveFormTarget(@RequestBody BaseCountryDto entity) {
         BaseCountry baseCountry = new BaseCountry();
         BeanUtils.copyProperties(entity, baseCountry);
@@ -92,7 +92,7 @@ public class BaseCountryController extends BaseController<BaseCountry> implement
      * 删除国家
      */
     @Override
-    @PostMapping("/deleteCountryFormId")
+    @PostMapping("/deleteTargetFormId")
     public RPCBaseResponse<BaseCountryVo> deleteTargetFormId(@RequestBody List<String> ids) {
         RPCBaseResponse<BaseCountry> baseCountryRPCBaseResponse = super.deleteTargetById(ids);
         RPCBaseResponse<BaseCountryVo> baseCountryVoRPCBaseResponse = new RPCBaseResponse<>();
@@ -104,7 +104,7 @@ public class BaseCountryController extends BaseController<BaseCountry> implement
      * 获取国家表
      */
     @Override
-    @GetMapping("/CountrylistForm")
+    @GetMapping("/getAllForm")
     public RPCBaseResponse<List<BaseCountryVo>> getAllForm() {
         RPCBaseResponse<List<BaseCountry>> listRPCBaseResponse = super.listAll();
         RPCBaseResponse<List<BaseCountryVo>> baseCountryVoRPCBaseResponse = new RPCBaseResponse<>();

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

@@ -68,7 +68,7 @@ public class BaseCountryServeController extends BaseController<BaseCountryServe>
      * @return
      */
     @Override
-    @PostMapping("/updateFormId")
+    @PostMapping("/updateTargetFormId")
     public RPCBaseResponse<BaseCountryServeVo> updateTargetFormId(@RequestBody BaseCountryServeDto entity) {
         BaseCountryServe baseCountryServe = new BaseCountryServe();
         BeanUtils.copyProperties(entity, baseCountryServe);
@@ -85,7 +85,7 @@ public class BaseCountryServeController extends BaseController<BaseCountryServe>
      * @return
      */
     @Override
-    @PostMapping("/saveForm")
+    @PostMapping("/saveFormTarget")
     public RPCBaseResponse<BaseCountryServeVo> saveFormTarget(@RequestBody BaseCountryServeDto entity) {
         BaseCountryServe baseCountryServe = new BaseCountryServe();
         BeanUtils.copyProperties(entity, baseCountryServe);
@@ -102,7 +102,7 @@ public class BaseCountryServeController extends BaseController<BaseCountryServe>
      * @return
      */
     @Override
-    @PostMapping("/deleteFormId")
+    @PostMapping("/deleteTargetFormId")
     public RPCBaseResponse<BaseCountryServeVo> deleteTargetFormId(@RequestBody List<String> ids) {
         RPCBaseResponse<BaseCountryServe> baseCountryServeRPCBaseResponse = super.deleteTargetById(ids);
         RPCBaseResponse<BaseCountryServeVo> baseCountryServeVoRPCBaseResponse = new RPCBaseResponse<>();
@@ -116,7 +116,7 @@ public class BaseCountryServeController extends BaseController<BaseCountryServe>
      * @return
      */
     @Override
-    @GetMapping("/listForm")
+    @GetMapping("/getAllForm")
     public RPCBaseResponse<List<BaseCountryServeVo>> getAllForm() {
         RPCBaseResponse<List<BaseCountryServe>> listRPCBaseResponse = super.listAll();
         RPCBaseResponse<List<BaseCountryServeVo>> baseCountryServeVoRPCBaseResponse = new RPCBaseResponse<>();

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

@@ -133,6 +133,12 @@
             <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>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
     <profiles>

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/service/ShopBannerService.java

@@ -1,9 +1,11 @@
 package edu.travel.tenant.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import edu.travel.remote.feign.mode.dto.tenant.BannerDto;
 import edu.travel.remote.feign.mode.vo.banner.BannerVo;
-import edu.travel.tenant.dto.BannerDto;
+import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.tenant.entity.ShopBanner;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -12,4 +14,6 @@ public interface ShopBannerService extends IService<ShopBanner>{
 
 
     List<BannerVo> getBanner(BannerDto mode);
+
+    RPCBaseResponse<String> uploadBannerImage(MultipartFile file);
 }

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/service/impl/ShopBannerServiceImpl.java

@@ -1,16 +1,21 @@
 package edu.travel.tenant.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import edu.travel.adapter.service.upload.UploadAdapter;
+import edu.travel.remote.feign.mode.dto.tenant.BannerDto;
 import edu.travel.remote.feign.mode.vo.banner.BannerVo;
-import edu.travel.tenant.dto.BannerDto;
+import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.tenant.entity.ShopBanner;
 import edu.travel.tenant.mapper.ShopBannerMapper;
 import edu.travel.tenant.service.ShopBannerService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -18,7 +23,8 @@ import java.util.List;
 
 @Service
 public class ShopBannerServiceImpl extends ServiceImpl<ShopBannerMapper, ShopBanner> implements ShopBannerService {
-
+    @Autowired
+    private UploadAdapter uploadAdapter;
     @Override
     public List<BannerVo> getBanner(BannerDto mode) {
        List<BannerVo> list = new ArrayList<>();
@@ -36,4 +42,20 @@ public class ShopBannerServiceImpl extends ServiceImpl<ShopBannerMapper, ShopBan
         }
         return list;
     }
+
+    @Override
+    public RPCBaseResponse<String> uploadBannerImage(MultipartFile file) {
+        //判断文件是否为空
+        if (file == null || file.isEmpty()) {
+            return RPCBaseResponse.error();
+        }
+//        try{
+//            String fileType = FileTypeUtil.getType(file.getInputStream());
+//
+//        }catch (){
+//            return RPCBaseResponse.error();
+//        }
+        return null;
+    }
+
 }

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

@@ -1,16 +1,21 @@
 package edu.travel.tenant.web;
 
+import edu.travel.remote.feign.mode.dto.tenant.BannerDto;
+import edu.travel.remote.feign.mode.romote.ShopBannerRemoteController;
 import edu.travel.remote.feign.mode.vo.banner.BannerVo;
 import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
-import edu.travel.tenant.dto.BannerDto;
 import edu.travel.tenant.entity.ShopBanner;
 import edu.travel.tenant.service.ShopBannerService;
 import edu.travel.web.BaseController;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+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,7 +28,7 @@ import static edu.travel.rpc.RPCBaseResponse.success;
 */
 @RestController
 @RequestMapping("/shopBanner")
-public class ShopBannerController extends BaseController<ShopBanner>{
+public class ShopBannerController extends BaseController<ShopBanner> implements ShopBannerRemoteController {
 /**
 * 服务对象
 */
@@ -41,6 +46,64 @@ public class ShopBannerController extends BaseController<ShopBanner>{
         return success(shopBannerService.getBanner(banner));
     }
 
+    /**
+     * 上传banner图片
+     * @param
+     * @return
+     */
+    @GetMapping("/uploadBannerImage")
+    public ResponseEntity<RPCBaseResponse<String>> uploadBannerImage(@RequestBody MultipartFile file){
+        return ResponseEntity.ok(shopBannerService.uploadBannerImage(file));
+    }
+
+    @Override
+    @GetMapping("/getFormId")
+    public RPCBaseResponse<BannerVo> getFormId(String id) {
+        RPCBaseResponse<ShopBanner> shopBannerRPCBaseResponse = super.getId(id);
+        RPCBaseResponse<BannerVo> shopBannerVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopBannerRPCBaseResponse, shopBannerVoRPCBaseResponse);
+        return shopBannerVoRPCBaseResponse;
+    }
+
+    @Override
+    @GetMapping("/updateFormTarget")
+    public RPCBaseResponse<BannerVo> updateTargetFormId(@RequestBody BannerDto entity) {
+        ShopBanner shopBanner = new ShopBanner();
+        BeanUtils.copyProperties(entity, shopBanner);
+        RPCBaseResponse<ShopBanner> shopBannerRPCBaseResponse = super.updateTargetById(shopBanner);
+        RPCBaseResponse<BannerVo> shopBannerVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopBannerRPCBaseResponse, shopBannerVoRPCBaseResponse);
+        return shopBannerVoRPCBaseResponse;
+    }
 
+    @Override
+    @GetMapping("/saveFormTarget")
+    public RPCBaseResponse<BannerVo> saveFormTarget(BannerDto entity) {
+        ShopBanner shopBanner = new ShopBanner();
+        BeanUtils.copyProperties(entity, shopBanner);
+        RPCBaseResponse<ShopBanner> shopBannerRPCBaseResponse = super.saveTarget(shopBanner);
+        RPCBaseResponse<BannerVo> shopBannerVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopBannerRPCBaseResponse, shopBannerVoRPCBaseResponse);
+        return shopBannerVoRPCBaseResponse;
+    }
+
+
+    @Override
+    @GetMapping("/deleteFormTarget")
+    public RPCBaseResponse<BannerVo> deleteTargetFormId(List<String> ids) {
+        RPCBaseResponse<ShopBanner> shopBannerRPCBaseResponse = super.deleteTargetById(ids);
+        RPCBaseResponse<BannerVo> shopBannerVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopBannerRPCBaseResponse, shopBannerVoRPCBaseResponse);
+        return shopBannerVoRPCBaseResponse;
+    }
+
+    @Override
+    @GetMapping("/getAllForm")
+    public RPCBaseResponse<List<BannerVo>> getAllForm() {
+        RPCBaseResponse<List<ShopBanner>> countryRPCBaseResponse = super.listAll();
+        RPCBaseResponse<List<BannerVo>> baseCountryVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(countryRPCBaseResponse, baseCountryVoRPCBaseResponse);
+        return baseCountryVoRPCBaseResponse;
+    }
 
 }

edu-travel-service/edu-travel-service-upload/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: mybatis-config-dev.yaml
             group: DEFAULT_GROUP