diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 15544510..0b4f1d5b 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 1547 - 1390 + 14 + 1805 128 128 @@ -791,6 +791,22 @@ data_scope character(n) + + a9b040a1f3059a566ea241c3327fd8b328753c52 + 64 + null + false + null + false + false + false + + false + + 数据源名称 + data_source_name + varchar(n) + 6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0 100 @@ -11688,7 +11704,7 @@ - c74f1c12036a04e6a3bcb807cf8017539ee11513 + 2dbd81fd2d63c7aba6de01c1193d31d4da6fc368 f9c5f9ef3226c5e4a275d1e0be09e8d6a4bbf098 9915937d4e3e8e237226fc9f049c585b793dc190 -1 @@ -11753,7 +11769,7 @@ abd5fc5f0bb213daae3de2abc362c5aea5276f4d a3c67705fc3d118ba46b7f57c9b24fbf0505d7b9 - c74f1c12036a04e6a3bcb807cf8017539ee11513 + 2dbd81fd2d63c7aba6de01c1193d31d4da6fc368 @@ -13293,513 +13309,6 @@ - - f9c5f9ef3226c5e4a275d1e0be09e8d6a4bbf098 - 443 - 379 - Segoe UI - 9 - 59 - 1944 - - 128 - 128 - 192 - - - - js_gen_table - 代码生成表 - - - - - - - f53f151fcfc0c5008da4d5314a50ef425a61c482 - a3c67705fc3d118ba46b7f57c9b24fbf0505d7b9 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - ff1e0ad7d41ac61e908fc5656bdde67a164a6974 - c1fb8a292fb9eddf858dd20d28a548c6af66fe4e - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 079f2c6d89277b4daecbd337e1bf4f781232976a - 971fd03164a8df8dde64dcbc49d25bd9e325b735 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 03fa62677d146f929436f5b658fec1d454ec0adc - bc518c6e08246711da4ef4bbfd902690ebf6797d - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7302decf65cd29ade7edd5a42ef629938c70f45c - b6fb605970d322ce2b1fa51d9b72cdedacd92f27 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 3c113dc08971de6b9b524afdcb41a1562f130081 - 7d0c8a848b33bb097d6a6bfb1b223c0699830431 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 705ceee9c058659c1509ef35e6cdd1bedc4422c4 - d3257d8d8e063a7b8aab08c53d2ef9c5477e16d5 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - ce338c590e6e91ae174e1728177e527d1fb5a1f8 - 2e588483efe68d91af1ede163ad51d1cfb60a8eb - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 58ee1b25a309334f43edd0e3695be10addd71571 - a8f71b15e475b44708cf2638e6d1484c4bf9c5c8 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - dc13101e962883627abb3ca0967353d2d1920ae1 - 6d2b54ff28dde18b6b574adac48050be8679f071 - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b50c10e77abcb30aa7a0efe2b3a9ef080516967a - 50929bce3dc6ed9c0d174fe99184428b6b25c376 - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - edc273602f2feb54b0d9f060c9414873cf0e46d1 - 34b9c5b33bfbc15bd8c8fbabe2e9e7f970cc9ddd - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a7e9e473423331cc2e697d7bad777fab8ea6487a - 69eabc90e25d0e1334e2e95c03192aea25a124ec - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 688b0f7ac0036d32e75f7da7a74d307c976be2ab - e8f6148deaa56e9cde72c0ee2f693ba95ca4dcf7 - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - - - - false - true - idx_gen_table_ptn - - - - - bc518c6e08246711da4ef4bbfd902690ebf6797d - false - - - - - - - - - -
f6f3255545f52e35027e72c2dc95db1a2b9bb3dd254 @@ -16198,6 +15707,546 @@
+ + f9c5f9ef3226c5e4a275d1e0be09e8d6a4bbf098 + 443 + 379 + Segoe UI + 9 + 59 + 1944 + + 128 + 128 + 192 + + + + js_gen_table + 代码生成表 + + + + + + + f53f151fcfc0c5008da4d5314a50ef425a61c482 + a3c67705fc3d118ba46b7f57c9b24fbf0505d7b9 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + ff1e0ad7d41ac61e908fc5656bdde67a164a6974 + c1fb8a292fb9eddf858dd20d28a548c6af66fe4e + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 079f2c6d89277b4daecbd337e1bf4f781232976a + 971fd03164a8df8dde64dcbc49d25bd9e325b735 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 03fa62677d146f929436f5b658fec1d454ec0adc + bc518c6e08246711da4ef4bbfd902690ebf6797d + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7302decf65cd29ade7edd5a42ef629938c70f45c + b6fb605970d322ce2b1fa51d9b72cdedacd92f27 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a9b040a1f3059a566ea241c3327fd8b328753c52 + 0ce662403b57068e13da3bbafac6841d287619a0 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 3c113dc08971de6b9b524afdcb41a1562f130081 + 7d0c8a848b33bb097d6a6bfb1b223c0699830431 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 705ceee9c058659c1509ef35e6cdd1bedc4422c4 + d3257d8d8e063a7b8aab08c53d2ef9c5477e16d5 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ce338c590e6e91ae174e1728177e527d1fb5a1f8 + 2e588483efe68d91af1ede163ad51d1cfb60a8eb + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 58ee1b25a309334f43edd0e3695be10addd71571 + a8f71b15e475b44708cf2638e6d1484c4bf9c5c8 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + dc13101e962883627abb3ca0967353d2d1920ae1 + 6d2b54ff28dde18b6b574adac48050be8679f071 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b50c10e77abcb30aa7a0efe2b3a9ef080516967a + 50929bce3dc6ed9c0d174fe99184428b6b25c376 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + edc273602f2feb54b0d9f060c9414873cf0e46d1 + 34b9c5b33bfbc15bd8c8fbabe2e9e7f970cc9ddd + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a7e9e473423331cc2e697d7bad777fab8ea6487a + 69eabc90e25d0e1334e2e95c03192aea25a124ec + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 688b0f7ac0036d32e75f7da7a74d307c976be2ab + e8f6148deaa56e9cde72c0ee2f693ba95ca4dcf7 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + + + + false + true + idx_gen_table_ptn + + + + + bc518c6e08246711da4ef4bbfd902690ebf6797d + false + + + + + + + + + +
diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index bc7d8620..f417be4c 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -46,6 +46,7 @@ CREATE TABLE js_gen_table comments varchar(500) NOT NULL, parent_table_name varchar(64), parent_table_fk_name varchar(64), + data_source_name varchar(64), tpl_category varchar(200), package_name varchar(500), module_name varchar(30), diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 9ced09e3..279a6cf6 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -46,6 +46,7 @@ CREATE TABLE [js_gen_table] [comments] nvarchar(500) NOT NULL, [parent_table_name] varchar(64), [parent_table_fk_name] varchar(64), + [data_source_name] varchar(64), [tpl_category] varchar(200), [package_name] varchar(500), [module_name] varchar(30), @@ -292,7 +293,7 @@ CREATE TABLE [js_sys_file_entity] [file_path] nvarchar(1000) NOT NULL, [file_content_type] varchar(200) NOT NULL, [file_extension] varchar(100) NOT NULL, - [file_size] decimal(38) NOT NULL, + [file_size] decimal(31) NOT NULL, PRIMARY KEY ([file_id]) ); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 0d3422bb..6c7533ff 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -47,6 +47,7 @@ CREATE TABLE js_gen_table comments varchar(500) NOT NULL COMMENT '表说明', parent_table_name varchar(64) COMMENT '关联父表的表名', parent_table_fk_name varchar(64) COMMENT '本表关联父表的外键名', + data_source_name varchar(64) COMMENT '数据源名称', tpl_category varchar(200) COMMENT '使用的模板', package_name varchar(500) COMMENT '生成包路径', module_name varchar(30) COMMENT '生成模块名', @@ -293,7 +294,7 @@ CREATE TABLE js_sys_file_entity file_path varchar(1000) NOT NULL COMMENT '文件相对路径', file_content_type varchar(200) NOT NULL COMMENT '文件内容类型', file_extension varchar(100) NOT NULL COMMENT '文件后缀扩展名', - file_size decimal(38) NOT NULL COMMENT '文件大小(单位B)', + file_size decimal(31) NOT NULL COMMENT '文件大小(单位B)', PRIMARY KEY (file_id), UNIQUE (file_md5) ) COMMENT = '文件实体表'; diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 68781cfe..884758bb 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -46,6 +46,7 @@ CREATE TABLE js_gen_table comments nvarchar2(500) NOT NULL, parent_table_name varchar2(64), parent_table_fk_name varchar2(64), + data_source_name varchar2(64), tpl_category varchar2(200), package_name varchar2(500), module_name varchar2(30), @@ -292,7 +293,7 @@ CREATE TABLE js_sys_file_entity file_path nvarchar2(1000) NOT NULL, file_content_type varchar2(200) NOT NULL, file_extension varchar2(100) NOT NULL, - file_size number(38) NOT NULL, + file_size number(31) NOT NULL, PRIMARY KEY (file_id) ); @@ -924,6 +925,7 @@ COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称'; COMMENT ON COLUMN js_gen_table.comments IS '表说明'; COMMENT ON COLUMN js_gen_table.parent_table_name IS '关联父表的表名'; COMMENT ON COLUMN js_gen_table.parent_table_fk_name IS '本表关联父表的外键名'; +COMMENT ON COLUMN js_gen_table.data_source_name IS '数据源名称'; COMMENT ON COLUMN js_gen_table.tpl_category IS '使用的模板'; COMMENT ON COLUMN js_gen_table.package_name IS '生成包路径'; COMMENT ON COLUMN js_gen_table.module_name IS '生成模块名'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 0a52bba8..89027073 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -46,6 +46,7 @@ CREATE TABLE js_gen_table comments varchar(500) NOT NULL, parent_table_name varchar(64), parent_table_fk_name varchar(64), + data_source_name varchar(64), tpl_category varchar(200), package_name varchar(500), module_name varchar(30), @@ -292,7 +293,7 @@ CREATE TABLE js_sys_file_entity file_path varchar(1000) NOT NULL, file_content_type varchar(200) NOT NULL, file_extension varchar(100) NOT NULL, - file_size decimal(38) NOT NULL, + file_size decimal(31) NOT NULL, PRIMARY KEY (file_id) ) WITHOUT OIDS; @@ -924,6 +925,7 @@ COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称'; COMMENT ON COLUMN js_gen_table.comments IS '表说明'; COMMENT ON COLUMN js_gen_table.parent_table_name IS '关联父表的表名'; COMMENT ON COLUMN js_gen_table.parent_table_fk_name IS '本表关联父表的外键名'; +COMMENT ON COLUMN js_gen_table.data_source_name IS '数据源名称'; COMMENT ON COLUMN js_gen_table.tpl_category IS '使用的模板'; COMMENT ON COLUMN js_gen_table.package_name IS '生成包路径'; COMMENT ON COLUMN js_gen_table.module_name IS '生成模块名'; diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index e7ce64a1..efb6a955 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -42,25 +42,6 @@ jdbc: removeAbandoned: true removeAbandonedTimeout: 1800 -# # 多数据源名称列表，启用方式：@MyBatisDao(dataSourceName="ds2") -# dataSourceNames: ds2 -# -# # 多数据源配置：ds2 -# ds2: -# type: oracle -# driver: oracle.jdbc.driver.OracleDriver -# url: jdbc:oracle:thin:@127.0.0.1:1521/orcl -# username: jeesite -# password: jeesite -# testSql: SELECT 1 FROM DUAL -# encrypt: -# username: false -# password: true -# pool: -# init: 1 -# minIdle: 3 -# maxActive: 20 - # JTA 分布式事务（v4.0.4+） jta: enabled: false @@ -78,21 +59,6 @@ jdbc: #======================================# spring: - - # Redis 连接参数 （RedisProperties） - redis: - host: 127.0.0.1 - port: 6379 - ssl: false - database: 0 - password: 1234 - timeout: 2000 - lettuce: - pool: - # 最大空闲连接数 - maxIdle: 3 - # 最大活动连接数 - maxActive: 20 # 缓存配置 cache: @@ -311,10 +277,6 @@ shiro: isGenerateNewSessionAfterLogin: false # URI 权限过滤器定义 - filterChainDefinitions: | - /ReportServer/** = user - ${adminPath}/** = user - # filterChainDefinitions: | # /ReportServer/** = user # ${adminPath}/file/** = anon @@ -326,12 +288,18 @@ shiro: # ${adminPath}/cms/article/* = anon # ${adminPath}/cms/link/* = anon # ${adminPath}/** = user + filterChainDefinitions: | + /ReportServer/** = user + ${adminPath}/** = user # 默认的授权过滤定义，如果在filterChainDefinitions中已经定义，则该定义会被覆盖。 defaultFilterChainDefinitions: | /static/** = anon /userfiles/** = anon /druid/** = perms[sys:state:druid] + /v2/api-docs = perms[sys:swagger] + /swagger-ui.html = perms[sys:swagger] + /swagger-resources/** = perms[sys:swagger] ${adminPath}/login-cas = cas ${adminPath}/login = authc ${adminPath}/logout = logout @@ -497,7 +465,7 @@ msg: # 短信网关 sms: beanName: smsSendService - url: http://lehuo520.cn/a/sms/api + url: http://localhost:80/msg/sms/send data: username=jeesite&password=jeesite.com prefix: 【JeeSite】 suffix: ~ diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.0.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.0.sql new file mode 100644 index 00000000..1a3f7f44 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.0.sql @@ -0,0 +1,7 @@ + +-- 代码生成添加数据源字段 +ALTER TABLE ${_prefix}gen_table ADD data_source_name varchar(64) NULL; + +-- 新增在线文档Swagger菜单 +INSERT INTO ${_prefix}sys_menu (menu_code, parent_code, parent_codes, tree_sort, tree_sorts, tree_leaf, tree_level, tree_names, menu_name, menu_type, menu_href, menu_target, menu_icon, menu_color, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('1044942498470014976', '0', '0,', '9040', '0000009040,', '1', 0, '在线文档', '在线文档', '1', '//swagger-ui.html', '', 'icon-book-open', '', 'sys:swagger', 80, '0', 'default', 'core', '0', 'system', getdate(), 'system', getdate(), ''); diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.0.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.0.sql new file mode 100644 index 00000000..70913feb --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.0.sql @@ -0,0 +1,10 @@ + +-- 代码生成添加数据源字段 +ALTER TABLE ${_prefix}gen_table +ADD COLUMN `data_source_name` varchar(64) NULL COMMENT '数据源名称' AFTER `tpl_category`; + +-- 新增在线文档Swagger菜单 +INSERT INTO ${_prefix}sys_menu (menu_code, parent_code, parent_codes, tree_sort, tree_sorts, tree_leaf, tree_level, tree_names, menu_name, menu_type, menu_href, menu_target, menu_icon, menu_color, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('1044942498470014976', '0', '0,', '9040', '0000009040,', '1', 0, '在线文档', '在线文档', '1', '//swagger-ui.html', '', 'icon-book-open', '', 'sys:swagger', 80, '0', 'default', 'core', '0', 'system', now(), 'system', now(), ''); + +commit; \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.0.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.0.sql new file mode 100644 index 00000000..3d2b742e --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.0.sql @@ -0,0 +1,10 @@ + +-- 代码生成添加数据源字段 +ALTER TABLE ${_prefix}gen_table ADD data_source_name varchar(64) NULL; +COMMENT ON COLUMN ${_prefix}gen_table.data_source_name IS '数据源名称'; + +-- 新增在线文档Swagger菜单 +INSERT INTO ${_prefix}sys_menu (menu_code, parent_code, parent_codes, tree_sort, tree_sorts, tree_leaf, tree_level, tree_names, menu_name, menu_type, menu_href, menu_target, menu_icon, menu_color, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('1044942498470014976', '0', '0,', '9040', '0000009040,', '1', 0, '在线文档', '在线文档', '1', '//swagger-ui.html', '', 'icon-book-open', '', 'sys:swagger', 80, '0', 'default', 'core', '0', 'system', sysdate, 'system', sysdate, ''); + +commit; \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.0.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.0.sql new file mode 100644 index 00000000..f71a2022 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.0.sql @@ -0,0 +1,10 @@ + +-- 日志表新增执行时间字段 +ALTER TABLE ${_prefix}gen_table ADD COLUMN data_source_name varchar(64); +COMMENT ON COLUMN ${_prefix}gen_table.data_source_name IS '数据源名称'; + +-- 新增在线文档Swagger菜单 +INSERT INTO ${_prefix}sys_menu (menu_code, parent_code, parent_codes, tree_sort, tree_sorts, tree_leaf, tree_level, tree_names, menu_name, menu_type, menu_href, menu_target, menu_icon, menu_color, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('1044942498470014976', '0', '0,', '9040', '0000009040,', '1', 0, '在线文档', '在线文档', '1', '//swagger-ui.html', '', 'icon-book-open', '', 'sys:swagger', 80, '0', 'default', 'core', '0', 'system', now(), 'system', now(), ''); + +commit; \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml b/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml index adcbc63e..f9d60b29 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml @@ -18,7 +18,7 @@ import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subMod * @author ${functionAuthor} * @version ${functionVersion} */ -@MyBatisDao +@MyBatisDao<% if(table.dataSourceName != ''){ %>(dataSourceName="${table.dataSourceName}")<% } %> public interface ${ClassName}Dao extends ${table.isTreeEntity?'Tree':'Crud'}Dao<${ClassName}> { }]]> diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index 9ced09e3..279a6cf6 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -46,6 +46,7 @@ CREATE TABLE [js_gen_table] [comments] nvarchar(500) NOT NULL, [parent_table_name] varchar(64), [parent_table_fk_name] varchar(64), + [data_source_name] varchar(64), [tpl_category] varchar(200), [package_name] varchar(500), [module_name] varchar(30), @@ -292,7 +293,7 @@ CREATE TABLE [js_sys_file_entity] [file_path] nvarchar(1000) NOT NULL, [file_content_type] varchar(200) NOT NULL, [file_extension] varchar(100) NOT NULL, - [file_size] decimal(38) NOT NULL, + [file_size] decimal(31) NOT NULL, PRIMARY KEY ([file_id]) ); diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index 0d3422bb..6c7533ff 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -47,6 +47,7 @@ CREATE TABLE js_gen_table comments varchar(500) NOT NULL COMMENT '表说明', parent_table_name varchar(64) COMMENT '关联父表的表名', parent_table_fk_name varchar(64) COMMENT '本表关联父表的外键名', + data_source_name varchar(64) COMMENT '数据源名称', tpl_category varchar(200) COMMENT '使用的模板', package_name varchar(500) COMMENT '生成包路径', module_name varchar(30) COMMENT '生成模块名', @@ -293,7 +294,7 @@ CREATE TABLE js_sys_file_entity file_path varchar(1000) NOT NULL COMMENT '文件相对路径', file_content_type varchar(200) NOT NULL COMMENT '文件内容类型', file_extension varchar(100) NOT NULL COMMENT '文件后缀扩展名', - file_size decimal(38) NOT NULL COMMENT '文件大小(单位B)', + file_size decimal(31) NOT NULL COMMENT '文件大小(单位B)', PRIMARY KEY (file_id), UNIQUE (file_md5) ) COMMENT = '文件实体表'; diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index 68781cfe..884758bb 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -46,6 +46,7 @@ CREATE TABLE js_gen_table comments nvarchar2(500) NOT NULL, parent_table_name varchar2(64), parent_table_fk_name varchar2(64), + data_source_name varchar2(64), tpl_category varchar2(200), package_name varchar2(500), module_name varchar2(30), @@ -292,7 +293,7 @@ CREATE TABLE js_sys_file_entity file_path nvarchar2(1000) NOT NULL, file_content_type varchar2(200) NOT NULL, file_extension varchar2(100) NOT NULL, - file_size number(38) NOT NULL, + file_size number(31) NOT NULL, PRIMARY KEY (file_id) ); @@ -924,6 +925,7 @@ COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称'; COMMENT ON COLUMN js_gen_table.comments IS '表说明'; COMMENT ON COLUMN js_gen_table.parent_table_name IS '关联父表的表名'; COMMENT ON COLUMN js_gen_table.parent_table_fk_name IS '本表关联父表的外键名'; +COMMENT ON COLUMN js_gen_table.data_source_name IS '数据源名称'; COMMENT ON COLUMN js_gen_table.tpl_category IS '使用的模板'; COMMENT ON COLUMN js_gen_table.package_name IS '生成包路径'; COMMENT ON COLUMN js_gen_table.module_name IS '生成模块名'; diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 0a52bba8..89027073 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -46,6 +46,7 @@ CREATE TABLE js_gen_table comments varchar(500) NOT NULL, parent_table_name varchar(64), parent_table_fk_name varchar(64), + data_source_name varchar(64), tpl_category varchar(200), package_name varchar(500), module_name varchar(30), @@ -292,7 +293,7 @@ CREATE TABLE js_sys_file_entity file_path varchar(1000) NOT NULL, file_content_type varchar(200) NOT NULL, file_extension varchar(100) NOT NULL, - file_size decimal(38) NOT NULL, + file_size decimal(31) NOT NULL, PRIMARY KEY (file_id) ) WITHOUT OIDS; @@ -924,6 +925,7 @@ COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称'; COMMENT ON COLUMN js_gen_table.comments IS '表说明'; COMMENT ON COLUMN js_gen_table.parent_table_name IS '关联父表的表名'; COMMENT ON COLUMN js_gen_table.parent_table_fk_name IS '本表关联父表的外键名'; +COMMENT ON COLUMN js_gen_table.data_source_name IS '数据源名称'; COMMENT ON COLUMN js_gen_table.tpl_category IS '使用的模板'; COMMENT ON COLUMN js_gen_table.package_name IS '生成包路径'; COMMENT ON COLUMN js_gen_table.module_name IS '生成模块名'; diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index a9470e85..9f6abd80 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -105,12 +105,12 @@ jdbc: # # # 多数据源配置：ds2 # ds2: -# type: oracle -# driver: oracle.jdbc.driver.OracleDriver -# url: jdbc:oracle:thin:@127.0.0.1:1521/orcl -# username: jeesite -# password: jeesite -# testSql: SELECT 1 FROM DUAL +# type: mysql +# driver: com.mysql.jdbc.Driver +# url: jdbc:mysql://127.0.0.1:3306/jeesite2?useSSL=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull +# username: root +# password: 123456 +# testSql: SELECT 1 # encrypt: # username: false # password: true @@ -118,7 +118,7 @@ jdbc: # init: 1 # minIdle: 3 # maxActive: 20 - + # # JTA 分布式事务（v4.0.4+） # jta: # enabled: false @@ -159,7 +159,7 @@ spring: # maxIdle: 3 # # 最大活动连接数 # maxActive: 20 -# + # # 缓存配置 # cache: # # 缓存及会话共享（专业版） @@ -495,8 +495,6 @@ spring: # realtime: # # 是否开启 # enabled: true -# # 消息实时推送任务Bean名称 -# beanName: msgLocalPushTask # # 推送失败次数，如果推送次数超过了设定次数，仍不成功，则放弃并保存到历史 # pushFailNumber: 3