diff --git a/.gitignore b/.gitignore index 6777172..7506a95 100644 --- a/.gitignore +++ b/.gitignore @@ -12,13 +12,6 @@ dist-ssr .eslintcache report.html vite.config.*.timestamp* -application-prod.yml -bunny-web.site.csr -bunny-web.site.key -bunny-web.site_bundle.crt -bunny-web.site_bundle.pem - -application-prod.yml yarn.lock npm-debug.log* @@ -70,4 +63,14 @@ lerna-debug.log* .vscode/ # Editor directories and files -tsconfig.tsbuildinfo \ No newline at end of file +tsconfig.tsbuildinfo + +# 本地 + +bunny-web.site.csr +bunny-web.site.key +bunny-web.site_bundle.crt +bunny-web.site_bundle.pem + +application-prod.yml +application-company.yml \ No newline at end of file diff --git a/src/main/java/cn/bunny/core/provider/SqlMetadataProvider.java b/src/main/java/cn/bunny/core/provider/SqlMetadataProvider.java index 2ae9c2e..3adaf0c 100644 --- a/src/main/java/cn/bunny/core/provider/SqlMetadataProvider.java +++ b/src/main/java/cn/bunny/core/provider/SqlMetadataProvider.java @@ -85,7 +85,8 @@ public class SqlMetadataProvider implements IMetadataProvider { ColumnMetaData columnInfo = new ColumnMetaData(); // 列名称 - columnInfo.setColumnName(column.getColumnName()); + String columnName = column.getColumnName().replaceAll("`", ""); + columnInfo.setColumnName(columnName); // 设置 JDBC 类型 String dataType = column.getColDataType().getDataType(); @@ -99,11 +100,11 @@ public class SqlMetadataProvider implements IMetadataProvider { columnInfo.setJavascriptType(StringUtils.uncapitalize(javaType)); // 列字段转成 下划线 -> 小驼峰 - String lowercaseName = MysqlTypeConvertUtil.convertToCamelCase(column.getColumnName(), false); + String lowercaseName = MysqlTypeConvertUtil.convertToCamelCase(columnName, false); columnInfo.setLowercaseName(lowercaseName); // 列字段转成 下划线 -> 大驼峰名称 - String uppercaseName = MysqlTypeConvertUtil.convertToCamelCase(column.getColumnName(), true); + String uppercaseName = MysqlTypeConvertUtil.convertToCamelCase(columnName, true); columnInfo.setUppercaseName(uppercaseName); // 解析注释