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); 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) {