本地上传

ruoyi-admin/src/main/java/com/ruoyi/web/controller/base/ProtocolController.java

@@ -43,7 +43,7 @@ public class ProtocolController extends BaseController {
     /**
      * 通过协议code获取协议详细信息
      */
-    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("通过协议code获取协议详细信息")
     @SaCheckPermission("protocol:protocol:query")
     @GetMapping("/info/{code}")
@@ -54,7 +54,7 @@ public class ProtocolController extends BaseController {
     /**
      * 保存协议管理
      */
-    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("保存协议管理")
     @SaCheckPermission("protocol:protocol:save")
     @Log(title = "协议管理", businessType = BusinessType.INSERT)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/commonproblem/CommonProblemController.java

@@ -14,6 +14,8 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.base.commonproblem.domain.bo.CommonProblemBo;
 import com.ruoyi.base.commonproblem.domain.vo.CommonProblemVo;
 import com.ruoyi.base.commonproblem.service.ICommonProblemService;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -41,6 +43,7 @@ public class CommonProblemController extends BaseController {
     /**
      * 分页查询常见问题列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("查询常见问题列表")
     @SaCheckPermission("common:problem:list")
     @GetMapping("/page")
@@ -51,6 +54,7 @@ public class CommonProblemController extends BaseController {
     /**
      * 获取常见问题详细信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取常见问题详细信息")
     @SaCheckPermission("common:problem:query")
     @GetMapping("/info/{id}")
@@ -62,6 +66,7 @@ public class CommonProblemController extends BaseController {
     /**
      * 新增常见问题
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("新增常见问题")
     @SaCheckPermission("common:problem:add")
     @Log(title = "常见问题", businessType = BusinessType.INSERT)
@@ -74,6 +79,7 @@ public class CommonProblemController extends BaseController {
     /**
      * 修改常见问题
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("修改常见问题")
     @SaCheckPermission("common:problem:edit")
     @Log(title = "常见问题", businessType = BusinessType.UPDATE)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/HospitalController.java

@@ -9,6 +9,9 @@ import java.util.Map;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -66,10 +69,13 @@ public class HospitalController extends BaseController {
     private final WxMinService wxMinService;
 
     private final ISysOssService iSysOssService;
+    @Value("${oss.filePathOssDomain}")
+    private String filePathOssDomain;
 
     /**
      * 分页查询医院信息列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("查询医院信息分页")
     @SaCheckPermission("info:hospital:list")
     @GetMapping("/page")
@@ -80,6 +86,7 @@ public class HospitalController extends BaseController {
     /**
      * 获取医院信息详细信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取医院信息详细信息")
     @SaCheckPermission("info:hospital:query")
     @GetMapping("/info/{id}")
@@ -92,6 +99,7 @@ public class HospitalController extends BaseController {
     /**
      * 新增医院信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("新增医院信息")
     @SaCheckPermission("info:hospital:add")
     @Log(title = "医院信息", businessType = BusinessType.INSERT)
@@ -104,6 +112,7 @@ public class HospitalController extends BaseController {
     /**
      * 修改医院信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("修改医院信息")
     @SaCheckPermission("info:hospital:edit")
     @Log(title = "医院信息", businessType = BusinessType.UPDATE)
@@ -169,7 +178,7 @@ public class HospitalController extends BaseController {
 
         iHospitalService.updateQrCodeUrl(bo.getHospitalId(), sysOss.getUrl());
         Map<String,String> map = new HashMap<>();
-        map.put("url",sysOss.getUrl());
+        map.put("url",filePathOssDomain + sysOss.getUrl());
         return R.ok(map);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/ServiceProductController.java

@@ -11,6 +11,8 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.info.service.domain.bo.ServiceProductBo;
 import com.ruoyi.info.service.domain.vo.ServiceProductVo;
 import com.ruoyi.info.service.enums.ServiceUnit;
@@ -46,6 +48,7 @@ public class ServiceProductController extends BaseController {
     /**
      * 分页查询服务列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("查询服务列表")
     @SaCheckPermission("service:serviceProduct:list")
     @GetMapping("/page")
@@ -64,6 +67,7 @@ public class ServiceProductController extends BaseController {
     /**
      * 获取服务详细信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取服务详细信息")
     @SaCheckPermission("service:serviceProduct:query")
     @GetMapping("/info/{id}")
@@ -76,6 +80,7 @@ public class ServiceProductController extends BaseController {
     /**
      * 新增服务
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("新增服务")
     @SaCheckPermission("service:serviceProduct:add")
     @Log(title = "服务", businessType = BusinessType.INSERT)
@@ -88,6 +93,7 @@ public class ServiceProductController extends BaseController {
     /**
      * 修改服务
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("修改服务")
     @SaCheckPermission("service:serviceProduct:edit")
     @Log(title = "服务", businessType = BusinessType.UPDATE)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -8,6 +8,8 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import io.swagger.annotations.Api;
@@ -34,6 +36,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 获取通知公告列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取通知公告列表")
     @SaCheckPermission("system:notice:list")
     @GetMapping("/list")
@@ -44,6 +47,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 根据通知公告编号获取详细信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("根据通知公告编号获取详细信息")
     @SaCheckPermission("system:notice:query")
     @GetMapping(value = "/{noticeId}")
@@ -54,6 +58,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 新增通知公告
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("新增通知公告")
     @SaCheckPermission("system:notice:add")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
@@ -65,6 +70,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 修改通知公告
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("修改通知公告")
     @SaCheckPermission("system:notice:edit")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)

ruoyi-admin/src/main/resources/application.yml

@@ -350,8 +350,8 @@ aliyunsample:
 
 oss:
   # Oss域名
-  filePathOssDomain: xxx
+  filePathOssDomain: https://peihu.songlanyun.com/
   # 线上域名
-  filePathAtlDomain: xxx
+  filePathAtlDomain: https://peihu.songlanyun.com/
   # 富文本替换值
   richReplaceValue: 【~Rich-Replace-Value~】

ruoyi-api/src/main/java/com/ruoyi/api/controller/common/CommonController.java

@@ -60,6 +60,7 @@ public class CommonController extends AbstractApiController {
     /**
      * 获取公告列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取公告列表")
     @GetMapping("/notice/list")
     public R<List<SysNotice>> noticeList(SysNotice notice) {
@@ -69,6 +70,7 @@ public class CommonController extends AbstractApiController {
     /**
      * 获取公告列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取公告详情")
     @GetMapping("/notice/info/{noticeId}")
     public R<SysNotice> noticeDetail(@ApiParam("公告ID") @PathVariable Long noticeId) {

ruoyi-api/src/main/java/com/ruoyi/api/controller/commonproblem/ApiCommonProblemController.java

@@ -7,6 +7,8 @@ import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.base.commonproblem.domain.bo.CommonProblemBo;
 import com.ruoyi.base.commonproblem.domain.vo.CommonProblemVo;
 import com.ruoyi.base.commonproblem.service.ICommonProblemService;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -36,6 +38,7 @@ public class ApiCommonProblemController {
     /**
      * 分页查询常见问题列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("查询常见问题列表")
     @GetMapping("/page")
     public TableDataInfo<CommonProblemVo> page(@Validated(QueryGroup.class) CommonProblemBo bo, PageQuery pageQuery) {
@@ -45,6 +48,7 @@ public class ApiCommonProblemController {
     /**
      * 获取常见问题详细信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取常见问题详细信息")
     @GetMapping("/info/{id}")
     public R<CommonProblemVo> getInfo(@ApiParam("主键") @NotNull(message = "主键不能为空")

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiHospitalController.java

@@ -2,6 +2,8 @@ package com.ruoyi.api.controller.info;
 
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.common.utils.MapTools;
 import com.ruoyi.info.hospital.domain.bo.HospitalBo;
 import com.ruoyi.info.hospital.domain.vo.HospitalVo;
@@ -35,6 +37,7 @@ public class ApiHospitalController {
     /**
      * 获取所有医院列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("查询医院信息列表")
     @GetMapping("/list")
     public R<List<HospitalVo>> list(@ApiParam("经纬度，以逗号隔开") @RequestParam(required = false) String coordinates) {
@@ -72,6 +75,7 @@ public class ApiHospitalController {
         return R.ok(hospitalVoList);
     }
 
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取医院信息详细信息")
     @GetMapping("/info/{id}")
     public R<HospitalVo> getInfo(@ApiParam("主键")

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiServiceProductController.java

@@ -3,6 +3,8 @@ package com.ruoyi.api.controller.info;
 import com.ruoyi.api.controller.common.AbstractApiController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.info.service.domain.bo.ServiceProductBo;
 import com.ruoyi.info.service.domain.vo.ServiceProductVo;
 import com.ruoyi.info.service.enums.ServiceUnit;
@@ -37,6 +39,7 @@ public class ApiServiceProductController extends AbstractApiController {
     /**
      * 查询服务列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("查询服务列表")
     @GetMapping("/list")
     public R<List<ServiceProductVo>> list(@Validated(QueryGroup.class) ServiceProductBo bo) {

ruoyi-api/src/main/java/com/ruoyi/api/controller/user/ApiUserLoginController.java

@@ -4,6 +4,8 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import com.ruoyi.api.controller.common.AbstractApiController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.RegGroup;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.framework.web.service.ApiTokenService;
 import com.ruoyi.user.domain.User;
 import com.ruoyi.user.enums.UserThirdType;
@@ -84,6 +86,7 @@ public class ApiUserLoginController extends AbstractApiController {
     /**
      * 注册用户，小程序授权且获取了手机号
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("注册用户，小程序授权且获取了手机号")
     @PostMapping("/user/authorization/register")
     public R<Map<String, Object>> registerAuthorization(@RequestBody @Validated(RegGroup.class) WxUserDto wxUserDto) {

ruoyi-base/src/main/java/com/ruoyi/base/commonproblem/domain/bo/CommonProblemBo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.filepathsplicing.FilePathRich;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,6 +47,7 @@ public class CommonProblemBo extends BaseEntity {
     /**
      * 答复内容
      */
+    @FilePathRich
     @ApiModelProperty(value = "答复内容", required = true)
     @NotBlank(message = "答复内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String replyContent;

ruoyi-base/src/main/java/com/ruoyi/base/commonproblem/domain/vo/CommonProblemVo.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.filepathsplicing.FilePathRich;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,6 +42,7 @@ public class CommonProblemVo {
     /**
      * 答复内容
      */
+    @FilePathRich
     @ExcelProperty(value = "答复内容")
     @ApiModelProperty("答复内容")
     private String replyContent;

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/bo/HospitalBo.java

@@ -3,6 +3,8 @@ package com.ruoyi.info.hospital.domain.bo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.filepathsplicing.FilePathRich;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -144,12 +146,14 @@ public class HospitalBo extends BaseEntity {
     /**
      * 医院介绍
      */
+    @FilePathRich
     @ApiModelProperty(value = "医院介绍", required = true)
     private String introduction;
 
     /**
      * 医院logo_url
      */
+    @FilePathValue
     @ApiModelProperty(value = "医院logo_url", required = true)
     @NotBlank(message = "医院logo不能为空", groups = { AddGroup.class, EditGroup.class })
     private String logoUrl;
@@ -157,6 +161,7 @@ public class HospitalBo extends BaseEntity {
     /**
      * 小程序二维码url
      */
+    @FilePathValue
     @ApiModelProperty(value = "小程序二维码url", required = true)
     private String qrCodeUrl;
 

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/vo/HospitalVo.java

@@ -2,10 +2,8 @@ package com.ruoyi.info.hospital.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.filepathsplicing.FilePathRich;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -150,6 +148,7 @@ public class HospitalVo implements Serializable {
     /**
      * 医院介绍
      */
+    @FilePathRich
     @ExcelProperty(value = "医院介绍")
     @ApiModelProperty("医院介绍")
     private String introduction;
@@ -157,6 +156,7 @@ public class HospitalVo implements Serializable {
     /**
      * 医院logo_url
      */
+    @FilePathValue
     @ExcelProperty(value = "医院logo_url")
     @ApiModelProperty("医院logo_url")
     private String logoUrl;
@@ -164,6 +164,7 @@ public class HospitalVo implements Serializable {
     /**
      * 小程序二维码url
      */
+    @FilePathValue
     @ExcelProperty(value = "小程序二维码url")
     @ApiModelProperty("小程序二维码url")
     private String qrCodeUrl;

ruoyi-info/src/main/java/com/ruoyi/info/service/domain/bo/ServiceProductBo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 import com.ruoyi.info.service.enums.ServiceUnit;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -50,6 +51,7 @@ public class ServiceProductBo extends BaseEntity {
     /**
      * 服务图片
      */
+    @FilePathValue
     @ApiModelProperty(value = "服务图片", required = true)
     private String image;
 

ruoyi-info/src/main/java/com/ruoyi/info/service/domain/vo/ServiceProductVo.java

@@ -2,6 +2,7 @@ package com.ruoyi.info.service.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 import com.ruoyi.info.service.enums.ServiceUnit;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -49,6 +50,7 @@ public class ServiceProductVo {
     /**
      * 服务图片
      */
+    @FilePathValue
     @ExcelProperty(value = "服务图片")
     @ApiModelProperty("服务图片")
     private String image;

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.filepathsplicing.FilePathRich;
 import com.ruoyi.common.xss.Xss;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -54,6 +55,7 @@ public class SysNotice extends BaseEntity {
     /**
      * 公告内容
      */
+    @FilePathRich
     @ApiModelProperty(value = "公告内容")
     private String noticeContent;
 

ruoyi-weixin/ruoyi-weixin-miniapp/src/main/java/com/ruoyi/weixin/domain/WxUserDto.java

@@ -1,6 +1,7 @@
 package com.ruoyi.weixin.domain;
 
 import com.ruoyi.common.core.validate.RegGroup;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -40,6 +41,7 @@ public class WxUserDto implements Serializable {
     /**
      * 头像
      */
+    @FilePathValue
     private String headPhoto;
 
     /**