From 8451f8d8cc95b45ddac57b3936bce13425031269 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 23 五月 2024 18:04:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
index ebee0b5..946f44b 100644
--- a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
+++ b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom;
import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.generator.FastAutoGenerator;
@@ -19,11 +20,10 @@
public static String database_username = "root";
public static String database_password= "123456";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
- public static String model_name = "/cnas-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
+ public static String model_name = "/performance-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
public static String setParent = "com.yuanchu.mom"; // 鍖呰矾寰�
public static void main(String[] args) {
String projectPath = System.getProperty("user.dir");
- System.out.println(projectPath+"===================");
FastAutoGenerator.create(database_url, database_username, database_password)
// 鍏ㄥ眬閰嶇疆
.globalConfig(builder -> {
@@ -53,13 +53,16 @@
.logicDeleteColumnName("state")
.addTableFills(
new Column("create_time", FieldFill.INSERT),
- new Column("update_time", FieldFill.INSERT_UPDATE)
+ new Column("update_time", FieldFill.INSERT_UPDATE),
+ new Column("create_user", FieldFill.INSERT),
+ new Column("update_user", FieldFill.INSERT_UPDATE)
)
+ .idType(IdType.AUTO) // 鑷涓婚敭
// Mapper 绛栫暐閰嶇疆
.mapperBuilder()
.enableFileOverride() // 瑕嗙洊宸茬敓鎴怣apper鏂囦欢
-
+ .enableBaseResultMap() // 鑷姩鐢熸垚resultMap
// Service 绛栫暐閰嶇疆
.serviceBuilder()
.formatServiceFileName("%sService") //鏍煎紡鍖� service 鎺ュ彛鏂囦欢鍚嶇О锛�%s杩涜鍖归厤琛ㄥ悕锛屽 UserService
@@ -69,6 +72,7 @@
// Controller 绛栫暐閰嶇疆
.controllerBuilder()
.enableFileOverride() // 瑕嗙洊宸茬敓鎴愭枃浠�
+ .enableRestStyle() // 寮�鍚敓鎴怈RestController 鎺у埗鍣�
;
})
//5銆佹ā鏉垮紩鎿�
--
Gitblit v1.9.3