From 702d6a209fc665000dc65e445b7adbb88d64b85c Mon Sep 17 00:00:00 2001
From: "545522390@qq.com" <liweisen825>
Date: Mon, 21 Jan 2019 17:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E7=94=A8=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common.php | 47 +++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/application/common.php b/application/common.php
index e37f4df..f2cc477 100644
--- a/application/common.php
+++ b/application/common.php
@@ -7,19 +7,6 @@ use think\Db;
 use think\facade\Cache;
 use think\facade\Request;
 
-/**
- * 获取默认分页信息
- * @return int
- */
-function defaultRows()
-{
-    $rows = intval(Request::param('rows', cookie('page-rows')));
-    if (!$rows) {
-        $rows = 20;
-    }
-    cookie('page-rows', $rows);
-    return $rows;
-}
 
 function isDebug()
 {
@@ -51,7 +38,7 @@ function auth($node, $moduleApp = 'project')
 }
 
 /**
- * 生产表唯一标记
+ * 生成表唯一标记
  * @param string $tableName 表名
  * @param string $fieldName 字段名
  * @param int $len 长度
@@ -91,6 +78,34 @@ function sysconf($name, $value = null)
     return isset($config[$name]) ? $config[$name] : '';
 }
 
+/**
+ * 错误消息，一般用于向上抛出逻辑错误
+ * @param $errno
+ * @param string $message
+ * @return array
+ */
+function error($errno, $message = '')
+{
+    return [
+        'errno' => $errno,
+        'message' => $message,
+    ];
+}
+
+/**
+ * 判断是否含有错误消息
+ * @param $data
+ * @return bool
+ */
+function isError($data)
+{
+    if (empty($data) || !is_array($data) || !array_key_exists('errno', $data) || (array_key_exists('errno', $data) && $data['errno'] == 0)) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
 /**
  * 日期格式标准输出
  * @param string $datetime 输入日期
@@ -102,6 +117,10 @@ function format_datetime($datetime, $format = 'Y年m月d日 H:i:s')
     return date($format, strtotime($datetime));
 }
 
+/**
+ * 当前时间
+ * @return false|string
+ */
 function nowTime()
 {
     return date('Y-m-d H:i:s', time());