manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

job添加instanceName集群的实例名字段，与yml配置文件一致，在微服务模块中使用非常重要；优化job目标字符串中包含单引号的时候XSS问题；若你重写了jobForm.html你需要同步下次此文件；若你在yml中修改了instanceName名字，你需要更新下sys_job的instanceName字段为你修改的名字。

Browse Source
This commit is contained in:
thinkgem
2019-03-05 22:10:09 +08:00
parent 2e4ca4b2ad
commit ee9f3fd580
12 changed files with 502 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.4.sql
View File

@@ -1,3 +1,5 @@
-- 删除sys_file_entity表的file_md5唯一索引
-- ALTER TABLE [js_sys_file_entity] DROP CONSTRAINT [UQ__js_sys_f__3BD63C9E32E0915F]
-- ALTER TABLE [${_prefix}sys_file_entity] DROP CONSTRAINT [UQ__js_sys_f__3BD63C9E32E0915F];
ALTER TABLE [${_prefix}sys_job] ADD [instance_name] varchar(64) DEFAULT JeeSiteScheduler NOT NULL;

8
modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.4.sql
View File

@@ -1,5 +1,9 @@
-- 删除sys_file_entity表的file_md5唯一索引
ALTER TABLE `js_sys_file_entity`
ALTER TABLE `${_prefix}sys_file_entity`
DROP INDEX `file_md5`,
ADD INDEX `file_md5`(`file_md5`);
ADD INDEX `file_md5`(`file_md5`);
-- 集群的实例名字
ALTER TABLE `${_prefix}sys_job`
ADD COLUMN `instance_name` varchar(64) NOT NULL DEFAULT JeeSiteScheduler COMMENT '集群的实例名字' AFTER `concurrent`;

6
modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.4.sql
View File

@@ -1,3 +1,7 @@
-- 删除sys_file_entity表的file_md5唯一索引
-- ALTER TABLE "JS_SYS_FILE_ENTITY" DROP CONSTRAINT "SYS_C0019398"
-- ALTER TABLE "${_prefix}SYS_FILE_ENTITY" DROP CONSTRAINT "SYS_C0019398"
ALTER TABLE "${_prefix}SYS_JOB"
ADD ("instance_name" VARCHAR2(64) DEFAULT JeeSiteScheduler NOT NULL );
COMMENT ON COLUMN "${_prefix}SYS_JOB"."instance_name" IS '集群的实例名字'

9
modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.4.sql
View File

@@ -1,4 +1,9 @@
-- 删除sys_file_entity表的file_md5唯一索引
ALTER TABLE "js_sys_file_entity"
DROP CONSTRAINT "js_sys_file_entity_file_md5_key";
ALTER TABLE "${_prefix}sys_file_entity"
DROP CONSTRAINT "${_prefix}sys_file_entity_file_md5_key";
-- 集群的实例名字
ALTER TABLE "${_prefix}sys_job"
ADD COLUMN "instance_name" varchar(255) NOT NULL DEFAULT JeeSiteScheduler;
COMMENT ON COLUMN "${_prefix}sys_job"."instance_name" IS '集群的实例名字';

3
modules/core/src/main/resources/mybatis/mybatis-config.xml
View File

@@ -37,6 +37,9 @@
<!-- 设置但JDBC类型为空时,某些驱动程序 要指定值,default:OTHER，插入空值时不需要指定类型 -->
<setting name="jdbcTypeForNull" value="NULL"/>
<!-- 返回值为Map时，类型数据空值字段时，仍然需要返回
<setting name="callSettersOnNulls" value="true"/>-->
</settings>
<!-- 类型别名 -->