Skip to content

Commit

Permalink
bump version to v0.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
sumory committed Mar 10, 2017
1 parent 7d35ecb commit 37e6de6
Show file tree
Hide file tree
Showing 7 changed files with 350 additions and 45 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### v0.6.3 2017.03.10

- 添加插件: `signature auth plugin`
- 将默认的配置文件做成模板,即`ngingx.conf.example``orange.conf.example`

### v0.6.2 2017.02.18

- 兼容Orange与最新版本的[lor]https://github.com/sumory/lor), 即lor v0.3.0
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 sumory.wu
Copyright (c) 2016 - 2017 sumory.wu

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
22 changes: 10 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ A Gateway based on OpenResty(Nginx+lua) for API Monitoring and Management.
- Orange v0.6.1 and versions before v0.6.1 are compatible with lor v0.2.*
- Orange v0.6.2+ is compatible with lor v0.3.0+

Import the SQL file(e.g. install/orange-v0.6.2.sql) which is adapted to your Orange version into MySQL database named `orange`.
Import the SQL file(e.g. install/orange-v0.6.3.sql) which is adapted to your Orange version into MySQL database named `orange`.

#### Install

**1) version < 0.5.0**
1) script management

If you use Orange under v0.5.0, there is no need to `install`.
use shell scripts (e.g. `start.sh`) to manage Orange.

**2) version >= 0.5.0**
2) CLI tool

In addition to `start.sh` script, a new cli tool could be utilized to manage Orange. You should install the cli first:

Expand All @@ -38,17 +38,15 @@ make install

then, the Orange runtime lua module is installed in `/usr/local/orange` and an executable command named `/usr/local/bin/orange` is generated.


#### Usages

Before starting Orange, you should ensure that the `orange.conf` and `nginx.conf` are redefined to satisfy the demands of your project.


**1) version < 0.5.0**
1) script management

Just `sh start.sh` to start Orange. You could rewrite some other shell scripts as you need.

**2) version >= 0.5.0**
2) CLI tool

`orange help` to check usages:

Expand Down Expand Up @@ -79,10 +77,10 @@ Find more about Orange on its [website](http://orange.sumory.com/docs). There is

### Contributors

- 雨帆([@syhily](https://github.com/syhily))
- lhmwzy([@lhmwzy](https://github.com/lhmwzy))
- 罗泽轩([@spacewander](https://github.com/spacewander))
- joke([@noname007](https://github.com/noname007))
- [@syhily](https://github.com/syhily)
- [@lhmwzy](https://github.com/lhmwzy)
- [@spacewander](https://github.com/spacewander)
- [@noname007](https://github.com/noname007)

### See also

Expand Down
11 changes: 6 additions & 5 deletions README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Orange是一个基于OpenResty的API网关。除Nginx的基本功能外,它还
#### 数据表导入MySQL

- 在MySQL中创建数据库,名为orange
- 将与当前代码版本配套的SQL脚本(如install/orange-v0.6.2.sql)导入到orange库中
- 将与当前代码版本配套的SQL脚本(如install/orange-v0.6.3.sql)导入到orange库中

#### 修改配置文件

Expand All @@ -47,6 +47,7 @@ orange.conf的配置如下,请按需修改:
"property_rate_limiting",
"basic_auth",
"key_auth",
"signature_auth",
"waf",
"divide",
"kvstore"
Expand Down Expand Up @@ -149,10 +150,10 @@ Orange启动成功后, dashboard和API server也随之启动:

### 贡献者

- 雨帆([@syhily](https://github.com/syhily))
- lhmwzy([@lhmwzy](https://github.com/lhmwzy))
- 罗泽轩([@spacewander](https://github.com/spacewander))
- joke([@noname007](https://github.com/noname007))
- [@syhily](https://github.com/syhily)
- [@lhmwzy](https://github.com/lhmwzy)
- [@spacewander](https://github.com/spacewander)
- [@noname007](https://github.com/noname007)

### See also

Expand Down
25 changes: 0 additions & 25 deletions install/orange-v0.6.2.sql
Original file line number Diff line number Diff line change
Expand Up @@ -214,31 +214,6 @@ VALUES
/*!40000 ALTER TABLE `property_rate_limiting` ENABLE KEYS */;
UNLOCK TABLES;

# Dump of table signature_auth
# ------------------------------------------------------------

DROP TABLE IF EXISTS `signature_auth`;

CREATE TABLE `signature_auth` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`key` varchar(255) NOT NULL DEFAULT '',
`value` varchar(2000) NOT NULL DEFAULT '',
`type` varchar(11) DEFAULT '0',
`op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `unique_key` (`key`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

LOCK TABLES `signature_auth` WRITE;
/*!40000 ALTER TABLE `signature_auth` DISABLE KEYS */;

INSERT INTO `signature_auth` (`id`, `key`, `value`, `type`, `op_time`)
VALUES
(1,'1','{}','meta','2016-11-11 11:11:11');

/*!40000 ALTER TABLE `signature_auth` ENABLE KEYS */;
UNLOCK TABLES;

# Dump of table redirect
# ------------------------------------------------------------

Expand Down
Loading

0 comments on commit 37e6de6

Please sign in to comment.