From 73f8756bd42e903f9f6c309d2e06434121bcd78a Mon Sep 17 00:00:00 2001 From: zpc Date: Fri, 16 May 2025 19:22:20 +0800 Subject: [PATCH 1/4] 33 --- .env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index d30629e..a15c551 100644 --- a/.env +++ b/.env @@ -6,9 +6,9 @@ DEFAULT_TIMEZONE = Asia/Shanghai [DATABASE] TYPE = mysql HOSTNAME = 127.0.0.1 -DATABASE = youda_test -USERNAME = youda_test -PASSWORD = youda_test +DATABASE = youda +USERNAME = youda +PASSWORD = youda HOSTPORT = 3306 CHARSET = utf8 DEBUG = false From 74af0e12cd9f86dab00e93496c0cdc09a8387395 Mon Sep 17 00:00:00 2001 From: youda Date: Fri, 16 May 2025 19:56:00 +0800 Subject: [PATCH 2/4] 222 --- app/api/controller/Index.php | 18 +++++++++--------- app/api/controller/Login.php | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/api/controller/Index.php b/app/api/controller/Index.php index 3dbef98..4b7b72f 100755 --- a/app/api/controller/Index.php +++ b/app/api/controller/Index.php @@ -94,15 +94,15 @@ class Index extends Base $type = \request()->param('type/d', 0); // 使用Redis缓存 - $redis = (new \app\common\server\RedisHelper())->getRedis(); - $cacheKey = 'danye:content:' . $type; + // $redis = (new \app\common\server\RedisHelper())->getRedis(); + // $cacheKey = 'danye:content:' . $type; - // 尝试从缓存获取数据 - $cacheData = $redis->get($cacheKey); - if ($cacheData) { - $cacheData = json_decode($cacheData, true); - return json(['status' => 1, 'msg' => '请求成功', 'data' => $cacheData['content'], 'is_image_optimizer' => $cacheData['is_image_optimizer']]); - } + // // 尝试从缓存获取数据 + // $cacheData = $redis->get($cacheKey); + // if ($cacheData) { + // $cacheData = json_decode($cacheData, true); + // return json(['status' => 1, 'msg' => '请求成功', 'data' => $cacheData['content'], 'is_image_optimizer' => $cacheData['is_image_optimizer']]); + // } // 缓存不存在，查询数据库 $info = Danye::where(['id' => $type])->find(); @@ -120,7 +120,7 @@ class Index extends Base 'content' => $content, 'is_image_optimizer' => $is_image_optimizer ]; - $redis->setex($cacheKey, 600, json_encode($cacheData)); + // $redis->setex($cacheKey, 600, json_encode($cacheData)); // return $this->renderSuccess("请求成功", $content); return json(['status' => 1, 'msg' => '请求成功', 'data' => $content, 'is_image_optimizer' => $is_image_optimizer]); diff --git a/app/api/controller/Login.php b/app/api/controller/Login.php index 121a603..07eccef 100755 --- a/app/api/controller/Login.php +++ b/app/api/controller/Login.php @@ -886,13 +886,13 @@ class Login extends Base $redis = (new RedisHelper())->getRedis(); $redisKey = "VerificationCode:{$mobile}"; $redisCode = $redis->get($redisKey); - if ($code != "9999") { + // if ($code != "9999") { if (empty($redisCode) || $redisCode != $code) { $logMessages[] = '验证码错误: ' . $code . '，正确验证码: ' . $redisCode . '==>' . $mobile; Log::error(end($logMessages)); return $this->renderError('验证码错误'); } - } + // } // 验证通过后删除Redis中的验证码 $redis->del($redisKey); From 644f1b1752b3855893dc0ea80ce94f51b576e75a Mon Sep 17 00:00:00 2001 From: youda Date: Fri, 16 May 2025 21:01:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Diamond.php | 2 +- app/api/controller/User.php | 3 +++ app/common/model/User.php | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/admin/controller/Diamond.php b/app/admin/controller/Diamond.php index 730db19..05b55ca 100644 --- a/app/admin/controller/Diamond.php +++ b/app/admin/controller/Diamond.php @@ -158,7 +158,7 @@ class Diamond extends Base // 更新数据 $result = DiamondProducts::edit($id, $param); - if ($result) { + if ($result !== false) { return $this->succ('修改成功'); } else { return $this->err('修改失败'); diff --git a/app/api/controller/User.php b/app/api/controller/User.php index 2e92058..57e00bf 100755 --- a/app/api/controller/User.php +++ b/app/api/controller/User.php @@ -1298,6 +1298,9 @@ class User extends Base } $invite_code = request()->param('invite_code', ''); $user = Usermodel::where('id', '=', $user_id)->find(); + if ($user['uid'] == $invite_code) { + return $this->renderError("不能绑定自己"); + } $p_user = Usermodel::where('uid', '=', $invite_code)->find(); if ($p_user != null) { $user->pid = $p_user['id']; diff --git a/app/common/model/User.php b/app/common/model/User.php index d1ae45e..b509d6f 100755 --- a/app/common/model/User.php +++ b/app/common/model/User.php @@ -427,6 +427,7 @@ class User extends Base $money1 = ProfitIntegral::field('change_money') ->where('user_id', '=', $data['pid']) ->where('type', '=', 5) + ->where('share_uid', '=', $data['id']) ->where('change_money', '>', 0) ->sum('change_money'); if ($money1 > 0) { From face8051085ad53793d6614aae21705c9b0f2509 Mon Sep 17 00:00:00 2001 From: zpc Date: Fri, 16 May 2025 21:01:40 +0800 Subject: [PATCH 4/4] 221 --- .env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index a15c551..d30629e 100644 --- a/.env +++ b/.env @@ -6,9 +6,9 @@ DEFAULT_TIMEZONE = Asia/Shanghai [DATABASE] TYPE = mysql HOSTNAME = 127.0.0.1 -DATABASE = youda -USERNAME = youda -PASSWORD = youda +DATABASE = youda_test +USERNAME = youda_test +PASSWORD = youda_test HOSTPORT = 3306 CHARSET = utf8 DEBUG = false