代码生成器支持多数据源表生成

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),

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])
 );
 

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 = '文件实体表';

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 '生成模块名';

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 '生成模块名';

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: ~

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(), '');

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;

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;

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;

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}> {
 	
 }]]>

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])
 );
 

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 = '文件实体表';

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 '生成模块名';

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 '生成模块名';

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