From 70293ae6aadf8ef0b9914d299b6aa100f1febf0a Mon Sep 17 00:00:00 2001
From: wispx <1591788658@qq.com>
Date: Tue, 11 Dec 2018 09:15:14 +0800
Subject: [PATCH] =?UTF-8?q?thinkphp=E5=AE=89=E5=85=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.lock                                 | 12 ++++++------
 install.sql                                   |  2 +-
 thinkphp/helper.php                           |  4 ++--
 thinkphp/library/think/App.php                |  2 +-
 thinkphp/library/think/db/Query.php           | 18 ++++++++++++------
 .../library/think/db/connector/Sqlsrv.php     |  2 ++
 .../think/model/relation/BelongsToMany.php    |  2 +-
 .../library/think/model/relation/HasMany.php  | 16 +++++++++++++---
 .../think/model/relation/MorphMany.php        | 18 ++++++++++++++----
 .../library/think/model/relation/MorphOne.php | 19 +++++++++++++++----
 thinkphp/library/think/response/Download.php  | 15 +++++++++++++--
 .../library/think/route/dispatch/Module.php   |  7 ++++++-
 thinkphp/library/think/template/TagLib.php    |  2 +-
 update.sql                                    |  3 +++
 vendor/composer/installed.json                | 16 ++++++++--------
 15 files changed, 98 insertions(+), 40 deletions(-)

diff --git a/composer.lock b/composer.lock
index ec8d6be6..b0defeca 100644
--- a/composer.lock
+++ b/composer.lock
@@ -581,7 +581,7 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.48",
+            "version": "v2.8.49",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -641,16 +641,16 @@
         },
         {
             "name": "topthink/framework",
-            "version": "v5.1.30",
+            "version": "v5.1.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/top-think/framework.git",
-                "reference": "4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc"
+                "reference": "93339b1a4df5a73e0143db0847a4c5e0b2e46fb0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/top-think/framework/zipball/4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc",
-                "reference": "4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc",
+                "url": "https://api.github.com/repos/top-think/framework/zipball/93339b1a4df5a73e0143db0847a4c5e0b2e46fb0",
+                "reference": "93339b1a4df5a73e0143db0847a4c5e0b2e46fb0",
                 "shasum": ""
             },
             "require": {
@@ -688,7 +688,7 @@
                 "orm",
                 "thinkphp"
             ],
-            "time": "2018-11-30T07:46:23+00:00"
+            "time": "2018-12-09T12:41:21+00:00"
         },
         {
             "name": "topthink/think-captcha",
diff --git a/install.sql b/install.sql
index d11aa127..70512abc 100644
--- a/install.sql
+++ b/install.sql
@@ -79,7 +79,7 @@ INSERT INTO `lsky_config` (`id`, `key`, `type`, `input_type`, `name`, `title`, `
 (38, 'upyun', 'text', 'text', 'upyun_operator_name', 'OperatorName', '操作员账号', '', ''),
 (39, 'upyun', 'text', 'password', 'upyun_operator_pwd', 'OperatorPwd', '操作员密码', '', ''),
 (40, 'upyun', 'text', 'text', 'upyun_service_name', 'ServiceName', '云储存服务名称', '', ''),
-(41, '', 'text', 'text', 'system_version', '系统版本', NULL, '1.3.2', ''),
+(41, '', 'text', 'text', 'system_version', '系统版本', NULL, '1.3.3', ''),
 
 
 (42, 'audit', 'bool', 'checkbox', 'open_audit', '开启图片鉴黄', '鉴黄接口申请地址：https://www.moderatecontent.com', '0', ''),
diff --git a/thinkphp/helper.php b/thinkphp/helper.php
index 4aa73722..9c465335 100644
--- a/thinkphp/helper.php
+++ b/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 = 180)
+    function download($filename, $name = '', $content = false, $expire = 360, $openinBrower = false)
     {
-        return Response::create($filename, 'download')->name($name)->isContent($content)->expire($expire);
+        return Response::create($filename, 'download')->name($name)->isContent($content)->expire($expire)->openinBrower($openinBrower);
     }
 }
 
diff --git a/thinkphp/library/think/App.php b/thinkphp/library/think/App.php
index addb756c..cfa2601e 100644
--- a/thinkphp/library/think/App.php
+++ b/thinkphp/library/think/App.php
@@ -20,7 +20,7 @@ use think\route\Dispatch;
  */
 class App extends Container
 {
-    const VERSION = '5.1.30 LTS';
+    const VERSION = '5.1.31 LTS';
 
     /**
      * 当前模块路径
diff --git a/thinkphp/library/think/db/Query.php b/thinkphp/library/think/db/Query.php
index f58da0e9..00483328 100644
--- a/thinkphp/library/think/db/Query.php
+++ b/thinkphp/library/think/db/Query.php
@@ -656,9 +656,9 @@ class Query
                 $query->fetchSql(true);
             }
 
-            $count = $query->aggregate('COUNT', '*');
+            $count = $query->aggregate('COUNT', '*', true);
         } else {
-            $count = $this->aggregate('COUNT', $field);
+            $count = $this->aggregate('COUNT', $field, true);
         }
 
         return is_string($count) ? $count : (int) $count;
@@ -1008,11 +1008,13 @@ class Query
         if ($tableName) {
             // 添加统一的前缀
             $prefix = $prefix ?: $tableName;
-            foreach ($field as $key => $val) {
-                if (is_numeric($key)) {
-                    $val = $prefix . '.' . $val . ($alias ? ' AS ' . $alias . $val : '');
+            foreach ($field as $key => &$val) {
+                if (is_numeric($key) && $alias) {
+                    $field[$prefix . '.' . $val] = $alias . $val;
+                    unset($field[$key]);
+                } elseif (is_numeric($key)) {
+                    $val = $prefix . '.' . $val;
                 }
-                $field[$key] = $val;
             }
         }
 
@@ -3548,6 +3550,10 @@ class Query
      */
     protected function parseView(&$options)
     {
+        if (!isset($options['map'])) {
+            return;
+        }
+
         foreach (['AND', 'OR'] as $logic) {
             if (isset($options['where'][$logic])) {
                 foreach ($options['where'][$logic] as $key => $val) {
diff --git a/thinkphp/library/think/db/connector/Sqlsrv.php b/thinkphp/library/think/db/connector/Sqlsrv.php
index aba405fd..123affb8 100644
--- a/thinkphp/library/think/db/connector/Sqlsrv.php
+++ b/thinkphp/library/think/db/connector/Sqlsrv.php
@@ -56,6 +56,8 @@ class Sqlsrv extends Connection
     public function getFields($tableName)
     {
         list($tableName) = explode(' ', $tableName);
+        $tableNames      = explode('.', $tableName);
+        $tableName       = isset($tableNames[1]) ? $tableNames[1] : $tableNames[0];
 
         $sql = "SELECT   column_name,   data_type,   column_default,   is_nullable
         FROM    information_schema.tables AS t
diff --git a/thinkphp/library/think/model/relation/BelongsToMany.php b/thinkphp/library/think/model/relation/BelongsToMany.php
index a66b0d01..b7cdebe1 100644
--- a/thinkphp/library/think/model/relation/BelongsToMany.php
+++ b/thinkphp/library/think/model/relation/BelongsToMany.php
@@ -559,7 +559,7 @@ class BelongsToMany extends Relation
 
             foreach ($ids as $id) {
                 $pivot[$this->foreignKey] = $id;
-                $this->pivot->insert($pivot, true);
+                $this->pivot->replace()->save($pivot);
                 $result[] = $this->newPivot($pivot, true);
             }
 
diff --git a/thinkphp/library/think/model/relation/HasMany.php b/thinkphp/library/think/model/relation/HasMany.php
index f679e95b..72d83144 100644
--- a/thinkphp/library/think/model/relation/HasMany.php
+++ b/thinkphp/library/think/model/relation/HasMany.php
@@ -240,6 +240,18 @@ class HasMany extends Relation
      * @return Model|false
      */
     public function save($data, $replace = true)
+    {
+        $model = $this->make($data);
+
+        return $model->replace($replace)->save() ? $model : false;
+    }
+
+    /**
+     * 创建关联对象实例
+     * @param array $data
+     * @return Model
+     */
+    public function make($data = [])
     {
         if ($data instanceof Model) {
             $data = $data->getData();
@@ -248,9 +260,7 @@ class HasMany extends Relation
         // 保存关联表数据
         $data[$this->foreignKey] = $this->parent->{$this->localKey};
 
-        $model = new $this->model;
-
-        return $model->replace($replace)->save($data) ? $model : false;
+        return new $this->model($data);
     }
 
     /**
diff --git a/thinkphp/library/think/model/relation/MorphMany.php b/thinkphp/library/think/model/relation/MorphMany.php
index e1ca0912..1a7f15eb 100644
--- a/thinkphp/library/think/model/relation/MorphMany.php
+++ b/thinkphp/library/think/model/relation/MorphMany.php
@@ -272,10 +272,22 @@ class MorphMany extends Relation
     /**
      * 保存（新增）当前关联数据对象
      * @access public
-     * @param  mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @param  mixed $data 数据
      * @return Model|false
      */
     public function save($data)
+    {
+        $model = $this->make($data);
+
+        return $model->save($data) ? $model : false;
+    }
+
+    /**
+     * 创建关联对象实例
+     * @param array $data
+     * @return Model
+     */
+    public function make($data = [])
     {
         if ($data instanceof Model) {
             $data = $data->getData();
@@ -284,12 +296,10 @@ class MorphMany extends Relation
         // 保存关联表数据
         $pk = $this->parent->getPk();
 
-        $model = new $this->model;
-
         $data[$this->morphKey]  = $this->parent->$pk;
         $data[$this->morphType] = $this->type;
 
-        return $model->save($data) ? $model : false;
+        return new $this->model($data);
     }
 
     /**
diff --git a/thinkphp/library/think/model/relation/MorphOne.php b/thinkphp/library/think/model/relation/MorphOne.php
index 738040db..716539f4 100644
--- a/thinkphp/library/think/model/relation/MorphOne.php
+++ b/thinkphp/library/think/model/relation/MorphOne.php
@@ -206,22 +206,33 @@ class MorphOne extends Relation
     /**
      * 保存（新增）当前关联数据对象
      * @access public
-     * @param  mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @param mixed $data 数据
      * @return Model|false
      */
     public function save($data)
+    {
+        $model = $this->make($data);
+        return $model->save() ? $model : false;
+    }
+
+    /**
+     * 创建关联对象实例
+     * @param array $data
+     * @return Model
+     */
+    public function make($data = [])
     {
         if ($data instanceof Model) {
             $data = $data->getData();
         }
+
         // 保存关联表数据
         $pk = $this->parent->getPk();
 
-        $model = new $this->model;
-
         $data[$this->morphKey]  = $this->parent->$pk;
         $data[$this->morphType] = $this->type;
-        return $model->save($data) ? $model : false;
+
+        return new $this->model($data);
     }
 
     /**
diff --git a/thinkphp/library/think/response/Download.php b/thinkphp/library/think/response/Download.php
index 02a440df..d5fcb444 100644
--- a/thinkphp/library/think/response/Download.php
+++ b/thinkphp/library/think/response/Download.php
@@ -20,7 +20,7 @@ class Download extends Response
     protected $name;
     protected $mimeType;
     protected $isContent = false;
-
+    protected $openinBrower = 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']       = 'attachment; filename="' . $name . '"';
+        $this->header['Content-Disposition']       = $this->openinBrower ? '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';
@@ -134,4 +134,15 @@ class Download extends Response
 
         return $this;
     }
+
+    /**
+     * 设置是否在浏览器中显示文件
+     * @access public
+     * @param  bool  $openinBrower 是否在浏览器中显示文件
+     * @return $this
+     */
+    public function openinBrower($openinBrower) {
+        $this->openinBrower = $openinBrower;
+        return $this;
+    }
 }
diff --git a/thinkphp/library/think/route/dispatch/Module.php b/thinkphp/library/think/route/dispatch/Module.php
index 396ce11d..dc1974ce 100644
--- a/thinkphp/library/think/route/dispatch/Module.php
+++ b/thinkphp/library/think/route/dispatch/Module.php
@@ -67,7 +67,12 @@ class Module extends Dispatch
         // 是否自动转换控制器和操作名
         $convert = is_bool($this->convert) ? $this->convert : $this->rule->getConfig('url_convert');
         // 获取控制器名
-        $controller       = strip_tags($result[1] ?: $this->rule->getConfig('default_controller'));
+        $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;
 
         // 获取操作名
diff --git a/thinkphp/library/think/template/TagLib.php b/thinkphp/library/think/template/TagLib.php
index 3653b7d2..bbbb2c03 100644
--- a/thinkphp/library/think/template/TagLib.php
+++ b/thinkphp/library/think/template/TagLib.php
@@ -298,7 +298,7 @@ class TagLib
      */
     public function parseCondition($condition)
     {
-        if (strpos($condition, ':')) {
+        if (!strpos($condition, '::') && strpos($condition, ':')) {
             $condition = ' ' . substr(strstr($condition, ':'), 1);
         }
 
diff --git a/update.sql b/update.sql
index 2fba1ddf..27db6978 100644
--- a/update.sql
+++ b/update.sql
@@ -12,3 +12,6 @@ INSERT INTO `lsky_config` (`id`, `key`, `type`, `input_type`, `name`, `title`, `
 (NULL, 'audit', 'text', 'text', 'audit_key', 'Key', NULL, '', ''),
 (NULL, 'audit', 'select', 'text', 'audit_index', '内容评级', '1=所有人，2=少年，3=成人', '3', '{\"1\": \"所有人\", \"2\": \"少年\", \"3\": \"成人\"}'),
 (NULL, 'other', 'bool', 'checkbox', 'open_api', '开启API', '是否开放接口', '0', '');
+
+-- v1.3.3
+UPDATE `lsky_config` SET `value` = '1.3.3' WHERE `lsky_config`.`name` = 'system_version';
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 4d9cdb43..cad0b7ec 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -594,8 +594,8 @@
     },
     {
         "name": "symfony/event-dispatcher",
-        "version": "v2.8.48",
-        "version_normalized": "2.8.48.0",
+        "version": "v2.8.49",
+        "version_normalized": "2.8.49.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/event-dispatcher.git",
@@ -656,17 +656,17 @@
     },
     {
         "name": "topthink/framework",
-        "version": "v5.1.30",
-        "version_normalized": "5.1.30.0",
+        "version": "v5.1.31",
+        "version_normalized": "5.1.31.0",
         "source": {
             "type": "git",
             "url": "https://github.com/top-think/framework.git",
-            "reference": "4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc"
+            "reference": "93339b1a4df5a73e0143db0847a4c5e0b2e46fb0"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/top-think/framework/zipball/4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc",
-            "reference": "4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc",
+            "url": "https://api.github.com/repos/top-think/framework/zipball/93339b1a4df5a73e0143db0847a4c5e0b2e46fb0",
+            "reference": "93339b1a4df5a73e0143db0847a4c5e0b2e46fb0",
             "shasum": ""
         },
         "require": {
@@ -682,7 +682,7 @@
             "sebastian/phpcpd": "2.*",
             "squizlabs/php_codesniffer": "2.*"
         },
-        "time": "2018-11-30T07:46:23+00:00",
+        "time": "2018-12-09T12:41:21+00:00",
         "type": "think-framework",
         "installation-source": "dist",
         "notification-url": "https://packagist.org/downloads/",