From 37b0e808927740c357e11088a32fc659be524547 Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Tue, 31 Dec 2024 15:12:59 +0800
Subject: [PATCH] =?UTF-8?q?chore=EF=BC=9A=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mcwl/McWlApplication.java    |  1 -
 .../src/main/resources/application-druid.yml   | 18 ------------------
 mcwl-admin/src/main/resources/application.yml  |  9 ++++++---
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/mcwl-admin/src/main/java/com/mcwl/McWlApplication.java b/mcwl-admin/src/main/java/com/mcwl/McWlApplication.java
index 9b2be11..4dd82af 100644
--- a/mcwl-admin/src/main/java/com/mcwl/McWlApplication.java
+++ b/mcwl-admin/src/main/java/com/mcwl/McWlApplication.java
@@ -11,7 +11,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author mcwl
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-@MapperScan(basePackages = "com.mcwl")
 public class McWlApplication
 {
     public static void main(String[] args)
diff --git a/mcwl-admin/src/main/resources/application-druid.yml b/mcwl-admin/src/main/resources/application-druid.yml
index 7ddbcfe..a1c90fd 100644
--- a/mcwl-admin/src/main/resources/application-druid.yml
+++ b/mcwl-admin/src/main/resources/application-druid.yml
@@ -84,21 +84,3 @@ wechat:
     # 应用密钥
     secret: abbabcf1da711a3bbd95387ec83edcac
 
-mybatis-plus:
-    # Mapper XML文件位置
-    mapper-locations: classpath*:mapper/**/*.xml
-    # 配置实体类所在的包名，MyBatis-Plus会自动扫描并注册为别名
-    type-aliases-package: com.mcwl.**.domain
-    # 全局配置
-    global-config:
-        db-config:
-          # 主键生成策略
-          id-type: auto
-          # 开启驼峰命名规则转换
-          capital-mode: true
-          # 配置逻辑删除相关属性
-          logic-delete-field: del_flag
-          logic-delete-value: '2'
-          logic-not-delete-value: '0'
-          # 数据库字段下划线命名规则
-          table-underline: true
diff --git a/mcwl-admin/src/main/resources/application.yml b/mcwl-admin/src/main/resources/application.yml
index 4485d30..4988aad 100644
--- a/mcwl-admin/src/main/resources/application.yml
+++ b/mcwl-admin/src/main/resources/application.yml
@@ -127,11 +127,14 @@ mybatis-plus:
     dbConfig:
       # 主键类型
       # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
-      idType: ASSIGN_ID
+      idType: auto
+      logic-delete-field: del_flag
       # 逻辑已删除值
-      logicDeleteValue: 2
+      logicDeleteValue: '2'
       # 逻辑未删除值
-      logicNotDeleteValue: 0
+      logicNotDeleteValue: '0'
+      # 数据库字段下划线命名规则
+      table-underline: true
       # 字段验证策略之 insert,在 insert 的时候的字段验证策略
       # IGNORED 忽略 NOT_NULL 非NULL NOT_EMPTY 非空 DEFAULT 默认 NEVER 不加入 SQL
       insertStrategy: NOT_NULL