Browse Source

升级依赖

Mark 5 years ago
parent
commit
f34f4f502b

+ 4 - 4
pom.xml

11
	<parent>
11
	<parent>
12
		<groupId>org.springframework.boot</groupId>
12
		<groupId>org.springframework.boot</groupId>
13
		<artifactId>spring-boot-starter-parent</artifactId>
13
		<artifactId>spring-boot-starter-parent</artifactId>
14
		<version>2.1.7.RELEASE</version>
14
		<version>2.1.8.RELEASE</version>
15
	</parent>
15
	</parent>
16
16
17
	<properties>
17
	<properties>
18
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19
		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19
		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20
		<java.version>1.8</java.version>
20
		<java.version>1.8</java.version>
21
		<mybatisplus.version>3.1.2</mybatisplus.version>
22
		<mysql.version>8.0.16</mysql.version>
21
		<mybatisplus.version>3.2.0</mybatisplus.version>
22
		<mysql.version>8.0.17</mysql.version>
23
		<mssql.version>4.0</mssql.version>
23
		<mssql.version>4.0</mssql.version>
24
		<oracle.version>11.2.0.3</oracle.version>
24
		<oracle.version>11.2.0.3</oracle.version>
25
		<druid.version>1.1.13</druid.version>
25
		<druid.version>1.1.13</druid.version>
37
		<qcloud.cos.version>4.4</qcloud.cos.version>
37
		<qcloud.cos.version>4.4</qcloud.cos.version>
38
		<swagger.version>2.7.0</swagger.version>
38
		<swagger.version>2.7.0</swagger.version>
39
		<joda.time.version>2.9.9</joda.time.version>
39
		<joda.time.version>2.9.9</joda.time.version>
40
		<fastjson.version>1.2.58</fastjson.version>
40
		<fastjson.version>1.2.60</fastjson.version>
41
		<hutool.version>4.1.1</hutool.version>
41
		<hutool.version>4.1.1</hutool.version>
42
		<lombok.version>1.18.4</lombok.version>
42
		<lombok.version>1.18.4</lombok.version>
43
43

+ 0 - 6
src/main/java/io/renren/config/MybatisPlusConfig.java

8
8
9
package io.renren.config;
9
package io.renren.config;
10
10
11
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
12
import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
13
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
11
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
14
import org.springframework.context.annotation.Bean;
12
import org.springframework.context.annotation.Bean;
15
import org.springframework.context.annotation.Configuration;
13
import org.springframework.context.annotation.Configuration;
30
        return new PaginationInterceptor();
28
        return new PaginationInterceptor();
31
    }
29
    }
32
30
33
    @Bean
34
    public ISqlInjector sqlInjector() {
35
        return new LogicSqlInjector();
36
    }
37
}
31
}

+ 0 - 4
src/main/resources/application.yml

51
    db-config:
51
    db-config:
52
      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
52
      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
53
      id-type: AUTO
53
      id-type: AUTO
54
      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
55
      field-strategy: NOT_NULL
56
      #驼峰下划线转换
57
      column-underline: true
58
      logic-delete-value: -1
54
      logic-delete-value: -1
59
      logic-not-delete-value: 0
55
      logic-not-delete-value: 0
60
    banner: false
56
    banner: false