Merge pull request #242 from dangdangdotcom/v0.7.0-dev

fix pr#240 issues
orlabs · Apr 1, 2019 · 36b9702 · 36b9702
2 parents 96320d9 + d09434b
commit 36b9702
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+### v0.7.0 2019
+
+- 支持通过cookie、随机数、HTTP method进行拦截过滤
+- 新增取余的方式进行匹配规则
+- 新增kafka、balancer、consul_balancer、persist log、node插件
+- 修复一些已知bug：后台页面展示异常
+- 对后台页面、balancer等模块的代码和文档说明的重构
+- 修复了issue#160，解决balancer开关未打开时出现invalid URL prefix in "" 的错误
+- 修复了issue#162，解决选择器类型为1时continue=false的错误
+- 修复了issue#233，解决proxy read timeout配置无效的问题
+- 修复了issue#236，解决忽略大小写进行匹配鉴权值的问题
+- 修改Makefile
+    - 使用指定版的依赖
+
+
 ### v0.6.4 2017.05.16
 
 - 修复issue#110, 解决在添加/删除规则后本地js cache未更新，之后立刻更改选择器配置造成的规则丢失bug

diff --git a/Makefile b/Makefile
@@ -10,14 +10,14 @@ init-config:
 
 deps:init-config
 	mkdir -p resty
-	wget https://github.com/pintsized/lua-resty-http/archive/master.zip
-	unzip master.zip
-	yes|cp -fr   lua-resty-http-master/lib/resty/*  resty/
-	rm -fr  master.zip  lua-resty-http-master
-	wget https://github.com/doujiang24/lua-resty-kafka/archive/master.zip
-	unzip master.zip
-	yes|cp -fr lua-resty-kafka-master/lib/resty/* resty
-	rm -fr  master.zip lua-resty-kafka-master
+	wget https://github.com/ledgetech/lua-resty-http/archive/v0.13.zip
+	unzip lua-resty-http-0.13.zip
+	yes|cp -fr   lua-resty-http-0.13/lib/resty/*  resty/
+	rm -fr  lua-resty-http-0.13.zip  lua-resty-http-0.13.zip
+	wget https://github.com/doujiang24/lua-resty-kafka/archive/v0.06.zip
+	unzip lua-resty-kafka-0.06.zip
+	yes|cp -fr lua-resty-kafka-0.06/lib/resty/* resty
+	rm -fr  lua-resty-kafka-0.06.zip lua-resty-kafka-0.06
 
 test:
 	@echo "to be continued..."

diff --git a/README.md b/README.md
@@ -84,7 +84,6 @@ Find more about Orange on its [website](http://orange.sumory.com/docs). There is
 - [@itchenyi](https://github.com/itchenyi)
 - [@Near-Zhang](https://github.com/Near-Zhang)
 - [@khlipeng](https://github.com/khlipeng)
-- [@sumory](https://github.com/sumory)
 - [@wujunze](https://github.com/wujunze)
 
 ### See also

diff --git a/README_zh.md b/README_zh.md
@@ -24,10 +24,10 @@ Orange是一个基于OpenResty的API网关。除Nginx的基本功能外，它还
 - MySQL
     - 配置存储和集群扩展需要MySQL支持
 - 使用luarocks安装一些第三方库
-    - luarocks install penlight
-    - luarocks install lua-resty-dns-client
-    - luarocks install lua-resty-http
-    - luarocks install luasocket
+    - luarocks install https://luarocks.org/manifests/steved/penlight-1.5.4-1.rockspec
+    - luarocks install https://luarocks.org/manifests/kong/lua-resty-dns-client-2.2.0-1.rockspec
+    - luarocks install https://luarocks.org/lua-resty-http-0.13-0.src.rock
+    - luarocks install https://luarocks.org/manifests/luarocks/luasocket-3.0rc1-2.rockspec
 
 #### 数据表导入MySQL
 
@@ -153,7 +153,6 @@ Orange启动成功后， dashboard和API server也随之启动：
 - [@itchenyi](https://github.com/itchenyi)
 - [@Near-Zhang](https://github.com/Near-Zhang)
 - [@khlipeng](https://github.com/khlipeng)
-- [@sumory](https://github.com/sumory)
 - [@wujunze](https://github.com/wujunze)
 
 

diff --git a/conf/orange.conf.example b/conf/orange.conf.example
@@ -43,21 +43,6 @@
             "^/error/$"
         ]
     },
-    "plugin_config":{
-        "kafka":{
-            "broker_list":[
-                {
-                    "host":"127.0.0.1",
-                    "port":9092
-                }
-            ],
-            "producer_config":{
-                "producer_type":"async"
-            },
-
-            "topic":"test"
-        }
-    },
     "api": {
         "auth_enable": true,
         "credentials": [

diff --git a/install/orange-v0.7.0.sql b/install/orange-v0.7.0.sql
@@ -325,7 +325,7 @@ DROP TABLE IF EXISTS `balancer`;
 CREATE TABLE `balancer` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `key` varchar(255) NOT NULL DEFAULT '',
-  `value` varchar(2000) NOT NULL DEFAULT '',
+  `value` varchar(10240) NOT NULL DEFAULT '',
   `type` varchar(11) DEFAULT '0',
   `op_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),

diff --git a/orange/plugins/kafka/README.md b/orange/plugins/kafka/README.md
@@ -0,0 +1,22 @@
+### KAFKA插件
+
+- 需加入如下配置到conf/orange.conf里，与配置中的plugins平级即可：
+
+
+    "plugin_config":{
+        "kafka":{
+            "broker_list":[
+                {
+                    "host":"127.0.0.1",
+                    "port":9092
+                }
+            ],
+            "producer_config":{
+                "producer_type":"async"
+            },
+
+            "topic":"test"
+        }
+    },
+
+