diff --git a/app/Utils/ApiResponseApp.php b/app/Utils/ApiResponseApp.php index 7463b7e..c843882 100644 --- a/app/Utils/ApiResponseApp.php +++ b/app/Utils/ApiResponseApp.php @@ -13,7 +13,7 @@ class ApiResponseApp return json([ 'code' => $code, 'data' => $data, - 'msg' => $message, + 'msg' => trans($message), 'time' => time() ]); } @@ -23,7 +23,7 @@ class ApiResponseApp $code = 0; return json([ 'code' => $code, - 'msg' => $message, + 'msg' => trans($message), 'data' => $data, 'time' => time() ]); diff --git a/app/controller/admin/api/v1/JobuserController.php b/app/controller/admin/api/v1/JobuserController.php index da9784e..968bfe8 100644 --- a/app/controller/admin/api/v1/JobuserController.php +++ b/app/controller/admin/api/v1/JobuserController.php @@ -38,9 +38,9 @@ class JobuserController if (!empty($data['key'])) { $key = $data['key']; $query->where(function ($query) use ($key) { - $query->where('username', 'like', '%' . $key . '%') - ->orWhere('invite_code', 'like', '%' . $key . '%') - ->orWhere('remark', 'like', '%' . $key . '%'); + $query->where('users.username', 'like', '%' . $key . '%') + ->orWhere('users.invite_code', 'like', '%' . $key . '%') + ->orWhere('users.remark', 'like', '%' . $key . '%'); }); } @@ -52,13 +52,25 @@ class JobuserController } // 使用 join 进行关联查询 f_id 对应的用户名称 - $users = $query->leftJoin('users as u', 'users.f_id', '=', 'u.id') // 假设 users 表有 id 字段，f_id 关联到父用户 - ->select('users.*', 'u.username as parent_username') // 选择用户表的字段和关联表的 username 字段 - ->orderBy('id', 'desc') - ->get(); // 或者使用 paginate() 来进行分页 + $users = $query->leftJoin('users as u', 'users.f_id', '=', 'u.id') // 假设 users 表有 id 字段，f_id 关联到父用户 + ->select( + 'users.id', + 'users.username', + 'users.updated_at', + 'users.invite_code', + 'users.login_time', + 'users.money', + 'users.remark', + 'users.status', + 'users.vip_id', + 'users.created_at', + 'u.username as parent_username' // 选择所需字段，并为父用户用户名起别名 + )->where('users.isrobot',0) + ->orderBy('users.id', 'desc')->get(); // 确保按 users 表的 id 排序 - // 格式化结果为数组 - return ApiResponse::success(200, $users->toArray()); + + // 返回分页结果 + return ApiResponse::success(200, $users); } /** diff --git a/app/controller/admin/api/v1/PromotionController.php b/app/controller/admin/api/v1/PromotionController.php index 18d2449..c07d61b 100644 --- a/app/controller/admin/api/v1/PromotionController.php +++ b/app/controller/admin/api/v1/PromotionController.php @@ -14,31 +14,117 @@ use app\model\UserPhoneLog; use hg\apidoc\annotation as Apidoc; use app\model\Withdraw; use App\Utils\Random; +use support\Db; + /** * @Apidoc\Title("admin推广链接控制器") * @Apidoc\Group("admin") */ class PromotionController -{ +{ /** - * @Apidoc\Title("管理员生成推广链接") - * @Apidoc\Url("admin/api/v1/Promotion/Generatelink") - * @Apidoc\Method("POST") - */ - public function Generatelink(Request $request){ - $invite_code=Random::str_random(7); - $Recommend =new Recommend(); - $Recommend->invite_code=$invite_code; - $Recommend->save(); + * @Apidoc\Title("管理员生成推广链接") + * @Apidoc\Url("admin/api/v1/Promotion/Generatelink") + * @Apidoc\Method("POST") + */ + public function Generatelink(Request $request) + { + $invite_code = UserDao::Createuser(); return ApiResponse::success(200, $invite_code); } /** - * @Apidoc\Title("获取推广列表所有") - * @Apidoc\Url("admin/api/v1/Promotion/list") - * @Apidoc\Method("POST") - */ - public function list(Request $request){ - $Recommend =Recommend::all(); - return ApiResponse::success(200, $Recommend); + * @Apidoc\Title("获取推广列表所有") + * @Apidoc\Url("admin/api/v1/Promotion/list") + * @Apidoc\Method("POST") + */ + public function list(Request $request) + { + // 获取请求的参数 + $data = $request->post(); + + // 构建查询构造器 + $query = User::query(); + + // 根据 key 进行模糊查询 + if (!empty($data['key'])) { + $key = $data['key']; + $query->where(function ($query) use ($key) { + $query->where('users.invite_code', 'like', '%' . $key . '%') + ->orWhere('users.remark', 'like', '%' . $key . '%'); + }); + } + + // 根据 status 过滤，假设 status 字段存在并且不是 -1 + if (isset($data['status']) && $data['status'] != -1) { + $status = (int)$data['status']; // 强制转换为整数 + // 使用 users 表的别名明确指定 status 字段 + $query->where('users.status', $status); + } + + // 使用 join 进行关联查询 f_id 对应的用户名称 + $users = $query->leftJoin('users as u', 'users.f_id', '=', 'u.id') // 假设 users 表有 id 字段，f_id 关联到父用户 + ->select( + 'users.id', + 'users.username', + 'users.updated_at', + 'users.invite_code', + 'users.login_time', + 'users.money', + 'users.remark', + 'users.status', + 'users.vip_id', + 'users.created_at', + 'u.username as parent_username' // 选择所需字段，并为父用户用户名起别名 + )->where('users.isrobot', 1) + ->orderBy('users.id', 'desc')->get(); // 确保按 users 表的 id 排序 + return ApiResponse::success(200, $users); } -} \ No newline at end of file + + /** + * @Apidoc\Title(" 获取推广链接详细注册名单") + * @Apidoc\Url("admin/api/v1/Promotion/detailed") + * @Apidoc\Param("invite_code", type="string", require=true, desc="机器人的邀请码") + * @Apidoc\Param("start_date", type="string", require=false, desc="开始时间，格式：YYYY-MM-DD") + * @Apidoc\Param("end_date", type="string", require=false, desc="结束时间，格式：YYYY-MM-DD") + * @Apidoc\Method("POST") + */ + public function detailed(Request $request) + { + $data = $request->post(); + + // 获取机器人邀请码对应的用户 ID + $users = User::where('robot_invite_code', $data['invite_code'])->pluck('id')->toArray(); + + // 获取时间段参数，默认使用今天 + $startDate = isset($data['start_date']) ? $data['start_date'] : date('Y-m-d'); + $endDate = isset($data['end_date']) ? $data['end_date'] : date('Y-m-d'); + + // 获取用户手机号（按 user_id 分组）并根据时间范围筛选 + $UserPhone = UserPhone::whereIn('user_id', $users) + ->whereBetween('created_at', [$startDate . ' 00:00:00', $endDate . ' 23:59:59']) // 时间范围筛选 + ->select('user_id', DB::raw('count(*) as phone_count')) // 聚合查询，按 user_id 分组，计算每个 user_id 的手机数量 + ->groupBy('user_id') + ->get(); + + // 获取注册的用户数量，按时间筛选 + $res['register'] = User::whereIn('id', $users) + ->whereBetween('created_at', [$startDate . ' 00:00:00', $endDate . ' 23:59:59']) // 时间范围筛选 + ->count(); + + // 获取绑定手机号的用户数量 + $res['binding'] = count($UserPhone); + + // 获取注册的用户详细信息（筛选注册时间段） + $res['register_user'] = User::whereIn('id', $users) + ->whereBetween('created_at', [$startDate . ' 00:00:00', $endDate . ' 23:59:59']) // 时间范围筛选 + ->get(); + + // 获取绑定手机号的用户详细信息 + $userIdsWithPhones = $UserPhone->pluck('user_id')->toArray(); // 获取绑定手机号的用户 ID 列表 + $res['binding_user'] = User::whereIn('id', $userIdsWithPhones) + ->whereBetween('created_at', [$startDate . ' 00:00:00', $endDate . ' 23:59:59']) // 时间范围筛选 + ->get(); + + return ApiResponse::success(200, $res); + } +} diff --git a/app/controller/api/UserController.php b/app/controller/api/UserController.php index dfd027b..d71681d 100644 --- a/app/controller/api/UserController.php +++ b/app/controller/api/UserController.php @@ -91,10 +91,12 @@ class UserController $f_id = 0; $ff_id = 0; $length = strlen($invitation); + $user = new User(); if (!empty($invitation)) { if ($length == 7) { $Recommend = Recommend::where('invite_code', $invitation)->first(); if (!empty($Recommend)) { + $user->robot_invite_code = $invitation; $Recommend->register += 1; $Recommend->save(); } @@ -110,7 +112,7 @@ class UserController $f->vip_id += 1; } } - $user = new User(); + $col = ['username']; foreach ($col as $v) { $user->$v = $request->post($v); @@ -122,7 +124,6 @@ class UserController $user->password = password_hash($password, PASSWORD_DEFAULT); $user->save(); $user_new = User::where('username', $username)->first(); - var_dump($user_new); UserRewardDao::Register_for_free($user_new->id); return ApiResponseApp::success([], '注册成功'); } diff --git a/app/dao/UserDao.php b/app/dao/UserDao.php index 3a502af..97c4d81 100644 --- a/app/dao/UserDao.php +++ b/app/dao/UserDao.php @@ -159,7 +159,7 @@ class UserDao * 返回邀请码 */ public static function Createuser(){ - $invite_code=Random::str_random(5); + $invite_code=Random::str_random(7); $user=new User(); $user->join_ip = '127.0.0.1'; $user->f_id = 0; diff --git a/app/middleware/Lang.php b/app/middleware/Lang.php new file mode 100644 index 0000000..55fda68 --- /dev/null +++ b/app/middleware/Lang.php @@ -0,0 +1,32 @@ +header('Accept-Language', 'zhcn'); // 默认值是 'zh_CN' + + // 将 Accept-Language 中的语言与系统支持的语言进行匹配 + // 这里假设我们支持 'zh_CN' 和 'en_US'，你可以根据实际需求扩展更多语言 + $lang = 'zh_CN'; // 默认语言 + + // 提取 Accept-Language 中的语言部分，如 'zh_CN' 或 'en_US' + if (strpos($acceptLanguage, 'zh') === 0) { + $lang = 'zhcn'; + } elseif (strpos($acceptLanguage, 'en') === 0) { + $lang = 'en'; + } + + // 设置语言，假设你有一个 locale 函数来处理语言设置 + locale(session('lang', $lang)); + + // 返回请求处理 + return $handler($request); + } +} diff --git a/app/model/Reward.php b/app/model/Reward.php new file mode 100644 index 0000000..4b8e3fe --- /dev/null +++ b/app/model/Reward.php @@ -0,0 +1,25 @@ +=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.0.2", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/translation-contracts": "^2.3" + "symfony/translation-contracts": "^2.3|^3.0" }, "conflict": { - "symfony/config": "<4.4", - "symfony/console": "<5.3", - "symfony/dependency-injection": "<5.0", - "symfony/http-kernel": "<5.0", - "symfony/twig-bundle": "<5.0", - "symfony/yaml": "<4.4" + "symfony/config": "<5.4", + "symfony/console": "<5.4", + "symfony/dependency-injection": "<5.4", + "symfony/http-kernel": "<5.4", + "symfony/twig-bundle": "<5.4", + "symfony/yaml": "<5.4" }, "provide": { - "symfony/translation-implementation": "2.3" + "symfony/translation-implementation": "2.3|3.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^4.4|^5.0|^6.0", + "symfony/config": "^5.4|^6.0", "symfony/console": "^5.4|^6.0", - "symfony/dependency-injection": "^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/finder": "^5.4|^6.0", "symfony/http-client-contracts": "^1.1|^2.0|^3.0", - "symfony/http-kernel": "^5.0|^6.0", - "symfony/intl": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/intl": "^5.4|^6.0", "symfony/polyfill-intl-icu": "^1.21", "symfony/service-contracts": "^1.1.2|^2|^3", - "symfony/yaml": "^4.4|^5.0|^6.0" + "symfony/yaml": "^5.4|^6.0" }, "suggest": { "psr/log-implementation": "To use logging capability in translator", @@ -4294,7 +4292,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v5.4.45" + "source": "https://github.com/symfony/translation/tree/v6.0.19" }, "funding": [ { @@ -4310,7 +4308,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:11:13+00:00" + "time": "2023-01-01T08:36:10+00:00" }, { "name": "symfony/translation-contracts", @@ -5074,6 +5072,6 @@ "platform": { "php": ">=7.2" }, - "platform-dev": {}, + "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/config/middleware.php b/config/middleware.php index f37c51e..e92e611 100644 --- a/config/middleware.php +++ b/config/middleware.php @@ -17,5 +17,6 @@ return [ // ... 这里省略其它中间件 app\middleware\CorsMiddleware::class, app\middleware\JwtAuthMiddleware::class, + app\middleware\Lang::class, ] ]; \ No newline at end of file diff --git a/config/process.php b/config/process.php index 608afba..5c85b86 100644 --- a/config/process.php +++ b/config/process.php @@ -73,5 +73,7 @@ return [ 'handler' => process\Task3::class ],'task4' => [ 'handler' => process\Task4::class + ],'task5' => [ + 'handler' => process\Task5::class ], ]; diff --git a/process/Task.php b/process/Task.php index 9a55d5e..625b577 100644 --- a/process/Task.php +++ b/process/Task.php @@ -45,7 +45,7 @@ class Task // new Crontab('50 7 * * *', function(){ // echo date('Y-m-d H:i:s')."\n"; // }); - // // 每5秒执行一次 + // 每1秒执行一次 收取验证码 new Crontab('*/1 * * * * *', function () { $GetLodeLog = GetLodeLog::where('status', 0)->get(); foreach ($GetLodeLog as $key => $value) { diff --git a/process/Task5.php b/process/Task5.php new file mode 100644 index 0000000..59adf24 --- /dev/null +++ b/process/Task5.php @@ -0,0 +1,23 @@ +delete(); + }); + } +} diff --git a/public/js/index-476be0bb.js b/public/js/index-476be0bb.js index c8551ab..bf2e154 100644 --- a/public/js/index-476be0bb.js +++ b/public/js/index-476be0bb.js @@ -15102,6 +15102,8 @@ const Vf = { 非必填: "Not required", 余额不足: "Insufficient balance", 请添加印度: "Please add Bangladesh", + 请添加孟加拉国:"Please add Bangladesh", + 孟加拉国:"Bangladesh", 提款需要300积分: "300 points required for withdrawal", 提款需要1000积分: "1000 points required for withdrawal", 提款需要500积分: "500 points required for withdrawal", @@ -15453,7 +15455,9 @@ const Vf = { 积分: "积分", 非必填: "非必填", 余额不足: "余额不足", - 请添加印度: "请添加孟加拉国", + 请添加印度: "请添加印度", + 请添加孟加拉国:"请添加孟加拉国", + 孟加拉国:"孟加拉国", 提款需要300积分: "提款需要300积分", 提款需要1000积分: "提款需要1000积分", 提款需要500积分: "提款需要500积分", diff --git a/public/mp4/name-9e85ff4d.mp4 b/public/mp4/name-9e85ff4d.mp4.back similarity index 100% rename from public/mp4/name-9e85ff4d.mp4 rename to public/mp4/name-9e85ff4d.mp4.back diff --git a/resource/translations/en/messages.php b/resource/translations/en/messages.php new file mode 100644 index 0000000..21db05f --- /dev/null +++ b/resource/translations/en/messages.php @@ -0,0 +1,21 @@ + 'You have not been idle for more than 6 hours, cannot sign in yet.', + '您已登陆' => 'You are already logged in.', + '请发送验证码' => 'Please send the verification code.', + '账户余额不足' => 'Insufficient account balance.', + '需要完成Whatsapp任务' => 'You need to complete the Whatsapp task.', + '账号或密码错误' => 'Incorrect username or password.', + '账号被禁用' => 'The account is disabled.', + '登录成功' => 'Login successful.', + '账号已存在' => 'Account already exists.', + '代理不存在' => 'Agent does not exist.', + '注册成功' => 'Registration successful.', + '原密码错误' => 'Incorrect original password.', + '修改成功' => 'Modification successful.', + '领取成功' => 'Claim successful.', + '每天只能提现三次' => 'You can only withdraw three times a day.', + '等待管理员审核' => 'Waiting for administrator review.', + '转账成功' => 'Transfer successful.', +]; diff --git a/resource/translations/zh_CN/messages.php b/resource/translations/zh_CN/messages.php new file mode 100644 index 0000000..6ae1a97 --- /dev/null +++ b/resource/translations/zh_CN/messages.php @@ -0,0 +1,21 @@ + '挂机时长没有超过6小时，暂不能签到', + '您已登陆' => '您已登陆', + '请发送验证码' => '请发送验证码', + '账户余额不足' => '账户余额不足', + '需要完成Whatsapp任务' => '需要完成Whatsapp任务', + '账号或密码错误' => '账号或密码错误', + '账号被禁用' => '账号被禁用', + '登录成功' => '登录成功', + '账号已存在' => '账号已存在', + '代理不存在' => '代理不存在', + '注册成功' => '注册成功', + '原密码错误' => '原密码错误', + '修改成功' => '修改成功', + '领取成功' => '领取成功', + '每天只能提现三次' => '每天只能提现三次', + '等待管理员审核' => '等待管理员审核', + '转账成功' => '转账成功', +]; \ No newline at end of file