From 53397e7d46beee5364368f1c7ba5cd8b7fd4bf02 Mon Sep 17 00:00:00 2001 From: dean Date: Thu, 3 Aug 2023 10:16:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ vendor/services.php | 2 +- vendor/topthink/think-orm/src/db/Builder.php | 12 +++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 380e6ddb8..7f6d0aee4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ ThinkCMF 6.0.9 让你更自由地飞 +=============== +欢迎入坑,有问题请及时提交issue! ### 主要特性 * 框架协议依旧为`MIT`,让你更自由地飞 diff --git a/vendor/services.php b/vendor/services.php index 3a58c1dad..5aa12cadf 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'app\\admin\\AppStoreService', diff --git a/vendor/topthink/think-orm/src/db/Builder.php b/vendor/topthink/think-orm/src/db/Builder.php index 688dfa423..9ff174fe6 100644 --- a/vendor/topthink/think-orm/src/db/Builder.php +++ b/vendor/topthink/think-orm/src/db/Builder.php @@ -737,9 +737,9 @@ abstract class Builder } return $key . ' ' . substr($exp, 0, -4) - . $this->parseDateTime($query, $value[0], $field, $bindType) - . ' AND ' - . $this->parseDateTime($query, $value[1], $field, $bindType); + . $this->parseDateTime($query, $value[0], $field, $bindType) + . ' AND ' + . $this->parseDateTime($query, $value[1], $field, $bindType); } @@ -783,9 +783,6 @@ abstract class Builder if (false === strpos($value, ',')) { return $key . ('IN' == $exp ? ' = ' : ' <> ') . $value; } - - $value = implode(',', $array); - } return $key . ' ' . $exp . ' (' . $value . ')'; @@ -1287,7 +1284,7 @@ abstract class Builder $this->insertAllSql ); } - + /** * 生成slect insert SQL * @access public @@ -1370,3 +1367,4 @@ abstract class Builder ); } } + -- Gitee From f21bef485fb16fa745d006e5ef3ad9e2ade0bc74 Mon Sep 17 00:00:00 2001 From: FOSSICKER <455502926@qq.com> Date: Mon, 25 Dec 2023 16:44:39 +0000 Subject: [PATCH 2/2] =?UTF-8?q?update=20vendor/thinkcmf/cmf-app/src/admin/?= =?UTF-8?q?controller/SlideItemController.php.=20more=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: FOSSICKER <455502926@qq.com> --- .../cmf-app/src/admin/controller/SlideItemController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/thinkcmf/cmf-app/src/admin/controller/SlideItemController.php b/vendor/thinkcmf/cmf-app/src/admin/controller/SlideItemController.php index 677d90a57..d355996d1 100644 --- a/vendor/thinkcmf/cmf-app/src/admin/controller/SlideItemController.php +++ b/vendor/thinkcmf/cmf-app/src/admin/controller/SlideItemController.php @@ -92,7 +92,7 @@ class SlideItemController extends AdminBaseController { if ($this->request->isPost()) { $data = $this->request->param('',null,'strip_tags'); - SlideItemModel::insert($data['post']); + SlideItemModel::create($data['post']); $this->success(lang('ADD_SUCCESS'), url('SlideItem/index', ['slide_id' => $data['post']['slide_id']])); } } -- Gitee