From 3f7696ac50d5b85749a962a3d107e2c573c5313c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 24 Jul 2025 20:19:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- .env.development | 11 +- .env.production | 3 - src/api/system/website/field/index.ts | 142 ------------- src/api/system/website/field/model/index.ts | 65 ------ src/api/system/website/index.ts | 169 --------------- src/api/system/website/model/index.ts | 63 ------ src/components/ChooseWebsiteField/index.vue | 72 ------- .../components/select-data.vue | 198 +++++++++--------- src/config/setting.ts | 6 +- src/store/modules/chat.ts | 2 +- .../cms/cmsArticle/components/search.vue | 2 + src/views/cms/cmsNavigation/index.vue | 31 +-- 13 files changed, 128 insertions(+), 638 deletions(-) delete mode 100644 src/api/system/website/field/index.ts delete mode 100644 src/api/system/website/field/model/index.ts delete mode 100644 src/api/system/website/index.ts delete mode 100644 src/api/system/website/model/index.ts delete mode 100644 src/components/ChooseWebsiteField/index.vue diff --git a/.env b/.env index 6dc5b52..fe99737 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -VITE_APP_NAME=webSoft +VITE_APP_NAME=WSADMIN VITE_API_URL=/api diff --git a/.env.development b/.env.development index 845a178..40cdf19 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,7 @@ -VITE_APP_NAME=后台管理系统 -VITE_SOCKET_URL=wss://server.websoft.top -VITE_SERVER_URL=https://server.websoft.top/api -VITE_API_URL=https://cms.websoft.top/api +VITE_APP_NAME=后台管理(开发环境) +VITE_API_URL=https://cms-api.websoft.top/api + + -#VITE_SOCKET_URL=ws://127.0.0.1:9191 -#VITE_SERVER_URL=http://127.0.0.1:8000/api #VITE_API_URL=http://127.0.0.1:9000/api -#/booking/bookingItem diff --git a/.env.production b/.env.production index dd3fb6e..fcc25d0 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1 @@ -VITE_APP_NAME=后台管理系统 -VITE_SOCKET_URL=wss://server.websoft.top -VITE_SERVER_URL=https://server.websoft.top/api VITE_API_URL=https://cms.websoft.top/api diff --git a/src/api/system/website/field/index.ts b/src/api/system/website/field/index.ts deleted file mode 100644 index c3677fc..0000000 --- a/src/api/system/website/field/index.ts +++ /dev/null @@ -1,142 +0,0 @@ -import request from '@/utils/request'; -import type {ApiResult, PageResult} from '@/api'; -import type { - CmsWebsiteField, - CmsWebsiteFieldParam -} from '@/api/cms/cmsWebsiteField/model'; -import {COMMON_API_URL, SERVER_API_URL} from '@/config/setting'; - -/** - * 分页查询项目参数 - */ -export async function pageWebsiteField(params: CmsWebsiteFieldParam) { - const res = await request.get>>( - COMMON_API_URL + '/system/website-field/page', - { - params - } - ); - if (res.data.code === 0) { - return res.data.data; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 查询项目参数列表 - */ -export async function listWebsiteField(params?: CmsWebsiteFieldParam) { - const res = await request.get>( - SERVER_API_URL + '/system/website-field', - { - params - } - ); - if (res.data.code === 0 && res.data.data) { - return res.data.data; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 根据id查询项目参数 - */ -export async function getWebsiteField(id: number) { - const res = await request.get>( - SERVER_API_URL + '/system/website-field/' + id - ); - if (res.data.code === 0 && res.data.data) { - return res.data.data; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 添加项目参数 - */ -export async function addWebsiteField(data: CmsWebsiteField) { - const res = await request.post>( - SERVER_API_URL + '/system/website-field', - data - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 修改项目参数 - */ -export async function updateWebsiteField(data: CmsWebsiteField) { - const res = await request.put>( - SERVER_API_URL + '/system/website-field', - data - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 删除项目参数 - */ -export async function removeWebsiteField(id?: number) { - const res = await request.delete>( - SERVER_API_URL + '/system/website-field/' + id - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 批量删除项目参数 - */ -export async function removeBatchWebsiteField(data: (number | undefined)[]) { - const res = await request.delete>( - SERVER_API_URL + '/system/website-field/batch', - { - data - } - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 检查IP是否存在 - */ -export async function checkExistence( - field: string, - value: string, - id?: number -) { - const res = await request.get>( - SERVER_API_URL + '/system/website-field/existence', - { - params: {field, value, id} - } - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 恢复项目参数 - */ -export async function undeleteWebsiteField(id?: number) { - const res = await request.delete>( - SERVER_API_URL + '/system/website-field/undelete/' + id - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} diff --git a/src/api/system/website/field/model/index.ts b/src/api/system/website/field/model/index.ts deleted file mode 100644 index 1fe6ad1..0000000 --- a/src/api/system/website/field/model/index.ts +++ /dev/null @@ -1,65 +0,0 @@ -import type { PageParam } from '@/api'; - -/** - * 网站参数 - */ -export interface WebsiteField { - id?: number; - name?: string; - value?: string; - comments?: string; - userId?: number; - template?: string; - defaultValue?: string; - modifyRange?: string; - type?: number; - status?: any; - sortNumber?: any; - createTime?: string; - deleted?: number; - style?: string; -} - -// 约定的网站参数名称 -export interface WebsiteParam { - // 网站名称 - site_logo?: string; - // 登录页面标题 - login_name?: string; - // 登录页面的背景图片 - login_bg_img?: string; -} - -// 约定的小程序参数名称 -export interface MpWeixinParam { - // 小程序LOGO - site_logo?: string; - // 我的页面顶部背景图片 - mp_user_top?: string; -} - -/** - * 网站参数搜索条件 - */ -export interface WebsiteFieldParam extends PageParam { - id?: number; - userId?: number; - name?: string; - websiteId?: number; -} - -export interface Config { - siteName?: string; - siteLogo?: string; - domain?: string; - icpNo?: string; - copyright?: string; - loginBgImg?: string; - address?: string; - tel?: string; - kefu2?: string; - kefu1?: string; - email?: string; - loginTitle?: string; - sysLogo?: string; -} diff --git a/src/api/system/website/index.ts b/src/api/system/website/index.ts deleted file mode 100644 index 133fe1a..0000000 --- a/src/api/system/website/index.ts +++ /dev/null @@ -1,169 +0,0 @@ -import request from '@/utils/request'; -import type { ApiResult, PageResult } from '@/api'; -import type { Website, WebsiteParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; - -/** - * 获取网站信息 - */ -export async function getSiteInfo() { - const res = await request.get>( - MODULES_API_URL + '/cms/website/getSiteInfo' - ); - if (res.data.code === 0 && res.data.data) { - return res.data.data; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 清除缓存 - */ -export async function removeSiteInfoCache(key?: string) { - const res = await request.delete>( - MODULES_API_URL + '/cms/website/clearSiteInfo/' + key - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 分页查询网站 - */ -export async function pageWebsite(params: WebsiteParam) { - const res = await request.get>>( - MODULES_API_URL + '/cms/website/page', - { - params - } - ); - if (res.data.code === 0) { - return res.data.data; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 查询网站列表 - */ -export async function listWebsite(params?: WebsiteParam) { - const res = await request.get>( - MODULES_API_URL + '/cms/website', - { - params - } - ); - if (res.data.code === 0 && res.data.data) { - return res.data.data; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 添加网站 - */ -export async function addWebsite(data: Website) { - const res = await request.post>( - MODULES_API_URL + '/cms/website', - data - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 修改网站 - */ -export async function updateWebsite(data: Website) { - const res = await request.put>( - MODULES_API_URL + '/cms/website', - data - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 删除网站 - */ -export async function removeWebsite(id?: number) { - const res = await request.delete>( - MODULES_API_URL + '/cms/website/' + id - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 批量删除网站 - */ -export async function removeBatchWebsite(data: (number | undefined)[]) { - const res = await request.delete>( - MODULES_API_URL + '/cms/website/batch', - { - data - } - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 修改用户状态 - */ -export async function updateWebsiteStatus(websiteId?: number, status?: number) { - const res = await request.put>( - MODULES_API_URL + '/cms/website/status', - { - websiteId, - status - } - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 根据id查询网站 - */ -export async function getWebsite(id: number) { - const res = await request.get>( - MODULES_API_URL + '/cms/website/' + id - ); - if (res.data.code === 0 && res.data.data) { - return res.data.data; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 检查IP是否存在 - */ -export async function checkExistence( - field: string, - value: string, - id?: number -) { - const res = await request.get>( - MODULES_API_URL + '/cms/website/existence', - { - params: { field, value, id } - } - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} diff --git a/src/api/system/website/model/index.ts b/src/api/system/website/model/index.ts deleted file mode 100644 index 785f28a..0000000 --- a/src/api/system/website/model/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { WebsiteField } from '@/api/cms/website/field/model'; -import { Navigation } from '@/api/cms/navigation/model'; -import { Link } from '@/api/cms/link/model'; -import { ArrangeCategory } from '@/api/cms/category/model'; -import { PageParam } from '@/api'; - -/** - * 菜单 - */ -export interface Website { - websiteId?: number; - websiteName?: string; - websiteCode?: string; - websiteIcon?: string; - websiteLogo?: string; - websiteDarkLogo?: string; - keywords?: string; - address?: string; - phone?: string; - email?: string; - version?: number; - websiteType?: string; - expirationTime?: string; - templateId?: string; - industryParent?: string; - industryChild?: string; - companyId?: number; - prefix?: string; - domain?: string; - adminUrl?: string; - icpNo?: string; - policeNo?: string; - comments?: string; - statusText?: string; - sortNumber?: number; - createTime?: string; - disabled?: boolean; - country?: string; - province?: string; - city?: string; - region?: string; - appId?: number; - fields?: WebsiteField[]; - status?: number; - tenantId?: number; - tenantName?: string; - navigations?: Navigation[]; - categoryList?: ArrangeCategory[]; - links?: Link[]; - // 配置信息 - config?: any; - style?: string; -} - -/** - * 菜单搜索参数 - */ -export interface WebsiteParam extends PageParam { - title?: string; - path?: string; - authority?: string; - parentId?: number; -} diff --git a/src/components/ChooseWebsiteField/index.vue b/src/components/ChooseWebsiteField/index.vue deleted file mode 100644 index e0e2c25..0000000 --- a/src/components/ChooseWebsiteField/index.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - diff --git a/src/components/SelectWebsiteField/components/select-data.vue b/src/components/SelectWebsiteField/components/select-data.vue index 38040b8..6a5c489 100644 --- a/src/components/SelectWebsiteField/components/select-data.vue +++ b/src/components/SelectWebsiteField/components/select-data.vue @@ -34,11 +34,11 @@
{{ record.comments }}
diff --git a/src/config/setting.ts b/src/config/setting.ts index 32880fe..299cf5b 100644 --- a/src/config/setting.ts +++ b/src/config/setting.ts @@ -4,12 +4,10 @@ export const TENANT_ID = import.meta.env.VITE_TENANT_ID; export const TEMPLATE_ID = 10258; // appSecret export const APP_SECRET = 'ffd6eee985af45e4a75098422d1decbb'; - +// 开发商官方网站 export const domain = 'https://websoft.top'; -// 基础模块 -export const COMMON_API_URL = 'https://server.websoft.top/api'; // 主节点 -export const SERVER_API_URL = import.meta.env.VITE_SERVER_URL; +export const SERVER_API_URL = 'https://server.gxwebsoft.com/api'; // 模块节点 export const MODULES_API_URL = import.meta.env.VITE_API_URL; export const THINK_API_URL = import.meta.env.VITE_THINK_URL; diff --git a/src/store/modules/chat.ts b/src/store/modules/chat.ts index 1ef1bf5..b42b27d 100644 --- a/src/store/modules/chat.ts +++ b/src/store/modules/chat.ts @@ -8,7 +8,7 @@ import { } from '@/api/system/chat'; import { emitter } from '@/utils/common'; -const SOCKET_URL: string = import.meta.env.VITE_SOCKET_URL; +const SOCKET_URL: string = 'wss://server.gxwebsoft.com'; interface ConnectionOptions { token: string; diff --git a/src/views/cms/cmsArticle/components/search.vue b/src/views/cms/cmsArticle/components/search.vue index f6a72b9..5c8d9e2 100644 --- a/src/views/cms/cmsArticle/components/search.vue +++ b/src/views/cms/cmsArticle/components/search.vue @@ -88,6 +88,7 @@ import {CmsNavigation} from '@/api/cms/cmsNavigation/model'; import dayjs from 'dayjs'; import Import from "./Import.vue"; import {useWebsiteSettingStore} from "@/store/modules/setting"; +import {openUrl, push} from "@/utils/common"; const props = withDefaults( defineProps<{ @@ -310,6 +311,7 @@ const reset = () => { resetFields(); type.value = undefined; reload(); + openUrl(`/website/article`) }; watch( diff --git a/src/views/cms/cmsNavigation/index.vue b/src/views/cms/cmsNavigation/index.vue index ade9c88..82c093b 100644 --- a/src/views/cms/cmsNavigation/index.vue +++ b/src/views/cms/cmsNavigation/index.vue @@ -62,7 +62,7 @@ /> 模型管理 @@ -75,7 +75,14 @@