From b8cc1992b7fc7334ca5d541448be5badcb5e32fc Mon Sep 17 00:00:00 2001
From: xiaoqu
Date: Tue, 8 Sep 2026 15:48:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(entity):=20=E6=8C=89=E7=BA=BF=E4=B8=8A?=
=?UTF-8?q?=E5=BA=93=E7=BB=93=E6=9E=84=E9=87=8D=E5=BB=BA=E5=AE=9E=E4=BD=93?=
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=20prod=20=E6=9F=A5=E8=AF=A2=20500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- CodeGenerator 支持 CODEGEN_DB_BASE_URL/CODEGEN_SCHEMA_M0/M2/SVC
环境变量覆盖(默认仍 dev 库),并开启文件覆盖
- m0/m2 实体按生产 xiaoqu_complex/xiaoqu_franchisee 重新生成:
User 移除线上不存在的 emailMask/mobileEnc/mobileBidx/mobileMask/
idcardEnc/idcardBidx/idcardMask/tenantResolveStatus/idcardResolveStatus
等 9 个字段;Agent/Properyt 字段对齐线上实际列
- svc 实体无实质变化(Flyway 管理,各环境一致)
- 修复 /api/admin/users 在 prod 报 Unknown column 'email_mask' 的 500
---
.../java/me/iiv/agent/entity/m0/Agent.java | 82 ++++++-------
.../entity/m0/AgentManageDistrictAuth.java | 2 +-
.../me/iiv/agent/entity/m0/Authority.java | 2 +-
.../java/me/iiv/agent/entity/m0/Properyt.java | 40 +++----
.../java/me/iiv/agent/entity/m0/User.java | 110 ++++--------------
.../agent/entity/m2/WarehouseAgentAuth.java | 2 +-
.../me/iiv/agent/entity/svc/AdminUser.java | 4 +-
.../me/iiv/agent/entity/svc/AgentApiKey.java | 4 +-
.../me/iiv/agent/entity/svc/AgentScope.java | 2 +-
.../me/iiv/agent/entity/svc/AuditLog.java | 2 +-
.../me/iiv/agent/entity/svc/ScopeTool.java | 2 +-
.../me/iiv/agent/entity/svc/TokenScope.java | 2 +-
.../java/me/iiv/agent/entity/svc/Tool.java | 2 +-
.../m0/AgentManageDistrictAuthMapper.java | 2 +-
.../me/iiv/agent/mapper/m0/AgentMapper.java | 2 +-
.../iiv/agent/mapper/m0/AuthorityMapper.java | 2 +-
.../iiv/agent/mapper/m0/ProperytMapper.java | 2 +-
.../me/iiv/agent/mapper/m0/UserMapper.java | 2 +-
.../mapper/m2/WarehouseAgentAuthMapper.java | 2 +-
.../iiv/agent/mapper/svc/AdminUserMapper.java | 2 +-
.../agent/mapper/svc/AgentApiKeyMapper.java | 2 +-
.../agent/mapper/svc/AgentScopeMapper.java | 2 +-
.../iiv/agent/mapper/svc/AuditLogMapper.java | 2 +-
.../iiv/agent/mapper/svc/ScopeToolMapper.java | 2 +-
.../agent/mapper/svc/TokenScopeMapper.java | 2 +-
.../me/iiv/agent/mapper/svc/ToolMapper.java | 2 +-
.../me/iiv/agent/codegen/CodeGenerator.java | 21 +++-
27 files changed, 125 insertions(+), 178 deletions(-)
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Agent.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Agent.java
index bc4b07d..becc5f9 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Agent.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Agent.java
@@ -15,7 +15,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
@@ -62,21 +62,11 @@ public class Agent implements Serializable {
*/
private String name;
- /**
- * 渠道编号(Z:总部;F:分公司;D:代理)
- */
- private String channelNo;
-
/**
* 上级id
*/
private Long supervisorId;
- /**
- * 上级代理
- */
- private String supervisorName;
-
/**
* 企业地址
*/
@@ -137,6 +127,11 @@ public class Agent implements Serializable {
*/
private Integer level;
+ /**
+ * 渠道编号(Z:总部;F:分公司;D:代理)
+ */
+ private String channelNo;
+
/**
* 户名
*/
@@ -192,6 +187,36 @@ public class Agent implements Serializable {
*/
private String shortName;
+ /**
+ * 金蝶供应商编号
+ */
+ private String supplierNo;
+
+ /**
+ * 开票通讯地址
+ */
+ private String invoiceAddress;
+
+ /**
+ * 开票联系电话
+ */
+ private String invoiceContact;
+
+ /**
+ * 组织内码
+ */
+ private String saleOrgInternalId;
+
+ /**
+ * 客户分组
+ */
+ private String custerGroupNo;
+
+ /**
+ * 金蝶内码
+ */
+ private Long jindieInternalId;
+
/**
* 金蝶客户编号
*/
@@ -212,41 +237,16 @@ public class Agent implements Serializable {
*/
private String saleOrgId;
- /**
- * 金蝶内码
- */
- private Long jindieInternalId;
-
- /**
- * 组织内码
- */
- private String saleOrgInternalId;
-
- /**
- * 客户分组
- */
- private String custerGroupNo;
-
- /**
- * 金蝶供应商编号
- */
- private String supplierNo;
-
- /**
- * 开票通讯地址
- */
- private String invoiceAddress;
-
- /**
- * 开票联系电话
- */
- private String invoiceContact;
-
/**
* 金蝶客户名称
*/
private String jinideName;
+ /**
+ * 上级代理
+ */
+ private String supervisorName;
+
/**
* 最后开票时间
*/
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/AgentManageDistrictAuth.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/AgentManageDistrictAuth.java
index 27e8871..4d1c395 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/AgentManageDistrictAuth.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/AgentManageDistrictAuth.java
@@ -16,7 +16,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Authority.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Authority.java
index e3b6d82..b5d18cd 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Authority.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Authority.java
@@ -15,7 +15,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Properyt.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Properyt.java
index 36a9581..7045e40 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Properyt.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Properyt.java
@@ -15,7 +15,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
@@ -28,15 +28,10 @@ public class Properyt implements Serializable {
private Long id;
/**
- * 销售id
+ * 创建id
*/
private Long createId;
- /**
- * 销售名称
- */
- private String createName;
-
/**
* 创建时间
*/
@@ -62,11 +57,6 @@ public class Properyt implements Serializable {
*/
private Integer type;
- /**
- * 金蝶客户名称
- */
- private String jinideName;
-
/**
* 企业名称
*/
@@ -77,11 +67,6 @@ public class Properyt implements Serializable {
*/
private Long agentId;
- /**
- * 代理名称
- */
- private String agentName;
-
/**
* 企业地址
*/
@@ -178,14 +163,14 @@ public class Properyt implements Serializable {
private String invoiceName;
/**
- * 金蝶客户编号
+ * 身份编码
*/
private String identifier;
/**
- * 金蝶内码
+ * 金蝶客户名称
*/
- private Long jindieInternalId;
+ private String jinideName;
/**
* 开票通讯地址
@@ -197,6 +182,21 @@ public class Properyt implements Serializable {
*/
private String invoiceContact;
+ /**
+ * 金蝶内码
+ */
+ private Long jindieInternalId;
+
+ /**
+ * 销售名称
+ */
+ private String createName;
+
+ /**
+ * 代理名称
+ */
+ private String agentName;
+
/**
* 最后开票时间
*/
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/User.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/User.java
index 394ba01..48ac7da 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/User.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/User.java
@@ -15,7 +15,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
@@ -43,7 +43,7 @@ public class User implements Serializable {
private Date modifyTime;
/**
- * 数据状态(0:启用:1:删除)
+ * 数据状态
*/
private Integer softDelete;
@@ -72,6 +72,11 @@ public class User implements Serializable {
*/
private String password;
+ /**
+ * 代理ID
+ */
+ private Long agentId;
+
/**
* 所属公司名称
*/
@@ -103,7 +108,7 @@ public class User implements Serializable {
private Integer approle;
/**
- * 系统权限0:管理权限;1:普通权限
+ * 角色类别(管理员,主管,其他)
*/
private Integer roleType;
@@ -112,11 +117,6 @@ public class User implements Serializable {
*/
private Long districtId;
- /**
- * 代理ID
- */
- private Long agentId;
-
/**
* 物业ID
*/
@@ -128,7 +128,7 @@ public class User implements Serializable {
private Long supervisorId;
/**
- * 考勤状态0:上班;1:下班;2:请假;3休息
+ * 工作状态
*/
private Integer workStatus;
@@ -142,8 +142,6 @@ public class User implements Serializable {
*/
private String email;
- private String emailMask;
-
/**
* 身份证号
*/
@@ -175,7 +173,7 @@ public class User implements Serializable {
private Integer backHardFlag;
/**
- * 权限id
+ * 权限组id
*/
private Long authorityId;
@@ -227,7 +225,7 @@ public class User implements Serializable {
private String modifyName;
/**
- * 物业权限id
+ * 物业平台权限组id
*/
private Long propertyAuthorityId;
@@ -237,48 +235,24 @@ public class User implements Serializable {
private String dingUserId;
/**
- * 工作中状态0:作业;1:转场;2:空闲;3:休息
+ * 工作状态
*/
private Integer workAtStatus;
- /**
- * 年龄
- */
private Integer age;
- /**
- * 试用期保护0:未启用;1:启用
- */
private Integer probationProtection;
- /**
- * 备注
- */
private String note;
- /**
- * 上班时间
- */
private String onTime;
- /**
- * 下班时间
- */
private String offTime;
- /**
- * 出纸机权限
- */
private Integer czjAuth;
- /**
- * 空感权限
- */
private Integer kgAuth;
- /**
- * 信标权限
- */
private Integer xbAuth;
/**
@@ -311,16 +285,6 @@ public class User implements Serializable {
*/
private Integer productOpAuth;
- /**
- * 金蝶人员销售订单编号
- */
- private String jindieSalerid;
-
- /**
- * 泡沫机APP显示0:关闭;1:打开;
- */
- private Integer foamFunctionAuth;
-
/**
* 金蝶内码
*/
@@ -351,6 +315,16 @@ public class User implements Serializable {
*/
private Integer flowAuth;
+ /**
+ * 泡沫机APP显示0:关闭;1:打开;
+ */
+ private Integer foamFunctionAuth;
+
+ /**
+ * 金蝶人员销售订单编号
+ */
+ private String jindieSalerid;
+
/**
* xiaoqu-ai 用户ID
*/
@@ -360,44 +334,4 @@ public class User implements Serializable {
* 同步到 xiaoqu-ai 的时间
*/
private Date xiaoquAiSyncedAt;
-
- /**
- * 0待回填/1已解析/2歧义/3悬空;property_id非空→初始UPDATE=1
- */
- private Byte tenantResolveStatus;
-
- /**
- * 0正常/1身份待核(冲突fail-closed锁B3人证比对;⊥tenant_resolve_status,不进PEP单路)
- */
- private Byte idcardResolveStatus;
-
- /**
- * AES-256-GCM(IV‖ct‖tag);canonical后加密;明文绝不落盘
- */
- private byte[] idcardEnc;
-
- /**
- * keyed HMAC-SHA256(canonical idcard);等值/dedup/唯一
- */
- private byte[] idcardBidx;
-
- /**
- * 存储预算掩码 前3后4(默认零解密展示)
- */
- private String idcardMask;
-
- /**
- * AES-256-GCM
- */
- private byte[] mobileEnc;
-
- /**
- * keyed HMAC-SHA256(canonical mobile);等值查找(非唯一)
- */
- private byte[] mobileBidx;
-
- /**
- * 展示掩码 前3后4
- */
- private String mobileMask;
}
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m2/WarehouseAgentAuth.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m2/WarehouseAgentAuth.java
index ec2dfc0..e47f00c 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m2/WarehouseAgentAuth.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m2/WarehouseAgentAuth.java
@@ -16,7 +16,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AdminUser.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AdminUser.java
index 0b9d2c7..3109a64 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AdminUser.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AdminUser.java
@@ -16,7 +16,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
@@ -38,7 +38,7 @@ public class AdminUser implements Serializable {
private String account;
/**
- * PBKDF2 加盐密码哈希
+ * PBKDF2 加盐密码哈希
*/
private String passwordHash;
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentApiKey.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentApiKey.java
index 179f1f2..df9f7fc 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentApiKey.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentApiKey.java
@@ -16,7 +16,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
@@ -48,7 +48,7 @@ public class AgentApiKey implements Serializable {
private String keyHash;
/**
- * ak 明文 AES-GCM 加密密文(二次获取用),空=历史数据未存
+ * ak 明文 AES-GCM 加密密文(Base64: iv‖cipher‖tag),空=历史数据未存
*/
private String keyCipher;
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentScope.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentScope.java
index d719a60..5068489 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentScope.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentScope.java
@@ -16,7 +16,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AuditLog.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AuditLog.java
index 834727f..7570168 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AuditLog.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AuditLog.java
@@ -16,7 +16,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/ScopeTool.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/ScopeTool.java
index 007e5dc..bade36e 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/ScopeTool.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/ScopeTool.java
@@ -16,7 +16,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/TokenScope.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/TokenScope.java
index e29b30b..6e0c8f7 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/TokenScope.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/TokenScope.java
@@ -16,7 +16,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/Tool.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/Tool.java
index 6cf9b15..e8b9ad3 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/Tool.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/Tool.java
@@ -15,7 +15,7 @@ import java.util.Date;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
@Getter
@Setter
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentManageDistrictAuthMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentManageDistrictAuthMapper.java
index dd62953..3246a49 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentManageDistrictAuthMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentManageDistrictAuthMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.m0.AgentManageDistrictAuth;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface AgentManageDistrictAuthMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentMapper.java
index 5756068..cf43c36 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.m0.Agent;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface AgentMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AuthorityMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AuthorityMapper.java
index 5af602d..b705e79 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AuthorityMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AuthorityMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.m0.Authority;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface AuthorityMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/ProperytMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/ProperytMapper.java
index 25ad35b..62830dc 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/ProperytMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/ProperytMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.m0.Properyt;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface ProperytMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/UserMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/UserMapper.java
index 072759c..36177dc 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/UserMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/UserMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.m0.User;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface UserMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m2/WarehouseAgentAuthMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m2/WarehouseAgentAuthMapper.java
index 7bc2628..87817be 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m2/WarehouseAgentAuthMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m2/WarehouseAgentAuthMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.m2.WarehouseAgentAuth;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface WarehouseAgentAuthMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AdminUserMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AdminUserMapper.java
index 250d4c5..e6ec565 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AdminUserMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AdminUserMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.svc.AdminUser;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface AdminUserMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AgentApiKeyMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AgentApiKeyMapper.java
index a9d5d6d..5d28f84 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AgentApiKeyMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AgentApiKeyMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.svc.AgentApiKey;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface AgentApiKeyMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AgentScopeMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AgentScopeMapper.java
index 0e54758..16fccf4 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AgentScopeMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AgentScopeMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.svc.AgentScope;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface AgentScopeMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AuditLogMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AuditLogMapper.java
index 349fcbf..402842b 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AuditLogMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/AuditLogMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.svc.AuditLog;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface AuditLogMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/ScopeToolMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/ScopeToolMapper.java
index a02cb0a..eff8878 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/ScopeToolMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/ScopeToolMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.svc.ScopeTool;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface ScopeToolMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/TokenScopeMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/TokenScopeMapper.java
index 00daeac..9cea6c7 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/TokenScopeMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/TokenScopeMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.svc.TokenScope;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface TokenScopeMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/ToolMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/ToolMapper.java
index 21e034f..61cebf4 100644
--- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/ToolMapper.java
+++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/svc/ToolMapper.java
@@ -9,7 +9,7 @@ import me.iiv.agent.entity.svc.Tool;
*
*
* @author codegen
- * @since 2026-09-03
+ * @since 2026-09-08
*/
public interface ToolMapper extends BaseMapper {
diff --git a/xiaoqu-agent-service/src/test/java/me/iiv/agent/codegen/CodeGenerator.java b/xiaoqu-agent-service/src/test/java/me/iiv/agent/codegen/CodeGenerator.java
index e7499bb..0c27cab 100644
--- a/xiaoqu-agent-service/src/test/java/me/iiv/agent/codegen/CodeGenerator.java
+++ b/xiaoqu-agent-service/src/test/java/me/iiv/agent/codegen/CodeGenerator.java
@@ -21,24 +21,35 @@ import java.util.Arrays;
* 运行方式:
* ./mvnw -q test-compile org.codehaus.mojo:exec-maven-plugin:3.5.0:java \
* -Dexec.mainClass=me.iiv.agent.codegen.CodeGenerator -Dexec.classpathScope=test
+ *
+ * 环境变量(按线上库生成时覆盖):
+ * CODEGEN_DB_BASE_URL 默认 jdbc:mysql://192.168.1.181:3306/(生产可走 SSH 隧道 jdbc:mysql://127.0.0.1:13306/)
+ * CODEGEN_SCHEMA_M0 默认 xiaoqu_comples_d(生产 xiaoqu_complex)
+ * CODEGEN_SCHEMA_M2 默认 xiaoqu_franchisee_d(生产 xiaoqu_franchisee)
+ * CODEGEN_SCHEMA_SVC 默认 xiaoqu_agent_svc_d(svc 表结构由 Flyway 管理,各环境一致,一般无需覆盖)
*/
public class CodeGenerator {
- private static final String BASE_URL = "jdbc:mysql://192.168.1.181:3306/";
+ private static final String BASE_URL = envOr("CODEGEN_DB_BASE_URL", "jdbc:mysql://192.168.1.181:3306/");
private static final String URL_PARAMS = "?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true";
private static final String USERNAME = requiredEnv("CODEGEN_DB_USERNAME");
private static final String PASSWORD = requiredEnv("CODEGEN_DB_PASSWORD");
private static final String OUTPUT_DIR = System.getProperty("user.dir") + "/src/main/java";
public static void main(String[] args) {
- generate("xiaoqu_comples_d", "m0",
+ generate(envOr("CODEGEN_SCHEMA_M0", "xiaoqu_comples_d"), "m0",
"user", "agent", "authority", "properyt", "agent_manage_district_auth");
- generate("xiaoqu_franchisee_d", "m2",
+ generate(envOr("CODEGEN_SCHEMA_M2", "xiaoqu_franchisee_d"), "m2",
"warehouse_agent_auth");
- generate("xiaoqu_agent_svc_d", "svc",
+ generate(envOr("CODEGEN_SCHEMA_SVC", "xiaoqu_agent_svc_d"), "svc",
"agent_api_key", "agent_scope", "tool", "scope_tool", "token_scope", "audit_log", "admin_user");
}
+ private static String envOr(String name, String defaultValue) {
+ String value = System.getenv(name);
+ return value == null || value.isBlank() ? defaultValue : value;
+ }
+
private static String requiredEnv(String name) {
String value = System.getenv(name);
if (value == null || value.isBlank()) {
@@ -64,8 +75,10 @@ public class CodeGenerator {
.addInclude(Arrays.asList(tables))
.entityBuilder()
.enableLombok()
+ .enableFileOverride()
.idType(IdType.AUTO)
.mapperBuilder()
+ .enableFileOverride()
.serviceBuilder()
.disableService()
.disableServiceImpl()