Merge remote-tracking branch 'origin/master'

UPGRADE_2.x.md

+# 2.0.74
+- 公共函数库
+
 # 2.0.73
 - 店员统计筛选
 

src/Common/Config/Bean/ScanPath.php

 <?php
-/**
- * Created by PhpStorm.
- * User: Administrator
- * Date: 2018/7/16
- * Time: 9:32
- */
+
+// 加载公共函数库
+include __DIR__.'/../../Func.php';
+
+// 以下用于swoft加载自定义的类
 $scanPaths = include __DIR__.'/PathConfig.php';
 $data = [];
-
 foreach ($scanPaths as $basePath) {
     $files = \Swoft\Helper\DirHelper::glob($basePath,'*.php');
     $baseNamespace = "Hdll\Services\\";
@@ -42,11 +40,8 @@ foreach ($scanPaths as $basePath) {
 
         }
 
-
     }
 
-
 }
 
-
 return $data;
\ No newline at end of file

src/Common/Func.php

+<?php
+//================================//
+// 公共函数库
+//================================//
+
+// 执行数据库操作，并对返回结果进行处理
+if(!function_exists('dbQuery')) {
+	function dbQuery($result) {
+        if($result instanceof \Swoft\Core\ResultInterface) {
+            $result = $result->getResult();
+        }
+		if($result === false) {
+            throw new \Exception('数据库操作错误[return:false]');
+        }
+        if(!is_array($result) && !is_object($result)) {
+            return $result; //字符串或数字等类型直接返回
+        }
+        if(is_object($result) && \method_exists($result, 'toArray')) {
+            $result = $result->toArray();
+        }
+        foreach ($result as $key => $value) {
+            if(is_array($value) || is_object($value)) {
+                $result[$key] = dbQuery($value);
+                continue;
+            }
+            if($key == 'deleteTime') unset($result[$key]);
+        }
+        return $result;
+	}
+}
\ No newline at end of file