From 1fdc594cbbff70aeab59f2e26c8b580b011e46c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Fri, 25 Sep 2020 15:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Database/ActiveRecord.php |  4 ++--
 Gii/GiiController.php     | 10 +++++-----
 System/Snowflake.php      |  5 +++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Database/ActiveRecord.php b/Database/ActiveRecord.php
index d4de2324..3746e481 100644
--- a/Database/ActiveRecord.php
+++ b/Database/ActiveRecord.php
@@ -16,6 +16,7 @@ use Snowflake\Error\Logger;
 use Snowflake\Snowflake;
 
 defined('SAVE_FAIL') or define('SAVE_FAIL', 3227);
+defined('FIND_OR_CREATE_MESSAGE') or define('FIND_OR_CREATE_MESSAGE', 'Create a new model, but the data cannot be empty.');
 
 /**
  * Class Orm
@@ -116,8 +117,7 @@ class ActiveRecord extends BaseActiveRecord
 			return $select;
 		}
 		if (empty($attributes)) {
-			$message = 'Create a new model, but the data cannot be empty.';
-			return Snowflake::app()->logger->addError($message, 'mysql');
+			return \logger()->addError(FIND_OR_CREATE_MESSAGE, 'mysql');
 		}
 		$select = new static();
 		$select->attributes = $attributes;
diff --git a/Gii/GiiController.php b/Gii/GiiController.php
index f3f5acb7..1ce123dc 100644
--- a/Gii/GiiController.php
+++ b/Gii/GiiController.php
@@ -215,7 +215,7 @@ class {$controllerName}Controller extends Controller
 	{
 		$model = ' . $className . '::findOne(Input()->post(\'id\', 0));
 		if (empty($model)) {
-			return JSON::to(500, \'指定数据不存在\');
+			return JSON::to(500, SELECT_IS_NULL);
 		}
 		$model->attributes = $this->loadParam();
 		
@@ -245,7 +245,7 @@ class {$controllerName}Controller extends Controller
 		$_key = Input()->array(\'ids\');
 		$pass = Input()->string(\'password\', true, 32);		
 		if (empty($_key)) {
-			return JSON::to(500, \'IDS集合不能为空\');
+			return JSON::to(500, PARAMS_IS_NULL);
 		}
 		
 		$user = $this->request->identity;
@@ -255,7 +255,7 @@ class {$controllerName}Controller extends Controller
 		
 		$model = ' . $className . '::find()->in(\'id\', $_key);
         if(!$model->delete()){
-			return JSON::to(500, \'系统繁忙, 请稍后再试!\');
+			return JSON::to(500, DB_ERROR_BUSY);
         }
         return JSON::to(0, $model->toArray());
 	}';
@@ -279,7 +279,7 @@ class {$controllerName}Controller extends Controller
     {
         $model = ' . $managerName . '::findOne(Input()->get(\'id\'));
         if(empty($model)){
-            return JSON::to(404, \'Data Not Exists\');
+            return JSON::to(404, SELECT_IS_NULL);
         }
         return JSON::to(0, $model->toArray());
     }';
@@ -311,7 +311,7 @@ class {$controllerName}Controller extends Controller
 		
 		$model = ' . $managerName . '::findOne($_key);
 		if (empty($model)) {
-			return JSON::to(500, \'指定数据不存在\');
+			return JSON::to(500, SELECT_IS_NULL);
 		}
         if(!$model->delete()){
 			return JSON::to(500, $model->getLastError());
diff --git a/System/Snowflake.php b/System/Snowflake.php
index 4b09ea4f..47cbafc0 100644
--- a/System/Snowflake.php
+++ b/System/Snowflake.php
@@ -16,6 +16,11 @@ use Snowflake\Process\Process;
 use Swoole\Coroutine;
 use Swoole\WebSocket\Server;
 
+
+defined('DB_ERROR_BUSY') or define('DB_ERROR', 'The database is busy. Please try again later.');
+defined('SELECT_IS_NULL') or define('SELECT_IS_NULL', 'Query data does not exist, please check the relevant conditions.');
+defined('PARAMS_IS_NULL') or define('PARAMS_IS_NULL', 'Required items cannot be empty, please add.');
+
 class Snowflake
 {