From d1bbbab7c39a4822b73dfebc0b4cf5061413385a Mon Sep 17 00:00:00 2001 From: ASUS <515617283@qq.com> Date: Fri, 15 Aug 2025 10:28:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/model/Course.php | 13 ++++++------- app/api/model/Msg.php | 12 ++++++------ app/czg/app/controller/CommonController.php | 4 ++-- app/functions.php | 4 ++-- config/route.php | 2 ++ 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/app/api/model/Course.php b/app/api/model/Course.php index 12ff143..98ec347 100644 --- a/app/api/model/Course.php +++ b/app/api/model/Course.php @@ -13,7 +13,6 @@ use think\Model; class Course extends Model { - public static function selectCourse($data) { @@ -32,7 +31,7 @@ class Course extends Model return returnSuccessData($cache); } $page = ($data['page'] - 1) * $data['limit']; - $db = $data_db = Db::connect(config('database.search_library'))->name('course'); + $db = $data_db = Db::connect(config('think-orm.search_library'))->name('course'); $db = $db->where(['status' => 1]); $count = $db->count(); $data_db = $data_db->limit($page, $data['limit']); @@ -104,7 +103,7 @@ class Course extends Model ])->limit(page($get['page'], $get['limit']), $get['limit'])->select(); } $is_arr = self::sacouresdata($result); - $db = Db::connect(config('database.search_library')); + $db = Db::connect(config('think-orm.search_library')); $course = $db->name('course')->whereIn('course_id', $is_arr['course_id'])->select(); $course_arr = self::sacouresdata($result, $course); // 拿详情 @@ -192,9 +191,9 @@ class Course extends Model if(empty($get['page']) || empty($get['limit']) || empty($get['randomNum'])) { return returnErrorData('参数不完整'); } - $sale = config('database.db_map'); + $sale = config('think-orm.db_map'); foreach ($sale as $k => $v) { - if(in_array($v, config('database.unset_db_map'))) { + if(in_array($v, config('think-orm.unset_db_map'))) { unset($sale[$k]); } } @@ -288,7 +287,7 @@ class Course extends Model } $courseId = $get['courseId']; // 获取短剧详情 - $dd_b = Db::connect(config('database.search_library')); + $dd_b = Db::connect(config('think-orm.search_library')); $db_name = $dd_b->name('course'); $bean = $db_name->where(['course_id' => $courseId])->find(); $dd_b->close(); @@ -433,7 +432,7 @@ class Course extends Model $weekView = Common::getCourseWeekViewCount($course['course_id']); } - $db_name = Db::connect(config('database.z_library'))->name('course'); + $db_name = Db::connect(config('think-orm.z_library'))->name('course'); // 4. 执行数据库更新 $db_name->where(['course_id' => $course['course_id']])->update([ 'view_counts' => $viewCounts, diff --git a/app/api/model/Msg.php b/app/api/model/Msg.php index eda1e0d..15d907c 100644 --- a/app/api/model/Msg.php +++ b/app/api/model/Msg.php @@ -18,7 +18,7 @@ class Msg extends Model } $send_time = Cache::get($event . $phone); if($send_time && time() - $send_time < 60) { -// return returnErrorData('发送频繁请稍后再试'); + return returnErrorData('发送频繁请稍后再试', 500); }else { Cache::set($event . $phone, time()); } @@ -26,22 +26,22 @@ class Msg extends Model switch ($event) { case 'bindWx': if($user && $user['wx_open_id']) { - return returnErrorData('当前手机号已被其他微信账号绑定'); + return returnErrorData('当前手机号已被其他微信账号绑定', 500); } break; case 'bindIos': if($user && $user['apple_id']) { - return returnErrorData('当前手机号已被其他苹果账号绑定'); + return returnErrorData('当前手机号已被其他苹果账号绑定', 500); } break; case 'login': if($user) { - return returnErrorData('当前手机号已注册'); + return returnErrorData('当前手机号已注册', 500); } break; case 'forget': if(!$user) { - return returnErrorData('手机号未注册'); + return returnErrorData('手机号未注册', 500); } break; } @@ -49,7 +49,7 @@ class Msg extends Model if($commonInfo && $commonInfo->value == 2) { return self::AlibabaSendMsg($event, $phone); }else { - return returnErrorData('配置错误'); + return returnErrorData('配置错误', 500); } } diff --git a/app/czg/app/controller/CommonController.php b/app/czg/app/controller/CommonController.php index 19c2cec..7e4f840 100644 --- a/app/czg/app/controller/CommonController.php +++ b/app/czg/app/controller/CommonController.php @@ -15,7 +15,7 @@ use app\common\library\Auth as UserAuth; class CommonController extends Frontend { - protected array $noNeedLogin = ['getAppUseKv', 'getAppUseKv']; + protected array $noNeedLogin = ['getAppUseKv', 'type']; /** * 图形验证码 * @throws Throwable @@ -98,7 +98,7 @@ class CommonController extends Frontend public function type() { - $type = $this->request->route('num'); + $type = $this->request->route->param('num'); $data = convertToCamelCase(Db::connect(config('think-orm.search_library'))->name('common_info')->where('type', $type)->find()); $this->success('ok', $data, 0); } diff --git a/app/functions.php b/app/functions.php index a138b5c..9ddb485 100644 --- a/app/functions.php +++ b/app/functions.php @@ -540,9 +540,9 @@ if (!function_exists('p')) { if (!function_exists('returnErrorData')) { - function returnErrorData($msg) + function returnErrorData($msg, $code = -1) { - return ['code' => -1, 'message' => $msg, 'data' => []]; + return ['code' => $code, 'message' => $msg, 'msg' => $msg, 'data' => []]; } } diff --git a/config/route.php b/config/route.php index ba7f61b..6bbc76a 100644 --- a/config/route.php +++ b/config/route.php @@ -15,7 +15,9 @@ use Webman\Route; Route::any('/czg/app/wuyou/queryOrder/{orderId}', [app\czg\app\controller\WuyouController::class, 'queryOrder']); +Route::any('/czg/app/wuyou/payOrder/{orderId}', [app\czg\app\controller\WuyouController::class, 'payOrder']); Route::any('/czg/app/Login/sendMsg/{phone}/{event}', [app\czg\app\controller\LoginController::class, 'sendMsg']); +Route::any('/czg/app/common/type/{num}', [app\czg\app\controller\CommonController::class, 'type']);