From 5f492608377bca384c260a0a98534678463eee11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Sat, 25 Jan 2025 14:58:14 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 nflg-mobilebroken-common/pom.xml              |  1 -
 nflg-mobilebroken-repository/pom.xml          | 11 --------
 .../repository/CodeGenerator.java             |  2 +-
 nflg-mobilebroken-starter/pom.xml             |  4 +++
 .../starter/config/MysqlDataSourceConfig.java | 12 ++++----
 pom.xml                                       | 28 +++++++++++--------
 7 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 549e00a2..91ae67b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ build/
 
 ### VS Code ###
 .vscode/
+logs
diff --git a/nflg-mobilebroken-common/pom.xml b/nflg-mobilebroken-common/pom.xml
index 9baa03d4..c79a84c5 100644
--- a/nflg-mobilebroken-common/pom.xml
+++ b/nflg-mobilebroken-common/pom.xml
@@ -45,7 +45,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-core</artifactId>
-            <version>3.4.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/nflg-mobilebroken-repository/pom.xml b/nflg-mobilebroken-repository/pom.xml
index 309cbeb7..bb7e61cb 100644
--- a/nflg-mobilebroken-repository/pom.xml
+++ b/nflg-mobilebroken-repository/pom.xml
@@ -28,7 +28,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.9</version>
         </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.baomidou</groupId>-->
@@ -37,18 +36,15 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter-test</artifactId>
-            <version>3.5.9</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.5.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.3.5.RELEASE</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -80,11 +76,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>central</id>
-            <url>https://repo1.maven.org/maven2/</url>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java b/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java
index 7579d24f..6eec9a78 100644
--- a/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java
+++ b/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java
@@ -17,7 +17,7 @@ public class CodeGenerator {
         FastAutoGenerator.create("jdbc:mysql://112.74.186.154:13151/mobilebroken?useUnicode=true&characterEncoding=UTF-8&tinyInt1isBit=false&useSSL=false&rewriteBatchedStatements=true&allowMultiQueries=true&serverTimezone=GMT%2B8&remarks=true&useInformationSchema=true&tinyInt1isBit=true"
                         , "nflg", "Aciga@2022")
                 .globalConfig(builder -> builder
-                        .author("曹鹏飞")
+                        .author("代码生成器生成")
                         .disableOpenDir()
                         .outputDir(Paths.get(System.getProperty("user.dir")) + "/src/main/java")
                         .commentDate("yyyy-MM-dd")
diff --git a/nflg-mobilebroken-starter/pom.xml b/nflg-mobilebroken-starter/pom.xml
index 6939b438..ab0b775d 100644
--- a/nflg-mobilebroken-starter/pom.xml
+++ b/nflg-mobilebroken-starter/pom.xml
@@ -29,6 +29,10 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.baomidou</groupId>-->
 <!--            <artifactId>mybatis-plus-jsqlparser</artifactId>-->
diff --git a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/config/MysqlDataSourceConfig.java b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/config/MysqlDataSourceConfig.java
index 8d9f646e..c5867fbe 100644
--- a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/config/MysqlDataSourceConfig.java
+++ b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/config/MysqlDataSourceConfig.java
@@ -99,10 +99,10 @@ public class MysqlDataSourceConfig {
         return sqlSessionFactoryBean.getObject();
     }
 
-//    @Bean
-//    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-//        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-//        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
-//        return interceptor;
-//    }
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
 }
diff --git a/pom.xml b/pom.xml
index e851d364..406528f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,13 +33,12 @@
         <cglib.version>3.3.0</cglib.version>
         <lombok.version>1.18.34</lombok.version>
         <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
-
-        <mybatis-plus.version>3.4.3.1</mybatis-plus.version>
-        <druid.version>1.1.22</druid.version>
+        <junit.version>5.11.0</junit.version>
+        <mybatis-plus.version>3.5.9</mybatis-plus.version>
+        <druid.version>1.2.23</druid.version>
         <freemarker.version>2.3.31</freemarker.version>
         <sa-token.version>1.39.0</sa-token.version>
         <weixin.version>4.7.0</weixin.version>
-
     </properties>
     <dependencies>
         <dependency>
@@ -103,7 +102,14 @@
             </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <artifactId>mybatis-plus-bom</artifactId>
+                <version>${mybatis-plus.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-core</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
             <dependency>
@@ -136,12 +142,12 @@
                 <artifactId>sa-token-jwt</artifactId>
                 <version>${sa-token.version}</version>
             </dependency>
-<!--            <dependency>-->
-<!--                <groupId>org.junit.jupiter</groupId>-->
-<!--                <artifactId>junit-jupiter</artifactId>-->
-<!--                <version>${junit.version}</version>-->
-<!--                <scope>test</scope>-->
-<!--            </dependency>-->
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>com.github.binarywang</groupId>
                 <artifactId>weixin-java-mp</artifactId>