open
/
open-dbtool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、BUG修复

Browse Source 
Former-commit-id: 3035541ee3c871c9a524512a153adf3ec0b4d48f
master
wangbing 5 years ago
parent bfc26c9317
commit 4393a7be86
15 changed files with 391 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
Unescape View File

@ -257,7 +257,7 @@ public class SpringBootCallable implements Callable {
freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "ScheduleConfig.java"), option + "/java/config/ScheduleConfig.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "ThreadPoolConfig.java"), option + "/java/config/ThreadPoolConfig.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "WebMvcConfig.java"), option + "/java/config/WebMvcConfig.java", ctx);
if (dataBase.name().equals(DataBase.SQLite)) {
if (dataBase.name().equals(DataBase.SQLite.name())) {
freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "SQLiteConfig.java"), option + "/java/config/SQLiteConfig.java", ctx);
}
if (project.getMultiDB()) {
@ -680,7 +680,7 @@ public class SpringBootCallable implements Callable {
continue;
}
for (File file : fileModule.listFiles()) {
if (!file.getName().startsWith("ALL_") && file.getName().endsWith(".sql")) {
if (!file.getName().startsWith("SQLite_ALL_") && file.getName().endsWith(".sql")) {
statement = connection.createStatement();
String sql = FileUtil.readFileToString(file);
statement.execute(sql);

2
src/main/resources/modules/SpringBoot/java/config/CacheConfig.java
Unescape View File

@ -19,7 +19,7 @@ public class CacheConfig {
public EhCacheCacheManager getCacheManager() {
net.sf.ehcache.config.Configuration configuration = new net.sf.ehcache.config.Configuration();
// todo 需根据服务器物理内存配置
configuration.setMaxBytesLocalHeap("1G");
configuration.setMaxBytesLocalHeap("128M");
configuration.updateCheck(false);
configuration.addDiskStore(new DiskStoreConfiguration().path("java.io.tmpdir"));
CacheManager cacheManager = CacheManager.create(configuration);

2
src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl
Unescape View File

@ -9,7 +9,7 @@ import ${basePackage}.frame.validation.Dict;
</#if>
/**
* ${table.getCName()}Request - ${table.tableComment}查询
* ${table.getCName()}Request - ${table.tableComment}查询
*
* @author ${author?default("")}
* @version 0.0.1

2
src/main/resources/modules/SpringBoot/java/module/req/searchRequestClass.ftl
Unescape View File

@ -6,7 +6,7 @@ import java.util.Date;
</#if>
/**
* ${table.getCName()}Request - ${table.tableComment?default("")}模糊搜索
* ${table.getCName()}Request - ${table.tableComment?default("")}模糊搜索
*
* @author ${author?default("")}
* @version 0.0.1

3
src/main/resources/modules/SpringBoot/java/module/req/updateRequestClass.ftl
Unescape View File

@ -1,6 +1,7 @@
package ${basePackage}.module.${moduleName}.req;
import ${basePackage}.frame.base.BaseUpdateRequest;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotEmpty;
@ -18,7 +19,7 @@ import ${basePackage}.frame.validation.Dict;
* @version 0.0.1
* @since ${date?string("yyyy-MM-dd")}
*/
public class ${table.getCName()}UpdateRequest extends BaseUpdateRequest {
public class ${table.getCName()}UpdateRequest extends BaseUpdateRequest {
<#list table.fields as field>
<#if !field.isSystem || field.fieldName == 'ID'>

213
src/main/resources/modules/SpringBoot/resources/dbtool/system/SQLite_ALL_TABLE.sql
Unescape View File

@ -1,8 +1,158 @@
-- ----------------------------
-- Table structure for DICT - 字典
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_DICT (
"ID" BIGINT PRIMARY KEY NOT NULL,
"DICT_NAME" VARCHAR(50),
"DICT_COMMENT" VARCHAR(50),
"VERSION" VARCHAR(50),
"VALID" BOOLEAN,
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);
-- ----------------------------
-- Table structure for DICT_ITEM - 字典项
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_DICT_ITEM (
"ID" BIGINT PRIMARY KEY NOT NULL,
"DICT_NAME" VARCHAR(50),
"KEY" VARCHAR(20),
"VALUE" VARCHAR(50),
"SORT" MEDIUMINT,
"VALID" BOOLEAN,
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);
-- ----------------------------
-- Table structure for RES - 资源
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_RES (
"ID" BIGINT PRIMARY KEY NOT NULL,
"RES_CODE" VARCHAR(50) NOT NULL,
"RES_NAME" VARCHAR(50) NOT NULL,
"RES_TYPE" VARCHAR(20) NOT NULL,
"RES_VALUE" VARCHAR(250),
"SUP_CODE" VARCHAR(50),
"SUP_NAME" VARCHAR(50),
"VALID" BOOLEAN NOT NULL,
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);
-- ----------------------------
-- Table structure for USER - 用户
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_USER (
"ID" BIGINT PRIMARY KEY NOT NULL,
"USER_NAME" VARCHAR(100) NOT NULL,
"USER_CODE" VARCHAR(50) NOT NULL,
"USER_ALIAS" VARCHAR(50),
"USER_PWD" VARCHAR(50) NOT NULL,
"USER_STATUS" VARCHAR(20) NOT NULL,
"DEPT_ID" BIGINT,
"DEPT_CODE" VARCHAR(50),
"DEPT_NAME" VARCHAR(100),
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);
-- ----------------------------
-- Table structure for DEPT - 部门
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_DEPT (
"ID" BIGINT PRIMARY KEY NOT NULL,
"DEPT_CODE" VARCHAR(50) NOT NULL,
"DEPT_NAME" VARCHAR(100) NOT NULL,
"DEPT_ALIAS" VARCHAR(50),
"SUP_CODE" VARCHAR(50),
"SUP_NAME" VARCHAR(100),
"VALID" BOOLEAN NOT NULL,
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);
-- ----------------------------
-- Table structure for ROLE - 角色
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_ROLE (
"ID" BIGINT PRIMARY KEY NOT NULL,
"CODE" VARCHAR(50) NOT NULL,
"NAME" VARCHAR(50) NOT NULL,
"COMMENT" VARCHAR(50),
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);
-- ----------------------------
-- Table structure for TOKENS - 通行证
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_TOKENS (
"ID" BIGINT PRIMARY KEY NOT NULL,
"TOKEN" VARCHAR(50) NOT NULL,
"USER_ID" BIGINT NOT NULL,
"USER_NAME" VARCHAR(50) NOT NULL,
"LOGIN_TIME" DATETIME NOT NULL,
"VALID_TIME" DATETIME NOT NULL,
"VALID" BOOLEAN NOT NULL,
"DEPT_ID" BIGINT,
"DEPT_CODE" VARCHAR(50),
"DEPT_NAME" VARCHAR(100),
"TERMINAL_TYPE" VARCHAR(20),
"TERMINAL_IP" VARCHAR(50),
"TERMINAL_INFO" VARCHAR(500),
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);
-- ----------------------------
-- Table structure for FILE - 文件
-- Target : SQLite
-- Author : wangbing
-- Date: : 2019-12-17
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_FILE (
"ID" BIGINT PRIMARY KEY NOT NULL,
@ -20,4 +170,63 @@ CREATE TABLE IF NOT EXISTS SYS_FILE (
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);
-- ----------------------------
-- Table structure for USER_ROLE - 用户角色授权
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_USER_ROLE (
"ID" BIGINT PRIMARY KEY NOT NULL,
"USER_ID" BIGINT NOT NULL,
"USER_CODE" VARCHAR(50) NOT NULL,
"ROLE_ID" BIGINT NOT NULL,
"ROLE_CODE" VARCHAR(50) NOT NULL,
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);
-- ----------------------------
-- Table structure for ROLE_RES - 角色资源关系
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_ROLE_RES (
"ID" BIGINT PRIMARY KEY NOT NULL,
"ROLE_ID" BIGINT NOT NULL,
"ROLE_CODE" VARCHAR(50) NOT NULL,
"RES_ID" BIGINT NOT NULL,
"RES_CODE" VARCHAR(50) NOT NULL,
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);
-- ----------------------------
-- Table structure for LOG_ERR - 错误日志
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_LOG_ERR (
"ID" BIGINT PRIMARY KEY NOT NULL,
"LOG_ERR_TYPE" VARCHAR(20),
"TITLE" VARCHAR(50) NOT NULL,
"CONTENT" TEXT,
"LOG_ERR_RESULT" VARCHAR(20) NOT NULL,
"ATTRIBUTE1" VARCHAR(50),
"ATTRIBUTE2" VARCHAR(50),
"ATTRIBUTE3" VARCHAR(50),
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);

21
src/main/resources/modules/SpringBoot/resources/dbtool/system/SQLite_DEPT.sql
Unescape View File

@ -0,0 +1,21 @@
-- ----------------------------
-- Table structure for DEPT - 部门
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_DEPT (
"ID" BIGINT PRIMARY KEY NOT NULL,
"DEPT_CODE" VARCHAR(50) NOT NULL,
"DEPT_NAME" VARCHAR(100) NOT NULL,
"DEPT_ALIAS" VARCHAR(50),
"SUP_CODE" VARCHAR(50),
"SUP_NAME" VARCHAR(100),
"VALID" BOOLEAN NOT NULL,
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);

22
src/main/resources/modules/SpringBoot/resources/dbtool/system/SQLite_LOG_ERR.sql
Unescape View File

@ -0,0 +1,22 @@
-- ----------------------------
-- Table structure for LOG_ERR - 错误日志
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_LOG_ERR (
"ID" BIGINT PRIMARY KEY NOT NULL,
"LOG_ERR_TYPE" VARCHAR(20),
"TITLE" VARCHAR(50) NOT NULL,
"CONTENT" TEXT,
"LOG_ERR_RESULT" VARCHAR(20) NOT NULL,
"ATTRIBUTE1" VARCHAR(50),
"ATTRIBUTE2" VARCHAR(50),
"ATTRIBUTE3" VARCHAR(50),
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);

22
src/main/resources/modules/SpringBoot/resources/dbtool/system/SQLite_RES.sql
Unescape View File

@ -0,0 +1,22 @@
-- ----------------------------
-- Table structure for RES - 资源
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_RES (
"ID" BIGINT PRIMARY KEY NOT NULL,
"RES_CODE" VARCHAR(50) NOT NULL,
"RES_NAME" VARCHAR(50) NOT NULL,
"RES_TYPE" VARCHAR(20) NOT NULL,
"RES_VALUE" VARCHAR(250),
"SUP_CODE" VARCHAR(50),
"SUP_NAME" VARCHAR(50),
"VALID" BOOLEAN NOT NULL,
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);

18
src/main/resources/modules/SpringBoot/resources/dbtool/system/SQLite_ROLE.sql
Unescape View File

@ -0,0 +1,18 @@
-- ----------------------------
-- Table structure for ROLE - 角色
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_ROLE (
"ID" BIGINT PRIMARY KEY NOT NULL,
"CODE" VARCHAR(50) NOT NULL,
"NAME" VARCHAR(50) NOT NULL,
"COMMENT" VARCHAR(50),
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);

19
src/main/resources/modules/SpringBoot/resources/dbtool/system/SQLite_ROLE_RES.sql
Unescape View File

@ -0,0 +1,19 @@
-- ----------------------------
-- Table structure for ROLE_RES - 角色资源关系
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_ROLE_RES (
"ID" BIGINT PRIMARY KEY NOT NULL,
"ROLE_ID" BIGINT NOT NULL,
"ROLE_CODE" VARCHAR(50) NOT NULL,
"RES_ID" BIGINT NOT NULL,
"RES_CODE" VARCHAR(50) NOT NULL,
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);

27
src/main/resources/modules/SpringBoot/resources/dbtool/system/SQLite_TOKENS.sql
Unescape View File

@ -0,0 +1,27 @@
-- ----------------------------
-- Table structure for TOKENS - 通行证
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_TOKENS (
"ID" BIGINT PRIMARY KEY NOT NULL,
"TOKEN" VARCHAR(50) NOT NULL,
"USER_ID" BIGINT NOT NULL,
"USER_NAME" VARCHAR(50) NOT NULL,
"LOGIN_TIME" DATETIME NOT NULL,
"VALID_TIME" DATETIME NOT NULL,
"VALID" BOOLEAN NOT NULL,
"DEPT_ID" BIGINT,
"DEPT_CODE" VARCHAR(50),
"DEPT_NAME" VARCHAR(100),
"TERMINAL_TYPE" VARCHAR(20),
"TERMINAL_IP" VARCHAR(50),
"TERMINAL_INFO" VARCHAR(500),
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);

23
src/main/resources/modules/SpringBoot/resources/dbtool/system/SQLite_USER.sql
Unescape View File

@ -0,0 +1,23 @@
-- ----------------------------
-- Table structure for USER - 用户
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_USER (
"ID" BIGINT PRIMARY KEY NOT NULL,
"USER_NAME" VARCHAR(100) NOT NULL,
"USER_CODE" VARCHAR(50) NOT NULL,
"USER_ALIAS" VARCHAR(50),
"USER_PWD" VARCHAR(50) NOT NULL,
"USER_STATUS" VARCHAR(20) NOT NULL,
"DEPT_ID" BIGINT,
"DEPT_CODE" VARCHAR(50),
"DEPT_NAME" VARCHAR(100),
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);

19
src/main/resources/modules/SpringBoot/resources/dbtool/system/SQLite_USER_ROLE.sql
Unescape View File

@ -0,0 +1,19 @@
-- ----------------------------
-- Table structure for USER_ROLE - 用户角色授权
-- Target : SQLite
-- Author : wangbing
-- Date: : 2020-03-09
-- ----------------------------
CREATE TABLE IF NOT EXISTS SYS_USER_ROLE (
"ID" BIGINT PRIMARY KEY NOT NULL,
"USER_ID" BIGINT NOT NULL,
"USER_CODE" VARCHAR(50) NOT NULL,
"ROLE_ID" BIGINT NOT NULL,
"ROLE_CODE" VARCHAR(50) NOT NULL,
"ROW_VERSION" BIGINT NOT NULL,
"IS_DELETED" BOOLEAN NOT NULL,
"CREATE_BY" BIGINT NOT NULL,
"CREATE_TIME" DATETIME NOT NULL,
"LAST_UPDATE_BY" BIGINT,
"LAST_UPDATE_TIME" DATETIME
);

3
src/main/resources/modules/SpringBoot/resources/dbtool/tableAll.ftl
Unescape View File

@ -38,6 +38,7 @@ PRIMARY KEY (`ID`)
</#list>
</#if>
<#if dataBase == 'SQLite'>
<#list module.tables as table>
-- ----------------------------
-- Table structure for ${table.tableName} - ${table.tableComment?default("")}
-- Target : SQLite
@ -49,5 +50,5 @@ CREATE TABLE IF NOT EXISTS ${module.modulePrefix?default("")}${table.tableName}
${dBmapper.getFieldSql(field)}<#if field_has_next>,</#if>
</#list>
);
</#list>
</#if>

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.