From 0cb816f646b57c2eb7679bde53ce8eae4da16f85 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 17 二月 2025 13:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main' into dev
---
rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java b/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java
index 60128b4..d182491 100644
--- a/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java
+++ b/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java
@@ -259,7 +259,7 @@
switch (this.sqlOsType) {
case MYSQL:
Class.forName("com.mysql.jdbc.Driver").newInstance();
- conn = DriverManager.getConnection("jdbc:mysql://"+url, username, password);
+ conn = DriverManager.getConnection("jdbc:mysql://"+url+"?useUnicode=true&characterEncoding=UTF-8&useSSL=false", username, password);
this.columns = getMysqlColumns(conn, table, true, sqlOsType);
break;
case SQL_SERVER:
@@ -520,7 +520,7 @@
}
// 澶栭敭淇グ
- if (!Cools.isEmpty(column.getForeignKeyMajor())){
+ if (!Cools.isEmpty(column.getForeignKey()) && !column.getForeignKey().equals("Tenant")){
sb.append(" public String get").append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1)).append("\\$").append("(){\n")
.append(" ").append(column.getForeignKey()).append("Service service = SpringUtils.getBean(").append(column.getForeignKey()).append("Service.class);\n")
.append(" ").append(column.getForeignKey()).append(" ").append(GeneratorUtils.firstCharConvert(column.getForeignKey()))
--
Gitblit v1.9.1