chuweiqiang před 1 rokem
rodič
revize
ea9e8c4bd5
2 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. 2 2
      .idea/workspace.xml
  2. 2 2
      application/api/controller/Login.php

+ 2 - 2
.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Order.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Login.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -563,7 +563,7 @@
       <workItem from="1710203085353" duration="15262000" />
       <workItem from="1710289833126" duration="9433000" />
       <workItem from="1710308567232" duration="1764000" />
-      <workItem from="1710376730554" duration="3008000" />
+      <workItem from="1710376730554" duration="6804000" />
     </task>
     <servers />
   </component>

+ 2 - 2
application/api/controller/Login.php

@@ -25,7 +25,7 @@ class Login extends Base
 
     // 需要登录的
     protected $need_login = [
-        'addActive'
+//        'addActive'
     ];
     /**
      * @title 用户统一登录
@@ -477,7 +477,7 @@ class Login extends Base
         $startTime = date('Y-m-d') . ' 00:00:00'; // 获取今天的起始时间
         $endTime = date('Y-m-d') . ' 23:59:59';   // 获取今天的结束时间
         if(!$this->user_id){
-            $this->error('请先登录');
+            $this->success('操作成功');
         }
         $active_log = Db::name('user_active_log')
             ->where('create_at','>',$startTime)