diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java index 90f45c6c..614823b0 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java @@ -662,7 +662,6 @@ public class SpringBootCallable implements Callable { freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "start-prod.bat"), option + "/resources/start-prod.bat", ctx); freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "application-dev.properties"), option + "/resources/application-dev.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "application-prod.properties"), option + "/resources/application-prod.ftl", ctx); - Tool.outputResource(option + "/resources/banner.txt", Tool.createFile(root.getAbsolutePath(), "banner.txt")); Tool.outputResource(option + "/resources/logback-spring.xml", Tool.createFile(root.getAbsolutePath(), "logback-spring.xml")); if (DataBase.ORACLE == dataBase) { @@ -689,6 +688,7 @@ public class SpringBootCallable implements Callable { { File system = Tool.createPath(dbtool.getAbsolutePath(), "system"); + freeMarkerManager.outputTemp(Tool.createFile(system.getAbsolutePath(), "ALL_TABLE.sql"), option + "/resources/dbtool/system/ALL_TABLE.sql", ctx); freeMarkerManager.outputTemp(Tool.createFile(system.getAbsolutePath(), "DICT.sql"), option + "/resources/dbtool/system/DICT.sql", ctx); freeMarkerManager.outputTemp(Tool.createFile(system.getAbsolutePath(), "DICT_ITEM.sql"), option + "/resources/dbtool/system/DICT_ITEM.sql", ctx); freeMarkerManager.outputTemp(Tool.createFile(system.getAbsolutePath(), "FILE.sql"), option + "/resources/dbtool/system/FILE.sql", ctx); diff --git a/src/main/resources/modules/Java_api/module/req/request.java b/src/main/resources/modules/Java_api/module/req/request.java index 4748338b..92cd1a44 100644 --- a/src/main/resources/modules/Java_api/module/req/request.java +++ b/src/main/resources/modules/Java_api/module/req/request.java @@ -44,7 +44,7 @@ ${i} } public String path() { - return "${module}/${target}/${method}"; + return "/${module}/${target}/${method}"; } <#if !isTempReq> diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/system/ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/system/ALL_TABLE.sql new file mode 100644 index 00000000..1441db67 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/system/ALL_TABLE.sql @@ -0,0 +1,78 @@ +/* +Target : MYSQL +Author +Date: ${date?string("yyyy-MM-dd")} +*/ + +-- ---------------------------- +-- Table structure for DICT - 字典 +-- ---------------------------- + +CREATE TABLE `SYS_DICT` ( + `ID` BIGINT(20) NOT NULL COMMENT '主键', + `DICT_NAME` VARCHAR(50) NOT NULL COMMENT '字典名称', + `DICT_COMMENT` VARCHAR(50) NOT NULL COMMENT '字典描述', + `VERSION` VARCHAR(50) NOT NULL COMMENT '字典版本', + `VALID` TINYINT(1) NOT NULL COMMENT '是否有效', + `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本', + `IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除', + `CREATE_BY` BIGINT(20) NOT NULL COMMENT '创建用户', + `CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间', + `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户', + `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间', +PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='字典'; + +/* +Target : MYSQL +Author +Date: 2019-01-01 +*/ + +-- ---------------------------- +-- Table structure for DICT_ITEM - 字典项 +-- ---------------------------- + +CREATE TABLE `SYS_DICT_ITEM` ( + `ID` BIGINT(20) NOT NULL COMMENT '主键', + `DICT_NAME` VARCHAR(50) NOT NULL COMMENT '字典名称', + `KEY` VARCHAR(50) NOT NULL COMMENT '字典键', + `VALUE` VARCHAR(100) NOT NULL COMMENT '字典值', + `SORT` INTEGER(10) NOT NULL COMMENT '排序', + `VALID` TINYINT(1) NOT NULL COMMENT '是否有效', + `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本', + `IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除', + `CREATE_BY` BIGINT(20) NOT NULL COMMENT '创建用户', + `CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间', + `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户', + `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间', +PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='字典项'; + +/* +Target : MYSQL +Author +Date: 2019-01-01 +*/ + +-- ---------------------------- +-- Table structure for FILE - 文件 +-- ---------------------------- + +CREATE TABLE `SYSFILE` ( + `ID` BIGINT(20) NOT NULL COMMENT '主键', + `NAME` VARCHAR(250) NOT NULL COMMENT '文件名称', + `FILE_TYPE` VARCHAR(10) COMMENT '文件类型', + `ATTRIBUTE1` VARCHAR(50) COMMENT '扩展属性1', + `ATTRIBUTE2` VARCHAR(50) COMMENT '扩展属性2', + `LOCATION` VARCHAR(500) COMMENT '存放地址', + `URL` VARCHAR(500) COMMENT '访问地址', + `URL_DOWNLOAD` VARCHAR(500) COMMENT '下载地址', + `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本', + `IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除', + `CREATE_BY` BIGINT(20) NOT NULL COMMENT '创建用户', + `CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间', + `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户', + `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间', +PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='文件'; diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/system/DICT.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/system/DICT.sql index e948f4b2..060962b4 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/system/DICT.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/system/DICT.sql @@ -1,7 +1,7 @@ /* Target : MYSQL Author -Date: 2019-11-23 +Date: ${date?string("yyyy-MM-dd")} */ -- ---------------------------- diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/system/DICT_ITEM.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/system/DICT_ITEM.sql index b58a1bfa..99ba1d6f 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/system/DICT_ITEM.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/system/DICT_ITEM.sql @@ -1,7 +1,7 @@ /* Target : MYSQL Author -Date: 2019-11-23 +Date: ${date?string("yyyy-MM-dd")} */ -- ---------------------------- diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/system/FILE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/system/FILE.sql index 49ad37a9..95487400 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/system/FILE.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/system/FILE.sql @@ -1,7 +1,7 @@ /* Target : MYSQL Author -Date: 2019-11-29 +Date: ${date?string("yyyy-MM-dd")} */ -- ----------------------------