From 22e306626c7cd9aa96e57278bc510c89fa2d85b8 Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Thu, 7 Apr 2022 10:57:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=85=B6=E4=BB=96=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E4=BE=9D=E8=B5=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json  |  1 -
 composer.lock  | 57 ++------------------------------------------------
 config/log.php |  8 +++----
 3 files changed, 6 insertions(+), 60 deletions(-)

diff --git a/composer.json b/composer.json
index afb2589..bb7c55d 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,6 @@
         "jianyan74/php-excel": "^1.0",
         "zhongshaofa/easy-admin": "^1.0.2",
         "ext-json": "*",
-        "zhongshaofa/thinkphp-log-trace": "^1.0",
         "guzzlehttp/guzzle": "^7.4"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 0b25a09..14facb2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fdb5d3e361e1b400984f4ff47a15c98e",
+    "content-hash": "b165f907f620d029664c50085142cb1a",
     "packages": [
         {
             "name": "adbario/php-dot-notation",
@@ -3301,59 +3301,6 @@
                 "source": "https://github.com/zhongshaofa/easyadmin-sdk/tree/v1.0.2"
             },
             "time": "2021-09-20T14:28:06+00:00"
-        },
-        {
-            "name": "zhongshaofa/thinkphp-log-trace",
-            "version": "v1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zhongshaofa/thinkphp-log-trace.git",
-                "reference": "20388c806bd78f493cb806ad1bce2f5c81c9e969"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zhongshaofa/thinkphp-log-trace/zipball/20388c806bd78f493cb806ad1bce2f5c81c9e969",
-                "reference": "20388c806bd78f493cb806ad1bce2f5c81c9e969",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
-            },
-            "require": {
-                "ext-json": "*",
-                "php": ">=7.1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.3.0",
-                "phpunit/phpunit": "^8.5.0",
-                "topthink/framework": "^6.0.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Test\\": "tests",
-                    "LogTrace\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "zhongshaofa",
-                    "email": "2286732552@qq.com"
-                }
-            ],
-            "description": "thinkphp6链路日志组件",
-            "support": {
-                "issues": "https://github.com/zhongshaofa/thinkphp-log-trace/issues",
-                "source": "https://github.com/zhongshaofa/thinkphp-log-trace/tree/v1.0.1"
-            },
-            "time": "2021-09-04T09:43:49+00:00"
         }
     ],
     "packages-dev": [
@@ -3600,5 +3547,5 @@
         "ext-json": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/config/log.php b/config/log.php
index 440bd78..cd96b9d 100644
--- a/config/log.php
+++ b/config/log.php
@@ -30,7 +30,7 @@ return [
     'channels'     => [
         'file' => [
             // 日志记录方式
-            'type'           => \LogTrace\FileLog::class,
+            'type'           => 'file',
             // 日志保存目录
             'path'           => '',
             // 单文件日志写入
@@ -59,11 +59,11 @@ return [
             // 服务器地址
             'hostname'          => Env::get('database.hostname', '127.0.0.1'),
             // 数据库名
-            'database'          => Env::get('database.database', 'pro_hairdressing_com'),
+            'database'          => Env::get('database.database', ''),
             // 用户名
-            'username'          => Env::get('database.username', 'pro_hairdressing_com'),
+            'username'          => Env::get('database.username', ''),
             // 密码
-            'password'          => Env::get('database.password', 'pro_hairdressing_com'),
+            'password'          => Env::get('database.password', ''),
             // 端口
             'hostport'          => Env::get('database.hostport', '3306'),
             // 数据库连接参数