server/manghe
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of 123.207.203.228:server/manghe into dev

Browse Source
This commit is contained in:
youda 2025-05-17 18:17:41 +08:00
commit a67dd65a97
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/api/controller/Index.php
View File

@ -94,15 +94,15 @@ class Index extends Base
$type = \request()->param('type/d', 0); $type = \request()->param('type/d', 0);
// 使用Redis缓存 // 使用Redis缓存
$redis = (new \app\common\server\RedisHelper())->getRedis(); // $redis = (new \app\common\server\RedisHelper())->getRedis();
$cacheKey = 'danye:content:' . $type; // $cacheKey = 'danye:content:' . $type;
// 尝试从缓存获取数据 // // 尝试从缓存获取数据
$cacheData = $redis->get($cacheKey); // $cacheData = $redis->get($cacheKey);
if ($cacheData) { // if ($cacheData) {
$cacheData = json_decode($cacheData, true); // $cacheData = json_decode($cacheData, true);
return json(['status' => 1, 'msg' => '请求成功', 'data' => $cacheData['content'], 'is_image_optimizer' => $cacheData['is_image_optimizer']]); // return json(['status' => 1, 'msg' => '请求成功', 'data' => $cacheData['content'], 'is_image_optimizer' => $cacheData['is_image_optimizer']]);
} // }
// 缓存不存在，查询数据库 // 缓存不存在，查询数据库
$info = Danye::where(['id' => $type])->find(); $info = Danye::where(['id' => $type])->find();
@ -120,7 +120,7 @@ class Index extends Base
'content' => $content, 'content' => $content,
'is_image_optimizer' => $is_image_optimizer '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 $this->renderSuccess("请求成功", $content);
return json(['status' => 1, 'msg' => '请求成功', 'data' => $content, 'is_image_optimizer' => $is_image_optimizer]); return json(['status' => 1, 'msg' => '请求成功', 'data' => $content, 'is_image_optimizer' => $is_image_optimizer]);

4
app/api/controller/Login.php
View File

@ -886,13 +886,13 @@ class Login extends Base
$redis = (new RedisHelper())->getRedis(); $redis = (new RedisHelper())->getRedis();
$redisKey = "VerificationCode:{$mobile}"; $redisKey = "VerificationCode:{$mobile}";
$redisCode = $redis->get($redisKey); $redisCode = $redis->get($redisKey);
if ($code != "9999") { // if ($code != "9999") {
if (empty($redisCode) || $redisCode != $code) { if (empty($redisCode) || $redisCode != $code) {
$logMessages[] = '验证码错误: ' . $code . '，正确验证码: ' . $redisCode . '==>' . $mobile; $logMessages[] = '验证码错误: ' . $code . '，正确验证码: ' . $redisCode . '==>' . $mobile;
Log::error(end($logMessages)); Log::error(end($logMessages));
return $this->renderError('验证码错误'); return $this->renderError('验证码错误');
} }
} // }
// 验证通过后删除Redis中的验证码 // 验证通过后删除Redis中的验证码
$redis->del($redisKey); $redis->del($redisKey);

3
app/api/controller/User.php
View File

@ -1298,6 +1298,9 @@ class User extends Base
} }
$invite_code = request()->param('invite_code', ''); $invite_code = request()->param('invite_code', '');
$user = Usermodel::where('id', '=', $user_id)->find(); $user = Usermodel::where('id', '=', $user_id)->find();
if ($user['uid'] == $invite_code) {
return $this->renderError("不能绑定自己");
}
$p_user = Usermodel::where('uid', '=', $invite_code)->find(); $p_user = Usermodel::where('uid', '=', $invite_code)->find();
if ($p_user != null) { if ($p_user != null) {
$user->pid = $p_user['id']; $user->pid = $p_user['id'];

1
app/common/model/User.php
View File

@ -427,6 +427,7 @@ class User extends Base
$money1 = ProfitIntegral::field('change_money') $money1 = ProfitIntegral::field('change_money')
->where('user_id', '=', $data['pid']) ->where('user_id', '=', $data['pid'])
->where('type', '=', 5) ->where('type', '=', 5)
->where('share_uid', '=', $data['id'])
->where('change_money', '>', 0) ->where('change_money', '>', 0)
->sum('change_money'); ->sum('change_money');
if ($money1 > 0) { if ($money1 > 0) {