调整框架兼容mybatis-plus
This commit is contained in:
476474485@qq.com
parent
baa68da51f
commit
e846a892d8
|
|
@ -65,4 +65,11 @@ logging:
|
|||
path: /Users/apple/Desktop/log/dev
|
||||
mybatis:
|
||||
mapper-locations: classpath*:com/hzya/**/*.xml
|
||||
config-location: classpath:mybatis/mybatis-config.xml
|
||||
mybatis-plus:
|
||||
mapper-locations: classpath*:com/hzya/**/*.xml # mapper XML文件位置
|
||||
type-aliases-package: com.hzya.frame.*.entity # 实体类所在包路径
|
||||
config-location: classpath:mybatis/mybatis-config.xml
|
||||
global-config:
|
||||
db-config:
|
||||
id-type: auto # 主键策略
|
||||
|
||||
|
|
|
|||
80
pom.xml
80
pom.xml
|
|
@ -30,8 +30,9 @@
|
|||
<zxing.version>3.3.0</zxing.version>
|
||||
<hutool.version>5.8.19</hutool.version>
|
||||
<druid.version>1.1.22</druid.version>
|
||||
<mybatis-spring-boot-starter.version>2.2.2</mybatis-spring-boot-starter.version>
|
||||
<!-- <mysql-connector-j.version>8.0.33</mysql-connector-j.version>-->
|
||||
<!-- <mybatis-spring-boot-starter.version>2.2.2</mybatis-spring-boot-starter.version>-->
|
||||
<mybatis-plus-boot-starter.version>3.5.6</mybatis-plus-boot-starter.version>
|
||||
<!-- <mysql-connector-j.version>8.0.33</mysql-connector-j.version>-->
|
||||
<mysql-connector-java>5.1.49</mysql-connector-java>
|
||||
<pagehelper-spring-boot-starter.version>1.4.6</pagehelper-spring-boot-starter.version>
|
||||
<spring-boot-starter-cache.version>2.7.4</spring-boot-starter-cache.version>
|
||||
|
|
@ -148,21 +149,21 @@
|
|||
<version>${guava.version}</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/org.mybatis.spring.boot/mybatis-spring-boot-starter -->
|
||||
<dependency>
|
||||
<groupId>org.mybatis.spring.boot</groupId>
|
||||
<artifactId>mybatis-spring-boot-starter</artifactId>
|
||||
<version>${mybatis-spring-boot-starter.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-autoconfigure</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.mybatis.spring.boot</groupId>-->
|
||||
<!-- <artifactId>mybatis-spring-boot-starter</artifactId>-->
|
||||
<!-- <version>${mybatis-spring-boot-starter.version}</version>-->
|
||||
<!-- <exclusions>-->
|
||||
<!-- <exclusion>-->
|
||||
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||
<!-- <artifactId>spring-boot-autoconfigure</artifactId>-->
|
||||
<!-- </exclusion>-->
|
||||
<!-- <exclusion>-->
|
||||
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||
<!-- <artifactId>spring-boot-starter</artifactId>-->
|
||||
<!-- </exclusion>-->
|
||||
<!-- </exclusions>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/com.mysql/mysql-connector-j -->
|
||||
<dependency>
|
||||
|
|
@ -190,7 +191,12 @@
|
|||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
|
||||
<dependency>
|
||||
<groupId>com.baomidou</groupId>
|
||||
<artifactId>mybatis-plus-boot-starter</artifactId>
|
||||
<version>${mybatis-plus-boot-starter.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
|
|
@ -263,23 +269,23 @@
|
|||
<optional>true</optional>
|
||||
</dependency>
|
||||
<!--sqlserver-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.microsoft.sqlserver</groupId>-->
|
||||
<!-- <artifactId>mssql-jdbc</artifactId>-->
|
||||
<!-- <version>${sqlserver.version}</version>-->
|
||||
<!-- <exclusions>-->
|
||||
<!-- <exclusion>-->
|
||||
<!-- <artifactId>bcprov-jdk15on</artifactId>-->
|
||||
<!-- <groupId>org.bouncycastle</groupId>-->
|
||||
<!-- </exclusion>-->
|
||||
<!-- </exclusions>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.microsoft.sqlserver</groupId>-->
|
||||
<!-- <artifactId>mssql-jdbc</artifactId>-->
|
||||
<!-- <version>${sqlserver.version}</version>-->
|
||||
<!-- <exclusions>-->
|
||||
<!-- <exclusion>-->
|
||||
<!-- <artifactId>bcprov-jdk15on</artifactId>-->
|
||||
<!-- <groupId>org.bouncycastle</groupId>-->
|
||||
<!-- </exclusion>-->
|
||||
<!-- </exclusions>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.bouncycastle</groupId>-->
|
||||
<!-- <artifactId>bcprov-jdk15on</artifactId>-->
|
||||
<!-- <version>1.52</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.bouncycastle</groupId>-->
|
||||
<!-- <artifactId>bcprov-jdk15on</artifactId>-->
|
||||
<!-- <version>1.52</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<!-- pdf转图片 -->
|
||||
<dependency>
|
||||
|
|
@ -320,7 +326,7 @@
|
|||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 缓存-->
|
||||
<!-- 缓存-->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-cache</artifactId>
|
||||
|
|
@ -380,7 +386,7 @@
|
|||
<include>**/*.xlsx</include>
|
||||
<include>**/*.json</include>
|
||||
<include>**/*.xdb</include>
|
||||
<!-- <include>**/*.jpg</include>-->
|
||||
<!-- <include>**/*.jpg</include>-->
|
||||
<include>**/*.txt</include>
|
||||
</includes>
|
||||
<filtering>true</filtering>
|
||||
|
|
@ -395,7 +401,7 @@
|
|||
<include>**/*.xml</include>
|
||||
<include>**/*.json</include>
|
||||
<include>**/*.txt</include>
|
||||
<!-- <include>**/*.jpg</include>-->
|
||||
<!-- <include>**/*.jpg</include>-->
|
||||
|
||||
</includes>
|
||||
<filtering>true</filtering>
|
||||
|
|
|
|||
Loading…
Reference in New Issue