Commit a582a6e72608616bec39f5a307a70a39795d829f
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-register
Conflicts: 更新日志.md
Showing
4 changed files
with
11 additions
and
3 deletions
img.png
0 → 100644
189 KB
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenEngine.java
| @@ -191,7 +191,7 @@ public class ToolCodegenEngine { | @@ -191,7 +191,7 @@ public class ToolCodegenEngine { | ||
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | private static String javaFilePath(String path) { | 193 | private static String javaFilePath(String path) { |
| 194 | - return "java/${basePackage}/${table.moduleName}/" + path + ".java"; | 194 | + return "java/${basePackage}/modules/${table.moduleName}/" + path + ".java"; |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | private static String vueTemplatePath(String path) { | 197 | private static String vueTemplatePath(String path) { |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java
| @@ -64,10 +64,17 @@ public class ToolCodegenSQLParser { | @@ -64,10 +64,17 @@ public class ToolCodegenSQLParser { | ||
| 64 | private static ToolSchemaTableDO parseTable(SQLCreateTableStatement statement) { | 64 | private static ToolSchemaTableDO parseTable(SQLCreateTableStatement statement) { |
| 65 | return ToolSchemaTableDO.builder() | 65 | return ToolSchemaTableDO.builder() |
| 66 | .tableName(statement.getTableSource().getTableName(true)) | 66 | .tableName(statement.getTableSource().getTableName(true)) |
| 67 | - .tableComment(((SQLCharExpr) statement.getComment()).getText()) | 67 | + .tableComment(getCommentText(statement)) |
| 68 | .build(); | 68 | .build(); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | + private static String getCommentText(SQLCreateTableStatement statement) { | ||
| 72 | + if (statement == null || statement.getComment() == null) { | ||
| 73 | + return ""; | ||
| 74 | + } | ||
| 75 | + return ((SQLCharExpr) statement.getComment()).getText(); | ||
| 76 | + } | ||
| 77 | + | ||
| 71 | private static List<ToolSchemaColumnDO> parseColumns(SQLCreateTableStatement statement) { | 78 | private static List<ToolSchemaColumnDO> parseColumns(SQLCreateTableStatement statement) { |
| 72 | List<ToolSchemaColumnDO> columns = new ArrayList<>(); | 79 | List<ToolSchemaColumnDO> columns = new ArrayList<>(); |
| 73 | statement.getTableElementList().forEach(element -> parseColumn(columns, element)); | 80 | statement.getTableElementList().forEach(element -> parseColumn(columns, element)); |