diff --git a/jero-boot/db/jeroboot-mysql-5.7-20220224.sql b/jero-boot/db/jeroboot-mysql-5.7-20220224.sql index 8744781d..726943b3 100644 --- a/jero-boot/db/jeroboot-mysql-5.7-20220224.sql +++ b/jero-boot/db/jeroboot-mysql-5.7-20220224.sql @@ -320,6 +320,7 @@ CREATE TABLE `onl_auth_relation` ( `auth_id` varchar(32) DEFAULT NULL COMMENT '权限id', `type` int(1) DEFAULT NULL COMMENT '1字段 2按钮 3数据权限', `cgform_id` varchar(32) DEFAULT NULL COMMENT 'online表单ID', + `auth_mode` varchar(50) DEFAULT NULL COMMENT '授权方式role角色，depart部门，user人', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; @@ -762,8 +763,6 @@ CREATE TABLE `qrtz_cron_triggers` ( -- ---------------------------- -- Records of qrtz_cron_triggers -- ---------------------------- -INSERT INTO `qrtz_cron_triggers` VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', '0/1 * * * * ?', 'Asia/Shanghai'); -INSERT INTO `qrtz_cron_triggers` VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', '0/1 * * * * ?', 'Asia/Shanghai'); -- ---------------------------- -- Table structure for qrtz_fired_triggers @@ -811,8 +810,6 @@ CREATE TABLE `qrtz_job_details` ( -- ---------------------------- -- Records of qrtz_job_details -- ---------------------------- -INSERT INTO `qrtz_job_details` VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', null, 'com.jero.modules.quartz.job.SampleJob', '0', '0', '0', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C77080000001000000001740009706172616D65746572707800); -INSERT INTO `qrtz_job_details` VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', null, 'com.jero.modules.quartz.job.SampleParamJob', '0', '0', '0', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C77080000001000000001740009706172616D6574657274000573636F74747800); -- ---------------------------- -- Table structure for qrtz_locks @@ -860,7 +857,7 @@ CREATE TABLE `qrtz_scheduler_state` ( -- ---------------------------- -- Records of qrtz_scheduler_state -- ---------------------------- -INSERT INTO `qrtz_scheduler_state` VALUES ('MyScheduler', 'MMMMMM1619153807188', '1619154265676', '10000'); +INSERT INTO `qrtz_scheduler_state` VALUES ('MyScheduler', 'DESKTOP-32NS8B11628777660578', 1628777772568, 10000); -- ---------------------------- -- Table structure for qrtz_simple_triggers @@ -937,8 +934,6 @@ CREATE TABLE `qrtz_triggers` ( -- ---------------------------- -- Records of qrtz_triggers -- ---------------------------- -INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', null, '1588405730000', '1588405729000', '5', 'PAUSED', 'CRON', '1588405237000', '0', null, '0', ''); -INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', null, '1588405236000', '1588405235000', '5', 'PAUSED', 'CRON', '1588405221000', '0', null, '0', ''); -- ---------------------------- -- Table structure for sys_announcement @@ -1717,8 +1712,7 @@ CREATE TABLE `sys_quartz_job` ( `parameter` varchar(255) DEFAULT NULL COMMENT '参数', `description` varchar(255) DEFAULT NULL COMMENT '描述', `status` int(1) DEFAULT NULL COMMENT '状态 0正常 -1停止', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `uniq_job_class_name` (`job_class_name`) USING BTREE + PRIMARY KEY (`id`) USING BTREE ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- @@ -2017,6 +2011,7 @@ CREATE TABLE `sys_third_account` ( `del_flag` tinyint(1) DEFAULT NULL COMMENT '删除状态(0-正常,1-已删除)', `realname` varchar(100) DEFAULT NULL COMMENT '真实姓名', `third_user_uuid` varchar(100) DEFAULT NULL COMMENT '第三方账号', + `third_user_id` varchar(100) DEFAULT NULL COMMENT '第三方app用户账号', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; diff --git a/jero-boot/db/jeroboot-oracle11g.sql b/jero-boot/db/jeroboot-oracle11g.sql index 5702c388..78d4355f 100644 --- a/jero-boot/db/jeroboot-oracle11g.sql +++ b/jero-boot/db/jeroboot-oracle11g.sql @@ -427,7 +427,8 @@ CREATE TABLE "ONL_AUTH_RELATION" ( "ROLE_ID" NVARCHAR2(32) NULL , "AUTH_ID" NVARCHAR2(32) NULL , "TYPE" NUMBER(11) NULL , -"CGFORM_ID" NVARCHAR2(32) NULL +"CGFORM_ID" NVARCHAR2(32) NULL, +"AUTH_MODE" NVARCHAR2(50) NULL ) LOGGING NOCOMPRESS @@ -438,6 +439,7 @@ COMMENT ON COLUMN "ONL_AUTH_RELATION"."ROLE_ID" IS '角色id'; COMMENT ON COLUMN "ONL_AUTH_RELATION"."AUTH_ID" IS '权限id'; COMMENT ON COLUMN "ONL_AUTH_RELATION"."TYPE" IS '1字段 2按钮 3数据权限'; COMMENT ON COLUMN "ONL_AUTH_RELATION"."CGFORM_ID" IS 'online表单ID'; +COMMENT ON COLUMN "ONL_AUTH_RELATION"."AUTH_MODE" IS '授权方式role角色，depart部门，user人'; -- ---------------------------- -- Records of ONL_AUTH_RELATION @@ -1057,8 +1059,6 @@ NOCACHE -- ---------------------------- -- Records of QRTZ_CRON_TRIGGERS -- ---------------------------- -INSERT INTO "QRTZ_CRON_TRIGGERS" VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', '0/1 * * * * ?', 'Asia/Shanghai'); -INSERT INTO "QRTZ_CRON_TRIGGERS" VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', '0/1 * * * * ?', 'Asia/Shanghai'); -- ---------------------------- -- Table structure for QRTZ_FIRED_TRIGGERS @@ -1114,8 +1114,6 @@ NOCACHE -- ---------------------------- -- Records of QRTZ_JOB_DETAILS -- ---------------------------- -INSERT INTO "QRTZ_JOB_DETAILS" VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', null, 'com.jero.modules.quartz.job.SampleJob', '0', '0', '0', '0', HexToRaw('30784143454430303035373337323030313536463732363732453731373536313732373437413245344136463632343436313734363134443631373039464230383345384246413942304342303230303030373837323030323636463732363732453731373536313732373437413245373537343639364337333245353337343732363936453637344236353739343436393732373437393436364336313637344436313730383230384538433346424335354432383032303030313541303031333631364336433646373737333534373236313645373336393635364537343434363137343631373837323030314436463732363732453731373536313732373437413245373537343639364337333245343436393732373437393436364336313637344436313730313345363245414432383736304143453032303030323541303030353634363937323734373934433030303336443631373037343030304634433641363137363631324637353734363936433246344436313730334237383730303137333732303031313641363137363631324537353734363936433245343836313733363834443631373030353037444143314333313636304431303330303032343630303041364336463631363434363631363337343646373234393030303937343638373236353733363836463643363437383730334634303030303030303030303030433737303830303030303031303030303030303031373430303039373036313732363136443635373436353732373037383030')); -INSERT INTO "QRTZ_JOB_DETAILS" VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', null, 'com.jero.modules.quartz.job.SampleParamJob', '0', '0', '0', '0', HexToRaw('307841434544303030353733373230303135364637323637324537313735363137323734374132453441364636323434363137343631344436313730394642303833453842464139423043423032303030303738373230303236364637323637324537313735363137323734374132453735373436393643373332453533373437323639364536373442363537393434363937323734373934363643363136373444363137303832303845384333464243353544323830323030303135413030313336313643364336463737373335343732363136453733363936353645373434343631373436313738373230303144364637323637324537313735363137323734374132453735373436393643373332453434363937323734373934363643363136373444363137303133453632454144323837363041434530323030303235413030303536343639373237343739344330303033364436313730373430303046344336413631373636313246373537343639364332463444363137303342373837303031373337323030313136413631373636313245373537343639364332453438363137333638344436313730303530374441433143333136363044313033303030323436303030413643364636313634343636313633373436463732343930303039373436383732363537333638364636433634373837303346343030303030303030303030304337373038303030303030313030303030303030313734303030393730363137323631364436353734363537323734303030353733363336463734373437383030')); -- ---------------------------- -- Table structure for QRTZ_LOCKS @@ -1260,8 +1258,6 @@ NOCACHE -- ---------------------------- -- Records of QRTZ_TRIGGERS -- ---------------------------- -INSERT INTO "QRTZ_TRIGGERS" VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', null, '1588405730000', '1588405729000', '5', 'PAUSED', 'CRON', '1588405237000', '0', null, '0', null); -INSERT INTO "QRTZ_TRIGGERS" VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', null, '1588405236000', '1588405235000', '5', 'PAUSED', 'CRON', '1588405221000', '0', null, '0', null); -- ---------------------------- -- Table structure for SYS_ANNOUNCEMENT @@ -2666,7 +2662,8 @@ CREATE TABLE "SYS_THIRD_ACCOUNT" ( "STATUS" NUMBER(4) NULL , "DEL_FLAG" NUMBER(4) NULL , "REALNAME" NVARCHAR2(100) NULL , -"THIRD_USER_UUID" NVARCHAR2(100) NULL +"THIRD_USER_UUID" NVARCHAR2(100) NULL, +"THIRD_USER_ID" NVARCHAR2(100) ) LOGGING NOCOMPRESS @@ -2681,6 +2678,7 @@ COMMENT ON COLUMN "SYS_THIRD_ACCOUNT"."STATUS" IS '状态(1-正常,2-冻结)'; COMMENT ON COLUMN "SYS_THIRD_ACCOUNT"."DEL_FLAG" IS '删除状态(0-正常,1-已删除)'; COMMENT ON COLUMN "SYS_THIRD_ACCOUNT"."REALNAME" IS '真实姓名'; COMMENT ON COLUMN "SYS_THIRD_ACCOUNT"."THIRD_USER_UUID" IS '第三方账号'; +COMMENT ON COLUMN "JEECGBOOT"."SYS_THIRD_ACCOUNT"."THIRD_USER_ID" IS '第三方app用户账号'; -- ---------------------------- -- Records of SYS_THIRD_ACCOUNT @@ -4032,14 +4030,6 @@ ALTER TABLE "SYS_PERMISSION_DATA_RULE" ADD CHECK ("ID" IS NOT NULL); -- ---------------------------- ALTER TABLE "SYS_PERMISSION_DATA_RULE" ADD PRIMARY KEY ("ID"); --- ---------------------------- --- Indexes structure for table SYS_QUARTZ_JOB --- ---------------------------- -CREATE UNIQUE INDEX "UNIQ_JOB_CLASS_NAME" -ON "SYS_QUARTZ_JOB" ("JOB_CLASS_NAME" ASC) -LOGGING -VISIBLE; - -- ---------------------------- -- Checks structure for table SYS_QUARTZ_JOB -- ---------------------------- diff --git a/jero-boot/db/jeroboot-sqlserver2017.sql b/jero-boot/db/jeroboot-sqlserver2017.sql index 5e6bace8..6f5b9f6e 100644 --- a/jero-boot/db/jeroboot-sqlserver2017.sql +++ b/jero-boot/db/jeroboot-sqlserver2017.sql @@ -1193,7 +1193,8 @@ CREATE TABLE [dbo].[onl_auth_relation] ( [role_id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, [auth_id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, [type] int NULL, - [cgform_id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL + [cgform_id] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, + [auth_mode] nvarchar(50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ) GO @@ -1228,6 +1229,12 @@ EXEC sp_addextendedproperty 'COLUMN', N'cgform_id' GO +EXEC sp_addextendedproperty +'MS_Description', N'授权方式role角色，depart部门，user人', +'SCHEMA', N'dbo', +'TABLE', N'onl_auth_relation', +'COLUMN', N'auth_mode' +GO -- ---------------------------- -- Records of onl_auth_relation @@ -7096,7 +7103,8 @@ CREATE TABLE [dbo].[sys_third_account] ( [status] tinyint NULL, [del_flag] tinyint NULL, [realname] nvarchar(100) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, - [third_user_uuid] nvarchar(100) COLLATE SQL_Latin1_General_CP1_CI_AS NULL + [third_user_uuid] nvarchar(100) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, + [third_user_id] nvarchar(100) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ) GO @@ -7159,6 +7167,12 @@ EXEC sp_addextendedproperty 'COLUMN', N'third_user_uuid' GO +EXEC sp_addextendedproperty +'MS_Description', N'第三方app用户账号', +'SCHEMA', N'dbo', +'TABLE', N'sys_third_account', +'COLUMN', N'third_user_id' +GO -- ---------------------------- -- Records of sys_third_account