Merge branch 'master' into feature/user-register

宋天
2 parents 2da6a746 e8a65d45
Showing 3 changed files with 10 additions and 2 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenEngine.java
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java
更新日志.md
@@ -191,7 +191,7 @@ public class ToolCodegenEngine {
     }
     private static String javaFilePath(String path) {
-        return "java/${basePackage}/${table.moduleName}/" + path + ".java";
+        return "java/${basePackage}/modules/${table.moduleName}/" + path + ".java";
     }
     private static String vueTemplatePath(String path) {
@@ -64,10 +64,17 @@ public class ToolCodegenSQLParser {
     private static ToolSchemaTableDO parseTable(SQLCreateTableStatement statement) {
         return ToolSchemaTableDO.builder()
                 .tableName(statement.getTableSource().getTableName(true))
-                .tableComment(((SQLCharExpr) statement.getComment()).getText())
+                .tableComment(getCommentText(statement))
                 .build();
     }
+    private static String getCommentText(SQLCreateTableStatement statement) {
+        if (statement == null || statement.getComment() == null) {
+            return "";
+        }
+        return ((SQLCharExpr) statement.getComment()).getText();
+    }
+
     private static List<ToolSchemaColumnDO> parseColumns(SQLCreateTableStatement statement) {
         List<ToolSchemaColumnDO> columns = new ArrayList<>();
         statement.getTableElementList().forEach(element -> parseColumn(columns, element));
@@ -22,6 +22,7 @@
 * 新增用户前台的昵称、头像的修改
 * 修复通知和字典查询权限 Bug
+* 修复代码生成器的 Java 类路径缺少 modules 目录的 Bug
 TODO