Merge remote-tracking branch 'origin/master'

application/common/Model/ProjectReport.php

@@ -31,6 +31,9 @@ class ProjectReport extends CommonModel
                     $projectList[$projectCode] = [];
                 }
                 @$projectList[$projectCode]['task']++;
+                if (!isset($projectList[$projectCode]['task:undone'])) {
+                    $projectList[$projectCode]['task:undone'] = 0;
+                }
                 !$task['done'] && @$projectList[$projectCode]['task:undone']++;
             }
             if ($projectList) {

thinkphp/helper.php

@@ -313,9 +313,9 @@ if (!function_exists('download')) {
      * @param integer $expire 有效期（秒）
      * @return \think\response\Download
      */
-    function download($filename, $name = '', $content = false, $expire = 360, $openinBrower = false)
+    function download($filename, $name = '', $content = false, $expire = 360, $openinBrowser = false)
     {
-        return Response::create($filename, 'download')->name($name)->isContent($content)->expire($expire)->openinBrower($openinBrower);
+        return Response::create($filename, 'download')->name($name)->isContent($content)->expire($expire)->openinBrowser($openinBrowser);
     }
 }
 
@@ -533,7 +533,7 @@ if (!function_exists('response')) {
      * @param string     $type
      * @return Response
      */
-    function response($data = [], $code = 200, $header = [], $type = 'html')
+    function response($data = '', $code = 200, $header = [], $type = 'html')
     {
         return Response::create($data, $type, $code, $header);
     }

thinkphp/library/think/App.php

@@ -20,7 +20,7 @@ use think\route\Dispatch;
  */
 class App extends Container
 {
-    const VERSION = '5.1.31 LTS';
+    const VERSION = '5.1.37 LTS';
 
     /**
      * 当前模块路径
@@ -179,6 +179,11 @@ class App extends Container
 
         $this->instance('app', $this);
 
+        // 加载环境变量配置文件
+        if (is_file($this->rootPath . '.env')) {
+            $this->env->load($this->rootPath . '.env');
+        }
+
         $this->configExt = $this->env->get('config_ext', '.php');
 
         // 加载惯例配置文件
@@ -196,11 +201,6 @@ class App extends Container
             'vendor_path'  => $this->rootPath . 'vendor' . DIRECTORY_SEPARATOR,
         ]);
 
-        // 加载环境变量配置文件
-        if (is_file($this->rootPath . '.env')) {
-            $this->env->load($this->rootPath . '.env');
-        }
-
         $this->namespace = $this->env->get('app_namespace', $this->namespace);
         $this->env->set('app_namespace', $this->namespace);
 
@@ -722,9 +722,9 @@ class App extends Container
         list($module, $class) = $this->parseModuleAndClass($name, $layer, $appendSuffix);
 
         if (class_exists($class)) {
-            return $this->__get($class);
+            return $this->make($class, true);
         } elseif ($empty && class_exists($emptyClass = $this->parseClass($module, $layer, $empty, $appendSuffix))) {
-            return $this->__get($emptyClass);
+            return $this->make($emptyClass, true);
         }
 
         throw new ClassNotFoundException('class not exists:' . $class, $class);

thinkphp/library/think/Console.php

@@ -487,12 +487,17 @@ class Console
     public function getNamespaces()
     {
         $namespaces = [];
-        foreach ($this->commands as $command) {
+        foreach ($this->commands as $name => $command) {
-            $namespaces = array_merge($namespaces, $this->extractAllNamespaces($command->getName()));
+            if (is_string($command)) {
+                $namespaces = array_merge($namespaces, $this->extractAllNamespaces($name));
+            } else {
+                $namespaces = array_merge($namespaces, $this->extractAllNamespaces($command->getName()));
 
-            foreach ($command->getAliases() as $alias) {
+                foreach ($command->getAliases() as $alias) {
-                $namespaces = array_merge($namespaces, $this->extractAllNamespaces($alias));
+                    $namespaces = array_merge($namespaces, $this->extractAllNamespaces($alias));
+                }
             }
+
         }
 
         return array_values(array_unique(array_filter($namespaces)));

thinkphp/library/think/Controller.php

@@ -67,6 +67,8 @@ class Controller
         // 控制器初始化
         $this->initialize();
 
+        $this->registerMiddleware();
+
         // 前置操作方法 即将废弃
         foreach ((array) $this->beforeActionList as $method => $options) {
             is_numeric($method) ?

thinkphp/library/think/File.php

@@ -300,7 +300,7 @@ class File extends SplFileObject
      */
     public function checkSize($size)
     {
-        if ($this->getSize() > $size) {
+        if ($this->getSize() > (int) $size) {
             $this->error = 'filesize not match';
             return false;
         }

thinkphp/library/think/Log.php

@@ -127,8 +127,10 @@ class Log implements LoggerInterface
         }
 
         if (PHP_SAPI == 'cli') {
-            // 命令行日志实时写入
+            if (empty($this->config['level']) || in_array($type, $this->config['level'])) {
-            $this->write($msg, $type, true);
+                // 命令行日志实时写入
+                $this->write($msg, $type, true);
+            }
         } else {
             $this->log[$type][] = $msg;
         }

thinkphp/library/think/Model.php

@@ -18,6 +18,33 @@ use think\db\Query;
  * Class Model
  * @package think
  * @mixin Query
+ * @method Query where(mixed $field, string $op = null, mixed $condition = null) static 查询条件
+ * @method Query whereRaw(string $where, array $bind = []) static 表达式查询
+ * @method Query whereExp(string $field, string $condition, array $bind = []) static 字段表达式查询
+ * @method Query when(mixed $condition, mixed $query, mixed $otherwise = null) static 条件查询
+ * @method Query join(mixed $join, mixed $condition = null, string $type = 'INNER') static JOIN查询
+ * @method Query view(mixed $join, mixed $field = null, mixed $on = null, string $type = 'INNER') static 视图查询
+ * @method Query with(mixed $with) static 关联预载入
+ * @method Query count(string $field) static Count统计查询
+ * @method Query min(string $field) static Min统计查询
+ * @method Query max(string $field) static Max统计查询
+ * @method Query sum(string $field) static SUM统计查询
+ * @method Query avg(string $field) static Avg统计查询
+ * @method Query field(mixed $field, boolean $except = false) static 指定查询字段
+ * @method Query fieldRaw(string $field, array $bind = []) static 指定查询字段
+ * @method Query union(mixed $union, boolean $all = false) static UNION查询
+ * @method Query limit(mixed $offset, integer $length = null) static 查询LIMIT
+ * @method Query order(mixed $field, string $order = null) static 查询ORDER
+ * @method Query orderRaw(string $field, array $bind = []) static 查询ORDER
+ * @method Query cache(mixed $key = null , integer $expire = null) static 设置查询缓存
+ * @method mixed value(string $field) static 获取某个字段的值
+ * @method array column(string $field, string $key = '') static 获取某个列的值
+ * @method mixed find(mixed $data = null) static 查询单个记录
+ * @method mixed select(mixed $data = null) static 查询多个记录
+ * @method mixed get(mixed $data = null,mixed $with =[],bool $cache= false) static 查询单个记录 支持关联预载入
+ * @method mixed getOrFail(mixed $data = null,mixed $with =[],bool $cache= false) static 查询单个记录 不存在则抛出异常
+ * @method mixed findOrEmpty(mixed $data = null,mixed $with =[],bool $cache= false) static 查询单个记录  不存在则返回空模型
+ * @method mixed all(mixed $data = null,mixed $with =[],bool $cache= false) static 查询多个记录 支持关联预载入
  * @method \think\Model withAttr(array $name,\Closure $closure) 动态定义获取器
  */
 abstract class Model implements \JsonSerializable, \ArrayAccess
@@ -392,11 +419,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * 设置数据是否存在
      * @access public
      * @param  bool $exists
-     * @return void
+     * @return $this
      */
     public function exists($exists)
     {
         $this->exists = $exists;
+        return $this;
     }
 
     /**
@@ -409,6 +437,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         return $this->exists;
     }
 
+    /**
+     * 判断模型是否为空
+     * @access public
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->data);
+    }
+
     /**
      * 保存当前数据对象
      * @access public
@@ -533,7 +571,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
                 $this->autoRelationUpdate();
             }
 
-            return false;
+            return true;
         } elseif ($this->autoWriteTimestamp && $this->updateTime && !isset($data[$this->updateTime])) {
             // 自动写入更新时间
             $data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);

thinkphp/library/think/Request.php

@@ -809,9 +809,14 @@ class Request
             return $this->server('REQUEST_METHOD') ?: 'GET';
         } elseif (!$this->method) {
             if (isset($_POST[$this->config['var_method']])) {
-                $this->method    = strtoupper($_POST[$this->config['var_method']]);
+                $method = strtolower($_POST[$this->config['var_method']]);
-                $method          = strtolower($this->method);
+                if (in_array($method, ['get', 'post', 'put', 'patch', 'delete'])) {
-                $this->{$method} = $_POST;
+                    $this->method    = strtoupper($method);
+                    $this->{$method} = $_POST;
+                } else {
+                    $this->method = 'POST';
+                }
+                unset($_POST[$this->config['var_method']]);
             } elseif ($this->server('HTTP_X_HTTP_METHOD_OVERRIDE')) {
                 $this->method = strtoupper($this->server('HTTP_X_HTTP_METHOD_OVERRIDE'));
             } else {
@@ -1320,7 +1325,8 @@ class Request
      * @param array $data 数据源
      * @return void
      */
-    public function arrayReset(array &$data) {
+    public function arrayReset(array &$data)
+    {
         foreach ($data as &$value) {
             if (is_array($value)) {
                 $this->arrayReset($value);
@@ -1523,7 +1529,7 @@ class Request
      */
     public function has($name, $type = 'param', $checkEmpty = false)
     {
-        if (!in_array($type, ['param', 'get', 'post', 'request', 'put', 'file', 'session', 'cookie', 'env', 'header', 'route'])) {
+        if (!in_array($type, ['param', 'get', 'post', 'request', 'put', 'patch', 'file', 'session', 'cookie', 'env', 'header', 'route'])) {
             return false;
         }
 

thinkphp/library/think/Route.php

@@ -408,7 +408,7 @@ class Route
             $result = $this->bind[$domain];
         } elseif (isset($name) && isset($this->bind[$name])) {
             $result = $this->bind[$name];
-        } elseif (isset($this->bind['*'])) {
+        } elseif (!empty($subDomain) && isset($this->bind['*'])) {
             $result = $this->bind['*'];
         } else {
             $result = null;

thinkphp/library/think/Template.php

@@ -1311,7 +1311,7 @@ class Template
     public function __debugInfo()
     {
         $data = get_object_vars($this);
-        unset($data['app'], $data['storege']);
+        unset($data['app'], $data['storage']);
 
         return $data;
     }

thinkphp/library/think/Validate.php

@@ -131,7 +131,7 @@ class Validate
      * 内置正则验证规则
      * @var array
      */
-    protected $regex = [
+    protected $defaultRegex = [
         'alphaDash'   => '/^[A-Za-z0-9\-\_]+$/',
         'chs'         => '/^[\x{4e00}-\x{9fa5}]+$/u',
         'chsAlpha'    => '/^[\x{4e00}-\x{9fa5}a-zA-Z]+$/u',
@@ -178,6 +178,12 @@ class Validate
      */
     protected $append = [];
 
+    /**
+     * 验证正则定义
+     * @var array
+     */
+    protected $regex = [];
+
     /**
      * 架构函数
      * @access public
@@ -513,10 +519,10 @@ class Validate
 
         if (isset($this->append[$field])) {
             // 追加额外的验证规则
-            $rules = array_merge($rules, $this->append[$field]);
+            $rules = array_unique(array_merge($rules, $this->append[$field]), SORT_REGULAR);
         }
 
-        $i = 0;
+        $i      = 0;
         $result = true;
 
         foreach ($rules as $key => $rule) {
@@ -561,10 +567,11 @@ class Validate
             } elseif (true !== $result) {
                 // 返回自定义错误信息
                 if (is_string($result) && false !== strpos($result, ':')) {
-                    $result = str_replace(
+                    $result = str_replace(':attribute', $title, $result);
-                        [':attribute', ':rule'],
+
-                        [$title, (string) $rule],
+                    if (strpos($result, ':rule') && is_scalar($rule)) {
-                        $result);
+                        $msg = str_replace(':rule', (string) $rule, $result);
+                    }
                 }
 
                 return $result;
@@ -1002,10 +1009,16 @@ class Validate
             // 支持多个字段验证
             $fields = explode('^', $key);
             foreach ($fields as $key) {
-                $map[] = [$key, '=', $data[$key]];
+                if (isset($data[$key])) {
+                    $map[] = [$key, '=', $data[$key]];
+                }
             }
-        } else {
+        } elseif (strpos($key, '=')) {
+            parse_str($key, $map);
+        } elseif (isset($data[$field])) {
             $map[] = [$key, '=', $data[$field]];
+        } else {
+            $map = [];
         }
 
         $pk = !empty($rule[3]) ? $rule[3] : $db->getPk();
@@ -1356,6 +1369,8 @@ class Validate
     {
         if (isset($this->regex[$rule])) {
             $rule = $this->regex[$rule];
+        } elseif (isset($this->defaultRegex[$rule])) {
+            $rule = $this->defaultRegex[$rule];
         }
 
         if (0 !== strpos($rule, '/') && !preg_match('/\/[imsU]{0,4}$/', $rule)) {
@@ -1457,13 +1472,17 @@ class Validate
             $msg = $title . $lang->get('not conform to the rules');
         }
 
-        if (is_string($msg) && 0 === strpos($msg, '{%')) {
+        if (!is_string($msg)) {
+            return $msg;
+        }
+
+        if (0 === strpos($msg, '{%')) {
             $msg = $lang->get(substr($msg, 2, -1));
         } elseif ($lang->has($msg)) {
             $msg = $lang->get($msg);
         }
 
-        if (is_string($msg) && is_scalar($rule) && false !== strpos($msg, ':')) {
+        if (is_scalar($rule) && false !== strpos($msg, ':')) {
             // 变量替换
             if (is_string($rule) && strpos($rule, ',')) {
                 $array = array_pad(explode(',', $rule), 3, '');
@@ -1471,9 +1490,12 @@ class Validate
                 $array = array_pad([], 3, '');
             }
             $msg = str_replace(
-                [':attribute', ':rule', ':1', ':2', ':3'],
+                [':attribute', ':1', ':2', ':3'],
-                [$title, (string) $rule, $array[0], $array[1], $array[2]],
+                [$title, $array[0], $array[1], $array[2]],
                 $msg);
+            if (strpos($msg, ':rule')) {
+                $msg = str_replace(':rule', (string) $rule, $msg);
+            }
         }
 
         return $msg;
@@ -1492,12 +1514,12 @@ class Validate
             $scene = $this->currentScene;
         }
 
+        $this->only = $this->append = $this->remove = [];
+
         if (empty($scene)) {
             return;
         }
 
-        $this->only = $this->append = $this->remove = [];
-
         if (method_exists($this, 'scene' . $scene)) {
             call_user_func([$this, 'scene' . $scene]);
         } elseif (isset($this->scene[$scene])) {

thinkphp/library/think/cache/Driver.php

@@ -219,7 +219,7 @@ abstract class Driver
         } elseif (is_null($keys)) {
             $this->tag = $name;
         } else {
-            $key = 'tag_' . md5($name);
+            $key = $this->getTagkey($name);
 
             if (is_string($keys)) {
                 $keys = explode(',', $keys);
@@ -248,20 +248,23 @@ abstract class Driver
     protected function setTagItem($name)
     {
         if ($this->tag) {
-            $key       = 'tag_' . md5($this->tag);
+            $key       = $this->getTagkey($this->tag);
-            $prev      = $this->tag;
             $this->tag = null;
 
             if ($this->has($key)) {
                 $value   = explode(',', $this->get($key));
                 $value[] = $name;
-                $value   = implode(',', array_unique($value));
+
+                if (count($value) > 1000) {
+                    array_shift($value);
+                }
+
+                $value = implode(',', array_unique($value));
             } else {
                 $value = $name;
             }
 
             $this->set($key, $value, 0);
-            $this->tag = $prev;
         }
     }
 
@@ -273,7 +276,7 @@ abstract class Driver
      */
     protected function getTagItem($tag)
     {
-        $key   = 'tag_' . md5($tag);
+        $key   = $this->getTagkey($tag);
         $value = $this->get($key);
 
         if ($value) {
@@ -283,6 +286,11 @@ abstract class Driver
         }
     }
 
+    protected function getTagKey($tag)
+    {
+        return 'tag_' . md5($tag);
+    }
+
     /**
      * 序列化数据
      * @access protected
@@ -350,4 +358,9 @@ abstract class Driver
     {
         return $this->writeTimes;
     }
+
+    public function __call($method, $args)
+    {
+        return call_user_func_array([$this->handler, $method], $args);
+    }
 }

thinkphp/library/think/cache/driver/File.php

@@ -266,7 +266,7 @@ class File extends Driver
             foreach ($keys as $key) {
                 $this->unlink($key);
             }
-            $this->rm('tag_' . md5($tag));
+            $this->rm($this->getTagKey($tag));
             return true;
         }
 

thinkphp/library/think/cache/driver/Lite.php

@@ -198,7 +198,7 @@ class Lite extends Driver
                 unlink($key);
             }
 
-            $this->rm('tag_' . md5($tag));
+            $this->rm($this->getTagKey($tag));
             return true;
         }
 

thinkphp/library/think/cache/driver/Memcache.php

@@ -188,11 +188,13 @@ class Memcache extends Driver
         if ($tag) {
             // 指定标签清除
             $keys = $this->getTagItem($tag);
+
             foreach ($keys as $key) {
                 $this->handler->delete($key);
             }
 
-            $this->rm('tag_' . md5($tag));
+            $tagName = $this->getTagKey($tag);
+            $this->rm($tagName);
             return true;
         }
 
@@ -200,4 +202,5 @@ class Memcache extends Driver
 
         return $this->handler->flush();
     }
+
 }

thinkphp/library/think/cache/driver/Memcached.php

@@ -204,7 +204,7 @@ class Memcached extends Driver
             $keys = $this->getTagItem($tag);
 
             $this->handler->deleteMulti($keys);
-            $this->rm('tag_' . md5($tag));
+            $this->rm($this->getTagKey($tag));
 
             return true;
         }
@@ -213,4 +213,67 @@ class Memcached extends Driver
 
         return $this->handler->flush();
     }
+
+    /**
+     * 缓存标签
+     * @access public
+     * @param  string        $name 标签名
+     * @param  string|array  $keys 缓存标识
+     * @param  bool          $overlay 是否覆盖
+     * @return $this
+     */
+    public function tag($name, $keys = null, $overlay = false)
+    {
+        if (is_null($keys)) {
+            $this->tag = $name;
+        } else {
+            $tagName = $this->getTagKey($name);
+            if ($overlay) {
+                $this->handler->delete($tagName);
+            }
+
+            if (!$this->handler->has($tagName)) {
+                $this->handler->set($tagName, '');
+            }
+
+            foreach ($keys as $key) {
+                $this->handler->append($tagName, ',' . $key);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 更新标签
+     * @access protected
+     * @param  string $name 缓存标识
+     * @return void
+     */
+    protected function setTagItem($name)
+    {
+        if ($this->tag) {
+            $tagName = $this->getTagKey($this->tag);
+
+            if ($this->handler->has($tagName)) {
+                $this->handler->append($tagName, ',' . $name);
+            } else {
+                $this->handler->set($tagName, $name);
+            }
+
+            $this->tag = null;
+        }
+    }
+
+    /**
+     * 获取标签包含的缓存标识
+     * @access public
+     * @param  string $tag 缓存标签
+     * @return array
+     */
+    public function getTagItem($tag)
+    {
+        $tagName = $this->getTagKey($tag);
+        return explode(',', trim($this->handler->get($tagName), ','));
+    }
 }

thinkphp/library/think/cache/driver/Redis.php

@@ -70,6 +70,10 @@ class Redis extends Driver
                 }
             }
 
+            if ('' == $this->options['password']) {
+                unset($this->options['password']);
+            }
+
             $this->handler = new \Predis\Client($this->options, $params);
 
             $this->options['prefix'] = '';
@@ -187,7 +191,7 @@ class Redis extends Driver
     {
         $this->writeTimes++;
 
-        return $this->handler->delete($this->getCacheKey($name));
+        return $this->handler->del($this->getCacheKey($name));
     }
 
     /**
@@ -202,11 +206,10 @@ class Redis extends Driver
             // 指定标签清除
             $keys = $this->getTagItem($tag);
 
-            foreach ($keys as $key) {
+            $this->handler->del($keys);
-                $this->handler->delete($key);
-            }
 
-            $this->rm('tag_' . md5($tag));
+            $tagName = $this->getTagKey($tag);
+            $this->handler->del($tagName);
             return true;
         }
 
@@ -215,4 +218,55 @@ class Redis extends Driver
         return $this->handler->flushDB();
     }
 
+    /**
+     * 缓存标签
+     * @access public
+     * @param  string        $name 标签名
+     * @param  string|array  $keys 缓存标识
+     * @param  bool          $overlay 是否覆盖
+     * @return $this
+     */
+    public function tag($name, $keys = null, $overlay = false)
+    {
+        if (is_null($keys)) {
+            $this->tag = $name;
+        } else {
+            $tagName = $this->getTagKey($name);
+            if ($overlay) {
+                $this->handler->del($tagName);
+            }
+
+            foreach ($keys as $key) {
+                $this->handler->sAdd($tagName, $key);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 更新标签
+     * @access protected
+     * @param  string $name 缓存标识
+     * @return void
+     */
+    protected function setTagItem($name)
+    {
+        if ($this->tag) {
+            $tagName = $this->getTagKey($this->tag);
+            $this->handler->sAdd($tagName, $name);
+        }
+    }
+
+    /**
+     * 获取标签包含的缓存标识
+     * @access protected
+     * @param  string $tag 缓存标签
+     * @return array
+     */
+    protected function getTagItem($tag)
+    {
+        $tagName = $this->getTagKey($tag);
+        return $this->handler->sMembers($tagName);
+    }
 }

thinkphp/library/think/cache/driver/Sqlite.php

@@ -216,7 +216,7 @@ class Sqlite extends Driver
     public function clear($tag = null)
     {
         if ($tag) {
-            $name = sqlite_escape_string($tag);
+            $name = sqlite_escape_string($this->getTagKey($tag));
             $sql  = 'DELETE FROM ' . $this->options['table'] . ' WHERE tag=\'' . $name . '\'';
             sqlite_query($this->handler, $sql);
             return true;

thinkphp/library/think/cache/driver/Wincache.php

@@ -160,15 +160,16 @@ class Wincache extends Driver
     {
         if ($tag) {
             $keys = $this->getTagItem($tag);
-            foreach ($keys as $key) {
+
-                wincache_ucache_delete($key);
+            wincache_ucache_delete($keys);
-            }
+
-            $this->rm('tag_' . md5($tag));
+            $tagName = $this->getTagkey($tag);
+            $this->rm($tagName);
             return true;
-        } else {
-            $this->writeTimes++;
-            return wincache_ucache_clear();
         }
+
+        $this->writeTimes++;
+        return wincache_ucache_clear();
     }
 
 }

thinkphp/library/think/cache/driver/Xcache.php

@@ -159,10 +159,12 @@ class Xcache extends Driver
         if ($tag) {
             // 指定标签清除
             $keys = $this->getTagItem($tag);
+
             foreach ($keys as $key) {
                 xcache_unset($key);
             }
-            $this->rm('tag_' . md5($tag));
+
+            $this->rm($this->getTagKey($tag));
             return true;
         }
 

thinkphp/library/think/db/Builder.php

@@ -411,8 +411,11 @@ abstract class Builder
         }
 
         if (is_scalar($value) && !in_array($exp, ['EXP', 'NOT NULL', 'NULL', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === false) {
-            $name  = $query->bind($value, $bindType);
+            if (0 === strpos($value, ':') && $query->isBind(substr($value, 1))) {
-            $value = ':' . $name;
+            } else {
+                $name  = $query->bind($value, $bindType);
+                $value = ':' . $name;
+            }
         }
 
         // 解析查询表达式
@@ -451,7 +454,7 @@ abstract class Builder
                 $array[] = $key . ' ' . $exp . ' :' . $name;
             }
 
-            $whereStr = '(' . implode($array, ' ' . strtoupper($logic) . ' ') . ')';
+            $whereStr = '(' . implode(' ' . strtoupper($logic) . ' ', $array) . ')';
         } else {
             $whereStr = $key . ' ' . $exp . ' ' . $value;
         }
@@ -644,6 +647,8 @@ abstract class Builder
         // IN 查询
         if ($value instanceof \Closure) {
             $value = $this->parseClosure($query, $value, false);
+        } elseif ($value instanceof Expression) {
+            $value = $value->getValue();
         } else {
             $value = array_unique(is_array($value) ? $value : explode(',', $value));
 

thinkphp/library/think/db/Connection.php

@@ -1246,22 +1246,14 @@ abstract class Connection
      * @access public
      * @param  Query     $query 查询对象
      * @param  string    $field   字段名
-     * @param  bool      $default   默认值
+     * @param  mixed     $default   默认值
+     * @param  bool      $one   是否返回一个值
      * @return mixed
      */
-    public function value(Query $query, $field, $default = null)
+    public function value(Query $query, $field, $default = null, $one = true)
     {
         $options = $query->getOptions();
 
-        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
-            $cache  = $options['cache'];
-            $result = $this->getCacheData($query, $cache, null, $key);
-
-            if (false !== $result) {
-                return $result;
-            }
-        }
-
         if (isset($options['field'])) {
             $query->removeOption('field');
         }
@@ -1271,7 +1263,19 @@ abstract class Connection
         }
 
         $query->setOption('field', $field);
-        $query->setOption('limit', 1);
+
+        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
+            $cache  = $options['cache'];
+            $result = $this->getCacheData($query, $cache, null, $key);
+
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
+        if ($one) {
+            $query->setOption('limit', 1);
+        }
 
         // 生成查询SQL
         $sql = $this->builder->select($query);
@@ -1320,7 +1324,7 @@ abstract class Connection
 
         $field = $aggregate . '(' . (!empty($distinct) ? 'DISTINCT ' : '') . $this->builder->parseKey($query, $field, true) . ') AS tp_' . strtolower($aggregate);
 
-        return $this->value($query, $field, 0);
+        return $this->value($query, $field, 0, false);
     }
 
     /**
@@ -1335,16 +1339,6 @@ abstract class Connection
     {
         $options = $query->getOptions();
 
-        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
-            // 判断查询缓存
-            $cache  = $options['cache'];
-            $result = $this->getCacheData($query, $cache, null, $guid);
-
-            if (false !== $result) {
-                return $result;
-            }
-        }
-
         if (isset($options['field'])) {
             $query->removeOption('field');
         }
@@ -1362,6 +1356,16 @@ abstract class Connection
 
         $query->setOption('field', $field);
 
+        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
+            // 判断查询缓存
+            $cache  = $options['cache'];
+            $result = $this->getCacheData($query, $cache, null, $guid);
+
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
         // 生成查询SQL
         $sql = $this->builder->select($query);
 

thinkphp/library/think/db/Query.php

@@ -611,9 +611,9 @@ class Query
     /**
      * 聚合查询
      * @access public
-     * @param  string $aggregate    聚合方法
+     * @param  string               $aggregate    聚合方法
-     * @param  string $field        字段名
+     * @param  string|Expression    $field        字段名
-     * @param  bool   $force        强制转为数字类型
+     * @param  bool                 $force        强制转为数字类型
      * @return mixed
      */
     public function aggregate($aggregate, $field, $force = false)
@@ -628,16 +628,13 @@ class Query
             $result = (float) $result;
         }
 
-        // 查询完成后清空聚合字段信息
-        $this->removeOption('field');
-
         return $result;
     }
 
     /**
      * COUNT查询
      * @access public
-     * @param  string $field 字段名
+     * @param  string|Expression $field 字段名
      * @return float|string
      */
     public function count($field = '*')
@@ -667,7 +664,7 @@ class Query
     /**
      * SUM查询
      * @access public
-     * @param  string $field 字段名
+     * @param  string|Expression $field 字段名
      * @return float
      */
     public function sum($field)
@@ -678,8 +675,8 @@ class Query
     /**
      * MIN查询
      * @access public
-     * @param  string $field    字段名
+     * @param  string|Expression $field    字段名
-     * @param  bool   $force    强制转为数字类型
+     * @param  bool              $force    强制转为数字类型
      * @return mixed
      */
     public function min($field, $force = true)
@@ -690,8 +687,8 @@ class Query
     /**
      * MAX查询
      * @access public
-     * @param  string $field    字段名
+     * @param  string|Expression $field    字段名
-     * @param  bool   $force    强制转为数字类型
+     * @param  bool              $force    强制转为数字类型
      * @return mixed
      */
     public function max($field, $force = true)
@@ -702,7 +699,7 @@ class Query
     /**
      * AVG查询
      * @access public
-     * @param  string $field 字段名
+     * @param  string|Expression $field 字段名
      * @return float
      */
     public function avg($field)
@@ -837,9 +834,10 @@ class Query
      * @param  mixed  $join      关联的表名
      * @param  mixed  $condition 条件
      * @param  string $type      JOIN类型
+     * @param  array  $bind      参数绑定
      * @return $this
      */
-    public function join($join, $condition = null, $type = 'INNER')
+    public function join($join, $condition = null, $type = 'INNER', $bind = [])
     {
         if (empty($condition)) {
             // 如果为组数，则循环调用join
@@ -850,7 +848,9 @@ class Query
             }
         } else {
             $table = $this->getJoinTable($join);
-
+            if ($bind) {
+                $this->bindParams($condition, $bind);
+            }
             $this->options['join'][] = [$table, strtoupper($type), $condition];
         }
 
@@ -862,9 +862,10 @@ class Query
      * @access public
      * @param  mixed  $join      关联的表名
      * @param  mixed  $condition 条件
+     * @param  array  $bind      参数绑定
      * @return $this
      */
-    public function leftJoin($join, $condition = null)
+    public function leftJoin($join, $condition = null, $bind = [])
     {
         return $this->join($join, $condition, 'LEFT');
     }
@@ -874,9 +875,10 @@ class Query
      * @access public
      * @param  mixed  $join      关联的表名
      * @param  mixed  $condition 条件
+     * @param  array  $bind      参数绑定
      * @return $this
      */
-    public function rightJoin($join, $condition = null)
+    public function rightJoin($join, $condition = null, $bind = [])
     {
         return $this->join($join, $condition, 'RIGHT');
     }
@@ -886,9 +888,10 @@ class Query
      * @access public
      * @param  mixed  $join      关联的表名
      * @param  mixed  $condition 条件
+     * @param  array  $bind      参数绑定
      * @return $this
      */
-    public function fullJoin($join, $condition = null)
+    public function fullJoin($join, $condition = null, $bind = [])
     {
         return $this->join($join, $condition, 'FULL');
     }
@@ -946,6 +949,10 @@ class Query
      */
     public function union($union, $all = false)
     {
+        if (empty($union)) {
+            return $this;
+        }
+
         $this->options['union']['type'] = $all ? 'UNION ALL' : 'UNION';
 
         if (is_array($union)) {
@@ -1505,6 +1512,7 @@ class Query
     {
         if ($field instanceof $this) {
             $this->options['where'] = $field->getOptions('where');
+            $this->bind($field->getBind(false));
             return $this;
         }
 
@@ -1520,10 +1528,10 @@ class Query
         }
 
         if ($field instanceof Expression) {
-            return $this->whereRaw($field, is_array($op) ? $op : []);
+            return $this->whereRaw($field, is_array($op) ? $op : [], $logic);
         } elseif ($strict) {
             // 使用严格模式查询
-            $where = [$field, $op, $condition];
+            $where = [$field, $op, $condition, $logic];
         } elseif (is_array($field)) {
             // 解析数组批量查询
             return $this->parseArrayWhereItems($field, $logic);
@@ -1531,7 +1539,7 @@ class Query
             $where = $field;
         } elseif (is_string($field)) {
             if (preg_match('/[,=\<\'\"\(\s]/', $field)) {
-                return $this->whereRaw($field, $op);
+                return $this->whereRaw($field, $op, $logic);
             } elseif (is_string($op) && strtolower($op) == 'exp') {
                 $bind = isset($param[2]) && is_array($param[2]) ? $param[2] : null;
                 return $this->whereExp($field, $condition, $bind, $logic);
@@ -1575,7 +1583,7 @@ class Query
                 // 字段相等查询
                 $where = [$field, '=', $op];
             }
-        } elseif (in_array(strtoupper($op), ['REGEXP', 'NOT REGEXP', 'EXISTS', 'NOT EXISTS', 'NOTEXISTS'], true)) {
+        } elseif (in_array(strtoupper($op), ['EXISTS', 'NOT EXISTS', 'NOTEXISTS'], true)) {
             $where = [$field, $op, is_string($condition) ? $this->raw($condition) : $condition];
         } else {
             $where = $field ? [$field, $op, $condition, isset($param[2]) ? $param[2] : null] : null;
@@ -1648,6 +1656,7 @@ class Query
     {
         if (true === $option) {
             $this->options = [];
+            $this->bind    = [];
         } elseif (is_string($option) && isset($this->options[$option])) {
             unset($this->options[$option]);
         }
@@ -2189,12 +2198,12 @@ class Query
     }
 
     /**
-     * 设置需要追加输出的属性
+     * 设置需要附加的输出属性
      * @access public
-     * @param  array $append 需要追加的属性
+     * @param  array $append   属性列表
      * @return $this
      */
-    public function append(array $append)
+    public function append(array $append = [])
     {
         $this->options['append'] = $append;
         return $this;
@@ -3347,13 +3356,13 @@ class Query
 
         // 输出属性控制
         if (!empty($options['visible'])) {
-            $result->visible($options['visible']);
+            $result->visible($options['visible'], true);
         } elseif (!empty($options['hidden'])) {
-            $result->hidden($options['hidden']);
+            $result->hidden($options['hidden'], true);
         }
 
         if (!empty($options['append'])) {
-            $result->append($options['append']);
+            $result->append($options['append'], true);
         }
 
         // 关联查询

thinkphp/library/think/db/builder/Mysql.php

@@ -94,13 +94,17 @@ class Mysql extends Builder
      * @param  Query        $query        查询对象
      * @param  string       $key
      * @param  string       $exp
-     * @param  Expression   $value
+     * @param  mixed        $value
      * @param  string       $field
      * @return string
      */
-    protected function parseRegexp(Query $query, $key, $exp, Expression $value, $field)
+    protected function parseRegexp(Query $query, $key, $exp, $value, $field)
     {
-        return $key . ' ' . $exp . ' ' . $value->getValue();
+        if ($value instanceof Expression) {
+            $value = $value->getValue();
+        }
+
+        return $key . ' ' . $exp . ' ' . $value;
     }
 
     /**
@@ -145,7 +149,7 @@ class Mysql extends Builder
             throw new Exception('not support data:' . $key);
         }
 
-        if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)`.\s]/', $key))) {
+        if ('*' != $key && !preg_match('/[,\'\"\*\(\)`.\s]/', $key)) {
             $key = '`' . $key . '`';
         }
 

thinkphp/library/think/db/builder/Sqlsrv.php

@@ -114,7 +114,7 @@ class Sqlsrv extends Builder
             throw new Exception('not support data:' . $key);
         }
 
-        if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)\[.\s]/', $key))) {
+        if ('*' != $key && !preg_match('/[,\'\"\*\(\)\[.\s]/', $key)) {
             $key = '[' . $key . ']';
         }
 

thinkphp/library/think/db/connector/pgsql.sql

@@ -37,6 +37,10 @@ DECLARE
      v_sql varchar;
      v_rec RECORD;
      v_key varchar;
+     v_conkey smallint[];
+     v_pk varchar[];
+   v_len smallint;
+   v_pos smallint := 1;
 BEGIN
      SELECT
            pg_class.oid  INTO v_oid
@@ -49,6 +53,31 @@ BEGIN
          RETURN;
      END IF;
 
+     SELECT
+         pg_constraint.conkey INTO v_conkey
+     FROM
+         pg_constraint
+     INNER JOIN pg_class ON pg_constraint.conrelid = pg_class.oid
+     INNER JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid
+     INNER JOIN pg_type ON pg_type.oid = pg_attribute.atttypid
+     WHERE
+        pg_class.relname = a_table_name
+     AND pg_constraint.contype = 'p';     
+     
+   v_len := array_length(v_conkey,1) + 1;
+   WHILE v_pos < v_len LOOP
+            SELECT 
+                pg_attribute.attname INTO v_key 
+            FROM pg_constraint 
+            INNER JOIN pg_class ON pg_constraint.conrelid = pg_class.oid 
+            INNER JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid AND pg_attribute.attnum = pg_constraint.conkey [ v_conkey[v_pos] ] 
+            INNER JOIN pg_type ON pg_type.oid = pg_attribute.atttypid 
+            WHERE pg_class.relname = a_table_name AND pg_constraint.contype = 'p';        
+            v_pk := array_append(v_pk,v_key);
+      
+      v_pos := v_pos + 1;
+     END LOOP;
+
      v_sql='
      SELECT
            pg_attribute.attname AS fields_name,
@@ -83,12 +112,19 @@ BEGIN
          v_ret.fields_not_null=v_rec.fields_not_null;
          v_ret.fields_default=v_rec.fields_default;
          v_ret.fields_comment=v_rec.fields_comment;
-         SELECT constraint_name INTO v_key FROM information_schema.key_column_usage WHERE table_schema=a_schema_name AND table_name=a_table_name AND column_name=v_rec.fields_name;
+        
-         IF FOUND THEN
+         v_ret.fields_key_name='';
-            v_ret.fields_key_name=v_key;
+     
-         ELSE
+     v_len := array_length(v_pk,1) + 1;
-            v_ret.fields_key_name='';
+     v_pos := 1;
-         END IF;
+     WHILE v_pos < v_len LOOP
+             IF v_rec.fields_name = v_pk[v_pos] THEN
+                v_ret.fields_key_name=v_pk[v_pos];
+                EXIT;
+             END IF;
+       v_pos := v_pos + 1;
+         END LOOP;        
+
          RETURN NEXT v_ret;
      END LOOP;
      RETURN ;

thinkphp/library/think/exception/DbException.php

@@ -26,7 +26,7 @@ class DbException extends Exception
      * @param  string    $sql
      * @param  int       $code
      */
-    public function __construct($message, array $config, $sql, $code = 10500)
+    public function __construct($message, array $config = [], $sql = '', $code = 10500)
     {
         $this->message = $message;
         $this->code    = $code;

thinkphp/library/think/facade/Config.php

@@ -16,11 +16,14 @@ use think\Facade;
 /**
  * @see \think\Config
  * @mixin \think\Config
+ * @method array load(string $file, string $name = '') static 加载配置文件
  * @method bool has(string $name) static 检测配置是否存在
- * @method array pull(string $name) static 获取一级配置
+ * @method array pull(string $name) static 获取一级配置参数
  * @method mixed get(string $name,mixed $default = null) static 获取配置参数
- * @method mixed set(string $name, mixed $value = null) static 设置配置参数
+ * @method array set(mixed $name, mixed $value = null) static 设置配置参数
- * @method array reset(string $prefix ='') static 重置配置参数
+ * @method array reset(string $name ='') static 重置配置参数
+ * @method void remove(string $name = '') static 移除配置
+ * @method void setYaconf(mixed $yaconf) static 设置开启Yaconf 或者指定配置文件名
  */
 class Config extends Facade
 {

thinkphp/library/think/facade/Log.php

@@ -21,6 +21,7 @@ use think\Facade;
  * @method \think\Log record(mixed $msg, string $type = 'info', array $context = []) static 记录日志信息
  * @method \think\Log clear() static 清空日志信息
  * @method \think\Log key(string $key) static 当前日志记录的授权key
+ * @method \think\Log close() static 关闭本次请求日志写入
  * @method bool check(array $config) static 检查日志写入权限
  * @method bool save() static 保存调试信息
  * @method void write(mixed $msg, string $type = 'info', bool $force = false) static 实时写入日志信息

thinkphp/library/think/log/driver/File.php

@@ -19,7 +19,7 @@ use think\App;
 class File
 {
     protected $config = [
-        'time_format' => ' c ',
+        'time_format' => 'c',
         'single'      => false,
         'file_size'   => 2097152,
         'path'        => '',
@@ -107,7 +107,13 @@ class File
         $info['timestamp'] = date($this->config['time_format']);
 
         foreach ($message as $type => $msg) {
-            $info[$type] = is_array($msg) ? implode("\r\n", $msg) : $msg;
+            $msg = is_array($msg) ? implode("\r\n", $msg) : $msg;
+            if (PHP_SAPI == 'cli') {
+                $info['msg']  = $msg;
+                $info['type'] = $type;
+            } else {
+                $info[$type] = $msg;
+            }
         }
 
         if (PHP_SAPI == 'cli') {
@@ -140,13 +146,13 @@ class File
             }
         }
 
+        $cli = PHP_SAPI == 'cli' ? '_cli' : '';
+
         if ($this->config['single']) {
             $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
 
-            $destination = $this->config['path'] . $name . '.log';
+            $destination = $this->config['path'] . $name . $cli . '.log';
         } else {
-            $cli = PHP_SAPI == 'cli' ? '_cli' : '';
-
             if ($this->config['max_files']) {
                 $filename = date('Ymd') . $cli . '.log';
             } else {
@@ -172,15 +178,13 @@ class File
 
         if ($this->config['single']) {
             $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
-
-            $name .= '_' . $type;
         } elseif ($this->config['max_files']) {
-            $name = date('Ymd') . '_' . $type . $cli;
+            $name = date('Ymd');
         } else {
-            $name = date('d') . '_' . $type . $cli;
+            $name = date('d');
         }
 
-        return $path . DIRECTORY_SEPARATOR . $name . '.log';
+        return $path . DIRECTORY_SEPARATOR . $name . '_' . $type . $cli . '.log';
     }
 
     /**

thinkphp/library/think/model/Collection.php

@@ -24,8 +24,10 @@ class Collection extends BaseCollection
      */
     public function load($relation)
     {
-        $item = current($this->items);
+        if (!$this->isEmpty()) {
-        $item->eagerlyResultSet($this->items, $relation);
+            $item = current($this->items);
+            $item->eagerlyResultSet($this->items, $relation);
+        }
 
         return $this;
     }

thinkphp/library/think/model/Relation.php

@@ -58,6 +58,16 @@ abstract class Relation
         return $this->query->getModel();
     }
 
+    /**
+     * 获取当前的关联模型类的实例
+     * @access public
+     * @return Query
+     */
+    public function getQuery()
+    {
+        return $this->query;
+    }
+
     /**
      * 设置当前关联为自关联
      * @access public
@@ -129,6 +139,17 @@ abstract class Relation
         }
     }
 
+    /**
+     * 更新数据
+     * @access public
+     * @param  array $data 更新数据
+     * @return integer|string
+     */
+    public function update(array $data = [])
+    {
+        return $this->query->update($data);
+    }
+
     /**
      * 删除记录
      * @access public

thinkphp/library/think/model/concern/Attribute.php

@@ -12,6 +12,7 @@
 namespace think\model\concern;
 
 use InvalidArgumentException;
+use think\db\Expression;
 use think\Exception;
 use think\Loader;
 use think\model\Relation;
@@ -326,9 +327,13 @@ trait Attribute
             $method = 'set' . Loader::parseName($name, 1) . 'Attr';
 
             if (method_exists($this, $method)) {
-                $value = $this->$method($value, array_merge($this->data, $data));
+                $origin = $this->data;
+                $value  = $this->$method($value, array_merge($this->data, $data));
 
                 $this->set[$name] = true;
+                if (is_null($value) && $origin !== $this->data) {
+                    return;
+                }
             } elseif (isset($this->type[$name])) {
                 // 类型转换
                 $value = $this->writeTransform($value, $this->type[$name]);
@@ -370,8 +375,7 @@ trait Attribute
             switch ($type) {
                 case 'datetime':
                 case 'date':
-                    $format = !empty($param) ? $param : $this->dateFormat;
+                    $value = $this->formatDateTime('Y-m-d H:i:s.u');
-                    $value  = $this->formatDateTime($format . '.u');
                     break;
                 case 'timestamp':
                 case 'integer':
@@ -384,7 +388,7 @@ trait Attribute
             'date',
             'timestamp',
         ])) {
-            $value = $this->formatDateTime($this->dateFormat . '.u');
+            $value = $this->formatDateTime('Y-m-d H:i:s.u');
         } else {
             $value = time();
         }
@@ -405,6 +409,10 @@ trait Attribute
             return;
         }
 
+        if ($value instanceof Expression) {
+            return $value;
+        }
+
         if (is_array($type)) {
             list($type, $param) = $type;
         } elseif (strpos($type, ':')) {
@@ -431,9 +439,8 @@ trait Attribute
                 }
                 break;
             case 'datetime':
-                $format = !empty($param) ? $param : $this->dateFormat;
+                $value = is_numeric($value) ? $value : strtotime($value);
-                $value  = is_numeric($value) ? $value : strtotime($value);
+                $value = $this->formatDateTime('Y-m-d H:i:s.u', $value);
-                $value  = $this->formatDateTime($format, $value);
                 break;
             case 'object':
                 if (is_object($value)) {

thinkphp/library/think/model/concern/Conversion.php

@@ -130,34 +130,52 @@ trait Conversion
      */
     public function toArray()
     {
-        $item    = [];
+        $item       = [];
-        $visible = [];
+        $hasVisible = false;
-        $hidden  = [];
+
+        foreach ($this->visible as $key => $val) {
+            if (is_string($val)) {
+                if (strpos($val, '.')) {
+                    list($relation, $name)      = explode('.', $val);
+                    $this->visible[$relation][] = $name;
+                } else {
+                    $this->visible[$val] = true;
+                    $hasVisible          = true;
+                }
+                unset($this->visible[$key]);
+            }
+        }
+
+        foreach ($this->hidden as $key => $val) {
+            if (is_string($val)) {
+                if (strpos($val, '.')) {
+                    list($relation, $name)     = explode('.', $val);
+                    $this->hidden[$relation][] = $name;
+                } else {
+                    $this->hidden[$val] = true;
+                }
+                unset($this->hidden[$key]);
+            }
+        }
 
         // 合并关联数据
         $data = array_merge($this->data, $this->relation);
 
-        // 过滤属性
-        if (!empty($this->visible)) {
-            $array = $this->parseAttr($this->visible, $visible);
-            $data  = array_intersect_key($data, array_flip($array));
-        } elseif (!empty($this->hidden)) {
-            $array = $this->parseAttr($this->hidden, $hidden, false);
-            $data  = array_diff_key($data, array_flip($array));
-        }
-
         foreach ($data as $key => $val) {
             if ($val instanceof Model || $val instanceof ModelCollection) {
                 // 关联模型对象
-                if (isset($visible[$key])) {
+                if (isset($this->visible[$key]) && is_array($this->visible[$key])) {
-                    $val->visible($visible[$key]);
+                    $val->visible($this->visible[$key]);
-                } elseif (isset($hidden[$key])) {
+                } elseif (isset($this->hidden[$key]) && is_array($this->hidden[$key])) {
-                    $val->hidden($hidden[$key]);
+                    $val->hidden($this->hidden[$key]);
                 }
                 // 关联模型对象
-                $item[$key] = $val->toArray();
+                if (!isset($this->hidden[$key]) || true !== $this->hidden[$key]) {
-            } else {
+                    $item[$key] = $val->toArray();
-                // 模型属性
+                }
+            } elseif (isset($this->visible[$key])) {
+                $item[$key] = $this->getAttr($key);
+            } elseif (!isset($this->hidden[$key]) && !$hasVisible) {
                 $item[$key] = $this->getAttr($key);
             }
         }
@@ -187,10 +205,7 @@ trait Conversion
 
                     $item[$key] = $relation->append([$attr])->toArray();
                 } else {
-                    $value = $this->getAttr($name, $item);
+                    $item[$name] = $this->getAttr($name, $item);
-                    if (false !== $value) {
-                        $item[$name] = $value;
-                    }
                 }
             }
         }
@@ -251,38 +266,4 @@ trait Conversion
         return $collection;
     }
 
-    /**
-     * 解析隐藏及显示属性
-     * @access protected
-     * @param  array $attrs  属性
-     * @param  array $result 结果集
-     * @param  bool  $visible
-     * @return array
-     */
-    protected function parseAttr($attrs, &$result, $visible = true)
-    {
-        $array = [];
-
-        foreach ($attrs as $key => $val) {
-            if (is_array($val)) {
-                if ($visible) {
-                    $array[] = $key;
-                }
-
-                $result[$key] = $val;
-            } elseif (strpos($val, '.')) {
-                list($key, $name) = explode('.', $val);
-
-                if ($visible) {
-                    $array[] = $key;
-                }
-
-                $result[$key][] = $name;
-            } else {
-                $array[] = $val;
-            }
-        }
-
-        return $array;
-    }
 }

thinkphp/library/think/model/concern/RelationShip.php

@@ -204,7 +204,7 @@ trait RelationShip
             $relationResult = $this->$method();
 
             if (isset($withRelationAttr[$relationName])) {
-                $relationResult->withAttr($withRelationAttr[$relationName]);
+                $relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
             }
 
             $this->relation[$relation] = $relationResult->getRelation($subRelation, $closure);
@@ -248,7 +248,7 @@ trait RelationShip
             $relationResult = $this->$relation();
 
             if (isset($withRelationAttr[$relationName])) {
-                $relationResult->withAttr($withRelationAttr[$relationName]);
+                $relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
             }
 
             $relationResult->eagerlyResultSet($resultSet, $relation, $subRelation, $closure, $join);
@@ -290,7 +290,7 @@ trait RelationShip
             $relationResult = $this->$relation();
 
             if (isset($withRelationAttr[$relationName])) {
-                $relationResult->withAttr($withRelationAttr[$relationName]);
+                $relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
             }
 
             $relationResult->eagerlyResult($result, $relation, $subRelation, $closure, $join);

thinkphp/library/think/model/concern/SoftDelete.php

@@ -235,7 +235,8 @@ trait SoftDelete
         $field = $this->getDeleteTimeField(true);
 
         if ($field) {
-            $query->useSoftDelete($field, $this->defaultSoftDelete);
+            $condition = is_null($this->defaultSoftDelete) ? ['null', ''] : ['=', $this->defaultSoftDelete];
+            $query->useSoftDelete($field, $condition);
         }
     }
 }

thinkphp/library/think/model/relation/BelongsToMany.php

@@ -559,7 +559,10 @@ class BelongsToMany extends Relation
 
             foreach ($ids as $id) {
                 $pivot[$this->foreignKey] = $id;
-                $this->pivot->replace()->save($pivot);
+                $this->pivot->replace()
+                    ->exists(false)
+                    ->data([])
+                    ->save($pivot);
                 $result[] = $this->newPivot($pivot, true);
             }
 

thinkphp/library/think/model/relation/HasMany.php

@@ -194,8 +194,8 @@ class HasMany extends Relation
             }
         }
 
-        return $this->query
+        return $this->query->alias($aggregate . '_table')
-            ->whereExp($this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
+            ->whereExp($aggregate . '_table.' . $this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
             ->fetchSql()
             ->$aggregate($field);
     }
@@ -241,9 +241,9 @@ class HasMany extends Relation
      */
     public function save($data, $replace = true)
     {
-        $model = $this->make($data);
+        $model = $this->make();
 
-        return $model->replace($replace)->save() ? $model : false;
+        return $model->replace($replace)->save($data) ? $model : false;
     }
 
     /**
@@ -266,11 +266,11 @@ class HasMany extends Relation
     /**
      * 批量保存当前关联数据对象
      * @access public
-     * @param  array $dataSet   数据集
+     * @param  array|\think\Collection $dataSet   数据集
      * @param  boolean $replace 是否自动识别更新和写入
      * @return array|false
      */
-    public function saveAll(array $dataSet, $replace = true)
+    public function saveAll($dataSet, $replace = true)
     {
         $result = [];
 

thinkphp/library/think/model/relation/MorphMany.php

@@ -277,7 +277,7 @@ class MorphMany extends Relation
      */
     public function save($data)
     {
-        $model = $this->make($data);
+        $model = $this->make();
 
         return $model->save($data) ? $model : false;
     }

thinkphp/library/think/model/relation/MorphOne.php

@@ -211,8 +211,8 @@ class MorphOne extends Relation
      */
     public function save($data)
     {
-        $model = $this->make($data);
+        $model = $this->make();
-        return $model->save() ? $model : false;
+        return $model->save($data) ? $model : false;
     }
 
     /**

thinkphp/library/think/response/Download.php

@@ -20,7 +20,7 @@ class Download extends Response
     protected $name;
     protected $mimeType;
     protected $isContent = false;
-    protected $openinBrower = false;
+    protected $openinBrowser = false;
     /**
      * 处理数据
      * @access protected
@@ -53,7 +53,7 @@ class Download extends Response
         $this->header['Pragma']                    = 'public';
         $this->header['Content-Type']              = $mimeType ?: 'application/octet-stream';
         $this->header['Cache-control']             = 'max-age=' . $this->expire;
-        $this->header['Content-Disposition']       = $this->openinBrower ? 'inline' : 'attachment; filename="' . $name . '"';
+        $this->header['Content-Disposition']       = $this->openinBrowser ? 'inline' : 'attachment; filename="' . $name . '"';
         $this->header['Content-Length']            = $size;
         $this->header['Content-Transfer-Encoding'] = 'binary';
         $this->header['Expires']                   = gmdate("D, d M Y H:i:s", time() + $this->expire) . ' GMT';
@@ -138,11 +138,11 @@ class Download extends Response
     /**
      * 设置是否在浏览器中显示文件
      * @access public
-     * @param  bool  $openinBrower 是否在浏览器中显示文件
+     * @param  bool  $openinBrowser 是否在浏览器中显示文件
      * @return $this
      */
-    public function openinBrower($openinBrower) {
+    public function openinBrowser($openinBrowser) {
-        $this->openinBrower = $openinBrower;
+        $this->openinBrowser = $openinBrowser;
         return $this;
     }
 }

thinkphp/library/think/response/Redirect.php

@@ -87,11 +87,12 @@ class Redirect extends Response
     /**
      * 记住当前url后跳转
      * @access public
+     * @param string $url 指定记住的url
      * @return $this
      */
-    public function remember()
+    public function remember($url = null)
     {
-        $this->app['session']->set('redirect_url', $this->app['request']->url());
+        $this->app['session']->set('redirect_url', $url ?: $this->app['request']->url());
 
         return $this;
     }

thinkphp/library/think/route/Rule.php

@@ -642,17 +642,26 @@ abstract class Rule
     protected function checkCrossDomain($request)
     {
         if (!empty($this->option['cross_domain'])) {
-
             $header = [
-                'Access-Control-Allow-Origin'  => '*',
+                'Access-Control-Allow-Credentials' => 'true',
-                'Access-Control-Allow-Methods' => 'GET, POST, PATCH, PUT, DELETE',
+                'Access-Control-Allow-Methods'     => 'GET, POST, PATCH, PUT, DELETE',
-                'Access-Control-Allow-Headers' => 'Authorization, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-Requested-With',
+                'Access-Control-Allow-Headers'     => 'Authorization, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-Requested-With',
             ];
 
             if (!empty($this->option['header'])) {
                 $header = array_merge($header, $this->option['header']);
             }
 
+            if (!isset($header['Access-Control-Allow-Origin'])) {
+                $httpOrigin = $request->header('origin');
+
+                if ($httpOrigin && strpos(config('cookie.domain'), $httpOrigin)) {
+                    $header['Access-Control-Allow-Origin'] = $httpOrigin;
+                } else {
+                    $header['Access-Control-Allow-Origin'] = '*';
+                }
+            }
+
             $this->option['header'] = $header;
 
             if ($request->method(true) == 'OPTIONS') {
@@ -722,13 +731,17 @@ abstract class Rule
 
         // 替换路由地址中的变量
         if (is_string($route) && !empty($matches)) {
-            foreach ($matches as $key => $val) {
+            $search = $replace = [];
-                if (false !== strpos($route, '<' . $key . '>')) {
+
-                    $route = str_replace('<' . $key . '>', $val, $route);
+            foreach ($matches as $key => $value) {
-                } elseif (false !== strpos($route, ':' . $key)) {
+                $search[]  = '<' . $key . '>';
-                    $route = str_replace(':' . $key, $val, $route);
+                $replace[] = $value;
-                }
+
+                $search[]  = ':' . $key;
+                $replace[] = $value;
             }
+
+            $route = str_replace($search, $replace, $route);
         }
 
         // 解析额外参数
@@ -997,7 +1010,7 @@ abstract class Rule
             }
         }
 
-        $regex = str_replace($match, $replace, $rule);
+        $regex = str_replace(array_unique($match), array_unique($replace), $rule);
         $regex = str_replace([')?/', ')/', ')?-', ')-', '\\\\/'], [')\/', ')\/', ')\-', ')\-', '\/'], $regex);
 
         if (isset($hasSlash)) {

thinkphp/library/think/route/RuleGroup.php

@@ -118,8 +118,8 @@ class RuleGroup extends Rule
      */
     public function check($request, $url, $completeMatch = false)
     {
+        // 跨域OPTIONS请求
         if ($dispatch = $this->checkCrossDomain($request)) {
-            // 跨域OPTIONS请求
             return $dispatch;
         }
 
@@ -151,10 +151,6 @@ class RuleGroup extends Rule
         $method = strtolower($request->method());
         $rules  = $this->getMethodRules($method);
 
-        if (count($rules) == 0) {
-            return false;
-        }
-
         if ($this->parent) {
             // 合并分组参数
             $this->mergeGroupOptions();

thinkphp/library/think/route/RuleItem.php

@@ -149,11 +149,6 @@ class RuleItem extends Rule
      */
     public function checkRule($request, $url, $match = null, $completeMatch = false)
     {
-        if ($dispatch = $this->checkCrossDomain($request)) {
-            // 允许跨域
-            return $dispatch;
-        }
-
         // 检查参数有效性
         if (!$this->checkOption($this->option, $request)) {
             return false;
@@ -169,6 +164,15 @@ class RuleItem extends Rule
         }
 
         if (false !== $match) {
+            if (!empty($option['cross_domain'])) {
+                if ($dispatch = $this->checkCrossDomain($request)) {
+                    // 允许跨域
+                    return $dispatch;
+                }
+
+                $option['header'] = $this->option['header'];
+            }
+
             // 检查前置行为
             if (isset($option['before']) && false === $this->checkBefore($option['before'])) {
                 return false;

thinkphp/library/think/route/dispatch/Module.php

@@ -69,10 +69,6 @@ class Module extends Dispatch
         // 获取控制器名
         $controller = strip_tags($result[1] ?: $this->rule->getConfig('default_controller'));
 
-        if (!preg_match('/^[A-Za-z](\w|\.)*$/', $controller)) {
-            throw new HttpException(404, 'controller not exists:' . $controller);
-        }
-
         $this->controller = $convert ? strtolower($controller) : $controller;
 
         // 获取操作名
@@ -97,10 +93,6 @@ class Module extends Dispatch
                 $this->rule->getConfig('url_controller_layer'),
                 $this->rule->getConfig('controller_suffix'),
                 $this->rule->getConfig('empty_controller'));
-
-            if ($instance instanceof Controller) {
-                $instance->registerMiddleware();
-            }
         } catch (ClassNotFoundException $e) {
             throw new HttpException(404, 'controller not exists:' . $e->getClass());
         }

thinkphp/library/think/route/dispatch/Url.php

@@ -60,6 +60,10 @@ class Url extends Dispatch
             $controller = !empty($path) ? array_shift($path) : null;
         }
 
+        if ($controller && !preg_match('/^[A-Za-z][\w|\.]*$/', $controller)) {
+            throw new HttpException(404, 'controller not exists:' . $controller);
+        }
+
         // 解析操作
         $action = !empty($path) ? array_shift($path) : null;