Compare commits
6 Commits
26f4151339
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 62bfd279be | |||
| 096516ba33 | |||
| ec6bd3ede5 | |||
| 734d8fe0ce | |||
| aede7248ca | |||
| 9b039b7abe |
@@ -802,8 +802,8 @@ class Helper
|
||||
$indexVueData['defaultItems'] = self::getJsonFromArray($indexVueData['defaultItems'] ?? []);
|
||||
$indexVueData['tableColumn'] = self::buildTableColumn($indexVueData['tableColumn'] ?? []);
|
||||
$indexVueData['dblClickNotEditColumn'] = self::buildSimpleArray($indexVueData['dblClickNotEditColumn'] ?? ['undefined']);
|
||||
$controllerFile['path'][] = $controllerFile['originalLastName'];
|
||||
$indexVueData['controllerUrl'] = '\'/admin/' . ($controllerFile['path'] ? implode('.', $controllerFile['path']) : '') . '/\'';
|
||||
$urlSegments = array_merge($controllerFile['path'], [$controllerFile['originalLastName']]);
|
||||
$indexVueData['controllerUrl'] = '\'/admin/' . ($urlSegments ? implode('.', array_map('strtolower', $urlSegments)) : '') . '/\'';
|
||||
$indexVueData['componentName'] = ($webViewsDir['path'] ? implode('/', $webViewsDir['path']) . '/' : '') . $webViewsDir['originalLastName'];
|
||||
$indexVueContent = self::assembleStub('html/index', $indexVueData);
|
||||
self::writeFile(root_path() . $webViewsDir['views'] . '/' . 'index.vue', $indexVueContent);
|
||||
|
||||
@@ -668,7 +668,7 @@ class Install extends Api
|
||||
|
||||
/**
|
||||
* 获取安装完成后的访问地址(根据请求来源区分 API 与前端开发模式)
|
||||
* - 通过 API 访问(8787):index.html#/admin、index.html#/
|
||||
* - 通过 API 访问(8787):index#/admin、index#/(无 index 与 # 之间的斜杠)
|
||||
* - 通过前端开发服务访问(1818):/#/admin、/#/
|
||||
*/
|
||||
public function accessUrls(Request $request): Response
|
||||
@@ -680,7 +680,8 @@ class Install extends Api
|
||||
$port = substr($host, strrpos($host, ':') + 1);
|
||||
}
|
||||
$scheme = $request->header('x-forwarded-proto', 'http');
|
||||
$base = rtrim($scheme . '://' . $host, '/');
|
||||
$basePath = $request instanceof \support\Request ? $request->publicBasePath() : '';
|
||||
$base = rtrim($scheme . '://' . $host, '/') . $basePath;
|
||||
|
||||
if ($port === '1818') {
|
||||
$adminUrl = $base . '/#/admin';
|
||||
|
||||
@@ -142,9 +142,14 @@ class Backend extends Api
|
||||
|
||||
if ($needLogin) {
|
||||
if (!$this->auth->isLogin()) {
|
||||
if ($request->method() === 'GET' && !$this->expectsApiJsonResponse($request)) {
|
||||
$location = $this->adminSpaLoginUrl($request);
|
||||
return redirect($location);
|
||||
}
|
||||
// 必须使用 HTTP 200 返回 JSON:若用 HTTP 303,axios 会跟随重定向,拿不到 JSON,前端无法跳转登录
|
||||
return $this->error(__('Please login first'), [
|
||||
'type' => Auth::NEED_LOGIN,
|
||||
], 0, ['statusCode' => Auth::LOGIN_RESPONSE_CODE]);
|
||||
], 0);
|
||||
}
|
||||
if ($needPermission) {
|
||||
$controllerPath = $this->getControllerPath($request);
|
||||
@@ -167,6 +172,37 @@ class Backend extends Api
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否应按 API 返回 JSON(前端 axios 会带 server: true;纯浏览器地址栏访问多为 HTML Accept)
|
||||
*/
|
||||
protected function expectsApiJsonResponse(WebmanRequest $request): bool
|
||||
{
|
||||
$server = $request->header('server', '');
|
||||
if ($server === 'true' || $server === '1') {
|
||||
return true;
|
||||
}
|
||||
if (strtolower($request->header('x-requested-with', '')) === 'xmlhttprequest') {
|
||||
return true;
|
||||
}
|
||||
$accept = strtolower($request->header('accept', ''));
|
||||
if (str_contains($accept, 'application/json')) {
|
||||
return true;
|
||||
}
|
||||
// 浏览器地址栏/点击链接触发的主文档请求,优先 302 到前端登录(避免误判为 API)
|
||||
if (strtolower((string) $request->header('sec-fetch-mode', '')) === 'navigate') {
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 后台 Vue 为 hash 路由时的登录页(相对路径,与 web/src/router 一致)
|
||||
*/
|
||||
protected function adminSpaLoginUrl(WebmanRequest $request): string
|
||||
{
|
||||
return '/#/admin/login';
|
||||
}
|
||||
|
||||
/**
|
||||
* 子类可覆盖,用于初始化 model 等(替代原 initialize)
|
||||
* @return Response|null 需直接返回时返回 Response,否则 null
|
||||
|
||||
@@ -11,12 +11,15 @@ use Exception;
|
||||
*/
|
||||
class TokenExpirationException extends Exception
|
||||
{
|
||||
protected array $data = [];
|
||||
|
||||
public function __construct(
|
||||
protected string $message = '',
|
||||
protected int $code = 409,
|
||||
protected array $data = [],
|
||||
string $message = '',
|
||||
int $code = 409,
|
||||
array $data = [],
|
||||
?\Throwable $previous = null
|
||||
) {
|
||||
$this->data = $data;
|
||||
parent::__construct($message, $code, $previous);
|
||||
}
|
||||
|
||||
|
||||
@@ -204,7 +204,24 @@ if (!function_exists('get_controller_path')) {
|
||||
if (count($parts) < 2) {
|
||||
return $parts[0] ?? null;
|
||||
}
|
||||
return implode('/', array_slice($parts, 1, -1)) ?: $parts[1];
|
||||
$segments = array_slice($parts, 1, -1);
|
||||
if ($segments === []) {
|
||||
return $parts[1] ?? null;
|
||||
}
|
||||
// ThinkPHP 风格段 game.Config -> game/config,与 $request->controller 解析结果一致(否则权限节点对不上)
|
||||
$normalized = [];
|
||||
foreach ($segments as $seg) {
|
||||
if (str_contains($seg, '.')) {
|
||||
$dotPos = strpos($seg, '.');
|
||||
$mod = substr($seg, 0, $dotPos);
|
||||
$ctrl = substr($seg, $dotPos + 1);
|
||||
$normalized[] = strtolower($mod);
|
||||
$normalized[] = strtolower(preg_replace('/([a-z])([A-Z])/', '$1_$2', $ctrl));
|
||||
} else {
|
||||
$normalized[] = strtolower(preg_replace('/([a-z])([A-Z])/', '$1_$2', $seg));
|
||||
}
|
||||
}
|
||||
return implode('/', $normalized);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -245,6 +245,34 @@ Route::get('/admin/security/dataRecycleLog/index', [\app\admin\controller\securi
|
||||
Route::post('/admin/security/dataRecycleLog/restore', [\app\admin\controller\security\DataRecycleLog::class, 'restore']);
|
||||
Route::get('/admin/security/dataRecycleLog/info', [\app\admin\controller\security\DataRecycleLog::class, 'info']);
|
||||
|
||||
// ==================== CRUD 生成的根级控制器(/admin/item/index 或 /admin/Item/index,无子目录、无点号) ====================
|
||||
// 显式路由在上,此处作为兜底;与 /admin/module.controller/action 互补
|
||||
Route::add(
|
||||
['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'],
|
||||
'/admin/{controller:[a-zA-Z][a-zA-Z0-9]*}/{action}',
|
||||
function (\Webman\Http\Request $request, string $controller, string $action) {
|
||||
$class = '\\app\\admin\\controller\\' . ucfirst(strtolower($controller));
|
||||
if (!class_exists($class)) {
|
||||
return new Response(404, ['Content-Type' => 'application/json'], json_encode(['code' => 404, 'msg' => '404 Not Found', 'data' => []], JSON_UNESCAPED_UNICODE));
|
||||
}
|
||||
if (!method_exists($class, $action)) {
|
||||
return new Response(404, ['Content-Type' => 'application/json'], json_encode(['code' => 404, 'msg' => '404 Not Found', 'data' => []], JSON_UNESCAPED_UNICODE));
|
||||
}
|
||||
$request->controller = $class;
|
||||
try {
|
||||
$instance = new $class();
|
||||
return $instance->$action($request);
|
||||
} catch (\Throwable $e) {
|
||||
return new Response(500, ['Content-Type' => 'application/json'], json_encode([
|
||||
'code' => 0,
|
||||
'msg' => $e->getMessage(),
|
||||
'time' => time(),
|
||||
'data' => null,
|
||||
], JSON_UNESCAPED_UNICODE));
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
// ==================== 兼容 ThinkPHP 风格 URL(module.Controller/action) ====================
|
||||
// 前端使用 /admin/user.Rule/index 格式,需转换为控制器调用
|
||||
Route::add(
|
||||
|
||||
@@ -231,8 +231,17 @@ class InstallData extends AbstractMigration
|
||||
|
||||
public function menuRule(): void
|
||||
{
|
||||
if (!$this->hasTable('menu_rule')) return;
|
||||
$table = $this->table('menu_rule');
|
||||
// Install 迁移在已存在 admin_rule(旧版表名)时会跳过创建 menu_rule,此处需与之一致
|
||||
$ruleTable = null;
|
||||
if ($this->hasTable('menu_rule')) {
|
||||
$ruleTable = 'menu_rule';
|
||||
} elseif ($this->hasTable('admin_rule')) {
|
||||
$ruleTable = 'admin_rule';
|
||||
}
|
||||
if ($ruleTable === null) {
|
||||
return;
|
||||
}
|
||||
$table = $this->table($ruleTable);
|
||||
$rows = [
|
||||
[
|
||||
'id' => '1',
|
||||
@@ -1155,7 +1164,7 @@ class InstallData extends AbstractMigration
|
||||
'createtime' => $this->nowTime,
|
||||
],
|
||||
];
|
||||
$exist = Db::name('menu_rule')->where('id', 1)->value('id');
|
||||
$exist = Db::name($ruleTable)->where('id', 1)->value('id');
|
||||
if (!$exist) {
|
||||
$table->insert($rows)->saveData();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
use Phinx\Migration\AbstractMigration;
|
||||
|
||||
/**
|
||||
* game_user:档位权重、中大奖权重、抽奖券数量(JSON 文本)
|
||||
*/
|
||||
class GameUserTierBigwinTicket extends AbstractMigration
|
||||
{
|
||||
public function change(): void
|
||||
{
|
||||
if (!$this->hasTable('game_user')) {
|
||||
return;
|
||||
}
|
||||
$table = $this->table('game_user');
|
||||
if (!$table->hasColumn('tier_weight')) {
|
||||
$table->addColumn('tier_weight', 'text', [
|
||||
'null' => true,
|
||||
'default' => null,
|
||||
'comment' => '档位权重 JSON,如 [{"T1":"5"},{"T2":"20"}]',
|
||||
]);
|
||||
}
|
||||
if (!$table->hasColumn('bigwin_weight')) {
|
||||
$table->addColumn('bigwin_weight', 'text', [
|
||||
'null' => true,
|
||||
'default' => null,
|
||||
'comment' => '中大奖权重 JSON',
|
||||
]);
|
||||
}
|
||||
if (!$table->hasColumn('ticket_count')) {
|
||||
$table->addColumn('ticket_count', 'text', [
|
||||
'null' => true,
|
||||
'default' => null,
|
||||
'comment' => '抽奖券 JSON,如 [{"ante":1,"count":1}]',
|
||||
]);
|
||||
}
|
||||
$table->update();
|
||||
}
|
||||
}
|
||||
@@ -13,11 +13,7 @@ if (!defined('BASE_PATH')) {
|
||||
require $baseDir . '/vendor/autoload.php';
|
||||
|
||||
if (class_exists('Dotenv\Dotenv') && is_file($baseDir . '/.env')) {
|
||||
if (method_exists('Dotenv\Dotenv', 'createUnsafeImmutable')) {
|
||||
Dotenv\Dotenv::createUnsafeImmutable($baseDir)->load();
|
||||
} else {
|
||||
Dotenv\Dotenv::createMutable($baseDir)->load();
|
||||
}
|
||||
Dotenv\Dotenv::createMutable($baseDir)->load();
|
||||
}
|
||||
|
||||
if (!function_exists('env')) {
|
||||
|
||||
@@ -10,11 +10,8 @@ $baseDir = __DIR__;
|
||||
require $baseDir . '/vendor/autoload.php';
|
||||
|
||||
if (class_exists('Dotenv\Dotenv') && is_file($baseDir . '/.env')) {
|
||||
if (method_exists('Dotenv\Dotenv', 'createUnsafeImmutable')) {
|
||||
Dotenv\Dotenv::createUnsafeImmutable($baseDir)->load();
|
||||
} else {
|
||||
Dotenv\Dotenv::createMutable($baseDir)->load();
|
||||
}
|
||||
// 必须用 Mutable:Webman Worker 已加载过时,Immutable 不会覆盖 $_ENV,会导致 Phinx 与 Db::name() 前缀/库名不一致
|
||||
Dotenv\Dotenv::createMutable($baseDir)->load();
|
||||
}
|
||||
|
||||
if (!function_exists('env')) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -107,7 +107,7 @@
|
||||
if (!urls.adminUrl && !urls.frontUrl) return;
|
||||
document.querySelectorAll('input[type="text"], input:not([type])').forEach(function(inp){
|
||||
var v = (inp.value || '').trim();
|
||||
if (v && (v.indexOf('#/admin') >= 0 || v.indexOf('index.html') >= 0) && v.indexOf('#/') >= 0) {
|
||||
if (v && (v.indexOf('#/admin') >= 0 || v.indexOf('index.html') >= 0 || v.indexOf('/index#') >= 0) && v.indexOf('#/') >= 0) {
|
||||
inp.value = urls.adminUrl;
|
||||
inp.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
}
|
||||
@@ -116,6 +116,22 @@
|
||||
document.querySelectorAll('a[href*="#/"]').forEach(function(a){
|
||||
if (urls.frontUrl && a.href.indexOf('#/admin') < 0) a.href = urls.frontUrl;
|
||||
});
|
||||
// index.html/#/ 会被当成路径 /index.html/ 导致 webman 404,统一为 index.html#/
|
||||
document.querySelectorAll('a[href*="index.html/#"]').forEach(function(a){
|
||||
a.href = a.href.replace(/index\.html\/#\//g, 'index.html#/');
|
||||
});
|
||||
// 打包的 index.js 完成页用 protocol+host 拼 adminUrl,会漏掉 /index.php 等前缀;用接口结果覆盖展示与点击
|
||||
if (urls.adminUrl) {
|
||||
document.querySelectorAll('.admin-url').forEach(function(el){
|
||||
el.textContent = urls.adminUrl;
|
||||
el.style.cursor = 'pointer';
|
||||
el.onclick = function(ev){
|
||||
ev.preventDefault();
|
||||
ev.stopPropagation();
|
||||
window.open(urls.adminUrl, '_blank', 'noreferrer');
|
||||
};
|
||||
});
|
||||
}
|
||||
ensureQuickPanel();
|
||||
}
|
||||
if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', function(){ setInterval(applyUrls, 800); });
|
||||
|
||||
@@ -35,6 +35,18 @@ class Request extends \Webman\Http\Request
|
||||
return $path;
|
||||
}
|
||||
|
||||
/**
|
||||
* 入口为 /index.php/... 时返回 /index.php,用于拼接后台/前台完整 URL(与路由 path() 剥离规则对应)
|
||||
*/
|
||||
public function publicBasePath(): string
|
||||
{
|
||||
$path = parent::path();
|
||||
if (str_starts_with($path, '/index.php')) {
|
||||
return '/index.php';
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取请求参数(兼容 ThinkPHP param,合并 get/post,post 优先)
|
||||
* @param string|null $name 参数名,null 返回全部
|
||||
|
||||
@@ -100,6 +100,16 @@ export const useTerminal = defineStore(
|
||||
}
|
||||
|
||||
function addTask(command: string, blockOnFailure = true, extend = '', callback: Function = () => {}) {
|
||||
const duplicatePending = state.taskList.some(
|
||||
(item) =>
|
||||
item.command === command &&
|
||||
(item.status === taskStatus.Waiting ||
|
||||
item.status === taskStatus.Connecting ||
|
||||
item.status === taskStatus.Executing)
|
||||
)
|
||||
if (duplicatePending) {
|
||||
return
|
||||
}
|
||||
if (!state.show) toggleDot(true)
|
||||
state.taskList = state.taskList.concat({
|
||||
uuid: uuid(),
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import type { AxiosRequestConfig, Method } from 'axios'
|
||||
import axios from 'axios'
|
||||
import { ElLoading, ElNotification, type LoadingOptions } from 'element-plus'
|
||||
import { nextTick } from 'vue'
|
||||
import { refreshToken } from '/@/api/common'
|
||||
import { i18n } from '/@/lang/index'
|
||||
import router from '/@/router/index'
|
||||
@@ -20,6 +21,12 @@ const loadingInstance: LoadingInstance = {
|
||||
count: 0,
|
||||
}
|
||||
|
||||
/** 请求是否后台 /admin/ 接口(不依赖当前路由,避免 loading 等场景误判为前台) */
|
||||
function isAdminBackendRequest(config: AxiosRequestConfig): boolean {
|
||||
const u = `${config.baseURL ?? ''}${config.url ?? ''}`
|
||||
return /\/admin\//i.test(u)
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据运行环境获取基础请求URL
|
||||
*/
|
||||
@@ -112,6 +119,25 @@ function createAxios<Data = any, T = ApiPromise<Data>>(axiosConfig: AxiosRequest
|
||||
|
||||
if (response.config.responseType == 'json') {
|
||||
if (response.data && response.data.code !== 1) {
|
||||
const needLogin =
|
||||
response.data.data &&
|
||||
typeof response.data.data === 'object' &&
|
||||
response.data.data.type === 'need login'
|
||||
if (needLogin) {
|
||||
const isAdminAppFlag = isAdminApp() || isAdminBackendRequest(response.config)
|
||||
if (isAdminAppFlag) {
|
||||
adminInfo.removeToken()
|
||||
} else {
|
||||
userInfo.removeToken()
|
||||
}
|
||||
const loginRouteName = isAdminAppFlag ? 'adminLogin' : 'userLogin'
|
||||
if (router.currentRoute.value.name !== loginRouteName) {
|
||||
nextTick(() => {
|
||||
void router.replace({ name: loginRouteName })
|
||||
})
|
||||
}
|
||||
return Promise.reject(response.data)
|
||||
}
|
||||
if (response.data.code == 409) {
|
||||
if (!window.tokenRefreshing) {
|
||||
window.tokenRefreshing = true
|
||||
|
||||
Reference in New Issue
Block a user