Mark 7 years ago
parent
commit
cd7210b041

+ 18 - 12
README.md

@ -1,8 +1,16 @@
1 1
**项目说明** 
2
- renren-fast是一个轻量级的Java快速开发平台,能快速开发项目并交付【接私活利器】
2
- renren-fast是一个轻量级的,前后端分离的Java快速开发平台,能快速开发项目并交付【接私活利器】
3 3
<br> 
4
<br>
4 5
 
5
6
 **项目主题** 
7
 ```
8
 本项目是前后端分离的,提供了两套主题,只需部署到nginx里即可。
9
```
10
 - Element UI主题【官方推荐】:https://github.com/daxiongYang/renren-fast-vue
11
 - AdminLTE主题:https://gitee.com/renrenio/renren-fast-adminlte
12
 <br> 
13
 <br> 
6 14
7 15
**具有如下特点** 
8 16
- 友好的代码结构及注释,便于阅读及二次开发
@ -21,7 +29,7 @@
21 29
**项目结构** 
22 30
```
23 31
renren-fast
24
├─doc  项目SQL语句
32
├─db  项目SQL语句
25 33
26 34
├─common 公共模块
27 35
│  ├─aspect 系统日志
@ -32,7 +40,7 @@ renren-fast
32 40
├─config 配置信息
33 41
34 42
├─modules 功能模块
35
│  ├─api API接口模块(APP调用)
43
│  ├─app API接口模块(APP调用)
36 44
│  ├─job 定时任务模块
37 45
│  ├─oss 文件服务模块
38 46
│  └─sys 权限模块
@ -41,17 +49,15 @@ renren-fast
41 49
42 50
├──resources 
43 51
│  ├─mapper SQL对应的XML文件
44
─static 第三方库、插件等静态资源
45
│  └─views  项目静态页面
52
─static 静态资源
46 53
47 54
```
48 55
<br> 
49 56
50 57
**如何交流、反馈、参与贡献?** 
51
- 开发文档:http://www.renren.io/open/renren-fast/
52
- Git仓库:http://git.oschina.net/babaio/renren-fast
53
- 其他项目:http://www.renren.io/open/
54
- [编程入门教程](http://www.renren.io):http://www.renren.io   
58
- 开发文档:http://www.renren.io/?s=index/Guide
59
- Git仓库:https://gitee.com/renrenio/renren-fast
60
- [人人开源](http://www.renren.io):http://www.renren.io   
55 61
- 官方QQ群:324780204、145799952
56 62
- 如需关注项目最新动态,请Watch、Star项目,同时也是对项目最好的支持
57 63
<br> 
@ -72,7 +78,7 @@ renren-fast
72 78
 **本地部署**
73 79
- 通过git下载源码
74 80
- 创建数据库renren_fast,数据库编码为UTF-8
75
- 执行doc/db.sql文件,初始化数据
81
- 执行db/mysql.sql文件,初始化数据
76 82
- 修改application-dev.yml,更新MySQL账号和密码
77 83
- Eclipse、IDEA运行RenrenApplication.java,则可启动项目
78 84
- 项目访问路径:http://localhost:8080/renren-fast
@ -81,7 +87,7 @@ renren-fast
81 87
82 88
83 89
 **项目演示**
84
- 演示地址:http://demo.open.renren.io/renren-fast
90
- 演示地址:http://fast.demo.renren.io
85 91
- 账号密码:admin/admin
86 92
<br> 
87 93

+ 323 - 0
db/mssql.sql

@ -0,0 +1,323 @@
1
-- 只提供了Quartz相关SQL,其他表结构,需要自行转换
2
3
4
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
5
  ALTER TABLE [dbo].[QRTZ_TRIGGERS] DROP CONSTRAINT FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS
6
GO
7
8
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
9
  ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] DROP CONSTRAINT FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS
10
GO
11
12
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
13
  ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] DROP CONSTRAINT FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS
14
GO
15
16
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
17
  ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] DROP CONSTRAINT FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS
18
GO
19
20
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_CALENDARS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
21
  DROP TABLE [dbo].[QRTZ_CALENDARS]
22
GO
23
24
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_CRON_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
25
  DROP TABLE [dbo].[QRTZ_CRON_TRIGGERS]
26
GO
27
28
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_BLOB_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
29
  DROP TABLE [dbo].[QRTZ_BLOB_TRIGGERS]
30
GO
31
32
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_FIRED_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
33
  DROP TABLE [dbo].[QRTZ_FIRED_TRIGGERS]
34
GO
35
36
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_PAUSED_TRIGGER_GRPS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
37
  DROP TABLE [dbo].[QRTZ_PAUSED_TRIGGER_GRPS]
38
GO
39
40
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SCHEDULER_STATE]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
41
  DROP TABLE [dbo].[QRTZ_SCHEDULER_STATE]
42
GO
43
44
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_LOCKS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
45
  DROP TABLE [dbo].[QRTZ_LOCKS]
46
GO
47
48
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_JOB_DETAILS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
49
  DROP TABLE [dbo].[QRTZ_JOB_DETAILS]
50
GO
51
52
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SIMPLE_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
53
  DROP TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS]
54
GO
55
56
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SIMPROP_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
57
  DROP TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS]
58
GO
59
60
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
61
  DROP TABLE [dbo].[QRTZ_TRIGGERS]
62
GO
63
64
CREATE TABLE [dbo].[QRTZ_CALENDARS] (
65
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
66
  [CALENDAR_NAME] [VARCHAR] (200)  NOT NULL ,
67
  [CALENDAR] [IMAGE] NOT NULL
68
) ON [PRIMARY]
69
GO
70
71
CREATE TABLE [dbo].[QRTZ_CRON_TRIGGERS] (
72
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
73
  [TRIGGER_NAME] [VARCHAR] (200)  NOT NULL ,
74
  [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL ,
75
  [CRON_EXPRESSION] [VARCHAR] (120)  NOT NULL ,
76
  [TIME_ZONE_ID] [VARCHAR] (80)
77
) ON [PRIMARY]
78
GO
79
80
CREATE TABLE [dbo].[QRTZ_FIRED_TRIGGERS] (
81
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
82
  [ENTRY_ID] [VARCHAR] (95)  NOT NULL ,
83
  [TRIGGER_NAME] [VARCHAR] (200)  NOT NULL ,
84
  [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL ,
85
  [INSTANCE_NAME] [VARCHAR] (200)  NOT NULL ,
86
  [FIRED_TIME] [BIGINT] NOT NULL ,
87
  [SCHED_TIME] [BIGINT] NOT NULL ,
88
  [PRIORITY] [INTEGER] NOT NULL ,
89
  [STATE] [VARCHAR] (16)  NOT NULL,
90
  [JOB_NAME] [VARCHAR] (200)  NULL ,
91
  [JOB_GROUP] [VARCHAR] (200)  NULL ,
92
  [IS_NONCONCURRENT] [VARCHAR] (1)  NULL ,
93
  [REQUESTS_RECOVERY] [VARCHAR] (1)  NULL
94
) ON [PRIMARY]
95
GO
96
97
CREATE TABLE [dbo].[QRTZ_PAUSED_TRIGGER_GRPS] (
98
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
99
  [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL
100
) ON [PRIMARY]
101
GO
102
103
CREATE TABLE [dbo].[QRTZ_SCHEDULER_STATE] (
104
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
105
  [INSTANCE_NAME] [VARCHAR] (200)  NOT NULL ,
106
  [LAST_CHECKIN_TIME] [BIGINT] NOT NULL ,
107
  [CHECKIN_INTERVAL] [BIGINT] NOT NULL
108
) ON [PRIMARY]
109
GO
110
111
CREATE TABLE [dbo].[QRTZ_LOCKS] (
112
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
113
  [LOCK_NAME] [VARCHAR] (40)  NOT NULL
114
) ON [PRIMARY]
115
GO
116
117
CREATE TABLE [dbo].[QRTZ_JOB_DETAILS] (
118
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
119
  [JOB_NAME] [VARCHAR] (200)  NOT NULL ,
120
  [JOB_GROUP] [VARCHAR] (200)  NOT NULL ,
121
  [DESCRIPTION] [VARCHAR] (250) NULL ,
122
  [JOB_CLASS_NAME] [VARCHAR] (250)  NOT NULL ,
123
  [IS_DURABLE] [VARCHAR] (1)  NOT NULL ,
124
  [IS_NONCONCURRENT] [VARCHAR] (1)  NOT NULL ,
125
  [IS_UPDATE_DATA] [VARCHAR] (1)  NOT NULL ,
126
  [REQUESTS_RECOVERY] [VARCHAR] (1)  NOT NULL ,
127
  [JOB_DATA] [IMAGE] NULL
128
) ON [PRIMARY]
129
GO
130
131
CREATE TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] (
132
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
133
  [TRIGGER_NAME] [VARCHAR] (200)  NOT NULL ,
134
  [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL ,
135
  [REPEAT_COUNT] [BIGINT] NOT NULL ,
136
  [REPEAT_INTERVAL] [BIGINT] NOT NULL ,
137
  [TIMES_TRIGGERED] [BIGINT] NOT NULL
138
) ON [PRIMARY]
139
GO
140
141
CREATE TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] (
142
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
143
  [TRIGGER_NAME] [VARCHAR] (200)  NOT NULL ,
144
  [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL ,
145
  [STR_PROP_1] [VARCHAR] (512) NULL,
146
  [STR_PROP_2] [VARCHAR] (512) NULL,
147
  [STR_PROP_3] [VARCHAR] (512) NULL,
148
  [INT_PROP_1] [INT] NULL,
149
  [INT_PROP_2] [INT] NULL,
150
  [LONG_PROP_1] [BIGINT] NULL,
151
  [LONG_PROP_2] [BIGINT] NULL,
152
  [DEC_PROP_1] [NUMERIC] (13,4) NULL,
153
  [DEC_PROP_2] [NUMERIC] (13,4) NULL,
154
  [BOOL_PROP_1] [VARCHAR] (1) NULL,
155
  [BOOL_PROP_2] [VARCHAR] (1) NULL,
156
) ON [PRIMARY]
157
GO
158
159
CREATE TABLE [dbo].[QRTZ_BLOB_TRIGGERS] (
160
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
161
  [TRIGGER_NAME] [VARCHAR] (200)  NOT NULL ,
162
  [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL ,
163
  [BLOB_DATA] [IMAGE] NULL
164
) ON [PRIMARY]
165
GO
166
167
CREATE TABLE [dbo].[QRTZ_TRIGGERS] (
168
  [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
169
  [TRIGGER_NAME] [VARCHAR] (200)  NOT NULL ,
170
  [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL ,
171
  [JOB_NAME] [VARCHAR] (200)  NOT NULL ,
172
  [JOB_GROUP] [VARCHAR] (200)  NOT NULL ,
173
  [DESCRIPTION] [VARCHAR] (250) NULL ,
174
  [NEXT_FIRE_TIME] [BIGINT] NULL ,
175
  [PREV_FIRE_TIME] [BIGINT] NULL ,
176
  [PRIORITY] [INTEGER] NULL ,
177
  [TRIGGER_STATE] [VARCHAR] (16)  NOT NULL ,
178
  [TRIGGER_TYPE] [VARCHAR] (8)  NOT NULL ,
179
  [START_TIME] [BIGINT] NOT NULL ,
180
  [END_TIME] [BIGINT] NULL ,
181
  [CALENDAR_NAME] [VARCHAR] (200)  NULL ,
182
  [MISFIRE_INSTR] [SMALLINT] NULL ,
183
  [JOB_DATA] [IMAGE] NULL
184
) ON [PRIMARY]
185
GO
186
187
ALTER TABLE [dbo].[QRTZ_CALENDARS] WITH NOCHECK ADD
188
  CONSTRAINT [PK_QRTZ_CALENDARS] PRIMARY KEY  CLUSTERED
189
    (
190
      [SCHED_NAME],
191
      [CALENDAR_NAME]
192
    )  ON [PRIMARY]
193
GO
194
195
ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] WITH NOCHECK ADD
196
  CONSTRAINT [PK_QRTZ_CRON_TRIGGERS] PRIMARY KEY  CLUSTERED
197
    (
198
      [SCHED_NAME],
199
      [TRIGGER_NAME],
200
      [TRIGGER_GROUP]
201
    )  ON [PRIMARY]
202
GO
203
204
ALTER TABLE [dbo].[QRTZ_FIRED_TRIGGERS] WITH NOCHECK ADD
205
  CONSTRAINT [PK_QRTZ_FIRED_TRIGGERS] PRIMARY KEY  CLUSTERED
206
    (
207
      [SCHED_NAME],
208
      [ENTRY_ID]
209
    )  ON [PRIMARY]
210
GO
211
212
ALTER TABLE [dbo].[QRTZ_PAUSED_TRIGGER_GRPS] WITH NOCHECK ADD
213
  CONSTRAINT [PK_QRTZ_PAUSED_TRIGGER_GRPS] PRIMARY KEY  CLUSTERED
214
    (
215
      [SCHED_NAME],
216
      [TRIGGER_GROUP]
217
    )  ON [PRIMARY]
218
GO
219
220
ALTER TABLE [dbo].[QRTZ_SCHEDULER_STATE] WITH NOCHECK ADD
221
  CONSTRAINT [PK_QRTZ_SCHEDULER_STATE] PRIMARY KEY  CLUSTERED
222
    (
223
      [SCHED_NAME],
224
      [INSTANCE_NAME]
225
    )  ON [PRIMARY]
226
GO
227
228
ALTER TABLE [dbo].[QRTZ_LOCKS] WITH NOCHECK ADD
229
  CONSTRAINT [PK_QRTZ_LOCKS] PRIMARY KEY  CLUSTERED
230
    (
231
      [SCHED_NAME],
232
      [LOCK_NAME]
233
    )  ON [PRIMARY]
234
GO
235
236
ALTER TABLE [dbo].[QRTZ_JOB_DETAILS] WITH NOCHECK ADD
237
  CONSTRAINT [PK_QRTZ_JOB_DETAILS] PRIMARY KEY  CLUSTERED
238
    (
239
      [SCHED_NAME],
240
      [JOB_NAME],
241
      [JOB_GROUP]
242
    )  ON [PRIMARY]
243
GO
244
245
ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] WITH NOCHECK ADD
246
  CONSTRAINT [PK_QRTZ_SIMPLE_TRIGGERS] PRIMARY KEY  CLUSTERED
247
    (
248
      [SCHED_NAME],
249
      [TRIGGER_NAME],
250
      [TRIGGER_GROUP]
251
    )  ON [PRIMARY]
252
GO
253
254
ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] WITH NOCHECK ADD
255
  CONSTRAINT [PK_QRTZ_SIMPROP_TRIGGERS] PRIMARY KEY  CLUSTERED
256
    (
257
      [SCHED_NAME],
258
      [TRIGGER_NAME],
259
      [TRIGGER_GROUP]
260
    )  ON [PRIMARY]
261
GO
262
263
ALTER TABLE [dbo].[QRTZ_TRIGGERS] WITH NOCHECK ADD
264
  CONSTRAINT [PK_QRTZ_TRIGGERS] PRIMARY KEY  CLUSTERED
265
    (
266
      [SCHED_NAME],
267
      [TRIGGER_NAME],
268
      [TRIGGER_GROUP]
269
    )  ON [PRIMARY]
270
GO
271
272
ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] ADD
273
  CONSTRAINT [FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS] FOREIGN KEY
274
    (
275
      [SCHED_NAME],
276
      [TRIGGER_NAME],
277
      [TRIGGER_GROUP]
278
    ) REFERENCES [dbo].[QRTZ_TRIGGERS] (
279
    [SCHED_NAME],
280
    [TRIGGER_NAME],
281
    [TRIGGER_GROUP]
282
  ) ON DELETE CASCADE
283
GO
284
285
ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] ADD
286
  CONSTRAINT [FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS] FOREIGN KEY
287
    (
288
      [SCHED_NAME],
289
      [TRIGGER_NAME],
290
      [TRIGGER_GROUP]
291
    ) REFERENCES [dbo].[QRTZ_TRIGGERS] (
292
    [SCHED_NAME],
293
    [TRIGGER_NAME],
294
    [TRIGGER_GROUP]
295
  ) ON DELETE CASCADE
296
GO
297
298
ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] ADD
299
  CONSTRAINT [FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS] FOREIGN KEY
300
    (
301
      [SCHED_NAME],
302
      [TRIGGER_NAME],
303
      [TRIGGER_GROUP]
304
    ) REFERENCES [dbo].[QRTZ_TRIGGERS] (
305
    [SCHED_NAME],
306
    [TRIGGER_NAME],
307
    [TRIGGER_GROUP]
308
  ) ON DELETE CASCADE
309
GO
310
311
ALTER TABLE [dbo].[QRTZ_TRIGGERS] ADD
312
  CONSTRAINT [FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS] FOREIGN KEY
313
    (
314
      [SCHED_NAME],
315
      [JOB_NAME],
316
      [JOB_GROUP]
317
    ) REFERENCES [dbo].[QRTZ_JOB_DETAILS] (
318
    [SCHED_NAME],
319
    [JOB_NAME],
320
    [JOB_GROUP]
321
  )
322
GO
323

+ 188 - 0
db/oracle.sql

@ -0,0 +1,188 @@
1
-- 只提供了Quartz相关SQL,其他表结构,需要自行转换
2
3
4
5
6
delete from qrtz_fired_triggers;
7
delete from qrtz_simple_triggers;
8
delete from qrtz_simprop_triggers;
9
delete from qrtz_cron_triggers;
10
delete from qrtz_blob_triggers;
11
delete from qrtz_triggers;
12
delete from qrtz_job_details;
13
delete from qrtz_calendars;
14
delete from qrtz_paused_trigger_grps;
15
delete from qrtz_locks;
16
delete from qrtz_scheduler_state;
17
18
drop table qrtz_calendars;
19
drop table qrtz_fired_triggers;
20
drop table qrtz_blob_triggers;
21
drop table qrtz_cron_triggers;
22
drop table qrtz_simple_triggers;
23
drop table qrtz_simprop_triggers;
24
drop table qrtz_triggers;
25
drop table qrtz_job_details;
26
drop table qrtz_paused_trigger_grps;
27
drop table qrtz_locks;
28
drop table qrtz_scheduler_state;
29
30
31
CREATE TABLE qrtz_job_details
32
(
33
  SCHED_NAME VARCHAR2(120) NOT NULL,
34
  JOB_NAME  VARCHAR2(200) NOT NULL,
35
  JOB_GROUP VARCHAR2(200) NOT NULL,
36
  DESCRIPTION VARCHAR2(250) NULL,
37
  JOB_CLASS_NAME   VARCHAR2(250) NOT NULL,
38
  IS_DURABLE VARCHAR2(1) NOT NULL,
39
  IS_NONCONCURRENT VARCHAR2(1) NOT NULL,
40
  IS_UPDATE_DATA VARCHAR2(1) NOT NULL,
41
  REQUESTS_RECOVERY VARCHAR2(1) NOT NULL,
42
  JOB_DATA BLOB NULL,
43
  CONSTRAINT QRTZ_JOB_DETAILS_PK PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
44
);
45
CREATE TABLE qrtz_triggers
46
(
47
  SCHED_NAME VARCHAR2(120) NOT NULL,
48
  TRIGGER_NAME VARCHAR2(200) NOT NULL,
49
  TRIGGER_GROUP VARCHAR2(200) NOT NULL,
50
  JOB_NAME  VARCHAR2(200) NOT NULL,
51
  JOB_GROUP VARCHAR2(200) NOT NULL,
52
  DESCRIPTION VARCHAR2(250) NULL,
53
  NEXT_FIRE_TIME NUMBER(13) NULL,
54
  PREV_FIRE_TIME NUMBER(13) NULL,
55
  PRIORITY NUMBER(13) NULL,
56
  TRIGGER_STATE VARCHAR2(16) NOT NULL,
57
  TRIGGER_TYPE VARCHAR2(8) NOT NULL,
58
  START_TIME NUMBER(13) NOT NULL,
59
  END_TIME NUMBER(13) NULL,
60
  CALENDAR_NAME VARCHAR2(200) NULL,
61
  MISFIRE_INSTR NUMBER(2) NULL,
62
  JOB_DATA BLOB NULL,
63
  CONSTRAINT QRTZ_TRIGGERS_PK PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
64
  CONSTRAINT QRTZ_TRIGGER_TO_JOBS_FK FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
65
  REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP)
66
);
67
CREATE TABLE qrtz_simple_triggers
68
(
69
  SCHED_NAME VARCHAR2(120) NOT NULL,
70
  TRIGGER_NAME VARCHAR2(200) NOT NULL,
71
  TRIGGER_GROUP VARCHAR2(200) NOT NULL,
72
  REPEAT_COUNT NUMBER(7) NOT NULL,
73
  REPEAT_INTERVAL NUMBER(12) NOT NULL,
74
  TIMES_TRIGGERED NUMBER(10) NOT NULL,
75
  CONSTRAINT QRTZ_SIMPLE_TRIG_PK PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
76
  CONSTRAINT QRTZ_SIMPLE_TRIG_TO_TRIG_FK FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
77
  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
78
);
79
CREATE TABLE qrtz_cron_triggers
80
(
81
  SCHED_NAME VARCHAR2(120) NOT NULL,
82
  TRIGGER_NAME VARCHAR2(200) NOT NULL,
83
  TRIGGER_GROUP VARCHAR2(200) NOT NULL,
84
  CRON_EXPRESSION VARCHAR2(120) NOT NULL,
85
  TIME_ZONE_ID VARCHAR2(80),
86
  CONSTRAINT QRTZ_CRON_TRIG_PK PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
87
  CONSTRAINT QRTZ_CRON_TRIG_TO_TRIG_FK FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
88
  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
89
);
90
CREATE TABLE qrtz_simprop_triggers
91
(
92
  SCHED_NAME VARCHAR2(120) NOT NULL,
93
  TRIGGER_NAME VARCHAR2(200) NOT NULL,
94
  TRIGGER_GROUP VARCHAR2(200) NOT NULL,
95
  STR_PROP_1 VARCHAR2(512) NULL,
96
  STR_PROP_2 VARCHAR2(512) NULL,
97
  STR_PROP_3 VARCHAR2(512) NULL,
98
  INT_PROP_1 NUMBER(10) NULL,
99
  INT_PROP_2 NUMBER(10) NULL,
100
  LONG_PROP_1 NUMBER(13) NULL,
101
  LONG_PROP_2 NUMBER(13) NULL,
102
  DEC_PROP_1 NUMERIC(13,4) NULL,
103
  DEC_PROP_2 NUMERIC(13,4) NULL,
104
  BOOL_PROP_1 VARCHAR2(1) NULL,
105
  BOOL_PROP_2 VARCHAR2(1) NULL,
106
  CONSTRAINT QRTZ_SIMPROP_TRIG_PK PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
107
  CONSTRAINT QRTZ_SIMPROP_TRIG_TO_TRIG_FK FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
108
  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
109
);
110
CREATE TABLE qrtz_blob_triggers
111
(
112
  SCHED_NAME VARCHAR2(120) NOT NULL,
113
  TRIGGER_NAME VARCHAR2(200) NOT NULL,
114
  TRIGGER_GROUP VARCHAR2(200) NOT NULL,
115
  BLOB_DATA BLOB NULL,
116
  CONSTRAINT QRTZ_BLOB_TRIG_PK PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
117
  CONSTRAINT QRTZ_BLOB_TRIG_TO_TRIG_FK FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
118
  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
119
);
120
CREATE TABLE qrtz_calendars
121
(
122
  SCHED_NAME VARCHAR2(120) NOT NULL,
123
  CALENDAR_NAME  VARCHAR2(200) NOT NULL,
124
  CALENDAR BLOB NOT NULL,
125
  CONSTRAINT QRTZ_CALENDARS_PK PRIMARY KEY (SCHED_NAME,CALENDAR_NAME)
126
);
127
CREATE TABLE qrtz_paused_trigger_grps
128
(
129
  SCHED_NAME VARCHAR2(120) NOT NULL,
130
  TRIGGER_GROUP  VARCHAR2(200) NOT NULL,
131
  CONSTRAINT QRTZ_PAUSED_TRIG_GRPS_PK PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP)
132
);
133
CREATE TABLE qrtz_fired_triggers
134
(
135
  SCHED_NAME VARCHAR2(120) NOT NULL,
136
  ENTRY_ID VARCHAR2(95) NOT NULL,
137
  TRIGGER_NAME VARCHAR2(200) NOT NULL,
138
  TRIGGER_GROUP VARCHAR2(200) NOT NULL,
139
  INSTANCE_NAME VARCHAR2(200) NOT NULL,
140
  FIRED_TIME NUMBER(13) NOT NULL,
141
  SCHED_TIME NUMBER(13) NOT NULL,
142
  PRIORITY NUMBER(13) NOT NULL,
143
  STATE VARCHAR2(16) NOT NULL,
144
  JOB_NAME VARCHAR2(200) NULL,
145
  JOB_GROUP VARCHAR2(200) NULL,
146
  IS_NONCONCURRENT VARCHAR2(1) NULL,
147
  REQUESTS_RECOVERY VARCHAR2(1) NULL,
148
  CONSTRAINT QRTZ_FIRED_TRIGGER_PK PRIMARY KEY (SCHED_NAME,ENTRY_ID)
149
);
150
CREATE TABLE qrtz_scheduler_state
151
(
152
  SCHED_NAME VARCHAR2(120) NOT NULL,
153
  INSTANCE_NAME VARCHAR2(200) NOT NULL,
154
  LAST_CHECKIN_TIME NUMBER(13) NOT NULL,
155
  CHECKIN_INTERVAL NUMBER(13) NOT NULL,
156
  CONSTRAINT QRTZ_SCHEDULER_STATE_PK PRIMARY KEY (SCHED_NAME,INSTANCE_NAME)
157
);
158
CREATE TABLE qrtz_locks
159
(
160
  SCHED_NAME VARCHAR2(120) NOT NULL,
161
  LOCK_NAME  VARCHAR2(40) NOT NULL,
162
  CONSTRAINT QRTZ_LOCKS_PK PRIMARY KEY (SCHED_NAME,LOCK_NAME)
163
);
164
165
create index idx_qrtz_j_req_recovery on qrtz_job_details(SCHED_NAME,REQUESTS_RECOVERY);
166
create index idx_qrtz_j_grp on qrtz_job_details(SCHED_NAME,JOB_GROUP);
167
168
create index idx_qrtz_t_j on qrtz_triggers(SCHED_NAME,JOB_NAME,JOB_GROUP);
169
create index idx_qrtz_t_jg on qrtz_triggers(SCHED_NAME,JOB_GROUP);
170
create index idx_qrtz_t_c on qrtz_triggers(SCHED_NAME,CALENDAR_NAME);
171
create index idx_qrtz_t_g on qrtz_triggers(SCHED_NAME,TRIGGER_GROUP);
172
create index idx_qrtz_t_state on qrtz_triggers(SCHED_NAME,TRIGGER_STATE);
173
create index idx_qrtz_t_n_state on qrtz_triggers(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_STATE);
174
create index idx_qrtz_t_n_g_state on qrtz_triggers(SCHED_NAME,TRIGGER_GROUP,TRIGGER_STATE);
175
create index idx_qrtz_t_next_fire_time on qrtz_triggers(SCHED_NAME,NEXT_FIRE_TIME);
176
create index idx_qrtz_t_nft_st on qrtz_triggers(SCHED_NAME,TRIGGER_STATE,NEXT_FIRE_TIME);
177
create index idx_qrtz_t_nft_misfire on qrtz_triggers(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME);
178
create index idx_qrtz_t_nft_st_misfire on qrtz_triggers(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_STATE);
179
create index idx_qrtz_t_nft_st_misfire_grp on qrtz_triggers(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_GROUP,TRIGGER_STATE);
180
181
create index idx_qrtz_ft_trig_inst_name on qrtz_fired_triggers(SCHED_NAME,INSTANCE_NAME);
182
create index idx_qrtz_ft_inst_job_req_rcvry on qrtz_fired_triggers(SCHED_NAME,INSTANCE_NAME,REQUESTS_RECOVERY);
183
create index idx_qrtz_ft_j_g on qrtz_fired_triggers(SCHED_NAME,JOB_NAME,JOB_GROUP);
184
create index idx_qrtz_ft_jg on qrtz_fired_triggers(SCHED_NAME,JOB_GROUP);
185
create index idx_qrtz_ft_t_g on qrtz_fired_triggers(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
186
create index idx_qrtz_ft_tg on qrtz_fired_triggers(SCHED_NAME,TRIGGER_GROUP);
187
188

+ 186 - 0
db/postgresql.sql

@ -0,0 +1,186 @@
1
-- 只提供了Quartz相关SQL,其他表结构,需要自行转换
2
3
4
5
drop table qrtz_fired_triggers;
6
DROP TABLE QRTZ_PAUSED_TRIGGER_GRPS;
7
DROP TABLE QRTZ_SCHEDULER_STATE;
8
DROP TABLE QRTZ_LOCKS;
9
drop table qrtz_simple_triggers;
10
drop table qrtz_cron_triggers;
11
drop table qrtz_simprop_triggers;
12
DROP TABLE QRTZ_BLOB_TRIGGERS;
13
drop table qrtz_triggers;
14
drop table qrtz_job_details;
15
drop table qrtz_calendars;
16
17
CREATE TABLE qrtz_job_details
18
(
19
  SCHED_NAME VARCHAR(120) NOT NULL,
20
  JOB_NAME  VARCHAR(200) NOT NULL,
21
  JOB_GROUP VARCHAR(200) NOT NULL,
22
  DESCRIPTION VARCHAR(250) NULL,
23
  JOB_CLASS_NAME   VARCHAR(250) NOT NULL,
24
  IS_DURABLE BOOL NOT NULL,
25
  IS_NONCONCURRENT BOOL NOT NULL,
26
  IS_UPDATE_DATA BOOL NOT NULL,
27
  REQUESTS_RECOVERY BOOL NOT NULL,
28
  JOB_DATA BYTEA NULL,
29
  PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
30
);
31
32
CREATE TABLE qrtz_triggers
33
(
34
  SCHED_NAME VARCHAR(120) NOT NULL,
35
  TRIGGER_NAME VARCHAR(200) NOT NULL,
36
  TRIGGER_GROUP VARCHAR(200) NOT NULL,
37
  JOB_NAME  VARCHAR(200) NOT NULL,
38
  JOB_GROUP VARCHAR(200) NOT NULL,
39
  DESCRIPTION VARCHAR(250) NULL,
40
  NEXT_FIRE_TIME BIGINT NULL,
41
  PREV_FIRE_TIME BIGINT NULL,
42
  PRIORITY INTEGER NULL,
43
  TRIGGER_STATE VARCHAR(16) NOT NULL,
44
  TRIGGER_TYPE VARCHAR(8) NOT NULL,
45
  START_TIME BIGINT NOT NULL,
46
  END_TIME BIGINT NULL,
47
  CALENDAR_NAME VARCHAR(200) NULL,
48
  MISFIRE_INSTR SMALLINT NULL,
49
  JOB_DATA BYTEA NULL,
50
  PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
51
  FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
52
  REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP)
53
);
54
55
CREATE TABLE qrtz_simple_triggers
56
(
57
  SCHED_NAME VARCHAR(120) NOT NULL,
58
  TRIGGER_NAME VARCHAR(200) NOT NULL,
59
  TRIGGER_GROUP VARCHAR(200) NOT NULL,
60
  REPEAT_COUNT BIGINT NOT NULL,
61
  REPEAT_INTERVAL BIGINT NOT NULL,
62
  TIMES_TRIGGERED BIGINT NOT NULL,
63
  PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
64
  FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
65
  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
66
);
67
68
CREATE TABLE qrtz_cron_triggers
69
(
70
  SCHED_NAME VARCHAR(120) NOT NULL,
71
  TRIGGER_NAME VARCHAR(200) NOT NULL,
72
  TRIGGER_GROUP VARCHAR(200) NOT NULL,
73
  CRON_EXPRESSION VARCHAR(120) NOT NULL,
74
  TIME_ZONE_ID VARCHAR(80),
75
  PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
76
  FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
77
  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
78
);
79
80
CREATE TABLE qrtz_simprop_triggers
81
(
82
  SCHED_NAME VARCHAR(120) NOT NULL,
83
  TRIGGER_NAME VARCHAR(200) NOT NULL,
84
  TRIGGER_GROUP VARCHAR(200) NOT NULL,
85
  STR_PROP_1 VARCHAR(512) NULL,
86
  STR_PROP_2 VARCHAR(512) NULL,
87
  STR_PROP_3 VARCHAR(512) NULL,
88
  INT_PROP_1 INT NULL,
89
  INT_PROP_2 INT NULL,
90
  LONG_PROP_1 BIGINT NULL,
91
  LONG_PROP_2 BIGINT NULL,
92
  DEC_PROP_1 NUMERIC(13,4) NULL,
93
  DEC_PROP_2 NUMERIC(13,4) NULL,
94
  BOOL_PROP_1 BOOL NULL,
95
  BOOL_PROP_2 BOOL NULL,
96
  PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
97
  FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
98
  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
99
);
100
101
CREATE TABLE qrtz_blob_triggers
102
(
103
  SCHED_NAME VARCHAR(120) NOT NULL,
104
  TRIGGER_NAME VARCHAR(200) NOT NULL,
105
  TRIGGER_GROUP VARCHAR(200) NOT NULL,
106
  BLOB_DATA BYTEA NULL,
107
  PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
108
  FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
109
  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
110
);
111
112
CREATE TABLE qrtz_calendars
113
(
114
  SCHED_NAME VARCHAR(120) NOT NULL,
115
  CALENDAR_NAME  VARCHAR(200) NOT NULL,
116
  CALENDAR BYTEA NOT NULL,
117
  PRIMARY KEY (SCHED_NAME,CALENDAR_NAME)
118
);
119
120
121
CREATE TABLE qrtz_paused_trigger_grps
122
(
123
  SCHED_NAME VARCHAR(120) NOT NULL,
124
  TRIGGER_GROUP  VARCHAR(200) NOT NULL,
125
  PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP)
126
);
127
128
CREATE TABLE qrtz_fired_triggers
129
(
130
  SCHED_NAME VARCHAR(120) NOT NULL,
131
  ENTRY_ID VARCHAR(95) NOT NULL,
132
  TRIGGER_NAME VARCHAR(200) NOT NULL,
133
  TRIGGER_GROUP VARCHAR(200) NOT NULL,
134
  INSTANCE_NAME VARCHAR(200) NOT NULL,
135
  FIRED_TIME BIGINT NOT NULL,
136
  SCHED_TIME BIGINT NOT NULL,
137
  PRIORITY INTEGER NOT NULL,
138
  STATE VARCHAR(16) NOT NULL,
139
  JOB_NAME VARCHAR(200) NULL,
140
  JOB_GROUP VARCHAR(200) NULL,
141
  IS_NONCONCURRENT BOOL NULL,
142
  REQUESTS_RECOVERY BOOL NULL,
143
  PRIMARY KEY (SCHED_NAME,ENTRY_ID)
144
);
145
146
CREATE TABLE qrtz_scheduler_state
147
(
148
  SCHED_NAME VARCHAR(120) NOT NULL,
149
  INSTANCE_NAME VARCHAR(200) NOT NULL,
150
  LAST_CHECKIN_TIME BIGINT NOT NULL,
151
  CHECKIN_INTERVAL BIGINT NOT NULL,
152
  PRIMARY KEY (SCHED_NAME,INSTANCE_NAME)
153
);
154
155
CREATE TABLE qrtz_locks
156
(
157
  SCHED_NAME VARCHAR(120) NOT NULL,
158
  LOCK_NAME  VARCHAR(40) NOT NULL,
159
  PRIMARY KEY (SCHED_NAME,LOCK_NAME)
160
);
161
162
create index idx_qrtz_j_req_recovery on qrtz_job_details(SCHED_NAME,REQUESTS_RECOVERY);
163
create index idx_qrtz_j_grp on qrtz_job_details(SCHED_NAME,JOB_GROUP);
164
165
create index idx_qrtz_t_j on qrtz_triggers(SCHED_NAME,JOB_NAME,JOB_GROUP);
166
create index idx_qrtz_t_jg on qrtz_triggers(SCHED_NAME,JOB_GROUP);
167
create index idx_qrtz_t_c on qrtz_triggers(SCHED_NAME,CALENDAR_NAME);
168
create index idx_qrtz_t_g on qrtz_triggers(SCHED_NAME,TRIGGER_GROUP);
169
create index idx_qrtz_t_state on qrtz_triggers(SCHED_NAME,TRIGGER_STATE);
170
create index idx_qrtz_t_n_state on qrtz_triggers(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_STATE);
171
create index idx_qrtz_t_n_g_state on qrtz_triggers(SCHED_NAME,TRIGGER_GROUP,TRIGGER_STATE);
172
create index idx_qrtz_t_next_fire_time on qrtz_triggers(SCHED_NAME,NEXT_FIRE_TIME);
173
create index idx_qrtz_t_nft_st on qrtz_triggers(SCHED_NAME,TRIGGER_STATE,NEXT_FIRE_TIME);
174
create index idx_qrtz_t_nft_misfire on qrtz_triggers(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME);
175
create index idx_qrtz_t_nft_st_misfire on qrtz_triggers(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_STATE);
176
create index idx_qrtz_t_nft_st_misfire_grp on qrtz_triggers(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_GROUP,TRIGGER_STATE);
177
178
create index idx_qrtz_ft_trig_inst_name on qrtz_fired_triggers(SCHED_NAME,INSTANCE_NAME);
179
create index idx_qrtz_ft_inst_job_req_rcvry on qrtz_fired_triggers(SCHED_NAME,INSTANCE_NAME,REQUESTS_RECOVERY);
180
create index idx_qrtz_ft_j_g on qrtz_fired_triggers(SCHED_NAME,JOB_NAME,JOB_GROUP);
181
create index idx_qrtz_ft_jg on qrtz_fired_triggers(SCHED_NAME,JOB_GROUP);
182
create index idx_qrtz_ft_t_g on qrtz_fired_triggers(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
183
create index idx_qrtz_ft_tg on qrtz_fired_triggers(SCHED_NAME,TRIGGER_GROUP);
184
185
186
commit;

+ 2 - 2
pom.xml

@ -39,7 +39,7 @@
39 39
40 40
		<!--wagon plugin 配置-->
41 41
		<service-path>/work/renren</service-path>
42
		<pack-name>${artifactId}-${version}.jar</pack-name>
42
		<pack-name>${project.artifactId}-${project.version}.jar</pack-name>
43 43
		<remote-addr>192.168.1.10:22</remote-addr>
44 44
		<remote-username>root</remote-username>
45 45
		<remote-passwd>123456</remote-passwd>
@ -192,7 +192,7 @@
192 192
	</dependencies>
193 193
194 194
	<build>
195
		<finalName>${artifactId}</finalName>
195
		<finalName>${project.artifactId}</finalName>
196 196
		<extensions>
197 197
			<extension>
198 198
				<groupId>org.apache.maven.wagon</groupId>

+ 11 - 0
src/main/java/io/renren/common/utils/HttpContextUtils.java

@ -10,4 +10,15 @@ public class HttpContextUtils {
10 10
	public static HttpServletRequest getHttpServletRequest() {
11 11
		return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
12 12
	}
13
14
	public static String getDomain(){
15
		HttpServletRequest request = getHttpServletRequest();
16
		StringBuffer url = request.getRequestURL();
17
		return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString();
18
	}
19
20
	public static String getOrigin(){
21
		HttpServletRequest request = getHttpServletRequest();
22
		return request.getHeader("Origin");
23
	}
13 24
}

+ 1 - 1
src/main/java/io/renren/modules/app/controller/ApiLoginController.java

@ -27,7 +27,7 @@ import java.util.Map;
27 27
@RestController
28 28
@RequestMapping("/app")
29 29
@Api("APP登录接口")
30
public class ApiLoginController {
30
public class AppLoginController {
31 31
    @Autowired
32 32
    private UserService userService;
33 33
    @Autowired

+ 1 - 1
src/main/java/io/renren/modules/app/controller/ApiRegisterController.java

@ -26,7 +26,7 @@ import java.util.Date;
26 26
@RestController
27 27
@RequestMapping("/app")
28 28
@Api("APP注册接口")
29
public class ApiRegisterController {
29
public class AppRegisterController {
30 30
    @Autowired
31 31
    private UserService userService;
32 32

+ 1 - 1
src/main/java/io/renren/modules/app/controller/ApiTestController.java

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
22 22
@RestController
23 23
@RequestMapping("/app")
24 24
@Api("APP测试接口")
25
public class ApiTestController {
25
public class AppTestController {
26 26
27 27
    @Login
28 28
    @GetMapping("userInfo")

+ 2 - 2
src/main/java/io/renren/modules/sys/controller/SysMenuController.java

@ -137,9 +137,9 @@ public class SysMenuController extends AbstractController {
137 137
	 * 删除
138 138
	 */
139 139
	@SysLog("删除菜单")
140
	@PostMapping("/delete")
140
	@PostMapping("/delete/{menuId}")
141 141
	@RequiresPermissions("sys:menu:delete")
142
	public R delete(long menuId){
142
	public R delete(@PathVariable("menuId") long menuId){
143 143
		if(menuId <= 31){
144 144
			return R.error("系统菜单,不能删除");
145 145
		}

+ 2 - 1
src/main/java/io/renren/modules/sys/entity/SysUserTokenEntity.java

@ -2,6 +2,7 @@ package io.renren.modules.sys.entity;
2 2
3 3
import com.baomidou.mybatisplus.annotations.TableId;
4 4
import com.baomidou.mybatisplus.annotations.TableName;
5
import com.baomidou.mybatisplus.enums.IdType;
5 6
6 7
import java.io.Serializable;
7 8
import java.util.Date;
@ -15,7 +16,7 @@ public class SysUserTokenEntity implements Serializable {
15 16
	private static final long serialVersionUID = 1L;
16 17
	
17 18
	//用户ID
18
	@TableId
19
	@TableId(type = IdType.INPUT)
19 20
	private Long userId;
20 21
	//token
21 22
	private String token;

+ 7 - 0
src/main/java/io/renren/modules/sys/oauth2/OAuth2Filter.java

@ -1,6 +1,7 @@
1 1
package io.renren.modules.sys.oauth2;
2 2
3 3
import com.google.gson.Gson;
4
import io.renren.common.utils.HttpContextUtils;
4 5
import io.renren.common.utils.R;
5 6
import org.apache.commons.lang.StringUtils;
6 7
import org.apache.http.HttpStatus;
@ -51,7 +52,11 @@ public class OAuth2Filter extends AuthenticatingFilter {
51 52
        String token = getRequestToken((HttpServletRequest) request);
52 53
        if(StringUtils.isBlank(token)){
53 54
            HttpServletResponse httpResponse = (HttpServletResponse) response;
55
            httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
56
            httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
57
54 58
            String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "invalid token"));
59
55 60
            httpResponse.getWriter().print(json);
56 61
57 62
            return false;
@ -64,6 +69,8 @@ public class OAuth2Filter extends AuthenticatingFilter {
64 69
    protected boolean onLoginFailure(AuthenticationToken token, AuthenticationException e, ServletRequest request, ServletResponse response) {
65 70
        HttpServletResponse httpResponse = (HttpServletResponse) response;
66 71
        httpResponse.setContentType("application/json;charset=utf-8");
72
        httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
73
        httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
67 74
        try {
68 75
            //处理登录失败的异常
69 76
            Throwable throwable = e.getCause() == null ? e : e.getCause();

+ 0 - 1
src/main/resources/application-dev.yml

@ -7,7 +7,6 @@ spring:
7 7
                url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
8 8
                username: renren
9 9
                password: 123456
10
                #password: Mark@69013275
11 10
            second:  #数据源2
12 11
                url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
13 12
                username: renren

+ 4 - 0
src/main/resources/mapper/sys/SysUserRoleDao.xml

@ -9,4 +9,8 @@
9 9
			#{roleId}
10 10
		</foreach>
11 11
	</delete>
12
13
	<select id="queryRoleIdList" resultType="long">
14
		select role_id from sys_user_role where user_id = #{value}
15
	</select>
12 16
</mapper>