From 71b6ca76de5c26b90d3378e915d8c049976c2112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 5 Apr 2017 10:25:41 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E6=9B=B4=E6=96=B0=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E5=9D=97=E5=8F=8A=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Auth.php  |  8 ++++++-
 application/admin/controller/Index.php |  8 +++----
 application/admin/controller/Menu.php  |  4 +++-
 application/extra/wechat.php           |  2 +-
 application/index/controller/Index.php | 30 --------------------------
 5 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php
index 92bfc4856..40a8a7c7a 100644
--- a/application/admin/controller/Auth.php
+++ b/application/admin/controller/Auth.php
@@ -45,7 +45,7 @@ class Auth extends BasicAdmin {
 
     /**
      * 权限授权
-     * @return void
+     * @return string|array
      */
     public function apply() {
         $auth_id = $this->request->get('id', '0');
@@ -77,6 +77,12 @@ class Auth extends BasicAdmin {
         }
     }
 
+    /**
+     * 节点数据拼装
+     * @param array $nodes
+     * @param int $level
+     * @return array
+     */
     protected function _filterNodes($nodes, $level = 1) {
         foreach ($nodes as $key => &$node) {
             if (!empty($node['_sub_']) && is_array($node['_sub_'])) {
diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index b0a81accf..400812276 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -36,8 +36,8 @@ class Index extends BasicAdmin {
      */
     public function index() {
         Node::applyAuthNode();
-        $list = Db::name('SystemMenu')->field('title,id,pid,url,icon')->order('sort asc,id asc')->where('status', '1')->select();
-        $menus = $this->_filter_menu(ToolsService::arr2tree($list));
+        $list = Db::name('SystemMenu')->where('status', '1')->order('sort asc,id asc')->select();
+        $menus = $this->_filterMenu(ToolsService::arr2tree($list));
         $this->assign('title', '后台管理');
         $this->assign('menus', $menus);
         return view();
@@ -48,10 +48,10 @@ class Index extends BasicAdmin {
      * @param array $menus
      * @return array
      */
-    private function _filter_menu($menus) {
+    private function _filterMenu($menus) {
         foreach ($menus as $key => &$menu) {
             if (!empty($menu['sub'])) {
-                $menu['sub'] = $this->_filter_menu($menu['sub']);
+                $menu['sub'] = $this->_filterMenu($menu['sub']);
             }
             if (!empty($menu['sub'])) {
                 $menu['url'] = '#';
diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index 571221703..ba5d8b8ad 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -104,7 +104,9 @@ class Menu extends BasicAdmin {
             }
             $this->assign('nodes', array_column($nodes, 'node'));
             $this->assign('menus', $menus);
-        }
+        }else{
+			$this->error('请不要改菜单构造！');
+		}
     }
 
     /**
diff --git a/application/extra/wechat.php b/application/extra/wechat.php
index 3b3f53340..7790c876a 100644
--- a/application/extra/wechat.php
+++ b/application/extra/wechat.php
@@ -13,7 +13,7 @@
 // +----------------------------------------------------------------------
 
 /**
- * 小程序配置参数
+ * 公众号配置参数
  * @return array
  */
 return [
diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php
index 78d876378..db764b5f5 100644
--- a/application/index/controller/Index.php
+++ b/application/index/controller/Index.php
@@ -14,7 +14,6 @@
 
 namespace app\index\controller;
 
-use library\Http;
 use think\Controller;
 use think\Db;
 
@@ -28,34 +27,5 @@ class Index extends Controller {
         return view();
     }
 
-    public function test() {
-        $DEVICE_NO = 'kdt1080126';
-        $key = '20585';
-        $content = "";
-        $content .= "^Q +http://weixin.qq.com/r/2Eg2LkzEKRFWrQhN9123";
-        $result = $this->sendSelfFormatOrderInfo($DEVICE_NO, $key, 1, $content);
-        var_dump($result);
-    }
-
-    function sendSelfFormatOrderInfo($device_no, $key, $times, $orderInfo) { // $times打印次数
-        $selfMessage = array(
-            'deviceNo'     => $device_no,
-            'printContent' => $orderInfo,
-            'key'          => $key,
-            'times'        => $times
-        );
-        $url = "http://open.printcenter.cn:8080/addOrder";
-        $options = [
-            'http' => [
-                'header'  => "Content-type: application/x-www-form-urlencoded ",
-                'method'  => 'POST',
-                'content' => http_build_query($selfMessage),
-            ],
-        ];
-        $context = stream_context_create($options);
-        $result = file_get_contents($url, false, $context);
-
-        return $result;
-    }
 
 }