diff --git a/server/composer.lock b/server/composer.lock index 2cebef3ae1569ad19342de7ead780b9f0aeee7ef..7f41469a9b8c25fba963a3da71d369ba996d427e 100644 --- a/server/composer.lock +++ b/server/composer.lock @@ -2873,11 +2873,11 @@ }, { "name": "madong/helper", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://gitcode.com/motion-code/helper.git", - "reference": "d13e1d7715b02d87342419643094b53b2218adaf" + "reference": "7d6029c0e8d3e09414e5db7bae0aa8b398267276" }, "require": { "illuminate/collections": "*", @@ -2904,7 +2904,7 @@ } ], "description": "The ingen Helper Package", - "time": "2025-07-04T01:40:03+00:00" + "time": "2025-08-05T03:16:37+00:00" }, { "name": "maennchen/zipstream-php", @@ -8177,7 +8177,7 @@ "packages-dev": [], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": { @@ -8186,6 +8186,6 @@ "ext-pdo": "*", "ext-gd": "*" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/server/config/core/app.php b/server/config/core/app.php index 77b2a13c029bc066ae09258aa26d70017c997cfe..ade27950a9c765d8adf878d9fd0a7720e95bc7f6 100644 --- a/server/config/core/app.php +++ b/server/config/core/app.php @@ -12,5 +12,5 @@ return [ 'enable' => true, - 'version' => '4.0.4', + 'version' => '4.0.5', ]; diff --git a/server/config/core/utils/app.php b/server/config/core/utils/app.php new file mode 100644 index 0000000000000000000000000000000000000000..c9afe2bc7486345d80449759b99edc3d13dce2ef --- /dev/null +++ b/server/config/core/utils/app.php @@ -0,0 +1,15 @@ + true, +]; diff --git a/server/config/core/uuid/app.php b/server/config/core/uuid/app.php new file mode 100644 index 0000000000000000000000000000000000000000..c9afe2bc7486345d80449759b99edc3d13dce2ef --- /dev/null +++ b/server/config/core/uuid/app.php @@ -0,0 +1,15 @@ + true, +]; diff --git a/server/config/core/uuid/snowflake.php b/server/config/core/uuid/snowflake.php new file mode 100644 index 0000000000000000000000000000000000000000..c4c1f6256a6cedff37eab53525e534ae590b8bd2 --- /dev/null +++ b/server/config/core/uuid/snowflake.php @@ -0,0 +1,20 @@ + true, + 'node_id' => 1, + 'worker_id' => null,//使用线程id + 'node_id_bits' => 3, + 'worker_id_bits' => 7, + 'sequence_bits' => 12, +]; diff --git a/server/core/abstract/BaseModel.php b/server/core/abstract/BaseModel.php index 81add97b0688566585ab111eb2f9c80496676259..bf988fd7da381bf565e3fbe3fbb0864d4f46cd3b 100644 --- a/server/core/abstract/BaseModel.php +++ b/server/core/abstract/BaseModel.php @@ -12,24 +12,19 @@ namespace core\abstract; -use app\common\model\platform\Tenant; + use app\common\model\system\SysRecycleBin; use app\common\scopes\global\AccessScope; -use app\common\scopes\global\TenantScope; -use app\common\scopes\global\TenantSharedTableScope; use app\common\services\system\SysRecycleBinService; use Carbon\Carbon; use core\exception\handler\AdminException; +use core\uuid\Snowflake; use Illuminate\Database\Eloquent\SoftDeletes; -use core\context\TenantContext; -use madong\helper\Snowflake; use support\Container; use support\Model; class BaseModel extends Model { - private const WORKER_ID = 1; - private const DATA_CENTER_ID = 1; /** * 指明模型的ID是否自动递增。 @@ -66,12 +61,6 @@ class BaseModel extends Model */ public $timestamps = true; - /** - * 雪花算法实例 - * - * @var Snowflake|null - */ - protected static ?Snowflake $snowflake = null; public function __construct(array $data = []) { @@ -81,7 +70,7 @@ class BaseModel extends Model protected static function booted() { // 1. 默认添加 AccessScope - static::addGlobalScope(new AccessScope); +// static::addGlobalScope(new AccessScope); } protected static function boot() @@ -90,7 +79,7 @@ class BaseModel extends Model //注册创建事件 static::creating(function ($model) { if (!isset($model->{$model->getKeyName()})) { - $model->{$model->getKeyName()} = self::generateSnowflakeID(); // 生成雪花 ID + $model->{$model->getKeyName()} = Snowflake::generate() ; // 生成雪花 ID } self::setCreatedBy($model); }); @@ -278,31 +267,6 @@ class BaseModel extends Model } } - /** - * 实例化雪花算法 - * - * @return Snowflake - */ - private static function createSnowflake(): Snowflake - { - if (self::$snowflake == null) { - self::$snowflake = new Snowflake(self::WORKER_ID, self::DATA_CENTER_ID); - } - return self::$snowflake; - } - - /** - * 生成雪花ID - * - * @return int - * @throws \Exception - */ - private static function generateSnowflakeID(): int - { - $snowflake = self::createSnowflake(); - return $snowflake->nextId(); - } - private static function prepareRecycleBinData($tableData, $table, $prefix): array { return [ diff --git a/server/core/db/DataImporterService.php b/server/core/db/DataImporterService.php index 01b5e712ee8d8eac765d5d9a93efffd42ad1131c..5617cbaad0aa29506db613a7e92d0f891b452722 100644 --- a/server/core/db/DataImporterService.php +++ b/server/core/db/DataImporterService.php @@ -12,7 +12,7 @@ namespace core\db; -use madong\helper\Snowflake; +use core\uuid\Snowflake; use PDO; /** @@ -24,35 +24,6 @@ use PDO; class DataImporterService { - private const WORKER_ID = 1; - private const DATA_CENTER_ID = 1; - - /** - * 雪花算法实例 - * - * @var Snowflake|null - */ - protected ?Snowflake $snowflake = null; - - - public function __construct() - { - $this->snowflake = new Snowflake(self::WORKER_ID, self::DATA_CENTER_ID); - } - - /** - * 生成雪花ID - * - * @return int - * @throws \Exception - */ - public function generateSnowflakeId(): int - { - $snowflake = $this->snowflake; - return $snowflake->nextId(); - } - - /** * 获取 PDO 连接的方法 * @@ -115,7 +86,7 @@ class DataImporterService if ($options['useSnowflakeId']) { $fields[] = $options['idKey']; if (empty($row[$options['idKey']])) { - $row[$options['idKey']] = $this->generateSnowflakeId(); + $row[$options['idKey']] = Snowflake::generate(); } } elseif ($options['useAutoIncrement']) { unset($row[$options['idKey']]); @@ -195,7 +166,7 @@ class DataImporterService foreach ($data as $key => $item) { // 如果需要使用雪花ID if ($options['useSnowflakeId']) { - $item[$options['idKey']] = $this->generateSnowflakeId(); // 生成雪花ID + $item[$options['idKey']] = Snowflake::generate(); // 生成雪花ID } elseif ($options['useAutoIncrement']) { unset($item[$options['idKey']]); // 自增ID由数据库处理 } @@ -244,7 +215,7 @@ class DataImporterService foreach ($data as $item) { // 如果需要使用雪花ID if ($options['useSnowflakeId']) { - $item[$options['idKey']] = $this->generateSnowflakeId(); // 生成雪花ID + $item[$options['idKey']] = Snowflake::generate(); // 生成雪花ID } elseif ($options['useAutoIncrement']) { unset($item[$options['idKey']]); // 自增ID由数据库处理 } diff --git a/server/core/uuid/Snowflake.php b/server/core/uuid/Snowflake.php new file mode 100644 index 0000000000000000000000000000000000000000..133dab6ac982a10eb379d6a734bd1874b32e50c7 --- /dev/null +++ b/server/core/uuid/Snowflake.php @@ -0,0 +1,106 @@ +id ?: 0) : 0; + self::$instance = new SnowflakeGenerator( + $nodeId, + $workerId, + array_merge([ + 'node_id_bits' => 3, + 'worker_id_bits' => 7, + 'sequence_bits' => 12, + ], config('core.uuid.snowflake', [])) + + ); + } + + return self::$instance; + } + + /** + * 静态代理调用：将所有静态方法调用转发到真正的 Snowflake 实例上 + * + * @param string $method 方法名，比如 "generate" + * @param array $args 参数列表 + * + * @return mixed + * @throws \core\exception\handler\AdminException + */ + public static function __callStatic(string $method, array $args) + { + $instance = self::instance(); + + if (!method_exists($instance, $method)) { + throw new AdminException(sprintf( + 'Call to undefined method %s::%s()', + static::class, + $method + )); + } + + return $instance->{$method}(...$args); + } +} + diff --git a/server/scripts/sql/install.sql b/server/scripts/sql/install.sql index 0023e3d8ba9c591206f712be875bf4557a099bec..82957f2e38fd88a3d77eb393be644044e004241a 100644 --- a/server/scripts/sql/install.sql +++ b/server/scripts/sql/install.sql @@ -320,7 +320,7 @@ CREATE TABLE `ma_sys_menu` ( `id` bigint(20) NOT NULL COMMENT '菜单ID', `pid` bigint(20) NOT NULL DEFAULT 0 COMMENT '父ID', - `app` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应用编码', + `app` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'admin' COMMENT '应用编码', `title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '菜单名称', `code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '唯一编码', `level` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父ID集合', diff --git a/web/.env.production b/web/.env.production index 0ed97cd7fe74187a9efffc990c870041e58ac332..b51217551886dc5d5cb1cbdf55c35b6783a84840 100644 --- a/web/.env.production +++ b/web/.env.production @@ -1,10 +1,9 @@ VITE_BASE=/ + # 接口地址 # VITE_GLOB_API_URL=/api - -#后端模式 -VITE_GLOB_API_URL=/ +VITE_GLOB_API_URL=useCurrentDomain #useCurrentDomain 为自动获取当前域名为base地址 # 是否开启压缩，可以设置为 none, brotli, gzip VITE_COMPRESS=none @@ -25,16 +24,8 @@ VITE_GLOB_CLIENT_KEY= X-Client-ID VITE_GLOB_ENABLE_WSS=true # wss接口地址 -# VITE_GLOB_WSS_URL=/ws - -#后端模式写全路径 -VITE_GLOB_WSS_URL=ws://127.0.0.1:3898 +# VITE_GLOB_WSS_URL=/ws +VITE_GLOB_WSS_URL=ws://127.0.0.1:3898 #useCurrentDomain 模式使用绝对url # WSS KEY VITE_GLOB_WSS_APPKEY = 60756ede2a9737a05384aad849e220f8 - - -# 线上环境接口地址 -VITE_AXIOS_BASE_URL = fetchCurrentDomain - -# VITE_AXIOS_BASE_URL = 'https://api.admin.madong.tech' \ No newline at end of file diff --git a/web/src/api/dev/terminal/index.ts b/web/src/api/dev/terminal/index.ts index 96219bd298707ad9ed03a0d1de031190d17ba99d..52c66f85aa85302672f6770df904dc6369915e85 100644 --- a/web/src/api/dev/terminal/index.ts +++ b/web/src/api/dev/terminal/index.ts @@ -1,6 +1,7 @@ +import { getApiBaseUrl } from './../../request'; import { requestClient } from "#/api/request"; import { useAccessStore } from "#/components/common/stores"; -import { getUrl } from "#/utils" + @@ -27,7 +28,7 @@ export class TerminalApi { const accessStore = useAccessStore(); const token = this.formatToken(accessStore.accessToken); return ( - getUrl() + this.baseUrl + '?command=' + commandKey + '&uuid=' + uuid + '&extend=' + extend + '&token=' + token + '&server=crmd' + getApiBaseUrl() + this.baseUrl + '?command=' + commandKey + '&uuid=' + uuid + '&extend=' + extend + '&token=' + token + '&server=crmd' ) } diff --git a/web/src/api/request.ts b/web/src/api/request.ts index 57c4a668589d5794576ff11422834db2d6260a94..5885fb8d0cd60f8acb21e972a7cd398ebce3387a 100644 --- a/web/src/api/request.ts +++ b/web/src/api/request.ts @@ -15,10 +15,10 @@ import { message } from 'ant-design-vue'; import { refreshTokenApi } from './core'; -const apiURL = import.meta.env.VITE_GLOB_API_URL; const clientKey = import.meta.env.VITE_GLOB_CLIENT_KEY; + function createRequestClient(baseURL: string, options?: RequestClientOptions) { const client = new RequestClient({ ...options, @@ -135,9 +135,28 @@ function createRequestClient(baseURL: string, options?: RequestClientOptions) { return client; } -export const requestClient = createRequestClient(apiURL, { + +export const getApiBaseUrl = (customValue?: string | null): string => { + if (customValue) { + return customValue === 'useCurrentDomain' + ? window.location.protocol + '//' + window.location.host + : customValue; + } + + const envValue = import.meta.env.VITE_GLOB_API_URL; + if (envValue) { + return envValue === 'useCurrentDomain' + ? window.location.protocol + '//' + window.location.host + : envValue; + } + return window.location.protocol + '//' + window.location.host; +} + + +export const requestClient = createRequestClient(getApiBaseUrl(null), { responseReturn: 'data', }); -export const baseRequestClient = new RequestClient({ baseURL: apiURL }); + +export const baseRequestClient = new RequestClient({ baseURL: getApiBaseUrl(null) }); diff --git a/web/src/components/form/components/avatar.vue b/web/src/components/form/components/avatar.vue index c05f5582cde6766f9e0c04f4c924f8e1586c4888..c5e58a80fbabcf9b8dbc25c53d7bf7646826d374 100644 --- a/web/src/components/form/components/avatar.vue +++ b/web/src/components/form/components/avatar.vue @@ -1,59 +1,89 @@ + + diff --git a/web/src/utils/tool.ts b/web/src/utils/tool.ts index 8b63f7b2b9c318ac468c7f723c0711be8a400165..84bf96276e1097fde1bd1eef3db9206fa9f817c0 100644 --- a/web/src/utils/tool.ts +++ b/web/src/utils/tool.ts @@ -1,4 +1,5 @@ +import { getApiBaseUrl } from '#/api/request'; import { useSiteConfigStore } from '#/store/modules/site-config'; import type { App, Component } from 'vue'; @@ -116,24 +117,6 @@ const padStart = (str: string, maxLength: number, fillString = ' ') => { return fillString.slice(0, fillLength) + str } -/** - * 根据环境获取基础URL - * @returns - */ -export const getUrl = (): string => { - const value: string = import.meta.env.VITE_AXIOS_BASE_URL as string - return value == 'fetchCurrentDomain' ? window.location.protocol + '//' + window.location.host : value -} - - -/** - * 根据环境获取基础请求URL的端口 - */ -export const getPort = (): string => { - const url = getUrl() - return new URL(url).port -} - /** @@ -144,10 +127,9 @@ export const getPort = (): string => { */ export const fullUrl = (relativeUrl: string, domain: string = ''): string => { const siteConfig = useSiteConfigStore(); - // 1. 处理空路径直接返回域名 - if (!relativeUrl) return domain || getUrl(); + if (!relativeUrl) return domain || getApiBaseUrl(null); @@ -157,7 +139,7 @@ export const fullUrl = (relativeUrl: string, domain: string = ''): string => { if (isAbsoluteUrl || isDataUrl) return relativeUrl; // 3. 确定最终使用的域名 - const finalDomain = domain || siteConfig.state.cdn_url || getUrl(); + const finalDomain = domain || siteConfig.state.cdn_url || getApiBaseUrl(); if (!finalDomain) return relativeUrl; // 保底返回原路径 // 4. 拼接URL @@ -176,6 +158,46 @@ export const fullUrl = (relativeUrl: string, domain: string = ''): string => { }; +/** + * 移除URL中的公共路径前缀 + * @param url 待处理的URL + * @param domain 可选指定要移除的特定域名（默认自动检测） + * @returns 移除前缀后的相对路径 + */ +export const stripBaseUrl = (url: string, domain: string = ''): string => { + const siteConfig = useSiteConfigStore(); + + // 1. 处理空值 + if (!url) return ''; + + // 2. 检测不需要处理的URL类型 + const isDataUrl = /^data:image\//i.test(url); + if (isDataUrl) return url; + + // 3. 确定要移除的域名（优先级：参数指定 > CDN域名 > API域名） + const baseDomain = domain || siteConfig.state.cdn_url || getApiBaseUrl(); + if (!baseDomain) return url; + + // 4. 标准化待移除的域名（移除尾部斜杠） + const normalizedDomain = baseDomain.replace(/\/+$/, ''); + + // 5. 移除域名部分（包括协议头可选匹配） + let result = url + .replace(new RegExp(`^https?:\\/\\/${normalizedDomain}\\/?`), '') + .replace(new RegExp(`^${normalizedDomain}\\/?`), ''); + + // 6. 移除可能的CDN参数（如果来自同一CDN） + if (normalizedDomain === siteConfig.state.cdn_url && siteConfig.state.cdn_url_params) { + const paramStr = `[?&]${siteConfig.state.cdn_url_params.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`; + result = result.replace(new RegExp(`${paramStr}(?:&|$)`), ''); + } + + // 7. 确保不会返回空路径（至少保留原文件名） + return result || url.split('/').pop() || ''; +}; + + + /** * 获取一组资源的完整地址（支持字符串或数组输入） * @param relativeUrls 相对路径（支持逗号分隔字符串或数组） diff --git a/web/src/views/core/profile/components/update-avatar.vue b/web/src/views/core/profile/components/update-avatar.vue index bbf660c43ea1cad584b1d59cc64b38af33dce652..f1819caafe8f38d301534d2d295cb14511cca0a5 100644 --- a/web/src/views/core/profile/components/update-avatar.vue +++ b/web/src/views/core/profile/components/update-avatar.vue @@ -13,6 +13,7 @@ import { import { Icon } from '#/components/icon'; import { SystemProfileApi } from '#/api/system/profile'; import { joinUrls } from '#/utils'; +import { getApiBaseUrl } from '#/api/request'; const api= new SystemProfileApi(); @@ -31,7 +32,7 @@ const authStore = useAuthStore(); const getAction = computed(() => { //@ts-ignore - return joinUrls(import.meta.env.VITE_GLOB_API_URL, 'system/files/upload-image') + return joinUrls(getApiBaseUrl(null), 'system/files/upload-image') }); const headers = {