Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-06-21 f585992c6f14c20a034c302970b7f46839099c08

Merge remote-tracking branch 'origin/dev' into dev

 pom.xml

@@ -14,7 +14,7 @@

    <properties>
        <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.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
@@ -25,10 +25,10 @@
        <velocity.version>1.7</velocity.version>
        <jwt.version>0.9.1</jwt.version>
        <mybatis-plus.version>3.4.3</mybatis-plus.version>
        <hutool.version>5.7.1</hutool.version>
        <feign.version>2.2.6.RELEASE</feign.version>
        <hutool.version>5.7.2</hutool.version>
        <feign.version>3.0.3</feign.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>
    </properties>


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

@@ -253,7 +253,7 @@
      enabled: true
  okhttp:
    enabled: true
  hystrix:
  circuitbreaker:
    enabled: true

--- # 定时任务配置

 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 @@

    private String prepareFieldSql(TableInfo tableInfo) {
        StringBuilder fieldSql = new StringBuilder();
        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, "(");

 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;
@@ -33,11 +32,6 @@
                .writeTimeout(120, TimeUnit.SECONDS)
                .connectionPool(new ConnectionPool())
                .build();
    }

    @Bean
    public Feign.Builder feignBuilder() {
        return HystrixFeign.builder();
    }

    @Bean

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -50,7 +50,7 @@
        CorsConfiguration config = new CorsConfiguration();
        config.setAllowCredentials(true);
        // 设置访问源地址
        config.addAllowedOrigin("*");
        config.addAllowedOriginPattern("*");
        // 设置访问源请求头
        config.addAllowedHeader("*");
        // 设置访问源请求方法

 ruoyi-ui/src/views/tool/gen/genInfoForm.vue

@@ -7,7 +7,7 @@
          <el-select v-model="info.tplCategory" @change="tplSelectChange">
            <el-option label="单表（增删改查）" value="crud" />
            <el-option label="树表（增删改查）" value="tree" />
            <el-option label="主子表（增删改查）" value="sub" />
<!--            <el-option label="主子表（增删改查）" value="sub" />-->
          </el-select>
        </el-form-item>
      </el-col>