diff --git a/app/common/controller/Frontend.php b/app/common/controller/Frontend.php
index e22e159..20fa4a0 100644
--- a/app/common/controller/Frontend.php
+++ b/app/common/controller/Frontend.php
@@ -50,7 +50,7 @@ class Frontend
         $this->auth = Auth::instance();
         $token      = request()->header('token');
         if ($token) {
-            if(request()->controller != 'app\czg\app\controller\LoginController' && request()->action != 'index'){} {
+            if(!strstr(request()->controller, 'LoginController') && request()->action != 'index') {
                 if(!$this->auth->init($token)) {
                     $this->error('Token expiration', [], 401);
                 }
diff --git a/app/czg/app/controller/HelpWordController.php b/app/czg/app/controller/HelpWordController.php
index ce59e33..e06d6a5 100644
--- a/app/czg/app/controller/HelpWordController.php
+++ b/app/czg/app/controller/HelpWordController.php
@@ -18,14 +18,12 @@ class HelpWordController extends Frontend
             $this->error('参数不完整');
         }
         $word = new HelpClassify;
-        $word->connect(Config('think-orm.search_library'));
-        $result = $word
-            ->with('helpword')
+        $result = Db::connect(config('think-orm.search_library'))->name('help_classify')
             ->where('types', $get['types'])->select()->toArray();
         $result = convertToCamelCase($result);
         foreach ($result as $k => $v) {
-            $result[$k]['helpWordList'] = convertToCamelCase($v['helpword']);
-            unset($result[$k]['helpword']);
+            $result[$k]['helpWordList'] = Db::connect(config('think-orm.search_library'))->name('help_word')
+                ->where('help_classify_id', $v['helpClassifyId'])->select()->toArray();
         }
         $this->success('ok', $result);
     }