Skip to content

Commit d36dc77

Browse files
sumorysumory
committed
release v0.6.1
1 parent b00caed commit d36dc77

File tree

6 files changed

+309
-25
lines changed

6 files changed

+309
-25
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
### v0.6.0 beta 2016.11.13
1+
### v0.6.1 2017.02.09
2+
3+
添加property based rate limiting插件，该插件由[@noname007](https://github.com/noname007)贡献
4+
5+
### v0.6.0 2016.11.13
26

37
注意，0.6.*版本与之前的版本并不兼容，主要改动如下：
48

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ A Gateway based on OpenResty(Nginx+lua) for API Monitoring and Management.
1717
- install OpenResty with `--with-http_stub_status_module` option
1818
- [Lor Framework](https://github.com/sumory/lor) v0.2.5+
1919

20-
Import the SQL file(e.g. install/orange-v0.6.0.sql) which is adapted to your Orange version to MySQL database named `orange`.
20+
Import the SQL file(e.g. install/orange-v0.6.1.sql) which is adapted to your Orange version to MySQL database named `orange`.
2121

2222
#### Install
2323

‎README_zh.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Orange是一个基于OpenResty的API网关。除Nginx的基本功能外，它还
2828
#### 数据表导入MySQL
2929

3030
- 在MySQL中创建数据库，名为orange
31-
- 将与当前代码版本配套的SQL脚本(如install/orange-v0.6.0.sql)导入到orange库中
31+
- 将与当前代码版本配套的SQL脚本(如install/orange-v0.6.1.sql)导入到orange库中
3232

3333
#### 修改配置文件
3434

‎install/orange-v0.6.0.sql‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -192,27 +192,6 @@ VALUES
192192
/*!40000 ALTER TABLE `rate_limiting` ENABLE KEYS */;
193193
UNLOCK TABLES;
194194

195-
DROP TABLE IF EXISTS `property_rate_limiting`;
196-
197-
CREATE TABLE `property_rate_limiting` (
198-
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
199-
`key` varchar(255) NOT NULL DEFAULT '',
200-
`value` varchar(2000) NOT NULL DEFAULT '',
201-
`type` varchar(11) DEFAULT '0',
202-
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
203-
PRIMARY KEY (`id`),
204-
UNIQUE KEY `unique_key` (`key`)
205-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
206-
207-
LOCK TABLES `property_rate_limiting` WRITE;
208-
/*!40000 ALTER TABLE `property_rate_limiting` DISABLE KEYS */;
209-
210-
INSERT INTO `property_rate_limiting` (`id`, `key`, `value`, `type`, `op_time`)
211-
VALUES
212-
(1,'1','{}','meta','2016-11-11 11:11:11');
213-
214-
/*!40000 ALTER TABLE `property_rate_limiting` ENABLE KEYS */;
215-
UNLOCK TABLES;
216195

217196
# Dump of table redirect
218197
# ------------------------------------------------------------

‎install/orange-v0.6.1.sql‎

Lines changed: 301 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,301 @@
1+
# ************************************************************
2+
# Sequel Pro SQL dump
3+
# Version 4096
4+
#
5+
# http://www.sequelpro.com/
6+
# http://code.google.com/p/sequel-pro/
7+
#
8+
# Host: 127.0.0.1 (MySQL 5.6.15)
9+
# Database: orange_test
10+
# Generation Time: 2016-11-13 14:48:35 +0000
11+
# ************************************************************
12+
13+
14+
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
15+
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
16+
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
17+
/*!40101 SET NAMES utf8 */;
18+
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
19+
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
20+
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
21+
22+
23+
# Dump of table basic_auth
24+
# ------------------------------------------------------------
25+
26+
DROP TABLE IF EXISTS `basic_auth`;
27+
28+
CREATE TABLE `basic_auth` (
29+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
30+
`key` varchar(255) NOT NULL DEFAULT '',
31+
`value` varchar(2000) NOT NULL DEFAULT '',
32+
`type` varchar(11) DEFAULT '0',
33+
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
34+
PRIMARY KEY (`id`),
35+
UNIQUE KEY `unique_key` (`key`)
36+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
37+
38+
LOCK TABLES `basic_auth` WRITE;
39+
/*!40000 ALTER TABLE `basic_auth` DISABLE KEYS */;
40+
41+
INSERT INTO `basic_auth` (`id`, `key`, `value`, `type`, `op_time`)
42+
VALUES
43+
(1,'1','{}','meta','2016-11-11 11:11:11');
44+
45+
/*!40000 ALTER TABLE `basic_auth` ENABLE KEYS */;
46+
UNLOCK TABLES;
47+
48+
49+
# Dump of table dashboard_user
50+
# ------------------------------------------------------------
51+
52+
DROP TABLE IF EXISTS `dashboard_user`;
53+
54+
CREATE TABLE `dashboard_user` (
55+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
56+
`username` varchar(60) NOT NULL DEFAULT '' COMMENT '用户名',
57+
`password` varchar(255) NOT NULL DEFAULT '' COMMENT '密码',
58+
`is_admin` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否是管理员账户：0否，1是',
59+
`create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建或者更新时间',
60+
`enable` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否启用该用户：0否1是',
61+
PRIMARY KEY (`id`),
62+
UNIQUE KEY `unique_username` (`username`)
63+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='dashboard users';
64+
65+
LOCK TABLES `dashboard_user` WRITE;
66+
/*!40000 ALTER TABLE `dashboard_user` DISABLE KEYS */;
67+
68+
INSERT INTO `dashboard_user` (`id`, `username`, `password`, `is_admin`, `create_time`, `enable`)
69+
VALUES
70+
(1,'admin','1fe832a7246fd19b7ea400a10d23d1894edfa3a5e09ee27e0c4a96eb0136763d',1,'2016-11-11 11:11:11',1);
71+
72+
/*!40000 ALTER TABLE `dashboard_user` ENABLE KEYS */;
73+
UNLOCK TABLES;
74+
75+
76+
# Dump of table divide
77+
# ------------------------------------------------------------
78+
79+
DROP TABLE IF EXISTS `divide`;
80+
81+
CREATE TABLE `divide` (
82+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
83+
`key` varchar(255) NOT NULL DEFAULT '',
84+
`value` varchar(2000) NOT NULL DEFAULT '',
85+
`type` varchar(11) DEFAULT '0',
86+
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
87+
PRIMARY KEY (`id`),
88+
UNIQUE KEY `unique_key` (`key`)
89+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
90+
91+
LOCK TABLES `divide` WRITE;
92+
/*!40000 ALTER TABLE `divide` DISABLE KEYS */;
93+
94+
INSERT INTO `divide` (`id`, `key`, `value`, `type`, `op_time`)
95+
VALUES
96+
(1,'1','{}','meta','2016-11-11 11:11:11');
97+
98+
/*!40000 ALTER TABLE `divide` ENABLE KEYS */;
99+
UNLOCK TABLES;
100+
101+
102+
# Dump of table key_auth
103+
# ------------------------------------------------------------
104+
105+
DROP TABLE IF EXISTS `key_auth`;
106+
107+
CREATE TABLE `key_auth` (
108+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
109+
`key` varchar(255) NOT NULL DEFAULT '',
110+
`value` varchar(2000) NOT NULL DEFAULT '',
111+
`type` varchar(11) DEFAULT '0',
112+
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
113+
PRIMARY KEY (`id`),
114+
UNIQUE KEY `unique_key` (`key`)
115+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
116+
117+
LOCK TABLES `key_auth` WRITE;
118+
/*!40000 ALTER TABLE `key_auth` DISABLE KEYS */;
119+
120+
INSERT INTO `key_auth` (`id`, `key`, `value`, `type`, `op_time`)
121+
VALUES
122+
(1,'1','{}','meta','2016-11-11 11:11:11');
123+
124+
/*!40000 ALTER TABLE `key_auth` ENABLE KEYS */;
125+
UNLOCK TABLES;
126+
127+
128+
# Dump of table meta
129+
# ------------------------------------------------------------
130+
131+
DROP TABLE IF EXISTS `meta`;
132+
133+
CREATE TABLE `meta` (
134+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
135+
`key` varchar(255) NOT NULL DEFAULT '',
136+
`value` varchar(5000) NOT NULL DEFAULT '',
137+
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
138+
PRIMARY KEY (`id`),
139+
UNIQUE KEY `unique_key` (`key`)
140+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
141+
142+
143+
144+
# Dump of table monitor
145+
# ------------------------------------------------------------
146+
147+
DROP TABLE IF EXISTS `monitor`;
148+
149+
CREATE TABLE `monitor` (
150+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
151+
`key` varchar(255) NOT NULL DEFAULT '',
152+
`value` varchar(2000) NOT NULL DEFAULT '',
153+
`type` varchar(11) DEFAULT '0',
154+
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
155+
PRIMARY KEY (`id`),
156+
UNIQUE KEY `unique_key` (`key`)
157+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
158+
159+
LOCK TABLES `monitor` WRITE;
160+
/*!40000 ALTER TABLE `monitor` DISABLE KEYS */;
161+
162+
INSERT INTO `monitor` (`id`, `key`, `value`, `type`, `op_time`)
163+
VALUES
164+
(1,'1','{}','meta','2016-11-11 11:11:11');
165+
166+
/*!40000 ALTER TABLE `monitor` ENABLE KEYS */;
167+
UNLOCK TABLES;
168+
169+
170+
# Dump of table rate_limiting
171+
# ------------------------------------------------------------
172+
173+
DROP TABLE IF EXISTS `rate_limiting`;
174+
175+
CREATE TABLE `rate_limiting` (
176+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
177+
`key` varchar(255) NOT NULL DEFAULT '',
178+
`value` varchar(2000) NOT NULL DEFAULT '',
179+
`type` varchar(11) DEFAULT '0',
180+
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
181+
PRIMARY KEY (`id`),
182+
UNIQUE KEY `unique_key` (`key`)
183+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
184+
185+
LOCK TABLES `rate_limiting` WRITE;
186+
/*!40000 ALTER TABLE `rate_limiting` DISABLE KEYS */;
187+
188+
INSERT INTO `rate_limiting` (`id`, `key`, `value`, `type`, `op_time`)
189+
VALUES
190+
(1,'1','{}','meta','2016-11-11 11:11:11');
191+
192+
/*!40000 ALTER TABLE `rate_limiting` ENABLE KEYS */;
193+
UNLOCK TABLES;
194+
195+
DROP TABLE IF EXISTS `property_rate_limiting`;
196+
197+
CREATE TABLE `property_rate_limiting` (
198+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
199+
`key` varchar(255) NOT NULL DEFAULT '',
200+
`value` varchar(2000) NOT NULL DEFAULT '',
201+
`type` varchar(11) DEFAULT '0',
202+
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
203+
PRIMARY KEY (`id`),
204+
UNIQUE KEY `unique_key` (`key`)
205+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
206+
207+
LOCK TABLES `property_rate_limiting` WRITE;
208+
/*!40000 ALTER TABLE `property_rate_limiting` DISABLE KEYS */;
209+
210+
INSERT INTO `property_rate_limiting` (`id`, `key`, `value`, `type`, `op_time`)
211+
VALUES
212+
(1,'1','{}','meta','2016-11-11 11:11:11');
213+
214+
/*!40000 ALTER TABLE `property_rate_limiting` ENABLE KEYS */;
215+
UNLOCK TABLES;
216+
217+
# Dump of table redirect
218+
# ------------------------------------------------------------
219+
220+
DROP TABLE IF EXISTS `redirect`;
221+
222+
CREATE TABLE `redirect` (
223+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
224+
`key` varchar(255) NOT NULL DEFAULT '',
225+
`value` varchar(2000) NOT NULL DEFAULT '',
226+
`type` varchar(11) DEFAULT '0',
227+
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
228+
PRIMARY KEY (`id`),
229+
UNIQUE KEY `unique_key` (`key`)
230+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
231+
232+
LOCK TABLES `redirect` WRITE;
233+
/*!40000 ALTER TABLE `redirect` DISABLE KEYS */;
234+
235+
INSERT INTO `redirect` (`id`, `key`, `value`, `type`, `op_time`)
236+
VALUES
237+
(1,'1','{}','meta','2016-11-11 11:11:11');
238+
239+
/*!40000 ALTER TABLE `redirect` ENABLE KEYS */;
240+
UNLOCK TABLES;
241+
242+
243+
# Dump of table rewrite
244+
# ------------------------------------------------------------
245+
246+
DROP TABLE IF EXISTS `rewrite`;
247+
248+
CREATE TABLE `rewrite` (
249+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
250+
`key` varchar(255) NOT NULL DEFAULT '',
251+
`value` varchar(2000) NOT NULL DEFAULT '',
252+
`type` varchar(11) DEFAULT '0',
253+
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
254+
PRIMARY KEY (`id`),
255+
UNIQUE KEY `unique_key` (`key`)
256+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
257+
258+
LOCK TABLES `rewrite` WRITE;
259+
/*!40000 ALTER TABLE `rewrite` DISABLE KEYS */;
260+
261+
INSERT INTO `rewrite` (`id`, `key`, `value`, `type`, `op_time`)
262+
VALUES
263+
(1,'1','{}','meta','2016-11-11 11:11:11');
264+
265+
/*!40000 ALTER TABLE `rewrite` ENABLE KEYS */;
266+
UNLOCK TABLES;
267+
268+
269+
# Dump of table waf
270+
# ------------------------------------------------------------
271+
272+
DROP TABLE IF EXISTS `waf`;
273+
274+
CREATE TABLE `waf` (
275+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
276+
`key` varchar(255) NOT NULL DEFAULT '',
277+
`value` varchar(2000) NOT NULL DEFAULT '',
278+
`type` varchar(11) DEFAULT '0',
279+
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
280+
PRIMARY KEY (`id`),
281+
UNIQUE KEY `unique_key` (`key`)
282+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
283+
284+
LOCK TABLES `waf` WRITE;
285+
/*!40000 ALTER TABLE `waf` DISABLE KEYS */;
286+
287+
INSERT INTO `waf` (`id`, `key`, `value`, `type`, `op_time`)
288+
VALUES
289+
(1,'1','{}','meta','2016-11-11 11:11:11');
290+
291+
/*!40000 ALTER TABLE `waf` ENABLE KEYS */;
292+
UNLOCK TABLES;
293+
294+
295+
296+
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
297+
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
298+
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
299+
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
300+
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
301+
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

‎orange/version.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
local version = "0.6.0"
1+
local version = "0.6.1"
22
return version

0 commit comments

Comments
 (0)