Skip to content

Commit f1439c4

Browse files
fqliaofqliao
authored
Merge pull request #16 from fqliao/feature-milestone2
add agency cert api
2 parents 20849e8 + ca9fce5 commit f1439c4

File tree

57 files changed

+2124
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2124
-148
lines changed

‎settings.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,7 @@ project(":wedpr-adm").projectDir=file("wedpr-adm")
8383
include 'wedpr-admin'
8484
project(":wedpr-admin").projectDir=file("wedpr-admin")
8585

86+
include "wedpr-components-report"
87+
project(":wedpr-components-report").projectDir=file("wedpr-components/report")
88+
89+

‎wedpr-adm/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
compile project(":wedpr-components-dataset")
1717
compile project(":wedpr-components-agency")
1818
compile project(":wedpr-components-security")
19+
compile project(":wedpr-components-report")
1920
}
2021
googleJavaFormat {
2122
//toolVersion = '1.7'

‎wedpr-adm/conf/application-wedpr.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,8 @@ wedpr.user.jwt.privateKey=
8989
wedpr.user.jwt.publicKey=
9090
wedpr.user.jwt.sessionKey=
9191

92+
#REPORT
93+
quartz-cron-report-job=0/2 * * * * ? *
94+
9295
springfox.documentation.enabled=true
9396

‎wedpr-adm/conf/quartz.properties‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
org.quartz.scheduler.instanceName=wedpr
2+
org.quartz.scheduler.instanceId=AUTO
3+
org.quartz.scheduler.skipUpdateCheck=true
4+
org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
5+
org.quartz.threadPool.threadCount=5
6+
org.quartz.threadPool.threadPriority=5
7+
org.quartz.jobStore.misfireThreshold=60000
8+
org.quartz.jobStore.class=org.springframework.scheduling.quartz.LocalDataSourceJobStore
9+
#org.quartz.jobStore.dataSource=dataSource
10+
org.quartz.jobStore.tablePrefix=QRTZ_
11+
org.quartz.jobStore.isClustered=true
12+
org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
13+
org.quartz.jobStore.useProperties=false

‎db/scripts/drop/db_drop.sh‎ renamed to ‎wedpr-adm/db/scripts/drop/db_drop.sh‎

File renamed without changes.

‎db/scripts/drop/wedpr_drop_sql.list‎ renamed to ‎wedpr-adm/db/scripts/drop/wedpr_drop_sql.list‎

File renamed without changes.

‎db/scripts/init/db_init.sh‎ renamed to ‎wedpr-adm/db/scripts/init/db_init.sh‎

File renamed without changes.

‎db/scripts/init/wedpr_sql.list‎ renamed to ‎wedpr-adm/db/scripts/init/wedpr_sql.list‎

File renamed without changes.

‎wedpr-adm/db/tables_quartz.sql‎

Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
#
2+
# Quartz seems to work best with the driver mm.mysql-2.0.7-bin.jar
3+
#
4+
# PLEASE consider using mysql with innodb tables to avoid locking issues
5+
#
6+
# In your Quartz properties file, you'll need to set
7+
# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
8+
#
9+
10+
DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
11+
DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
12+
DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
13+
DROP TABLE IF EXISTS QRTZ_LOCKS;
14+
DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
15+
DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
16+
DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
17+
DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
18+
DROP TABLE IF EXISTS QRTZ_TRIGGERS;
19+
DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
20+
DROP TABLE IF EXISTS QRTZ_CALENDARS;
21+
22+
23+
CREATE TABLE IF NOT EXISTS QRTZ_JOB_DETAILS
24+
(
25+
SCHED_NAME VARCHAR(120) NOT NULL,
26+
JOB_NAME VARCHAR(200) NOT NULL,
27+
JOB_GROUP VARCHAR(200) NOT NULL,
28+
DESCRIPTION VARCHAR(250) NULL,
29+
JOB_CLASS_NAME VARCHAR(250) NOT NULL,
30+
IS_DURABLE VARCHAR(1) NOT NULL,
31+
IS_NONCONCURRENT VARCHAR(1) NOT NULL,
32+
IS_UPDATE_DATA VARCHAR(1) NOT NULL,
33+
REQUESTS_RECOVERY VARCHAR(1) NOT NULL,
34+
JOB_DATA BLOB NULL,
35+
PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
36+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
37+
38+
CREATE TABLE IF NOT EXISTS QRTZ_TRIGGERS
39+
(
40+
SCHED_NAME VARCHAR(120) NOT NULL,
41+
TRIGGER_NAME VARCHAR(200) NOT NULL,
42+
TRIGGER_GROUP VARCHAR(200) NOT NULL,
43+
JOB_NAME VARCHAR(200) NOT NULL,
44+
JOB_GROUP VARCHAR(200) NOT NULL,
45+
DESCRIPTION VARCHAR(250) NULL,
46+
NEXT_FIRE_TIME BIGINT(13) NULL,
47+
PREV_FIRE_TIME BIGINT(13) NULL,
48+
PRIORITY INTEGER NULL,
49+
TRIGGER_STATE VARCHAR(16) NOT NULL,
50+
TRIGGER_TYPE VARCHAR(8) NOT NULL,
51+
START_TIME BIGINT(13) NOT NULL,
52+
END_TIME BIGINT(13) NULL,
53+
CALENDAR_NAME VARCHAR(200) NULL,
54+
MISFIRE_INSTR SMALLINT(2) NULL,
55+
JOB_DATA BLOB NULL,
56+
PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
57+
FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
58+
REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP)
59+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
60+
61+
CREATE TABLE IF NOT EXISTS QRTZ_SIMPLE_TRIGGERS
62+
(
63+
SCHED_NAME VARCHAR(120) NOT NULL,
64+
TRIGGER_NAME VARCHAR(200) NOT NULL,
65+
TRIGGER_GROUP VARCHAR(200) NOT NULL,
66+
REPEAT_COUNT BIGINT(7) NOT NULL,
67+
REPEAT_INTERVAL BIGINT(12) NOT NULL,
68+
TIMES_TRIGGERED BIGINT(10) NOT NULL,
69+
PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
70+
FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
71+
REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
72+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
73+
74+
CREATE TABLE IF NOT EXISTS QRTZ_CRON_TRIGGERS
75+
(
76+
SCHED_NAME VARCHAR(120) NOT NULL,
77+
TRIGGER_NAME VARCHAR(200) NOT NULL,
78+
TRIGGER_GROUP VARCHAR(200) NOT NULL,
79+
CRON_EXPRESSION VARCHAR(200) NOT NULL,
80+
TIME_ZONE_ID VARCHAR(80),
81+
PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
82+
FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
83+
REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
84+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
85+
86+
CREATE TABLE IF NOT EXISTS QRTZ_SIMPROP_TRIGGERS
87+
(
88+
SCHED_NAME VARCHAR(120) NOT NULL,
89+
TRIGGER_NAME VARCHAR(200) NOT NULL,
90+
TRIGGER_GROUP VARCHAR(200) NOT NULL,
91+
STR_PROP_1 VARCHAR(512) NULL,
92+
STR_PROP_2 VARCHAR(512) NULL,
93+
STR_PROP_3 VARCHAR(512) NULL,
94+
INT_PROP_1 INT NULL,
95+
INT_PROP_2 INT NULL,
96+
LONG_PROP_1 BIGINT NULL,
97+
LONG_PROP_2 BIGINT NULL,
98+
DEC_PROP_1 NUMERIC(13,4) NULL,
99+
DEC_PROP_2 NUMERIC(13,4) NULL,
100+
BOOL_PROP_1 VARCHAR(1) NULL,
101+
BOOL_PROP_2 VARCHAR(1) NULL,
102+
PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
103+
FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
104+
REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
105+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
106+
107+
CREATE TABLE IF NOT EXISTS QRTZ_BLOB_TRIGGERS
108+
(
109+
SCHED_NAME VARCHAR(120) NOT NULL,
110+
TRIGGER_NAME VARCHAR(200) NOT NULL,
111+
TRIGGER_GROUP VARCHAR(200) NOT NULL,
112+
BLOB_DATA BLOB NULL,
113+
PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
114+
FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
115+
REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
116+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
117+
118+
CREATE TABLE IF NOT EXISTS QRTZ_CALENDARS
119+
(
120+
SCHED_NAME VARCHAR(120) NOT NULL,
121+
CALENDAR_NAME VARCHAR(200) NOT NULL,
122+
CALENDAR BLOB NOT NULL,
123+
PRIMARY KEY (SCHED_NAME,CALENDAR_NAME)
124+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
125+
126+
CREATE TABLE IF NOT EXISTS QRTZ_PAUSED_TRIGGER_GRPS
127+
(
128+
SCHED_NAME VARCHAR(120) NOT NULL,
129+
TRIGGER_GROUP VARCHAR(200) NOT NULL,
130+
PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP)
131+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
132+
133+
CREATE TABLE IF NOT EXISTS QRTZ_FIRED_TRIGGERS
134+
(
135+
SCHED_NAME VARCHAR(120) NOT NULL,
136+
ENTRY_ID VARCHAR(95) NOT NULL,
137+
TRIGGER_NAME VARCHAR(200) NOT NULL,
138+
TRIGGER_GROUP VARCHAR(200) NOT NULL,
139+
INSTANCE_NAME VARCHAR(200) NOT NULL,
140+
FIRED_TIME BIGINT(13) NOT NULL,
141+
SCHED_TIME BIGINT(13) NOT NULL,
142+
PRIORITY INTEGER NOT NULL,
143+
STATE VARCHAR(16) NOT NULL,
144+
JOB_NAME VARCHAR(200) NULL,
145+
JOB_GROUP VARCHAR(200) NULL,
146+
IS_NONCONCURRENT VARCHAR(1) NULL,
147+
REQUESTS_RECOVERY VARCHAR(1) NULL,
148+
PRIMARY KEY (SCHED_NAME,ENTRY_ID)
149+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
150+
151+
CREATE TABLE IF NOT EXISTS QRTZ_SCHEDULER_STATE
152+
(
153+
SCHED_NAME VARCHAR(120) NOT NULL,
154+
INSTANCE_NAME VARCHAR(200) NOT NULL,
155+
LAST_CHECKIN_TIME BIGINT(13) NOT NULL,
156+
CHECKIN_INTERVAL BIGINT(13) NOT NULL,
157+
PRIMARY KEY (SCHED_NAME,INSTANCE_NAME)
158+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
159+
160+
CREATE TABLE IF NOT EXISTS QRTZ_LOCKS
161+
(
162+
SCHED_NAME VARCHAR(120) NOT NULL,
163+
LOCK_NAME VARCHAR(40) NOT NULL,
164+
PRIMARY KEY (SCHED_NAME,LOCK_NAME)
165+
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
166+
167+
168+
commit;

‎db/templates/generate_xgb_templates.py‎ renamed to ‎wedpr-adm/db/templates/generate_xgb_templates.py‎

File renamed without changes.

0 commit comments

Comments
 (0)