From 0a9a65ba1dea198e2efea30d92340027ae2c0671 Mon Sep 17 00:00:00 2001
From: 505575853 <31321865+505575853@users.noreply.github.com>
Date: Sat, 6 Oct 2018 02:17:41 +0800
Subject: [PATCH] =?UTF-8?q?frp=E5=8F=96=E6=B6=88=20privilege=5Ftoken=20?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=20token=20(#591)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update frp.lua

* Update frp

* Update frp

* Update Makefile
---
 package/lean/luci-app-frpc/Makefile                     | 2 +-
 package/lean/luci-app-frpc/luasrc/model/cbi/frp/frp.lua | 2 +-
 package/lean/luci-app-frpc/root/etc/config/frp          | 2 +-
 package/lean/luci-app-frpc/root/etc/init.d/frp          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/lean/luci-app-frpc/Makefile b/package/lean/luci-app-frpc/Makefile
index fe9d38da02..9d6ce74843 100644
--- a/package/lean/luci-app-frpc/Makefile
+++ b/package/lean/luci-app-frpc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=LuCI for FRPC
 LUCI_DEPENDS:=+wget +frpc
 LUCI_PKGARCH:=all
-PKG_VERSION:=1.0
+PKG_VERSION:=1.1
 PKG_RELEASE:=1
 
 include $(TOPDIR)/feeds/luci/luci.mk
diff --git a/package/lean/luci-app-frpc/luasrc/model/cbi/frp/frp.lua b/package/lean/luci-app-frpc/luasrc/model/cbi/frp/frp.lua
index 3039793922..531dd84f6c 100644
--- a/package/lean/luci-app-frpc/luasrc/model/cbi/frp/frp.lua
+++ b/package/lean/luci-app-frpc/luasrc/model/cbi/frp/frp.lua
@@ -22,7 +22,7 @@ e=t:taboption("base",Value, "server_port", translate("Port"))
 e.datatype = "port"
 e.optional=false
 e.rmempty=false
-e=t:taboption("base",Value, "privilege_token", translate("Privilege Token"), translate("Time duration between server of frpc and frps mustn't exceed 15 minutes."))
+e=t:taboption("base",Value, "token", translate("Token"), translate("Time duration between server of frpc and frps mustn't exceed 15 minutes."))
 e.optional=false
 e.password=true
 e.rmempty=false
diff --git a/package/lean/luci-app-frpc/root/etc/config/frp b/package/lean/luci-app-frpc/root/etc/config/frp
index 2015955e8d..736e571f92 100644
--- a/package/lean/luci-app-frpc/root/etc/config/frp
+++ b/package/lean/luci-app-frpc/root/etc/config/frp
@@ -10,7 +10,7 @@ config frp 'common'
 	option vhost_https_port '443'	
 	option server_addr 'yourdomain.com'
 	option server_port '7000'
-	option privilege_token '1234567'
+	option token '1234567'
 	option log_level 'info'
 	option enable_http_proxy '0'
 	option protocol 'tcp'
diff --git a/package/lean/luci-app-frpc/root/etc/init.d/frp b/package/lean/luci-app-frpc/root/etc/init.d/frp
index 4207e041b1..66f7881dcc 100755
--- a/package/lean/luci-app-frpc/root/etc/init.d/frp
+++ b/package/lean/luci-app-frpc/root/etc/init.d/frp
@@ -159,7 +159,7 @@ start() {
 
 	config_get server_addr common server_addr
 	config_get server_port common server_port
-	config_get privilege_token common privilege_token
+	config_get token common token
 	config_get enable_cpool common enable_cpool
 	config_get pool_count common pool_count
 	config_get log_level common log_level
@@ -179,7 +179,7 @@ start() {
 	echo "[common]" >$tmpconf
 	echo "server_addr=${server_addr}" >>$tmpconf
 	echo "server_port=${server_port}" >>$tmpconf
-	echo "token=${privilege_token}" >>$tmpconf
+	echo "token=${token}" >>$tmpconf
 	echo "log_level=${log_level}" >>$tmpconf
 	echo "log_max_days=${log_max_days}" >>$tmpconf
 	echo "protocol=${protocol}" >>$tmpconf