Commit 882b456cfc8c9b3a628954943d5d41d7d61b9212

Authored by zhangdaiscott
1 parent 3238e7c0

导入mysql db时报错

jeecg-boot/db/jeecgboot-mysql-5.7.sql
@@ -7533,165 +7533,4 @@ INSERT INTO `tmp_report_data_income` VALUES ('中石油参股', 72062.45, 0.00, @@ -7533,165 +7533,4 @@ INSERT INTO `tmp_report_data_income` VALUES ('中石油参股', 72062.45, 0.00,
7533 INSERT INTO `tmp_report_data_income` VALUES ('非中石油', 1486526.90, 212070.72, 0.00, 0.00, 0.00, 226415.09, 1698597.62); 7533 INSERT INTO `tmp_report_data_income` VALUES ('非中石油', 1486526.90, 212070.72, 0.00, 0.00, 0.00, 226415.09, 1698597.62);
7534 7534
7535 7535
7536 --- ----------------------------  
7537 --- QRTZ_  
7538 --- ----------------------------  
7539 -DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;  
7540 -DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;  
7541 -DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;  
7542 -DROP TABLE IF EXISTS QRTZ_LOCKS;  
7543 -DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;  
7544 -DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;  
7545 -DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;  
7546 -DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;  
7547 -DROP TABLE IF EXISTS QRTZ_TRIGGERS;  
7548 -DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;  
7549 -DROP TABLE IF EXISTS QRTZ_CALENDARS;  
7550 -  
7551 -  
7552 -CREATE TABLE QRTZ_JOB_DETAILS  
7553 - (  
7554 - SCHED_NAME VARCHAR(120) NOT NULL,  
7555 - JOB_NAME VARCHAR(200) NOT NULL,  
7556 - JOB_GROUP VARCHAR(200) NOT NULL,  
7557 - DESCRIPTION VARCHAR(250) NULL,  
7558 - JOB_CLASS_NAME VARCHAR(250) NOT NULL,  
7559 - IS_DURABLE VARCHAR(1) NOT NULL,  
7560 - IS_NONCONCURRENT VARCHAR(1) NOT NULL,  
7561 - IS_UPDATE_DATA VARCHAR(1) NOT NULL,  
7562 - REQUESTS_RECOVERY VARCHAR(1) NOT NULL,  
7563 - JOB_DATA BLOB NULL,  
7564 - PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)  
7565 -);  
7566 -  
7567 -CREATE TABLE QRTZ_TRIGGERS  
7568 - (  
7569 - SCHED_NAME VARCHAR(120) NOT NULL,  
7570 - TRIGGER_NAME VARCHAR(200) NOT NULL,  
7571 - TRIGGER_GROUP VARCHAR(200) NOT NULL,  
7572 - JOB_NAME VARCHAR(200) NOT NULL,  
7573 - JOB_GROUP VARCHAR(200) NOT NULL,  
7574 - DESCRIPTION VARCHAR(250) NULL,  
7575 - NEXT_FIRE_TIME BIGINT(13) NULL,  
7576 - PREV_FIRE_TIME BIGINT(13) NULL,  
7577 - PRIORITY INTEGER NULL,  
7578 - TRIGGER_STATE VARCHAR(16) NOT NULL,  
7579 - TRIGGER_TYPE VARCHAR(8) NOT NULL,  
7580 - START_TIME BIGINT(13) NOT NULL,  
7581 - END_TIME BIGINT(13) NULL,  
7582 - CALENDAR_NAME VARCHAR(200) NULL,  
7583 - MISFIRE_INSTR SMALLINT(2) NULL,  
7584 - JOB_DATA BLOB NULL,  
7585 - PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),  
7586 - FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)  
7587 - REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP)  
7588 -);  
7589 -  
7590 -CREATE TABLE QRTZ_SIMPLE_TRIGGERS  
7591 - (  
7592 - SCHED_NAME VARCHAR(120) NOT NULL,  
7593 - TRIGGER_NAME VARCHAR(200) NOT NULL,  
7594 - TRIGGER_GROUP VARCHAR(200) NOT NULL,  
7595 - REPEAT_COUNT BIGINT(7) NOT NULL,  
7596 - REPEAT_INTERVAL BIGINT(12) NOT NULL,  
7597 - TIMES_TRIGGERED BIGINT(10) NOT NULL,  
7598 - PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),  
7599 - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)  
7600 - REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)  
7601 -);  
7602 -  
7603 -CREATE TABLE QRTZ_CRON_TRIGGERS  
7604 - (  
7605 - SCHED_NAME VARCHAR(120) NOT NULL,  
7606 - TRIGGER_NAME VARCHAR(200) NOT NULL,  
7607 - TRIGGER_GROUP VARCHAR(200) NOT NULL,  
7608 - CRON_EXPRESSION VARCHAR(200) NOT NULL,  
7609 - TIME_ZONE_ID VARCHAR(80),  
7610 - PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),  
7611 - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)  
7612 - REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)  
7613 -);  
7614 -  
7615 -CREATE TABLE QRTZ_SIMPROP_TRIGGERS  
7616 - (  
7617 - SCHED_NAME VARCHAR(120) NOT NULL,  
7618 - TRIGGER_NAME VARCHAR(200) NOT NULL,  
7619 - TRIGGER_GROUP VARCHAR(200) NOT NULL,  
7620 - STR_PROP_1 VARCHAR(512) NULL,  
7621 - STR_PROP_2 VARCHAR(512) NULL,  
7622 - STR_PROP_3 VARCHAR(512) NULL,  
7623 - INT_PROP_1 INT NULL,  
7624 - INT_PROP_2 INT NULL,  
7625 - LONG_PROP_1 BIGINT NULL,  
7626 - LONG_PROP_2 BIGINT NULL,  
7627 - DEC_PROP_1 NUMERIC(13,4) NULL,  
7628 - DEC_PROP_2 NUMERIC(13,4) NULL,  
7629 - BOOL_PROP_1 VARCHAR(1) NULL,  
7630 - BOOL_PROP_2 VARCHAR(1) NULL,  
7631 - PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),  
7632 - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)  
7633 - REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)  
7634 -);  
7635 -  
7636 -CREATE TABLE QRTZ_BLOB_TRIGGERS  
7637 - (  
7638 - SCHED_NAME VARCHAR(120) NOT NULL,  
7639 - TRIGGER_NAME VARCHAR(200) NOT NULL,  
7640 - TRIGGER_GROUP VARCHAR(200) NOT NULL,  
7641 - BLOB_DATA BLOB NULL,  
7642 - PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),  
7643 - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)  
7644 - REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)  
7645 -);  
7646 -  
7647 -CREATE TABLE QRTZ_CALENDARS  
7648 - (  
7649 - SCHED_NAME VARCHAR(120) NOT NULL,  
7650 - CALENDAR_NAME VARCHAR(200) NOT NULL,  
7651 - CALENDAR BLOB NOT NULL,  
7652 - PRIMARY KEY (SCHED_NAME,CALENDAR_NAME)  
7653 -);  
7654 -  
7655 -CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS  
7656 - (  
7657 - SCHED_NAME VARCHAR(120) NOT NULL,  
7658 - TRIGGER_GROUP VARCHAR(200) NOT NULL,  
7659 - PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP)  
7660 -);  
7661 -  
7662 -CREATE TABLE QRTZ_FIRED_TRIGGERS  
7663 - (  
7664 - SCHED_NAME VARCHAR(120) NOT NULL,  
7665 - ENTRY_ID VARCHAR(95) NOT NULL,  
7666 - TRIGGER_NAME VARCHAR(200) NOT NULL,  
7667 - TRIGGER_GROUP VARCHAR(200) NOT NULL,  
7668 - INSTANCE_NAME VARCHAR(200) NOT NULL,  
7669 - FIRED_TIME BIGINT(13) NOT NULL,  
7670 - SCHED_TIME BIGINT(13) NOT NULL,  
7671 - PRIORITY INTEGER NOT NULL,  
7672 - STATE VARCHAR(16) NOT NULL,  
7673 - JOB_NAME VARCHAR(200) NULL,  
7674 - JOB_GROUP VARCHAR(200) NULL,  
7675 - IS_NONCONCURRENT VARCHAR(1) NULL,  
7676 - REQUESTS_RECOVERY VARCHAR(1) NULL,  
7677 - PRIMARY KEY (SCHED_NAME,ENTRY_ID)  
7678 -);  
7679 -  
7680 -CREATE TABLE QRTZ_SCHEDULER_STATE  
7681 - (  
7682 - SCHED_NAME VARCHAR(120) NOT NULL,  
7683 - INSTANCE_NAME VARCHAR(200) NOT NULL,  
7684 - LAST_CHECKIN_TIME BIGINT(13) NOT NULL,  
7685 - CHECKIN_INTERVAL BIGINT(13) NOT NULL,  
7686 - PRIMARY KEY (SCHED_NAME,INSTANCE_NAME)  
7687 -);  
7688 -  
7689 -CREATE TABLE QRTZ_LOCKS  
7690 - (  
7691 - SCHED_NAME VARCHAR(120) NOT NULL,  
7692 - LOCK_NAME VARCHAR(40) NOT NULL,  
7693 - PRIMARY KEY (SCHED_NAME,LOCK_NAME)  
7694 -);  
7695 -  
7696 -  
7697 SET FOREIGN_KEY_CHECKS = 1; 7536 SET FOREIGN_KEY_CHECKS = 1;
jeecg-boot/pom.xml
@@ -48,7 +48,8 @@ @@ -48,7 +48,8 @@
48 <dom4j.version>1.6.1</dom4j.version> 48 <dom4j.version>1.6.1</dom4j.version>
49 <qiniu-java-sdk.version>7.4.0</qiniu-java-sdk.version> 49 <qiniu-java-sdk.version>7.4.0</qiniu-java-sdk.version>
50 <!-- Log4j2惊爆0Day漏洞--> 50 <!-- Log4j2惊爆0Day漏洞-->
51 - <log4j2.version>2.15.0</log4j2.version> 51 + <log4j2.version>2.17.0</log4j2.version>
  52 + <logback.version>1.2.9</logback.version>
52 </properties> 53 </properties>
53 54
54 <modules> 55 <modules>