feat: 代理登录/注册改图形数字验证码(SVG无GD依赖、一次性校验);后台内容区全屏铺满
This commit is contained in:
1 parent
423ac0d3b5
commit
d5a3183895
10 files changed
+272
-71
No files matched your search
@@ -7,6 +7,7 @@ use App\Core\Database;
|
||||
use App\Core\Validator;
|
||||
use App\Services\JwtService;
|
||||
use App\Services\TurnstileService;
|
||||
use App\Services\CaptchaService;
|
||||
|
||||
/**
|
||||
* 认证控制器
|
||||
@@ -53,11 +54,17 @@ class AuthController extends Controller
|
||||
$this->error('请输入用户名或邮箱');
|
||||
}
|
||||
|
||||
// Cloudflare Turnstile(按系统配置开关与入口白名单)
|
||||
$portalKey = $portal === 'agent' ? 'agent_login' : 'admin_login';
|
||||
$turnstileToken = trim((string) ($input['turnstile_token'] ?? ''));
|
||||
if (!TurnstileService::verifyFor($portalKey, $turnstileToken !== '' ? $turnstileToken : null, clientIp())) {
|
||||
$this->error('人机验证失败,请完成验证后重试');
|
||||
// 人机验证:代理入口用图形数字验证码,管理员入口用 Cloudflare Turnstile(按配置开关)
|
||||
if ($portal === 'agent') {
|
||||
$captchaCode = trim((string) ($input['captcha_code'] ?? ''));
|
||||
if (!CaptchaService::verify($captchaCode)) {
|
||||
$this->error('图形验证码错误或已过期,请刷新后重试');
|
||||
}
|
||||
} else {
|
||||
$turnstileToken = trim((string) ($input['turnstile_token'] ?? ''));
|
||||
if (!TurnstileService::verifyFor('admin_login', $turnstileToken !== '' ? $turnstileToken : null, clientIp())) {
|
||||
$this->error('人机验证失败,请完成验证后重试');
|
||||
}
|
||||
}
|
||||
|
||||
$db = Database::getInstance();
|
||||
@@ -133,10 +140,10 @@ class AuthController extends Controller
|
||||
$this->error('两次输入的密码不一致');
|
||||
}
|
||||
|
||||
// Cloudflare Turnstile(按系统配置开关与入口白名单)
|
||||
$turnstileToken = trim((string) ($input['turnstile_token'] ?? ''));
|
||||
if (!TurnstileService::verifyFor('agent_register', $turnstileToken !== '' ? $turnstileToken : null, clientIp())) {
|
||||
$this->error('人机验证失败,请完成验证后重试');
|
||||
// 图形数字验证码(代理注册)
|
||||
$captchaCode = trim((string) ($input['captcha_code'] ?? ''));
|
||||
if (!CaptchaService::verify($captchaCode)) {
|
||||
$this->error('图形验证码错误或已过期,请刷新后重试');
|
||||
}
|
||||
|
||||
// 手机号格式验证
|
||||
|
||||
@@ -832,6 +832,22 @@ class PublicController extends Controller
|
||||
], 'ok');
|
||||
}
|
||||
|
||||
/**
|
||||
* 图形数字验证码(SVG,代理登录/注册用)
|
||||
* GET /api/public/captcha
|
||||
*/
|
||||
public function captcha(): void
|
||||
{
|
||||
[, $svg] = \App\Services\CaptchaService::generate();
|
||||
|
||||
header('Content-Type: image/svg+xml; charset=UTF-8');
|
||||
header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
|
||||
header('Pragma: no-cache');
|
||||
header('Expires: 0');
|
||||
echo $svg;
|
||||
exit;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取公告列表(公开/客户端)
|
||||
* GET /api/public/announcements?target=client&project_id=1&limit=10
|
||||
|
||||
@@ -0,0 +1,132 @@
|
||||
<?php
|
||||
namespace App\Services;
|
||||
|
||||
/**
|
||||
* 图形数字验证码(SVG 输出,无 GD 扩展依赖)
|
||||
* 一次性使用:生成即写入 Session,校验后立即失效
|
||||
*/
|
||||
class CaptchaService
|
||||
{
|
||||
/** 验证码位数 */
|
||||
public const LENGTH = 4;
|
||||
|
||||
/** 有效期(秒) */
|
||||
public const TTL = 300;
|
||||
|
||||
/**
|
||||
* 生成验证码:写入 Session 并返回 [code, svg]
|
||||
* @return array{0:string,1:string}
|
||||
*/
|
||||
public static function generate(): array
|
||||
{
|
||||
$code = '';
|
||||
for ($i = 0; $i < self::LENGTH; $i++) {
|
||||
$code .= (string) random_int(0, 9);
|
||||
}
|
||||
|
||||
if (session_status() === PHP_SESSION_ACTIVE) {
|
||||
$_SESSION['captcha_code'] = $code;
|
||||
$_SESSION['captcha_time'] = time();
|
||||
}
|
||||
|
||||
return [$code, self::render($code)];
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验验证码(比对后立即失效)
|
||||
*/
|
||||
public static function verify(?string $input): bool
|
||||
{
|
||||
$code = (string) ($_SESSION['captcha_code'] ?? '');
|
||||
$time = (int) ($_SESSION['captcha_time'] ?? 0);
|
||||
unset($_SESSION['captcha_code'], $_SESSION['captcha_time']);
|
||||
|
||||
if ($code === '' || $time <= 0) {
|
||||
return false;
|
||||
}
|
||||
if (time() - $time > self::TTL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$input = trim((string) $input);
|
||||
if ($input === '') {
|
||||
return false;
|
||||
}
|
||||
|
||||
return hash_equals($code, $input);
|
||||
}
|
||||
|
||||
/**
|
||||
* 渲染 SVG 图形
|
||||
*/
|
||||
private static function render(string $code): string
|
||||
{
|
||||
$w = 132;
|
||||
$h = 40;
|
||||
|
||||
$textColors = ['#1f2937', '#374151', '#1e3a8a', '#3f3f46', '#4c1d95', '#7c2d12', '#065f46'];
|
||||
$bgColors = ['#f8fafc', '#f1f5f9', '#fdf4ff', '#ecfeff', '#f7fee7'];
|
||||
$lineColors = ['#c7d2fe', '#fbcfe8', '#a5f3fc', '#bbf7d0'];
|
||||
|
||||
$bg = $bgColors[random_int(0, count($bgColors) - 1)];
|
||||
$line = $lineColors[random_int(0, count($lineColors) - 1)];
|
||||
|
||||
$svg = [];
|
||||
$svg[] = sprintf(
|
||||
'<svg xmlns="http://www.w3.org/2000/svg" width="%d" height="%d" viewBox="0 0 %d %d">',
|
||||
$w, $h, $w, $h
|
||||
);
|
||||
$svg[] = sprintf('<rect width="%d" height="%d" fill="%s"/>', $w, $h, $bg);
|
||||
|
||||
// 干扰线
|
||||
for ($i = 0; $i < 4; $i++) {
|
||||
$svg[] = sprintf(
|
||||
'<line x1="%d" y1="%d" x2="%d" y2="%d" stroke="%s" stroke-width="1.6" stroke-opacity="0.75"/>',
|
||||
random_int(-8, $w), random_int(0, $h),
|
||||
random_int(-8, $w), random_int(0, $h),
|
||||
$line
|
||||
);
|
||||
}
|
||||
|
||||
// 干扰曲线
|
||||
$svg[] = sprintf(
|
||||
'<path d="M0 %d Q %d %d %d %d T %d %d" fill="none" stroke="%s" stroke-width="1.6" stroke-opacity="0.6"/>',
|
||||
random_int(8, 40),
|
||||
(int) ($w / 4), random_int(0, $h),
|
||||
(int) ($w / 2), random_int(0, $h),
|
||||
$w, random_int(8, 40),
|
||||
$line
|
||||
);
|
||||
|
||||
// 噪点
|
||||
for ($i = 0; $i < 26; $i++) {
|
||||
$svg[] = sprintf(
|
||||
'<circle cx="%d" cy="%d" r="%d" fill="#64748b" fill-opacity="0.3"/>',
|
||||
random_int(0, $w), random_int(0, $h), random_int(1, 2)
|
||||
);
|
||||
}
|
||||
|
||||
// 数字(逐位随机大小/旋转/位置)
|
||||
$len = strlen($code);
|
||||
$cell = (int) (($w - 24) / $len);
|
||||
for ($i = 0; $i < $len; $i++) {
|
||||
$x = 16 + $i * $cell + random_int(-3, 3);
|
||||
$y = random_int(28, 33);
|
||||
$size = random_int(22, 27);
|
||||
$rotate = random_int(-22, 22);
|
||||
$cx = $x + 8;
|
||||
$cy = $y - 7;
|
||||
$color = $textColors[random_int(0, count($textColors) - 1)];
|
||||
|
||||
$svg[] = sprintf(
|
||||
'<text x="%d" y="%d" font-size="%d" font-family="Consolas, Monaco, \'Courier New\', monospace" font-weight="bold" fill="%s" transform="rotate(%d %d %d)">%s</text>',
|
||||
$x, $y, $size, htmlspecialchars($code[$i], ENT_QUOTES),
|
||||
$rotate, $cx, $cy, htmlspecialchars($code[$i], ENT_QUOTES)
|
||||
);
|
||||
}
|
||||
|
||||
$svg[] = '</svg>';
|
||||
|
||||
return implode('', $svg);
|
||||
}
|
||||
}
|
||||
@@ -50,6 +50,9 @@ $router->group('api/public', function ($router) {
|
||||
// 人机验证公开配置(登录页用;客户端激活/验证接口从不校验)
|
||||
$router->get('turnstile-config', [PublicController::class, 'turnstileConfig']);
|
||||
|
||||
// 图形数字验证码(代理登录/注册用)
|
||||
$router->get('captcha', [PublicController::class, 'captcha']);
|
||||
|
||||
// 支付方式(前台展示用)
|
||||
$router->get('payment/options', [PublicController::class, 'paymentOptions']);
|
||||
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
<template>
|
||||
<div class="captcha-wrap">
|
||||
<el-input
|
||||
:model-value="modelValue"
|
||||
placeholder="图形验证码"
|
||||
maxlength="6"
|
||||
clearable
|
||||
class="captcha-input"
|
||||
@update:model-value="emit('update:modelValue', $event)"
|
||||
@keyup.enter="emit('enter')"
|
||||
/>
|
||||
<div class="captcha-img" title="看不清?点击刷新" @click="refresh">
|
||||
<img :src="src" alt="图形验证码" draggable="false" @error="refresh" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted } from 'vue'
|
||||
|
||||
defineProps({
|
||||
modelValue: { type: String, default: '' }
|
||||
})
|
||||
const emit = defineEmits(['update:modelValue', 'enter', 'refresh'])
|
||||
|
||||
const src = ref('')
|
||||
|
||||
function refresh() {
|
||||
src.value = `/api/public/captcha?t=${Date.now()}`
|
||||
emit('update:modelValue', '')
|
||||
emit('refresh')
|
||||
}
|
||||
|
||||
defineExpose({ refresh })
|
||||
|
||||
onMounted(refresh)
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.captcha-wrap {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
width: 100%;
|
||||
}
|
||||
.captcha-input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.captcha-img {
|
||||
flex-shrink: 0;
|
||||
width: 132px;
|
||||
height: 40px;
|
||||
cursor: pointer;
|
||||
border: 1px solid #dcdfe6;
|
||||
border-radius: 6px;
|
||||
overflow: hidden;
|
||||
background: #f5f7fa;
|
||||
transition: border-color 0.2s;
|
||||
}
|
||||
.captcha-img:hover {
|
||||
border-color: #409eff;
|
||||
}
|
||||
.captcha-img img {
|
||||
display: block;
|
||||
width: 132px;
|
||||
height: 40px;
|
||||
}
|
||||
</style>
|
||||
@@ -11,12 +11,11 @@ export const useUserStore = defineStore('user', () => {
|
||||
* @param {string} account 用户名或邮箱
|
||||
* @param {string} password 密码
|
||||
* @param {'admin'|'agent'} portal 登录入口
|
||||
* @param {string} turnstileToken Turnstile 人机验证 token
|
||||
* @param {object} extra 附加参数(admin: {turnstile_token} / agent: {captcha_code})
|
||||
*/
|
||||
async function login(account, password, portal = 'admin', turnstileToken = '') {
|
||||
async function login(account, password, portal = 'admin', extra = {}) {
|
||||
const endpoint = portal === 'agent' ? '/auth/agent-login' : '/auth/admin-login'
|
||||
const body = { username: account, password }
|
||||
if (turnstileToken) body.turnstile_token = turnstileToken
|
||||
const body = { username: account, password, ...(extra || {}) }
|
||||
const res = await request.post(endpoint, body)
|
||||
user.value = res.data.user
|
||||
token.value = res.data.token.access_token
|
||||
|
||||
@@ -69,9 +69,12 @@
|
||||
|
||||
/* 全局公共样式 - 列表页统一显示方式 */
|
||||
|
||||
/* 页面容器 */
|
||||
[class$="-page"] {
|
||||
max-width: 1600px;
|
||||
/* 页面容器:后台内容全屏铺满右侧内容区
|
||||
(去掉历史 1600px 限宽;!important 用于覆盖各页面 scoped 样式中的限宽) */
|
||||
[class$="-page"],
|
||||
.page-container {
|
||||
width: 100%;
|
||||
max-width: none !important;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ async function handleLogin() {
|
||||
}
|
||||
loading.value = true
|
||||
try {
|
||||
await userStore.login(form.username, form.password, 'admin', turnstileToken.value)
|
||||
await userStore.login(form.username, form.password, 'admin', { turnstile_token: turnstileToken.value })
|
||||
ElMessage.success('登录成功')
|
||||
router.push('/dashboard')
|
||||
} catch (e) {
|
||||
|
||||
@@ -43,8 +43,8 @@
|
||||
<el-link type="primary" :underline="false" @click="handleForgotPassword">忘记密码?</el-link>
|
||||
</div>
|
||||
|
||||
<el-form-item v-if="tsEnabled">
|
||||
<TurnstileWidget ref="turnstileRef" :site-key="TURNSTILE_SITE_KEY" :required="tsEnabled" @update:token="onToken" />
|
||||
<el-form-item prop="captcha">
|
||||
<ImageCaptcha ref="captchaRef" v-model="form.captcha" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
@@ -69,60 +69,47 @@ import { useRouter } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { User, Lock, Avatar } from '@element-plus/icons-vue'
|
||||
import { useUserStore } from '@/stores/user'
|
||||
import TurnstileWidget from '@/components/TurnstileWidget.vue'
|
||||
import { TURNSTILE_SITE_KEY } from '@/config/turnstile'
|
||||
import request from '@/api'
|
||||
import ImageCaptcha from '@/components/ImageCaptcha.vue'
|
||||
|
||||
const router = useRouter()
|
||||
const userStore = useUserStore()
|
||||
const loading = ref(false)
|
||||
const formRef = ref(null)
|
||||
const turnstileRef = ref(null)
|
||||
const turnstileToken = ref('')
|
||||
const tsEnabled = ref(false)
|
||||
|
||||
function onToken(t) {
|
||||
turnstileToken.value = t || ''
|
||||
}
|
||||
const captchaRef = ref(null)
|
||||
|
||||
const form = reactive({
|
||||
account: '',
|
||||
password: '',
|
||||
captcha: '',
|
||||
remember: false,
|
||||
})
|
||||
|
||||
const rules = {
|
||||
account: [{ required: true, message: '请输入用户名或邮箱', trigger: 'blur' }],
|
||||
password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
|
||||
captcha: [{ required: true, message: '请输入图形验证码', trigger: 'blur' }],
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
onMounted(() => {
|
||||
const saved = localStorage.getItem('agent_remember_account')
|
||||
if (saved) {
|
||||
form.account = saved
|
||||
form.remember = true
|
||||
}
|
||||
try {
|
||||
const res = await request.get('/public/turnstile-config')
|
||||
const d = res.data || {}
|
||||
tsEnabled.value = !!d.enabled && Array.isArray(d.endpoints) && d.endpoints.includes('agent_login')
|
||||
} catch {
|
||||
tsEnabled.value = false
|
||||
}
|
||||
})
|
||||
|
||||
async function handleLogin() {
|
||||
if (!formRef.value) return
|
||||
await formRef.value.validate(async (valid) => {
|
||||
if (!valid) return
|
||||
if (tsEnabled.value && !turnstileToken.value) {
|
||||
ElMessage.warning('请先完成人机验证')
|
||||
turnstileRef.value?.reset?.()
|
||||
if (!form.captcha.trim()) {
|
||||
ElMessage.warning('请输入图形验证码')
|
||||
captchaRef.value?.refresh?.()
|
||||
return
|
||||
}
|
||||
loading.value = true
|
||||
try {
|
||||
await userStore.login(form.account, form.password, 'agent', turnstileToken.value)
|
||||
await userStore.login(form.account, form.password, 'agent', { captcha_code: form.captcha.trim() })
|
||||
if (form.remember) {
|
||||
localStorage.setItem('agent_remember_account', form.account)
|
||||
} else {
|
||||
@@ -131,8 +118,8 @@ async function handleLogin() {
|
||||
ElMessage.success('登录成功')
|
||||
router.push('/dashboard')
|
||||
} catch (e) {
|
||||
turnstileRef.value?.reset?.()
|
||||
turnstileToken.value = ''
|
||||
// 登录失败:验证码已失效,刷新图片
|
||||
captchaRef.value?.refresh?.()
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
@@ -73,8 +73,8 @@
|
||||
</el-checkbox>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item v-if="tsEnabled">
|
||||
<TurnstileWidget ref="turnstileRef" :site-key="TURNSTILE_SITE_KEY" :required="tsEnabled" @update:token="onToken" />
|
||||
<el-form-item prop="captcha">
|
||||
<ImageCaptcha ref="captchaRef" v-model="form.captcha" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
@@ -94,34 +94,17 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, computed, onMounted } from 'vue'
|
||||
import { ref, reactive, computed } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { User, Lock, Message, Phone, Ticket } from '@element-plus/icons-vue'
|
||||
import request from '@/api'
|
||||
import TurnstileWidget from '@/components/TurnstileWidget.vue'
|
||||
import { TURNSTILE_SITE_KEY } from '@/config/turnstile'
|
||||
import ImageCaptcha from '@/components/ImageCaptcha.vue'
|
||||
|
||||
const router = useRouter()
|
||||
const loading = ref(false)
|
||||
const formRef = ref(null)
|
||||
const turnstileRef = ref(null)
|
||||
const turnstileToken = ref('')
|
||||
const tsEnabled = ref(false)
|
||||
|
||||
function onToken(t) {
|
||||
turnstileToken.value = t || ''
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
try {
|
||||
const res = await request.get('/public/turnstile-config')
|
||||
const d = res.data || {}
|
||||
tsEnabled.value = !!d.enabled && Array.isArray(d.endpoints) && d.endpoints.includes('agent_register')
|
||||
} catch {
|
||||
tsEnabled.value = false
|
||||
}
|
||||
})
|
||||
const captchaRef = ref(null)
|
||||
|
||||
const form = reactive({
|
||||
username: '',
|
||||
@@ -131,6 +114,7 @@ const form = reactive({
|
||||
password: '',
|
||||
confirmPassword: '',
|
||||
agreement: false,
|
||||
captcha: '',
|
||||
})
|
||||
|
||||
const validatePhone = (rule, value, callback) => {
|
||||
@@ -177,6 +161,7 @@ const rules = {
|
||||
],
|
||||
confirmPassword: [{ required: true, validator: validateConfirmPassword, trigger: 'blur' }],
|
||||
agreement: [{ validator: validateAgreement, trigger: 'change' }],
|
||||
captcha: [{ required: true, message: '请输入图形验证码', trigger: 'blur' }],
|
||||
}
|
||||
|
||||
const passwordStrength = computed(() => {
|
||||
@@ -209,9 +194,9 @@ async function handleRegister() {
|
||||
if (!formRef.value) return
|
||||
await formRef.value.validate(async (valid) => {
|
||||
if (!valid) return
|
||||
if (tsEnabled.value && !turnstileToken.value) {
|
||||
ElMessage.warning('请先完成人机验证')
|
||||
turnstileRef.value?.reset?.()
|
||||
if (!form.captcha.trim()) {
|
||||
ElMessage.warning('请输入图形验证码')
|
||||
captchaRef.value?.refresh?.()
|
||||
return
|
||||
}
|
||||
loading.value = true
|
||||
@@ -223,13 +208,13 @@ async function handleRegister() {
|
||||
email: form.email,
|
||||
phone: form.phone,
|
||||
invite_code: form.inviteCode,
|
||||
turnstile_token: turnstileToken.value,
|
||||
captcha_code: form.captcha.trim(),
|
||||
})
|
||||
ElMessage.success('注册成功,请登录')
|
||||
router.push('/agent/login')
|
||||
} catch (e) {
|
||||
turnstileRef.value?.reset?.()
|
||||
turnstileToken.value = ''
|
||||
// 注册失败:验证码已失效,刷新图片
|
||||
captchaRef.value?.refresh?.()
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user