diff --git a/README.md b/README.md index 380e6ddb8dd1d5d83a2b8277876792e4d0397adc..7f6d0aee479bdda8acb80b18a318444f21f7b336 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 3a58c1dadf6504ee8a1d988126498beb61628f65..5aa12cadf2b33699575b86f9dc7d052a440b5856 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'app\\admin\\AppStoreService', diff --git a/vendor/thinkcmf/cmf-app/src/admin/controller/SlideItemController.php b/vendor/thinkcmf/cmf-app/src/admin/controller/SlideItemController.php index 677d90a57d72a0f7f87ecabfd8e3df2eabd9d685..d355996d1783e09a2f8acc1f3c1ca9bc88c3ea37 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']])); } } diff --git a/vendor/topthink/think-orm/src/db/Builder.php b/vendor/topthink/think-orm/src/db/Builder.php index 688dfa42357e327debee404b9fc64603ffbb9b75..9ff174fe6921bf3a2f5ddc58cbed20c56bfcd321 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 ); } } +