Commit 2b5b0393 by 叶明星

去掉多余的东西

parent 421b9c96
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Support\Facades\Log;
use Laravel\Lumen\Routing\Controller as BaseController; use Laravel\Lumen\Routing\Controller as BaseController;
class Controller extends BaseController class Controller extends BaseController
{ {
public function Export( $Errcode=0, $ErrMsg='', $dataArr=[]) { public function apiReturn($Errcode = 0, $level = 1 , $dataArr = '') {
if(!empty($dataArr) && !is_array($dataArr)) return json_encode(['errcode'=>-1,'errmsg'=>'系统错误']); //生成错误码
$Errcode = $this->Errcode($Errcode , $level);
//获取错误描述
$ErrMsg = config('errmsg.cn.'.$Errcode);
//上报错误
$data=['errcode'=>$Errcode, 'errmsg'=>$ErrMsg]; $data=['errcode'=>$Errcode, 'errmsg'=>$ErrMsg];
if(!empty($dataArr)) foreach ($dataArr as $k=>$v) $data[$k]=$v;
//非正常返回码,上报
if(($data['errcode'] < 10000 || $data['errcode'] >= 50000) && $data['errcode'] !==0 ){
try{
ErrorLog($Errcode,$ErrMsg);
}catch (\Exception $e){
Log::info($e);
}
}
if(!empty($dataArr) && is_array($dataArr)){
foreach ($dataArr as $k=>$v){
$data['data'][$k]=$v;
}
}else{
$data['data'] = $dataArr;
}
return json_encode($data); return json_encode($data);
} }
...@@ -17,8 +40,8 @@ class Controller extends BaseController ...@@ -17,8 +40,8 @@ class Controller extends BaseController
* @param int $level 错误级别 1普通错误 5需关注错误 9致命错误,急需解决 * @param int $level 错误级别 1普通错误 5需关注错误 9致命错误,急需解决
* @return int * @return int
*/ */
protected function ProduceErrcode( $code='0',$level=1){ protected function Errcode( $code = 0,$level=1){
if($code=='0') return 0; if($code === 0) return 0;
$SystemCode=config('website.SystemCode'); $SystemCode=config('website.SystemCode');
return errCode($code,$level,$SystemCode); return errCode($code,$level,$SystemCode);
} }
......
...@@ -84,7 +84,6 @@ $app->middleware([ ...@@ -84,7 +84,6 @@ $app->middleware([
// $app->register(App\Providers\AuthServiceProvider::class); // $app->register(App\Providers\AuthServiceProvider::class);
// $app->register(App\Providers\EventServiceProvider::class); // $app->register(App\Providers\EventServiceProvider::class);
$app->register(Illuminate\Redis\RedisServiceProvider::class); $app->register(Illuminate\Redis\RedisServiceProvider::class);
$app->register(Jenssegers\Mongodb\MongodbServiceProvider::class);
$app->register(Hhxsv5\LaravelS\Illuminate\LaravelSServiceProvider::class); $app->register(Hhxsv5\LaravelS\Illuminate\LaravelSServiceProvider::class);
$app->withEloquent(); $app->withEloquent();
/* /*
...@@ -99,10 +98,11 @@ $app->withEloquent(); ...@@ -99,10 +98,11 @@ $app->withEloquent();
*/ */
$app->configure('website'); $app->configure('website');
$app->configure('database'); $app->configure('database');
$app->configure('errmsg');
LogReport::$suffix = '_'.env('LARAVELS_LISTEN_PORT', ''); LogReport::$suffix = '_'.env('LARAVELS_LISTEN_PORT', '');
LogReport::$app_name = env('ELK_NAME',''); LogReport::$app_name = env('ELK_NAME','');
LogReport::$log_path = realpath(__DIR__ . '/../').'/storage/logs/LogReport/'; LogReport::$log_path = realpath(__DIR__ . '/../').'/storage/logs/LogReport/';
require_once __DIR__.'/../app/Http/function.php';
$app->router->group([ $app->router->group([
'namespace' => 'App\Http\Controllers', 'namespace' => 'App\Http\Controllers',
], function ($router) { ], function ($router) {
......
<?php
return [
'cn'=>[
-1 => '系统错误',
0 => 'ok',
]
];
...@@ -18,9 +18,5 @@ $router->get('/', function () use ($router) { ...@@ -18,9 +18,5 @@ $router->get('/', function () use ($router) {
$router->post('/synchronization', 'ServicesController@synchronization'); $router->post('/synchronization', 'ServicesController@synchronization');
$router->post('/ladderprice', 'ServicesController@ladderprice');
$router->post('/uuid', 'ServicesController@uuid');
$router->post('/self/sample/class/list', 'ServicesController@SelfSampleClassList');
$router->post('/self/sample/list', 'ServicesController@SelfSampleList');
$router->post('/get_new_customer_limit', 'ServicesController@getnewCustomerLimit');
{"server":{"listen_ip":"0.0.0.0","listen_port":"60004","socket_type":1,"enable_coroutine_runtime":false,"server":"LaravelS","handle_static":false,"laravel_base_path":"/root/www/GoodsMachining","inotify_reload":{"enable":false,"watch_path":"/root/www/GoodsMachining","file_types":[".php"],"excluded_dirs":[],"log":true},"event_handlers":[],"websocket":{"enable":false},"sockets":[],"processes":[],"timer":{"enable":false,"jobs":[],"pid_file":"/root/www/GoodsMachining/storage/laravels-timer.pid","max_wait_time":5},"events":[],"swoole_tables":[],"register_providers":[],"cleaners":[],"swoole":{"daemonize":false,"dispatch_mode":2,"reactor_num":4,"worker_num":8,"task_ipc_mode":1,"task_max_request":8000,"task_tmpdir":"/dev/shm","max_request":8000,"open_tcp_nodelay":true,"pid_file":"/root/www/GoodsMachining/storage/laravels.pid","log_file":"/root/www/GoodsMachining/storage/logs/swoole-2019-05.log","log_level":4,"document_root":"/root/www/GoodsMachining/public","buffer_output_size":2097152,"socket_buffer_size":134217728,"package_max_length":4194304,"reload_async":true,"max_wait_time":60,"enable_reuse_port":true,"enable_coroutine":false,"http_compression":false},"enable_gzip":false,"process_prefix":"/root/www/GoodsMachining","ignore_check_pid":true},"laravel":{"root_path":"/root/www/GoodsMachining","static_path":"/root/www/GoodsMachining/public","cleaners":[],"register_providers":[],"is_lumen":true,"_SERVER":{"XDG_SESSION_ID":"1","HOSTNAME":"localhost.localdomain","SELINUX_ROLE_REQUESTED":"","SHELL":"/bin/bash","TERM":"xterm","HISTSIZE":"1000","SSH_CLIENT":"192.168.117.1 50292 22","SELINUX_USE_CURRENT_RANGE":"","SSH_TTY":"/dev/pts/0","USER":"root","LS_COLORS":"rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=01;05;37;41:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=01;36:*.au=01;36:*.flac=01;36:*.mid=01;36:*.midi=01;36:*.mka=01;36:*.mp3=01;36:*.mpc=01;36:*.ogg=01;36:*.ra=01;36:*.wav=01;36:*.axa=01;36:*.oga=01;36:*.spx=01;36:*.xspf=01;36:","MAIL":"/var/spool/mail/root","PATH":"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin","_":"/usr/bin/php","SUPERVISOR_GROUP_NAME":"goodsm","PWD":"/root","LANG":"en_US.UTF-8","SELINUX_LEVEL_REQUESTED":"","HISTCONTROL":"ignoredups","SUPERVISOR_ENABLED":"1","SHLVL":"2","HOME":"/root","LOGNAME":"root","SSH_CONNECTION":"192.168.117.1 50292 192.168.117.128 22","SUPERVISOR_SERVER_URL":"unix:///var/run/supervisor/supervisor.sock","SUPERVISOR_PROCESS_NAME":"goodsm","LESSOPEN":"||/usr/bin/lesspipe.sh %s","XDG_RUNTIME_DIR":"/run/user/0","PHP_SELF":"/root/www/GoodsMachining/artisan","SCRIPT_NAME":"/root/www/GoodsMachining/artisan","SCRIPT_FILENAME":"/root/www/GoodsMachining/artisan","PATH_TRANSLATED":"/root/www/GoodsMachining/artisan","DOCUMENT_ROOT":"","REQUEST_TIME_FLOAT":1557385187.647738,"REQUEST_TIME":1557385187,"argv":["/root/www/GoodsMachining/artisan","laravels","config","--ignore"],"argc":4,"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","SYSTEM_CODE":"04","SYSTEM_NAME":"商品信息处理服务","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"60004","DB_Self_HOST":"192.168.1.234","DB_Self_DATABASE":"liexin_data","DB_Self_USERNAME":"spu","DB_Self_PASSWORD":"spu","DB_Self_PORT":"3306","DB_Self_PREFIX":"lie_","DB_Pur_HOST":"192.168.1.232","DB_Pur_DATABASE":"liexin_wms","DB_Pur_USERNAME":"root","DB_Pur_PASSWORD":"123456","DB_Pur_PORT":"3306","DB_Pur_PREFIX":"lie_","DB_SPU_HOST":"192.168.1.234","DB_SPU_DATABASE":"liexin_spu","DB_SPU_USERNAME":"spu","DB_SPU_PASSWORD":"spu","DB_SPU_PORT":"3306","DB_SPU_PREFIX":"lie_","SPU_DB_DATABASE":"liexin_spu","SKU_0_DB_DATABASE":"liexin_sku_0","SKU_1_DB_DATABASE":"liexin_sku_1","SKU_2_DB_DATABASE":"liexin_sku_2","SKU_3_DB_DATABASE":"liexin_sku_3","SKU_4_DB_DATABASE":"liexin_sku_4","SKU_5_DB_DATABASE":"liexin_sku_5","SKU_6_DB_DATABASE":"liexin_sku_6","SKU_7_DB_DATABASE":"liexin_sku_7","SKU_8_DB_DATABASE":"liexin_sku_8","SKU_9_DB_DATABASE":"liexin_sku_9","DB_CONNECTION":"mysql","DB_HOST":"192.168.1.235","DB_USERNAME":"icDb29mLy2s","DB_PASSWORD":"icDb29mLy2s","DB_PORT":"3306","DB_DATABASE":"0","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.237","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","MONG_DB_SPU_ATTRS_HOST":"192.168.1.237","MONG_DB_SPU_ATTRS_USERNAME":"","MONG_DB_SPU_ATTRS_PASSWORD":"","MONG_DB_SPU_ATTRS_DATABASE":"ichunt","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","SHELL_VERBOSITY":0},"_ENV":{"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","SYSTEM_CODE":"04","SYSTEM_NAME":"商品信息处理服务","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"60004","DB_Self_HOST":"192.168.1.234","DB_Self_DATABASE":"liexin_data","DB_Self_USERNAME":"spu","DB_Self_PASSWORD":"spu","DB_Self_PORT":"3306","DB_Self_PREFIX":"lie_","DB_Pur_HOST":"192.168.1.232","DB_Pur_DATABASE":"liexin_wms","DB_Pur_USERNAME":"root","DB_Pur_PASSWORD":"123456","DB_Pur_PORT":"3306","DB_Pur_PREFIX":"lie_","DB_SPU_HOST":"192.168.1.234","DB_SPU_DATABASE":"liexin_spu","DB_SPU_USERNAME":"spu","DB_SPU_PASSWORD":"spu","DB_SPU_PORT":"3306","DB_SPU_PREFIX":"lie_","SPU_DB_DATABASE":"liexin_spu","SKU_0_DB_DATABASE":"liexin_sku_0","SKU_1_DB_DATABASE":"liexin_sku_1","SKU_2_DB_DATABASE":"liexin_sku_2","SKU_3_DB_DATABASE":"liexin_sku_3","SKU_4_DB_DATABASE":"liexin_sku_4","SKU_5_DB_DATABASE":"liexin_sku_5","SKU_6_DB_DATABASE":"liexin_sku_6","SKU_7_DB_DATABASE":"liexin_sku_7","SKU_8_DB_DATABASE":"liexin_sku_8","SKU_9_DB_DATABASE":"liexin_sku_9","DB_CONNECTION":"mysql","DB_HOST":"192.168.1.235","DB_USERNAME":"icDb29mLy2s","DB_PASSWORD":"icDb29mLy2s","DB_PORT":"3306","DB_DATABASE":"0","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.237","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","MONG_DB_SPU_ATTRS_HOST":"192.168.1.237","MONG_DB_SPU_ATTRS_USERNAME":"","MONG_DB_SPU_ATTRS_PASSWORD":"","MONG_DB_SPU_ATTRS_DATABASE":"ichunt","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","SHELL_VERBOSITY":0}}} {"server":{"listen_ip":"0.0.0.0","listen_port":"40001","socket_type":1,"enable_coroutine_runtime":false,"server":"LaravelS","handle_static":false,"laravel_base_path":"/var/www/liexin_service_initial","inotify_reload":{"enable":false,"watch_path":"/var/www/liexin_service_initial","file_types":[".php"],"excluded_dirs":[],"log":true},"event_handlers":[],"websocket":{"enable":false},"sockets":[],"processes":[],"timer":{"enable":false,"jobs":[],"pid_file":"/var/www/liexin_service_initial/storage/laravels-timer.pid","max_wait_time":5},"events":[],"swoole_tables":[],"register_providers":[],"cleaners":[],"swoole":{"daemonize":true,"dispatch_mode":2,"reactor_num":4,"worker_num":"3","task_ipc_mode":1,"task_max_request":8000,"task_tmpdir":"/dev/shm","max_request":8000,"open_tcp_nodelay":true,"pid_file":"/var/www/liexin_service_initial/storage/laravels.pid","log_file":"/var/www/liexin_service_initial/storage/logs/swoole-2020-04.log","log_level":4,"document_root":"/var/www/liexin_service_initial/public","buffer_output_size":2097152,"socket_buffer_size":134217728,"package_max_length":4194304,"reload_async":true,"max_wait_time":60,"enable_reuse_port":true,"enable_coroutine":false,"http_compression":false},"enable_gzip":false,"process_prefix":"/var/www/liexin_service_initial","ignore_check_pid":false},"laravel":{"root_path":"/var/www/liexin_service_initial","static_path":"/var/www/liexin_service_initial/public","cleaners":[],"register_providers":[],"is_lumen":true,"_SERVER":{"PHP_EXTRA_CONFIGURE_ARGS":"--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi","HOSTNAME":"1e472cf58def","PHP_INI_DIR":"/usr/local/etc/php","SHLVL":"1","HOME":"/root","OLDPWD":"/var/www","PHP_LDFLAGS":"-Wl,-O1 -Wl,--hash-style=both -pie","PHP_MD5":"","PHP_CFLAGS":"-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64","PHP_VERSION":"7.2.27","GPG_KEYS":"1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F","PHP_ASC_URL":"https://www.php.net/get/php-7.2.27.tar.xz.asc/from/this/mirror","PHP_CPPFLAGS":"-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64","_":"/usr/local/bin/php","PHP_URL":"https://www.php.net/get/php-7.2.27.tar.xz/from/this/mirror","TERM":"xterm","PATH":"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin","PWD":"/var/www/liexin_service_initial","PHPIZE_DEPS":"autoconf \t\tdpkg-dev \t\tfile \t\tg++ \t\tgcc \t\tlibc-dev \t\tmake \t\tpkg-config \t\tre2c","PHP_SHA256":"7bd0fb9e3b63cfe53176d1f3565cd686f90b3926217158de5ba57091f49e4c32","PHP_SELF":"/var/www/liexin_service_initial/artisan","SCRIPT_NAME":"/var/www/liexin_service_initial/artisan","SCRIPT_FILENAME":"/var/www/liexin_service_initial/artisan","PATH_TRANSLATED":"/var/www/liexin_service_initial/artisan","DOCUMENT_ROOT":"","REQUEST_TIME_FLOAT":1586489789.744501,"REQUEST_TIME":1586489789,"argv":["/var/www/liexin_service_initial/artisan","laravels","config","--daemonize"],"argc":4,"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","SYSTEM_CODE":"01","SYSTEM_NAME":"服务初始服务(开发环境)","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"40001","worker_num":"3","DB_CONNECTION":"mysql","DB_HOST":"192.168.1.235","DB_USERNAME":"icDb29mLy2s","DB_PASSWORD":"icDb29mLy2s","DB_PORT":"3306","DB_DATABASE":"0","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.237","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","SHELL_VERBOSITY":0},"_ENV":{"PHP_EXTRA_CONFIGURE_ARGS":"--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi","HOSTNAME":"1e472cf58def","PHP_INI_DIR":"/usr/local/etc/php","SHLVL":"1","HOME":"/root","OLDPWD":"/var/www","PHP_LDFLAGS":"-Wl,-O1 -Wl,--hash-style=both -pie","PHP_MD5":"","PHP_CFLAGS":"-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64","PHP_VERSION":"7.2.27","GPG_KEYS":"1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F","PHP_ASC_URL":"https://www.php.net/get/php-7.2.27.tar.xz.asc/from/this/mirror","PHP_CPPFLAGS":"-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64","_":"/usr/local/bin/php","PHP_URL":"https://www.php.net/get/php-7.2.27.tar.xz/from/this/mirror","TERM":"xterm","PATH":"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin","PWD":"/var/www/liexin_service_initial","PHPIZE_DEPS":"autoconf \t\tdpkg-dev \t\tfile \t\tg++ \t\tgcc \t\tlibc-dev \t\tmake \t\tpkg-config \t\tre2c","PHP_SHA256":"7bd0fb9e3b63cfe53176d1f3565cd686f90b3926217158de5ba57091f49e4c32","APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","SYSTEM_CODE":"01","SYSTEM_NAME":"服务初始服务(开发环境)","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"40001","worker_num":"3","DB_CONNECTION":"mysql","DB_HOST":"192.168.1.235","DB_USERNAME":"icDb29mLy2s","DB_PASSWORD":"icDb29mLy2s","DB_PORT":"3306","DB_DATABASE":"0","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.237","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","SHELL_VERBOSITY":0}}}
\ No newline at end of file \ No newline at end of file
40102 33613
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment