From cc32ebe2ae600305abee823760380cb5776ea76e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 29 一月 2024 08:28:14 +0800
Subject: [PATCH] #
---
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java
index 3af09ac..09eb45f 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java
@@ -206,7 +206,7 @@
.replaceAll("@\\{JSPRIMARYKEYDOMS}", jsPrimaryKeyDoms)
.replaceAll("@\\{MAJORCOLUMN}", GeneratorUtils.humpToLine(majorColumn))
.replaceAll("@\\{MAJORCOLUMN0}", GeneratorUtils.firstCharConvert(majorColumn, false))
- .replaceAll("@\\{MAJORCOLUMN_UP}", GeneratorUtils.firstCharConvert(GeneratorUtils.humpToLine(majorColumn), false))
+ .replaceAll("@\\{MAJORCOLUMN_UP}", GeneratorUtils.firstCharConvert(majorColumn, false))
.replaceAll("@\\{PRIMARYKEYCOLUMN}", GeneratorUtils.firstCharConvert(primaryKeyColumn, false))
.replaceAll("@\\{PRIMARYKEYCOLUMN0}", GeneratorUtils.firstCharConvert(primaryKeyColumn, true))
.replaceAll("@\\{UPCASEMARJORCOLUMN}", GeneratorUtils.firstCharConvert(primaryKeyColumn, false))
@@ -230,7 +230,7 @@
}
switch (this.sqlOsType) {
case MYSQL:
- Class.forName("com.mysql.jdbc.Driver").newInstance();
+ Class.forName("com.mysql.cj.jdbc.Driver").newInstance();
conn = DriverManager.getConnection("jdbc:mysql://"+url, username, password);
this.columns = getMysqlColumns(conn, table, true, sqlOsType);
break;
@@ -723,7 +723,7 @@
sb.append(" layDate.render({\n")
.append(" elem: '#").append(column.getHumpName()).append("\\\\\\\\\\$',\n")
.append(" type: 'datetime',\n")
- .append(" value: data!==undefined?data['").append(column.getHumpName()).append("\\\\\\\\\\$'").append("]:null\n")
+ .append(" value: data!==undefined?data['").append(column.getHumpName()).append("\\$'").append("]:null\n")
.append(" });\n");
}
}
--
Gitblit v1.9.1