From dcd95d013ff52aa630505fc7dec2ca7412d59ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Mon, 21 Jun 2021 12:43:23 +0800
Subject: [PATCH 1/3] update springboot 2.3.11 => 2.4.7 update springboot-admin
2.3.1 => 2.4.1 update feign 2.2.6 => 3.0.3 update hutool 5.7.1 => 5.7.2
---
pom.xml | 8 ++++----
ruoyi-admin/src/main/resources/application.yml | 2 +-
.../main/java/com/ruoyi/framework/config/FeignConfig.java | 8 +-------
.../java/com/ruoyi/framework/config/ResourcesConfig.java | 2 +-
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 967354cf..355d59e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
2.3.2
- 2.3.11.RELEASE
+ 2.4.7
UTF-8
UTF-8
1.8
@@ -25,10 +25,10 @@
1.7
0.9.1
3.4.3
- 5.7.1
- 2.2.6.RELEASE
+ 5.7.2
+ 3.0.3
11.0
- 2.3.1
+ 2.4.1
3.15.2
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 563931bf..8de65697 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -253,7 +253,7 @@ feign:
enabled: true
okhttp:
enabled: true
- hystrix:
+ circuitbreaker:
enabled: true
--- # 定时任务配置
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
index 478a450f..f10769bc 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
@@ -1,7 +1,6 @@
package com.ruoyi.framework.config;
import feign.*;
-import feign.hystrix.HystrixFeign;
import okhttp3.ConnectionPool;
import okhttp3.OkHttpClient;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -35,11 +34,6 @@ public class FeignConfig {
.build();
}
- @Bean
- public Feign.Builder feignBuilder() {
- return HystrixFeign.builder();
- }
-
@Bean
public Contract feignContract() {
return new SpringMvcContract();
@@ -60,4 +54,4 @@ public class FeignConfig {
return new Retryer.Default();
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index c0f08173..c3cdc943 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -50,7 +50,7 @@ public class ResourcesConfig implements WebMvcConfigurer
CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true);
// 设置访问源地址
- config.addAllowedOrigin("*");
+ config.addAllowedOriginPattern("*");
// 设置访问源请求头
config.addAllowedHeader("*");
// 设置访问源请求方法
From ff5edc44ede7d15969cef2c2c6cd3d157ff9c2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Mon, 21 Jun 2021 12:52:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?update=20=E6=B3=A8=E9=87=8A=E4=B8=BB?=
=?UTF-8?q?=E5=AD=90=E8=A1=A8=E9=80=89=E9=A1=B9=20=E4=B8=8D=E6=8E=A8?=
=?UTF-8?q?=E8=8D=90=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/tool/gen/genInfoForm.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
index 27d6a22b..f2271568 100644
--- a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
+++ b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
@@ -7,7 +7,7 @@
-
+
From 9c55b83deac5d2262b16e0d0fd1f18150f60c684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Mon, 21 Jun 2021 17:53:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20insertAll=20sql?=
=?UTF-8?q?=E6=8B=BC=E6=8E=A5=E6=97=A0=E4=B8=BB=E9=94=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/ruoyi/common/core/mybatisplus/methods/InsertAll.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java
index 84e7ef47..939849e3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.core.mybatisplus.methods;
+import cn.hutool.core.util.StrUtil;
import org.apache.ibatis.executor.keygen.NoKeyGenerator;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.SqlSource;
@@ -26,7 +27,9 @@ public class InsertAll extends AbstractMethod {
private String prepareFieldSql(TableInfo tableInfo) {
StringBuilder fieldSql = new StringBuilder();
- fieldSql.append(tableInfo.getKeyColumn()).append(",");
+ if (StrUtil.isNotBlank(tableInfo.getKeyColumn())) {
+ fieldSql.append(tableInfo.getKeyColumn()).append(",");
+ }
tableInfo.getFieldList().forEach(x -> fieldSql.append(x.getColumn()).append(","));
fieldSql.delete(fieldSql.length() - 1, fieldSql.length());
fieldSql.insert(0, "(");