Browse Source

修改监控脚本频率

shensong 5 years ago
parent
commit
7f52a0a8af

+ 4 - 3
app/Console/Commands/Monitor.php

@@ -14,7 +14,7 @@ class Monitor extends Command {
14 14
 
15 15
 
16 16
     protected $signature = 'Monitor';
17
-    protected $phone = '13161864516';
17
+//    protected $phone = '13161864516';
18 18
 
19 19
     /**
20 20
      * The console command description.
@@ -43,9 +43,10 @@ class Monitor extends Command {
43 43
 
44 44
         $uv = DB::table('templates_log')->where('create_time','<=',date('Y-m-d H:i:s',$currentTime))->where('create_time','>=',$fiveMinuteBefore)->count();
45 45
 
46
-        if($uv < 10){
46
+        if($uv < 4){
47 47
             #发送验证码报警
48
-            $res = self::sendMsg($this->phone);
48
+            self::sendMsg('13161864516');
49
+            self::sendMsg('18410900527');
49 50
             error_log(date('Y-m-d H:i:s',time()).' uv:'.$uv." \n ",3,"/log/seafood_log/".date('Y-m-d',time()).'Monitor.log');
50 51
         }
51 52
 

+ 7 - 3
app/Error.php

@@ -12,9 +12,13 @@ class Error
12 12
      */
13 13
     public static $errCodes = [
14 14
 
15
-        0 => "成功",
16
-        1001 => '未分配销售'
17
-        
15
+        0    => "成功",
16
+        200  =>'请求成功',
17
+        1001 => '未分配销售',
18
+
19
+        2000 =>'请求参数不合法',
20
+        2001 =>'未查询到有效数据',
21
+        2002 =>'密码错误',
18 22
     ];
19 23
     /**
20 24
      * 返回错误码

+ 44 - 0
app/Http/Controllers/Api/LoginController.php

@@ -0,0 +1,44 @@
1
+<?php
2
+/**
3
+ * Created by PhpStorm.
4
+ * User: shensong
5
+ * Date: 2019/11/22
6
+ * Time: 17:44
7
+ */
8
+
9
+namespace App\Http\Controllers\Api;
10
+
11
+
12
+use App\Admin;
13
+use App\AdminRole;
14
+use App\Http\Controllers\Controller;
15
+use Illuminate\Http\Request;
16
+use Illuminate\Support\Facades\Hash;
17
+
18
+class LoginController extends Controller
19
+{
20
+    /**
21
+     * h5登录接口
22
+     * @param Request $request
23
+     * @return array
24
+     */
25
+    public function doLogin(Request $request) {
26
+        $username = $request->input('username',null);
27
+        $password = $request->input('password',null);
28
+
29
+        if(is_null($username) || is_null($password)) {
30
+            return self::returnValue('参数不合法',2000);
31
+        }
32
+
33
+        $admin = Admin::where('username', $username)->first();
34
+        if(empty($admin->password)){
35
+            return self::returnValue('该用户不存在',2001);
36
+        }
37
+
38
+        if($res = Hash::check($password, $admin->password)){
39
+            return self::returnValue(['admin_id'=>$admin->id],200);
40
+        }else{
41
+            return self::returnValue('密码错误',2002);
42
+        }
43
+    }
44
+}

+ 5 - 0
app/Http/routes.php

@@ -308,4 +308,9 @@ Route::group(['prefix' => 'api'], function() {
308 308
     Route::get('/template/addLongLog', 'Api\TemplateController@addLongLog');
309 309
     Route::get('/dayGrandTotal', 'Api\TemplateController@dayGrandTotal');
310 310
 
311
+});
312
+
313
+Route::group(['prefix' => 'api'], function(){
314
+    #h5登录
315
+    Route::post('/login','Api\LoginController@doLogin');
311 316
 });