Skip to content

Commit

Permalink
!132 发布 2.1.2 版本 2023 最后一版
Browse files Browse the repository at this point in the history
Merge pull request !132 from 疯狂的狮子Li/dev
  • Loading branch information
JavaLionLi authored and gitee-org committed Dec 22, 2023
2 parents cda3d98 + 3bc99c3 commit cf8613a
Show file tree
Hide file tree
Showing 144 changed files with 1,318 additions and 738 deletions.
2 changes: 1 addition & 1 deletion .run/ruoyi-auth.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-auth" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-auth:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-auth:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-auth/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-gateway.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-gateway" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-gateway:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-gateway:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-gateway/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-gen.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-gen" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-gen:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-gen:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-modules/ruoyi-gen/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-job.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-job" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-job:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-job:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-modules/ruoyi-job/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-monitor.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-monitor" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-monitor:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-monitor:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-visual/ruoyi-monitor/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-nacos.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-nacos" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-nacos:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-nacos:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-visual/ruoyi-nacos/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-powerjob-server.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-powerjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-powerjob-server:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-powerjob-server:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-visual/ruoyi-powerjob-server/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-resource.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-resource" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-resource:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-resource:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-modules/ruoyi-resource/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-seata-server.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-seata-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-seata-server:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-seata-server:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-visual/ruoyi-seata-server/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-sentinel-dashboard.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-sentinel-dashboard" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-sentinel-dashboard:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-sentinel-dashboard:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-system.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-system" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-system:2.1.1" />
<option name="imageTag" value="ruoyi/ruoyi-system:2.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-modules/ruoyi-system/Dockerfile" />
</settings>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Cloud-Plus/blob/master/LICENSE)
[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Cloud-Plus)
<br>
[![RuoYi-Cloud-Plus](https://img.shields.io/badge/RuoYi_Cloud_Plus-2.1.1-success.svg)](https://gitee.com/dromara/RuoYi-Cloud-Plus)
[![RuoYi-Cloud-Plus](https://img.shields.io/badge/RuoYi_Cloud_Plus-2.1.2-success.svg)](https://gitee.com/dromara/RuoYi-Cloud-Plus)
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.1-blue.svg)]()
[![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]()
[![JDK-19](https://img.shields.io/badge/JDK-21-green.svg)]()
Expand Down Expand Up @@ -42,7 +42,7 @@
| Web容器 | 采用 Undertow 基于 XNIO 的高性能容器 | 采用 Tomcat |
| 权限认证 | 采用 Sa-Token、Jwt 静态使用功能齐全 低耦合 高扩展 | Spring Security 配置繁琐扩展性极差 |
| 权限注解 | 采用 Sa-Token 支持注解 登录校验、角色校验、权限校验、二级认证校验、HttpBasic校验、忽略校验<br/>角色与权限校验支持多种条件 如 `AND` `OR``权限 OR 角色` 等复杂表达式 | 只支持是否存在匹配 |
| 关系数据库支持 | 原生支持 MySQL、Oracle、PostgreSQL、SQLServer<br/>可同时使用异构切换 | 支持 Mysql、Oracle 不支持同时使用、不支持异构切换 |
| 关系数据库支持 | 原生支持 MySQL、Oracle、PostgreSQL、SQLServer<br/>可同时使用异构切换(支持其他 mybatis-plus 支持的所有数据库 只需要增加jdbc依赖即可使用 达梦金仓等均有成功案例) | 支持 Mysql、Oracle 不支持同时使用、不支持异构切换 |
| 缓存数据库 | 支持 Redis 5-7 支持大部分新功能特性 如 分布式限流、分布式队列 | Redis 简单 get set 支持 |
| Redis客户端 | 采用 Redisson Redis官方推荐 基于Netty的客户端工具<br/>支持Redis 90%以上的命令 底层优化规避很多不正确的用法 例如: keys被转换为scan<br/>支持单机、哨兵、单主集群、多主集群等模式 | Lettuce + RedisTemplate 支持模式少 工具使用繁琐<br/>连接池采用 common-pool Bug多经常性出问题 |
| 缓存注解 | 采用 Spring-Cache 注解 对其扩展了实现支持了更多功能<br/>例如 过期时间 最大空闲时间 组最大长度等 只需一个注解即可完成数据自动缓存 | 需手动编写Redis代码逻辑 |
Expand Down
8 changes: 6 additions & 2 deletions config/nacos/application-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,11 @@ api-decrypt:
enabled: true
# AES 加密头标识
headerFlag: encrypt-key
# 公私钥 非对称算法的公私钥 如:SM2,RSA 使用者请自行更换
publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==
# 响应加密公钥 非对称算法的公私钥 如:SM2,RSA 使用者请自行更换
# 对应前端解密私钥 MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=
publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJnNwrj4hi/y3CCJu868ghCG5dUj8wZK++RNlTLcXoMmdZWEQ/u02RgD5LyLAXGjLOjbMtC+/J9qofpSGTKSx/MCAwEAAQ==
# 请求解密私钥 非对称算法的公私钥 如:SM2,RSA 使用者请自行更换
# 对应前端加密公钥 MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==
privateKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=

# 接口文档配置
Expand Down Expand Up @@ -249,3 +252,4 @@ tenant:
- sys_user_post
- sys_user_role
- sys_client
- sys_oss_config
2 changes: 0 additions & 2 deletions config/nacos/datasource.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,5 @@ spring:
idleTimeout: 600000
# 此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认30分钟
maxLifetime: 1800000
# 连接测试query(配置检测连接是否有效)
connectionTestQuery: SELECT 1
# 多久检查一次连接的活性
keepaliveTime: 30000
2 changes: 0 additions & 2 deletions config/nacos/ruoyi-gen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ spring:
# url: ${datasource.system-oracle.url}
# username: ${datasource.system-oracle.username}
# password: ${datasource.system-oracle.password}
# hikari:
# connectionTestQuery: SELECT 1 FROM DUAL
# postgres:
# type: ${spring.datasource.type}
# driverClassName: org.postgresql.Driver
Expand Down
2 changes: 1 addition & 1 deletion config/nacos/ruoyi-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ powerjob:
enabled: true
# 需要先在 powerjob 登录页执行应用注册后才能使用
app-name: ruoyi-worker
enable-test-mode: false
allow-lazy-connect-server: false
max-appended-wf-context-length: 4096
max-result-length: 4096
# 29203 端口 随着主应用端口飘逸 避免集群冲突
Expand Down
2 changes: 0 additions & 2 deletions config/nacos/ruoyi-resource.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ spring:
# url: ${datasource.system-oracle.url}
# username: ${datasource.system-oracle.username}
# password: ${datasource.system-oracle.password}
# hikari:
# connectionTestQuery: SELECT 1 FROM DUAL
# postgres:
# type: ${spring.datasource.type}
# driverClassName: org.postgresql.Driver
Expand Down
2 changes: 0 additions & 2 deletions config/nacos/ruoyi-system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ spring:
# url: ${datasource.system-oracle.url}
# username: ${datasource.system-oracle.username}
# password: ${datasource.system-oracle.password}
# hikari:
# connectionTestQuery: SELECT 1 FROM DUAL
# postgres:
# type: ${spring.datasource.type}
# driverClassName: org.postgresql.Driver
Expand Down
22 changes: 11 additions & 11 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
network_mode: "host"

nacos:
image: ruoyi/ruoyi-nacos:2.1.1
image: ruoyi/ruoyi-nacos:2.1.2
container_name: nacos
ports:
- "8848:8848"
Expand Down Expand Up @@ -96,7 +96,7 @@ services:
network_mode: "host"

seata-server:
image: ruoyi/ruoyi-seata-server:2.1.1
image: ruoyi/ruoyi-seata-server:2.1.2
container_name: seata-server
ports:
- "7091:7091"
Expand Down Expand Up @@ -135,7 +135,7 @@ services:
network_mode: "host"

sentinel:
image: ruoyi/ruoyi-sentinel-dashboard:2.1.1
image: ruoyi/ruoyi-sentinel-dashboard:2.1.2
container_name: sentinel
environment:
TZ: Asia/Shanghai
Expand All @@ -150,7 +150,7 @@ services:
network_mode: "host"

ruoyi-monitor:
image: ruoyi/ruoyi-monitor:2.1.1
image: ruoyi/ruoyi-monitor:2.1.2
container_name: ruoyi-monitor
environment:
# 时区上海
Expand All @@ -166,7 +166,7 @@ services:
network_mode: "host"

ruoyi-powerjob-server:
image: ruoyi/ruoyi-powerjob-server:2.1.1
image: ruoyi/ruoyi-powerjob-server:2.1.2
container_name: ruoyi-powerjob-server
environment:
# 时区上海
Expand All @@ -181,7 +181,7 @@ services:
network_mode: "host"

ruoyi-gateway:
image: ruoyi/ruoyi-gateway:2.1.1
image: ruoyi/ruoyi-gateway:2.1.2
container_name: ruoyi-gateway
environment:
# 时区上海
Expand All @@ -197,7 +197,7 @@ services:
network_mode: "host"

ruoyi-auth:
image: ruoyi/ruoyi-auth:2.1.1
image: ruoyi/ruoyi-auth:2.1.2
container_name: ruoyi-auth
environment:
# 时区上海
Expand All @@ -213,7 +213,7 @@ services:
network_mode: "host"

ruoyi-system:
image: ruoyi/ruoyi-system:2.1.1
image: ruoyi/ruoyi-system:2.1.2
container_name: ruoyi-system
environment:
# 时区上海
Expand All @@ -229,7 +229,7 @@ services:
network_mode: "host"

ruoyi-gen:
image: ruoyi/ruoyi-gen:2.1.1
image: ruoyi/ruoyi-gen:2.1.2
container_name: ruoyi-gen
environment:
# 时区上海
Expand All @@ -245,7 +245,7 @@ services:
network_mode: "host"

ruoyi-job:
image: ruoyi/ruoyi-job:2.1.1
image: ruoyi/ruoyi-job:2.1.2
container_name: ruoyi-job
environment:
# 时区上海
Expand All @@ -261,7 +261,7 @@ services:
network_mode: "host"

ruoyi-resource:
image: ruoyi/ruoyi-resource:2.1.1
image: ruoyi/ruoyi-resource:2.1.2
container_name: ruoyi-resource
environment:
# 时区上海
Expand Down
2 changes: 1 addition & 1 deletion docker/nginx/conf/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ http {
}

# 解决 powerjob 代理之后静态文件无法访问的问题 请勿修改乱动
location .*\.(js|css|jpg|png|svg|woff|ttf|ico)?$ {
location ~ ^/(js|css|jpg|png|svg|woff|ttf|ico|img)/ {
proxy_pass http://powerjob-server;
}

Expand Down
24 changes: 12 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<description>RuoYi-Cloud-Plus微服务系统</description>

<properties>
<revision>2.1.1</revision>
<revision>2.1.2</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
<spring-boot.version>3.1.5</spring-boot.version>
<spring-boot.version>3.1.7</spring-boot.version>
<spring-cloud.version>2022.0.4</spring-cloud.version>
<spring-boot-admin.version>3.1.7</spring-boot-admin.version>
<spring-boot.mybatis>3.0.2</spring-boot.mybatis>
<spring-boot-admin.version>3.1.8</spring-boot-admin.version>
<spring-boot.mybatis>3.0.3</spring-boot.mybatis>
<mybatis.version>3.5.13</mybatis.version>
<mybatis-plus.version>3.5.4</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
Expand All @@ -30,29 +30,29 @@
<springdoc.version>2.2.0</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
<poi.version>5.2.3</poi.version>
<easyexcel.version>3.3.2</easyexcel.version>
<easyexcel.version>3.3.3</easyexcel.version>
<hutool.version>5.8.22</hutool.version>
<redisson.version>3.24.1</redisson.version>
<redisson.version>3.24.3</redisson.version>
<lock4j.version>2.2.5</lock4j.version>
<powerjob.version>4.3.3</powerjob.version>
<powerjob.version>4.3.6</powerjob.version>
<satoken.version>1.37.0</satoken.version>
<lombok.version>1.18.30</lombok.version>
<logstash.version>7.4</logstash.version>
<easy-es.version>1.1.1</easy-es.version>
<easy-es.version>2.0.0-beta4</easy-es.version>
<elasticsearch.version>7.14.0</elasticsearch.version>
<skywalking-toolkit.version>8.16.0</skywalking-toolkit.version>
<bouncycastle.version>1.76</bouncycastle.version>
<alibaba-ttl.version>2.14.2</alibaba-ttl.version>
<alibaba-ttl.version>2.14.4</alibaba-ttl.version>
<mapstruct-plus.version>1.3.5</mapstruct-plus.version>
<mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
<justauth.version>1.16.5</justauth.version>
<justauth.version>1.16.6</justauth.version>
<!-- 离线IP地址定位库 -->
<ip2region.version>2.7.0</ip2region.version>
<!-- 临时修复 fastjson 漏洞 -->
<fastjson.version>1.2.83</fastjson.version>

<!-- OSS 配置 -->
<aws-java-sdk-s3.version>1.12.540</aws-java-sdk-s3.version>
<aws-java-sdk-s3.version>1.12.600</aws-java-sdk-s3.version>
<okhttp.version>4.10.0</okhttp.version>

<!-- SMS 配置 -->
Expand Down Expand Up @@ -293,7 +293,7 @@
</dependency>

<dependency>
<groupId>cn.easy-es</groupId>
<groupId>org.dromara.easy-es</groupId>
<artifactId>easy-es-boot-starter</artifactId>
<version>${easy-es.version}</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion ruoyi-api/ruoyi-api-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</description>

<properties>
<revision>2.1.1</revision>
<revision>2.1.2</revision>
</properties>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package org.dromara.resource.api;

import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.resource.api.domain.RemoteFile;

/**
* 文件服务(降级处理)
*
* @author Lion Li
*/
@Slf4j
public class RemoteFileServiceMock implements RemoteFileService {

/**
* 上传文件
*
* @param file 文件信息
* @return 结果
*/
public RemoteFile upload(String name, String originalFilename, String contentType, byte[] file) {
log.warn("服务调用异常 -> 降级处理");
return null;
}

/**
* 通过ossId查询对应的url
*
* @param ossIds ossId串逗号分隔
* @return url串逗号分隔
*/
public String selectUrlByIds(String ossIds) {
log.warn("服务调用异常 -> 降级处理");
return StringUtils.EMPTY;
}

}
Loading

0 comments on commit cf8613a

Please sign in to comment.