Merge branch 'dev' of ssh://192.168.10.210:10022/wugg/fivechang into dev

application/Admin/controller/Base.php

@@ -7,6 +7,11 @@ class Base
     public $userinfo="";
     public function __construct()
     {
+
+        if(request()->isOptions()){
+            echo '';
+            die();
+        }
         $post=request()->post();
         $token = isset($post['token']) && $post['token']!=""?$post['token']:"";
         if($token==""){

application/Admin/controller/Login.php

@@ -3,7 +3,6 @@
  * @2021-7-10
 **/
 namespace app\Admin\controller;
-use think\admin\helper\TokenHelper;
 use think\Db;
 use app\Admin\model\User;
 class Login
@@ -15,6 +14,12 @@ class Login
      * @param password  密码
      *
      */
+    public function __construct(){
+        if(request()->isOptions()){
+            echo '';
+            die();
+        }
+    }
     public function index(){
          $post=request()->post();
          $username = isset($post['username'])&&$post['username']!="" ? trim($post['username']) :"";

application/Home/controller/Base.php

@@ -11,6 +11,10 @@ class Base
     public $userinfo="";
     public function __construct()
     {
+        if(request()->isOptions()){
+            echo '';
+            die();
+        }
         $this->post=request()->post();
         $token = isset($this->post['token'])&&$this->post['token']!="" ? trim($this->post['token']):"";
         if($token==""){

application/Home/controller/Login.php

@@ -11,6 +11,12 @@ class Login
      * @param password  密码
      *
      */
+    public function __construct(){
+        if(request()->isOptions()){
+            echo '';
+            die();
+        }
+    }
     public function index(){
         $post=request()->post();
         $username = isset($post['username'])&&$post['username']!="" ? trim($post['username']) :"";

application/common.php

@@ -61,7 +61,7 @@ function error_show($code,$msg=""){
     ];
 
     echo  json_encode($data);
-    die();
+
 }
 
 /**
@@ -76,7 +76,7 @@ function app_show($code,$msg="",$list=[]){
         "data"=>$list
     ];
     echo  json_encode($data);
-    die();
+
 }
 function makeNo($str){