Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
yaoshanliang committed Aug 30, 2016
1 parent 1327eef commit 87bc003
Show file tree
Hide file tree
Showing 5 changed files with 160 additions and 10 deletions.
32 changes: 23 additions & 9 deletions app/Http/Controllers/Api/V1/LogController.php
Expand Up @@ -8,7 +8,7 @@
use App\Services\Api;

use Queue;
use App\Jobs\AppLog;
use App\Model\AppLog;

class LogController extends ApiController
{
Expand All @@ -24,18 +24,32 @@ public function postLog(Request $request)
{
// 验证
$this->apiValidate($request->all(), [
'type' => 'required|in:A,D,S,U',
'title' => 'required',
'data' => 'required'
]);

// 日志队列
$ips = $request->ips();
$ip = $ips[0];
$ips = implode(',', $ips);
Queue::push(new AppLog(parent::getAppId(), parent::getUserId(), $request->type, $request->title, $request->data, "$request->sql", $ip, $ips));
AppLog::create([
'app_id' => parent::getAppId(),
'user_id' => "$request->user_id",
'request_method' => "$request->request_method",
'request_url' => "$request->request_url",
'request_params' => "$request->request_params",
'response_code' => "$request->response_code",
'response_message' => "$request->response_message",
'response_data' => "$request->response_data",
'request_ip' => "$request->request_ip",
'user_agent' => "$request->user_agent",
'request_at' => "$request->request_at",
'pushed_at' => "$request->pushed_at",
'poped_at' => "$request->poped_at",
'created_at' => $this->getMillisecond(),
'request_time' => date('Y-m-d H:i:s', (int)$request->request_at),
]);

return Api::apiReturn(SUCCESS, '记录成功');
}

public function getMillisecond() {
list($s1, $s2) = explode(' ', microtime());
return (float)sprintf('%f', (floatval($s1) + floatval($s2)));
}

}
2 changes: 1 addition & 1 deletion app/Model/AppLog.php
Expand Up @@ -7,7 +7,7 @@ class AppLog extends Model
{
protected $table = 'log_app';

protected $fillable = ['id', 'app_id', 'user_id', 'type', 'title', 'data', 'sql', 'ip', 'ips', 'pushed_at', 'poped_at', 'created_at'];
protected $fillable = ['id', 'app_id', 'user_id', 'request_method', 'request_url', 'request_params', 'request_ip', 'response_code', 'response_message', 'response_data', 'request_at', 'pushed_at', 'poped_at', 'created_at', 'request_time', 'user_agent'];

public $timestamps = false;

Expand Down
61 changes: 61 additions & 0 deletions composer.json
@@ -0,0 +1,61 @@
{
"name": "yaoshanliang/ucenter",
"description": "UCenter.",
"keywords": ["ucenter", "laravel"],
"license": "MIT",
"type": "project",
"repositories": [
{"type": "composer", "url": "http://packagist.phpcomposer.com"},
{"packagist": false}
],
"require": {
"laravel/framework": "5.1.*",
"barryvdh/laravel-debugbar": "^2.0",
"predis/predis": "^1.0",
"ccampbell/chromephp": "^4.1",
"php-console/laravel-service-provider": "^5.1",
"OpenSkill/Datatable": "^0.2.0",
"dingo/api": "1.0.x@dev",
"lucadegasperi/oauth2-server-laravel": "^5.1",
"zizaco/entrust": "dev-laravel-5",
"php-curl-class/php-curl-class": "^4.10",
"overtrue/laravel-wechat": "~3.0",
"yaoshanliang/phpsms": "^1.1"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1",
"doctrine/dbal": "2.5.1"
},
"autoload": {
"classmap": [
"database"
],
"psr-4": {
"App\\": "app/"
}
},
"autoload-dev": {
"classmap": [
"tests/TestCase.php"
]
},
"scripts": {
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-create-project-cmd": [
"php -r \"copy('.env.example', '.env');\"",
"php artisan key:generate"
]
},
"config": {
"preferred-install": "dist",
"secure-http": false
}
}
27 changes: 27 additions & 0 deletions database/migrations/2016_08_25_100718_drop_log_user_table.php
@@ -0,0 +1,27 @@
<?php

use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class DropLogUserTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::drop('log_app');
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}
48 changes: 48 additions & 0 deletions database/migrations/2016_08_25_100728_create_log_user_table.php
@@ -0,0 +1,48 @@
<?php

use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class CreateLogUserTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('log_app', function(Blueprint $table)
{
$table->bigIncrements('id');
$table->integer('app_id')->unsigned();
$table->integer('user_id');
$table->string('request_method')->default('');
$table->string('request_url')->default('');
$table->text('request_params')->default('');
$table->integer('response_code');
$table->string('response_message')->default('');
$table->text('response_data')->default('');
$table->string('request_ip')->default('');
$table->string('user_agent')->default('');
$table->float('request_at', 14, 4);
$table->float('pushed_at', 14, 4);
$table->float('poped_at', 14, 4);
$table->float('created_at', 14, 4);
$table->timestamp('request_time');

$table->index('app_id');
$table->index('user_id');
});
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}

0 comments on commit 87bc003

Please sign in to comment.