[feat] 修改上传方法的返回值，直接把url返回回去

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/JobProjectToWebController.java

@@ -17,7 +17,7 @@ import com.tourism.webadmin.back.model.TourismFile;
 import com.tourism.webadmin.back.service.JobProjectService;
 import com.tourism.webadmin.back.service.TourismProjectService;
 import com.tourism.webadmin.back.vo.JobProjectVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/LoginToWebsiteController.java

@@ -41,7 +41,7 @@ import com.tourism.webadmin.app.website.service.LoginToWebsiteService;
 import com.tourism.webadmin.back.service.TourCountryCodeService;
 import com.tourism.webadmin.back.service.TourUserService;
 import com.tourism.webadmin.back.util.SMSUtils;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.tourism.webadmin.upms.model.SysUser;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import com.tourism.common.core.annotation.DisableDataFilter;

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/TourismProjectToWebController.java

@@ -3,8 +3,6 @@ package com.tourism.webadmin.app.website.controller;
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.page.PageMethod;
-import com.tourism.common.additional.model.FileUrlObject;
-import com.tourism.common.additional.utils.JsonUtils;
 import com.tourism.common.additional.utils.MapConvertUtils;
 import com.tourism.common.additional.utils.StringUtils;
 import com.tourism.common.additional.utils.UrlConvertUtils;
@@ -18,13 +16,12 @@ import com.tourism.webadmin.back.model.TourismFile;
 import com.tourism.webadmin.back.model.TourismProject;
 import com.tourism.webadmin.back.service.TourismProjectService;
 import com.tourism.webadmin.back.vo.TourismProjectVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/WebsiteTourismProjectTravelNotesController.java

@@ -16,7 +16,7 @@ import com.tourism.webadmin.back.model.*;
 import com.tourism.webadmin.back.service.*;
 import com.tourism.webadmin.back.vo.TourTourismProjectTravelNotesVo;
 import com.tourism.webadmin.back.vo.TourismProjectVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/impl/BasicToWebServiceImpl.java

@@ -22,7 +22,7 @@ import com.tourism.webadmin.back.service.TourUserLikeTravelNotesService;
 import com.tourism.webadmin.back.vo.BannerInfoVo;
 import com.tourism.webadmin.back.vo.DirectoryInfoVo;
 import com.tourism.webadmin.back.vo.TourTourismProjectTravelNotesVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/TakeOutProjectController.java

@@ -23,7 +23,7 @@ import com.tourism.webadmin.back.dto.RestaurantCartDto;
 import com.tourism.webadmin.back.model.*;
 import com.tourism.webadmin.back.service.*;
 import com.tourism.webadmin.back.vo.*;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/TourProjectController.java

@@ -23,7 +23,7 @@ import com.tourism.webadmin.back.model.TourismFile;
 import com.tourism.webadmin.back.model.TourismProject;
 import com.tourism.webadmin.back.service.TourismProjectService;
 import com.tourism.webadmin.back.vo.TourismProjectVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/WechatDeliveryAddressController.java

@@ -18,7 +18,7 @@ import com.tourism.webadmin.back.dto.DeliveryAddressWebDto;
 import com.tourism.webadmin.back.model.DeliveryAddress;
 import com.tourism.webadmin.back.service.DeliveryAddressService;
 import com.tourism.webadmin.back.vo.DeliveryAddressVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/WechatDeliveryOrderController.java

@@ -17,7 +17,7 @@ import com.tourism.webadmin.back.service.DeliveryOrderItemsService;
 import com.tourism.webadmin.back.service.DeliveryOrderService;
 import com.tourism.webadmin.back.vo.DeliveryOrderItemsVo;
 import com.tourism.webadmin.back.vo.DeliveryOrderVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/WechatHomeController.java

@@ -23,7 +23,7 @@ import com.tourism.webadmin.back.vo.BannerInfoVo;
 import com.tourism.webadmin.back.vo.DirectoryInfoVo;
 import com.tourism.webadmin.back.vo.IconVo;
 import com.tourism.webadmin.back.vo.TourismProjectVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/BannerInfoController.java

@@ -19,7 +19,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/CompanyInfoController.java

@@ -20,7 +20,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/DeliveryAddressController.java

@@ -12,7 +12,7 @@ import com.tourism.webadmin.back.dto.DeliveryAddressDto;
 import com.tourism.webadmin.back.model.DeliveryAddress;
 import com.tourism.webadmin.back.service.DeliveryAddressService;
 import com.tourism.webadmin.back.vo.DeliveryAddressVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/DeliveryOrderController.java

@@ -15,7 +15,7 @@ import com.tourism.webadmin.back.model.DeliveryOrder;
 import com.tourism.webadmin.back.model.DeliveryOrderItems;
 import com.tourism.webadmin.back.service.DeliveryOrderService;
 import com.tourism.webadmin.back.vo.DeliveryOrderVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/DeliveryOrderItemsController.java

@@ -12,7 +12,7 @@ import com.tourism.webadmin.back.dto.DeliveryOrderItemsDto;
 import com.tourism.webadmin.back.model.DeliveryOrderItems;
 import com.tourism.webadmin.back.service.DeliveryOrderItemsService;
 import com.tourism.webadmin.back.vo.DeliveryOrderItemsVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/DirectoryInfoController.java

@@ -20,7 +20,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/IconController.java

@@ -18,7 +18,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/JobFileController.java

@@ -18,7 +18,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/JobProjectController.java

@@ -20,7 +20,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/RestaurantCartController.java

@@ -12,7 +12,7 @@ import com.tourism.common.core.object.*;
 import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/RestaurantFoodInfoController.java

@@ -20,7 +20,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.tourism.webadmin.upms.service.SysDeptService;
 import io.swagger.v3.oas.annotations.tags.Tag;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/RestaurantFoodTypeController.java

@@ -13,7 +13,7 @@ import com.tourism.common.core.object.*;
 import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.tourism.webadmin.upms.service.SysDeptService;
 import io.swagger.v3.oas.annotations.tags.Tag;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/RestaurantInfoController.java

@@ -20,7 +20,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.tourism.webadmin.upms.service.SysDeptService;
 import io.swagger.v3.oas.annotations.tags.Tag;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/RestaurantTypeController.java

@@ -19,7 +19,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourBookInfoController.java

@@ -13,7 +13,7 @@ import com.tourism.webadmin.back.dto.TourBookInfoDto;
 import com.tourism.webadmin.back.model.TourBookInfo;
 import com.tourism.webadmin.back.service.TourBookInfoService;
 import com.tourism.webadmin.back.vo.TourBookInfoVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourCountryCodeController.java

@@ -14,7 +14,7 @@ import com.tourism.webadmin.back.dto.TourCountryCodeDto;
 import com.tourism.webadmin.back.model.TourCountryCode;
 import com.tourism.webadmin.back.service.TourCountryCodeService;
 import com.tourism.webadmin.back.vo.TourCountryCodeVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourTourismProjectTravelNotesController.java

@@ -20,7 +20,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourTourismTravelNotesFileController.java

@@ -19,7 +19,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourUserController.java

@@ -19,7 +19,7 @@ import com.tourism.webadmin.back.dto.TourUserDto;
 import com.tourism.webadmin.back.model.TourUser;
 import com.tourism.webadmin.back.service.TourUserService;
 import com.tourism.webadmin.back.vo.TourUserVo;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourismFileController.java

@@ -19,7 +19,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourismProjectController.java

@@ -2,33 +2,37 @@ package com.tourism.webadmin.back.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaIgnore;
-import com.alibaba.fastjson.JSONObject;
 import cn.hutool.core.util.ReflectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.page.PageMethod;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.tourism.common.additional.config.ApplicationConfig;
+import com.tourism.common.core.annotation.MyRequestBody;
+import com.tourism.common.core.constant.ErrorCodeEnum;
+import com.tourism.common.core.object.*;
 import com.tourism.common.core.upload.BaseUpDownloader;
 import com.tourism.common.core.upload.UpDownloaderFactory;
 import com.tourism.common.core.upload.UploadResponseInfo;
 import com.tourism.common.core.upload.UploadStoreInfo;
+import com.tourism.common.core.util.*;
 import com.tourism.common.log.annotation.OperationLog;
 import com.tourism.common.log.model.constant.SysOperationLogType;
-import com.github.pagehelper.page.PageMethod;
-import com.tourism.webadmin.back.vo.*;
-import com.tourism.webadmin.back.dto.*;
-import com.tourism.webadmin.back.model.*;
-import com.tourism.webadmin.back.service.*;
-import com.tourism.common.core.object.*;
-import com.tourism.common.core.util.*;
-import com.tourism.common.core.constant.*;
-import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.tourism.webadmin.back.dto.TourismContentDto;
+import com.tourism.webadmin.back.dto.TourismFileDto;
+import com.tourism.webadmin.back.dto.TourismProjectDto;
+import com.tourism.webadmin.back.model.TourismContent;
+import com.tourism.webadmin.back.model.TourismFile;
+import com.tourism.webadmin.back.model.TourismProject;
+import com.tourism.webadmin.back.service.TourismProjectService;
+import com.tourism.webadmin.back.vo.TourismProjectVo;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
 

application-webadmin/src/main/java/com/tourism/webadmin/config/FilterConfig.java

@@ -1,5 +1,6 @@
 package com.tourism.webadmin.config;
 
+import com.tourism.common.additional.config.ApplicationConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;

application-webadmin/src/main/java/com/tourism/webadmin/upms/controller/LoginController.java

@@ -15,7 +15,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.tourism.webadmin.upms.bo.SysMenuExtraData;
 import com.tourism.webadmin.upms.service.*;
 import com.tourism.webadmin.upms.model.*;

application-webadmin/src/main/java/com/tourism/webadmin/upms/controller/SysUserController.java

@@ -19,7 +19,7 @@ import com.tourism.common.core.util.*;
 import com.tourism.common.core.constant.*;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.redis.cache.SessionCacheHelper;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

application-webadmin/src/main/java/com/tourism/webadmin/upms/service/impl/SysDataPermServiceImpl.java

@@ -17,7 +17,7 @@ import com.tourism.common.core.object.CallResult;
 import com.tourism.common.core.util.MyModelUtil;
 import com.tourism.common.core.util.RedisKeyUtil;
 import com.tourism.common.core.constant.ApplicationConstant;
-import com.tourism.webadmin.config.ApplicationConfig;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.tourism.webadmin.upms.dao.SysDataPermDeptMapper;
 import com.tourism.webadmin.upms.dao.SysDataPermMapper;
 import com.tourism.webadmin.upms.dao.SysDataPermUserMapper;

application-webadmin/src/main/java/com/tourism/webadmin/config/ApplicationConfig.java → common/common-additional/src/main/java/com/tourism/common/additional/config/ApplicationConfig.java

@@ -1,4 +1,4 @@
-package com.tourism.webadmin.config;
+package com.tourism.common.additional.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

common/common-additional/src/main/java/com/tourism/common/additional/utils/UrlConvertUtils.java

@@ -18,7 +18,7 @@ public class UrlConvertUtils {
                 //遍历每个元素的数组对象,对元素的url对象进行拼接
                 for (FileUrlObject y : fileUrlObjectList) {
                     String hotPictureUrlsAfterConvert =
-                            hostIpPort + File.separator + y.getUploadPath() + File.separator + y.getFilename();
+                            hostIpPort + "/" + y.getUploadPath() + "/" + y.getFilename();
                     arrayList.add(hotPictureUrlsAfterConvert);
                 }
             }

common/common-core/pom.xml

@@ -117,5 +117,11 @@
             <version>${groovy.version}</version>
             <type>pom</type>
         </dependency>
+        <dependency>
+            <groupId>com.tourism</groupId>
+            <artifactId>common-additional</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

common/common-core/src/main/java/com/tourism/common/core/upload/UploadResponseInfo.java

@@ -30,4 +30,9 @@ public class UploadResponseInfo {
      * 返回给前端的文件名。
      */
     private String filename;
+
+    /**
+     * 文件路径
+     */
+    private String fileUrl;
 }

common/common-huaweicloud/common-huaweicloud-obs/src/main/java/com/tourism/common/huaweicloud/obs/util/HuaweicloudObsUpDownloader.java

@@ -3,19 +3,20 @@ package com.tourism.common.huaweicloud.obs.util;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.tourism.common.core.upload.BaseUpDownloader;
 import com.tourism.common.core.upload.UpDownloaderFactory;
 import com.tourism.common.core.upload.UploadResponseInfo;
 import com.tourism.common.core.upload.UploadStoreTypeEnum;
 import com.tourism.common.huaweicloud.obs.wrapper.HuaweicloudObsTemplate;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -35,6 +36,9 @@ public class HuaweicloudObsUpDownloader extends BaseUpDownloader {
     @Autowired
     private UpDownloaderFactory factory;
 
+    @Autowired
+    private ApplicationConfig applicationConfig;
+
     @PostConstruct
     public void doRegister() {
         factory.registerUpDownloader(UploadStoreTypeEnum.HUAWEI_OBS_SYSTEM, this);
@@ -112,7 +116,9 @@ public class HuaweicloudObsUpDownloader extends BaseUpDownloader {
             return responseInfo;
         }
         responseInfo.setUploadPath(uploadPath);
+
         super.fillUploadResponseInfo(responseInfo, serviceContextPath, uploadFile.getOriginalFilename());
+        responseInfo.setFileUrl(applicationConfig.getHostIpPort() + "/" + uploadPath + "/" + responseInfo.getFilename());
         huaweicloudObsTemplate.putObject(uploadPath + "/" + responseInfo.getFilename(), uploadFile.getInputStream());
         return responseInfo;
     }