Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
f585992c6f
8
pom.xml
8
pom.xml
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<ruoyi-vue-plus.version>2.3.2</ruoyi-vue-plus.version>
|
<ruoyi-vue-plus.version>2.3.2</ruoyi-vue-plus.version>
|
||||||
<spring-boot.version>2.3.11.RELEASE</spring-boot.version>
|
<spring-boot.version>2.4.7</spring-boot.version>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
|
@ -25,10 +25,10 @@
|
||||||
<velocity.version>1.7</velocity.version>
|
<velocity.version>1.7</velocity.version>
|
||||||
<jwt.version>0.9.1</jwt.version>
|
<jwt.version>0.9.1</jwt.version>
|
||||||
<mybatis-plus.version>3.4.3</mybatis-plus.version>
|
<mybatis-plus.version>3.4.3</mybatis-plus.version>
|
||||||
<hutool.version>5.7.1</hutool.version>
|
<hutool.version>5.7.2</hutool.version>
|
||||||
<feign.version>2.2.6.RELEASE</feign.version>
|
<feign.version>3.0.3</feign.version>
|
||||||
<feign-okhttp.version>11.0</feign-okhttp.version>
|
<feign-okhttp.version>11.0</feign-okhttp.version>
|
||||||
<spring-boot-admin.version>2.3.1</spring-boot-admin.version>
|
<spring-boot-admin.version>2.4.1</spring-boot-admin.version>
|
||||||
<redisson.version>3.15.2</redisson.version>
|
<redisson.version>3.15.2</redisson.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|
|
@ -253,7 +253,7 @@ feign:
|
||||||
enabled: true
|
enabled: true
|
||||||
okhttp:
|
okhttp:
|
||||||
enabled: true
|
enabled: true
|
||||||
hystrix:
|
circuitbreaker:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
--- # 定时任务配置
|
--- # 定时任务配置
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.ruoyi.common.core.mybatisplus.methods;
|
package com.ruoyi.common.core.mybatisplus.methods;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
import org.apache.ibatis.executor.keygen.NoKeyGenerator;
|
import org.apache.ibatis.executor.keygen.NoKeyGenerator;
|
||||||
import org.apache.ibatis.mapping.MappedStatement;
|
import org.apache.ibatis.mapping.MappedStatement;
|
||||||
import org.apache.ibatis.mapping.SqlSource;
|
import org.apache.ibatis.mapping.SqlSource;
|
||||||
|
@ -26,7 +27,9 @@ public class InsertAll extends AbstractMethod {
|
||||||
|
|
||||||
private String prepareFieldSql(TableInfo tableInfo) {
|
private String prepareFieldSql(TableInfo tableInfo) {
|
||||||
StringBuilder fieldSql = new StringBuilder();
|
StringBuilder fieldSql = new StringBuilder();
|
||||||
|
if (StrUtil.isNotBlank(tableInfo.getKeyColumn())) {
|
||||||
fieldSql.append(tableInfo.getKeyColumn()).append(",");
|
fieldSql.append(tableInfo.getKeyColumn()).append(",");
|
||||||
|
}
|
||||||
tableInfo.getFieldList().forEach(x -> fieldSql.append(x.getColumn()).append(","));
|
tableInfo.getFieldList().forEach(x -> fieldSql.append(x.getColumn()).append(","));
|
||||||
fieldSql.delete(fieldSql.length() - 1, fieldSql.length());
|
fieldSql.delete(fieldSql.length() - 1, fieldSql.length());
|
||||||
fieldSql.insert(0, "(");
|
fieldSql.insert(0, "(");
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package com.ruoyi.framework.config;
|
package com.ruoyi.framework.config;
|
||||||
|
|
||||||
import feign.*;
|
import feign.*;
|
||||||
import feign.hystrix.HystrixFeign;
|
|
||||||
import okhttp3.ConnectionPool;
|
import okhttp3.ConnectionPool;
|
||||||
import okhttp3.OkHttpClient;
|
import okhttp3.OkHttpClient;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
|
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
|
||||||
|
@ -35,11 +34,6 @@ public class FeignConfig {
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
|
||||||
public Feign.Builder feignBuilder() {
|
|
||||||
return HystrixFeign.builder();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public Contract feignContract() {
|
public Contract feignContract() {
|
||||||
return new SpringMvcContract();
|
return new SpringMvcContract();
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class ResourcesConfig implements WebMvcConfigurer
|
||||||
CorsConfiguration config = new CorsConfiguration();
|
CorsConfiguration config = new CorsConfiguration();
|
||||||
config.setAllowCredentials(true);
|
config.setAllowCredentials(true);
|
||||||
// 设置访问源地址
|
// 设置访问源地址
|
||||||
config.addAllowedOrigin("*");
|
config.addAllowedOriginPattern("*");
|
||||||
// 设置访问源请求头
|
// 设置访问源请求头
|
||||||
config.addAllowedHeader("*");
|
config.addAllowedHeader("*");
|
||||||
// 设置访问源请求方法
|
// 设置访问源请求方法
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<el-select v-model="info.tplCategory" @change="tplSelectChange">
|
<el-select v-model="info.tplCategory" @change="tplSelectChange">
|
||||||
<el-option label="单表(增删改查)" value="crud" />
|
<el-option label="单表(增删改查)" value="crud" />
|
||||||
<el-option label="树表(增删改查)" value="tree" />
|
<el-option label="树表(增删改查)" value="tree" />
|
||||||
<el-option label="主子表(增删改查)" value="sub" />
|
<!-- <el-option label="主子表(增删改查)" value="sub" />-->
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
Loading…
Reference in New Issue