From e1ed4933134ccc7bcb11efb83415264fc55865bf Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 31 Aug 2024 17:22:25 +0800 Subject: [PATCH] 1 --- app/api/controller/IndexController.php | 4 +++- app/common/model/user/User.php | 20 ++++++++--------- composer.json | 2 +- composer.lock | 22 +++++++------------ vendor/composer/installed.json | 14 ++++++------ vendor/composer/installed.php | 6 ++--- vendor/webman/think-orm/src/ThinkOrm.php | 2 +- .../webman/think-orm/src/config/thinkorm.php | 2 -- 8 files changed, 33 insertions(+), 39 deletions(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 28fd3f781..61de17549 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -44,7 +44,9 @@ class IndexController extends BaseApiController public function index() { - return json([1]); + $now_money=$this->request->get('money'); + $a= (new User())->update(['now_money'=>$now_money],['id'=>366]); + return json($a); } diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index c5d807bdf..5b62d7d75 100644 --- a/app/common/model/user/User.php +++ b/app/common/model/user/User.php @@ -196,15 +196,15 @@ class User extends BaseModel })->field("FROM_UNIXTIME($create_time,'$timeType') as days,count(id) as num")->group('days')->select()->toArray(); } - // public static function onBeforeUpdate($data) - // { - // var_dump($data->toArray()); - // channelLog($data->toArray()??[], 'user', '更新前'); - // } - // public static function onAfterUpdate($data) - // { - // var_dump($data->toArray()); + public static function onBeforeWrite($data) + { + var_dump($data->toArray()); + channelLog($data->toArray()??[], 'user', '更新前'); + } + public static function onAfterWrite($data) + { + var_dump($data->toArray()); - // channelLog($data->toArray()??[], 'user', '更新后'); - // } + channelLog($data->toArray()??[], 'user', '更新后'); + } } diff --git a/composer.json b/composer.json index d15c2d391..c9b3a5826 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "php": ">=8.1", "workerman/webman-framework": "^1.5.22", "monolog/monolog": "^2.2", - "webman/think-orm": "v1.1.1", + "webman/think-orm": "v1.1.3", "vlucas/phpdotenv": "^5.4", "psr/container": "^1.1.1", "ext-json": "*", diff --git a/composer.lock b/composer.lock index ee9fc1370..1fe62351d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fb2dcd2b6d5f80016cfae906588f8bb9", + "content-hash": "883e9ccf0087df3fcbef974d5c9317f3", "packages": [ { "name": "aliyuncs/oss-sdk-php", @@ -7319,23 +7319,17 @@ }, { "name": "webman/think-orm", - "version": "v1.1.1", + "version": "v1.1.3", "source": { "type": "git", "url": "https://github.com/webman-php/think-orm.git", - "reference": "9f1e525c5c4b5a2e1eee6a4f82ef5d23c69139a2" + "reference": "1c20a9bbedf8a3c0b741f19b175eb929907101c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webman-php/think-orm/zipball/9f1e525c5c4b5a2e1eee6a4f82ef5d23c69139a2", - "reference": "9f1e525c5c4b5a2e1eee6a4f82ef5d23c69139a2", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://api.github.com/repos/webman-php/think-orm/zipball/1c20a9bbedf8a3c0b741f19b175eb929907101c6", + "reference": "1c20a9bbedf8a3c0b741f19b175eb929907101c6", + "shasum": "" }, "require": { "topthink/think-orm": "^2.0.53 || ^3.0.0", @@ -7353,9 +7347,9 @@ ], "support": { "issues": "https://github.com/webman-php/think-orm/issues", - "source": "https://github.com/webman-php/think-orm/tree/v1.1.1" + "source": "https://github.com/webman-php/think-orm/tree/v1.1.3" }, - "time": "2023-04-23T14:40:18+00:00" + "time": "2024-08-14T03:46:14+00:00" }, { "name": "webmozart/assert", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index be31e2968..abc2e61cb 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -7268,24 +7268,24 @@ }, { "name": "webman/think-orm", - "version": "v1.1.1", - "version_normalized": "1.1.1.0", + "version": "v1.1.3", + "version_normalized": "1.1.3.0", "source": { "type": "git", "url": "https://github.com/webman-php/think-orm.git", - "reference": "9f1e525c5c4b5a2e1eee6a4f82ef5d23c69139a2" + "reference": "1c20a9bbedf8a3c0b741f19b175eb929907101c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webman-php/think-orm/zipball/9f1e525c5c4b5a2e1eee6a4f82ef5d23c69139a2", - "reference": "9f1e525c5c4b5a2e1eee6a4f82ef5d23c69139a2", + "url": "https://api.github.com/repos/webman-php/think-orm/zipball/1c20a9bbedf8a3c0b741f19b175eb929907101c6", + "reference": "1c20a9bbedf8a3c0b741f19b175eb929907101c6", "shasum": "" }, "require": { "topthink/think-orm": "^2.0.53 || ^3.0.0", "workerman/webman-framework": "^1.2.1" }, - "time": "2023-04-23T14:40:18+00:00", + "time": "2024-08-14T03:46:14+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -7299,7 +7299,7 @@ ], "support": { "issues": "https://github.com/webman-php/think-orm/issues", - "source": "https://github.com/webman-php/think-orm/tree/v1.1.1" + "source": "https://github.com/webman-php/think-orm/tree/v1.1.3" }, "install-path": "../webman/think-orm" }, diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 12dfcbab0..84d6169e2 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -993,9 +993,9 @@ 'dev_requirement' => false, ), 'webman/think-orm' => array( - 'pretty_version' => 'v1.1.1', - 'version' => '1.1.1.0', - 'reference' => '9f1e525c5c4b5a2e1eee6a4f82ef5d23c69139a2', + 'pretty_version' => 'v1.1.3', + 'version' => '1.1.3.0', + 'reference' => '1c20a9bbedf8a3c0b741f19b175eb929907101c6', 'type' => 'library', 'install_path' => __DIR__ . '/../webman/think-orm', 'aliases' => array(), diff --git a/vendor/webman/think-orm/src/ThinkOrm.php b/vendor/webman/think-orm/src/ThinkOrm.php index a5e2f13d2..c35a53e5d 100644 --- a/vendor/webman/think-orm/src/ThinkOrm.php +++ b/vendor/webman/think-orm/src/ThinkOrm.php @@ -40,7 +40,7 @@ class ThinkOrm implements Bootstrap } foreach ($instances as $connection) { /* @var \think\db\connector\Mysql $connection */ - if (in_array($connection->getConfig('type'), ['mysql', 'oracle', 'sqlsrv'])) { + if (in_array($connection->getConfig('type'), ['mysql', 'oracle', 'sqlsrv']) && method_exists($connection, 'getPdo') && $connection->getPdo()) { try { $connection->query('select 1'); } catch (Throwable $e) {} diff --git a/vendor/webman/think-orm/src/config/thinkorm.php b/vendor/webman/think-orm/src/config/thinkorm.php index 37af444bb..8cb83de7e 100644 --- a/vendor/webman/think-orm/src/config/thinkorm.php +++ b/vendor/webman/think-orm/src/config/thinkorm.php @@ -27,8 +27,6 @@ return [ 'prefix' => '', // 断线重连 'break_reconnect' => true, - // 关闭SQL监听日志 - 'trigger_sql' => false, // 自定义分页类 'bootstrap' => '' ],