mojiahui/webman-buildadmin-mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

webman-buildadmin框架优化

Browse Source
This commit is contained in:
zhenhui
2026-03-18 19:21:10 +08:00
parent 16f84dce24
commit 9effe705b3
6 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/admin/library/crud/Helper.php
View File

@@ -845,8 +845,9 @@ class Helper
return $itemJson;
}
public static function formatObjectKey(string $keyName): string
public static function formatObjectKey(string|int $keyName): string
{
$keyName = (string) $keyName;
if (preg_match("/^[a-zA-Z_][a-zA-Z0-9_]+$/", $keyName)) {
return $keyName;
}

15
app/admin/library/crud/stubs/mixins/controller/index.stub
View File

@@ -3,11 +3,16 @@
* 查看
* @throws Throwable
*/
public function index(): void
public function index(\Webman\Http\Request $request): \support\Response
{
// 如果是 select 则转发到 select 方法，若未重写该方法，其实还是继续执行 index
if ($this->request->param('select')) {
$this->select();
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
if ($request->get('select') || $request->post('select')) {
$this->_select();
return $this->success();
}
/**
@@ -24,7 +29,7 @@
->order($order)
->paginate($limit);
$this->success('', [
return $this->success('', [
'list' => $res->items(),
'total' => $res->total(),
'remark' => get_route_remark(),

15
app/admin/model/AdminLog.php
View File

@@ -127,13 +127,14 @@ class AdminLog extends Model
$useragent = strlen($useragent) > 255 ? substr($useragent, 0, 255) : $useragent;
self::create([
'admin_id' => $adminId,
'username' => $username,
'url' => $url,
'title' => $title,
'data' => !is_scalar($data) ? json_encode($data, JSON_UNESCAPED_UNICODE) : $data,
'ip' => $request->getRealIp(),
'useragent' => $useragent,
'admin_id' => $adminId,
'username' => $username,
'url' => $url,
'title' => $title,
'data' => !is_scalar($data) ? json_encode($data, JSON_UNESCAPED_UNICODE) : $data,
'ip' => $request->getRealIp(),
'useragent' => $useragent,
'create_time' => time(),
]);
}

2
config/process.php
View File

@@ -21,7 +21,7 @@ global $argv;
return [
'webman' => [
'handler' => Http::class,
'listen' => 'http://0.0.0.0:8787',
'listen' => 'http://0.0.0.0:6969',
'count' => cpu_count() * 4,
'user' => '',
'group' => '',

5
web/.env.development
View File

@@ -4,5 +4,8 @@ ENV = 'development'
# base路径
VITE_BASE_PATH = './'
# 本地环境接口地址 - 用空字符串走同源，由 vite 代理到 8787，避免 CORS
# 本地环境接口地址 - 用空字符串走同源，由 vite 代理到后端，避免 CORS
VITE_AXIOS_BASE_URL = ''
# 开发时代理目标地址（后端服务器地址，端口改为 6969 时在此配置）
VITE_PROXY_TARGET = http://localhost:6969

8
web/vite.config.ts
View File

@@ -11,7 +11,7 @@ const pathResolve = (dir: string): any => {
// https://vitejs.cn/config/
const viteConfig = ({ mode }: ConfigEnv): UserConfig => {
const { VITE_PORT, VITE_OPEN, VITE_BASE_PATH, VITE_OUT_DIR } = loadEnv(mode, process.cwd())
const { VITE_PORT, VITE_OPEN, VITE_BASE_PATH, VITE_OUT_DIR, VITE_PROXY_TARGET } = loadEnv(mode, process.cwd())
const alias: Record<string, string> = {
'/@': pathResolve('./src/'),
@@ -29,9 +29,9 @@ const viteConfig = ({ mode }: ConfigEnv): UserConfig => {
open: VITE_OPEN != 'false',
// 开发时把 /api、/admin、/install 代理到 webman，避免跨域
proxy: {
'/api': { target: 'http://localhost:8787', changeOrigin: true },
'/admin': { target: 'http://localhost:8787', changeOrigin: true },
'/install': { target: 'http://localhost:8787', changeOrigin: true },
'/api': { target: VITE_PROXY_TARGET || 'http://localhost:6969', changeOrigin: true },
'/admin': { target: VITE_PROXY_TARGET || 'http://localhost:6969', changeOrigin: true },
'/install': { target: VITE_PROXY_TARGET || 'http://localhost:6969', changeOrigin: true },
},
},
build: {