diff --git a/.env.development b/.env.development index 5e73aa7..0252384 100644 --- a/.env.development +++ b/.env.development @@ -5,10 +5,10 @@ VITE_ENV = 'development' VITE_HOST = 'https://test.gitcode.net' # 接口地址 -VITE_API_HOST = '/official' +VITE_API_HOST = '/gateway/official' # devPress接口地址 -VITE_DEV_API_HOST = '/official' +VITE_DEV_API_HOST = '/gateway/official' # devPress地址 VITE_DEV_HOST = 'https://test.gitcode.net' diff --git a/src/components/LoginModal/index.vue b/src/components/LoginModal/index.vue index 87dfda4..f149490 100644 --- a/src/components/LoginModal/index.vue +++ b/src/components/LoginModal/index.vue @@ -784,7 +784,7 @@ onUnmounted(() => { :class="['login-modal', formType === 'login' ? 'login-modal-l' : 'login-modal-r']" > diff --git a/src/utils/request.ts b/src/utils/request.ts index dff8a73..c5ad813 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -7,6 +7,7 @@ import { useGlobalInfoStore } from '@/stores/Global'; import { cutParamsInUrl, getSignUtmSource } from './index'; import { Message } from 'vue-devui/message'; import degradeInterceptor from './degradeInterceptor'; +import { useAccountStore } from '@/stores/user'; const handleError = dealWarning(); @@ -67,9 +68,14 @@ const refreshToken = async () => axios.request({ }); const proxyService = (params: any, customConfigs?: CustomConfigs) => { + const account = useAccountStore(); const service = axios.create({ baseURL: params.apiType === 'devApi' ? baseDevURL : baseURL, timeout: 15000, + headers: { + 'DP_TOKEN': account.accountInfo.access_token, + 'DP_REFRESH_TOKEN': account.accountInfo.refresh_token, + }, withCredentials: true }); /** user api相关请求白名单 */ diff --git a/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarning.vue b/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarning.vue new file mode 100644 index 0000000..ca97a06 --- /dev/null +++ b/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarning.vue @@ -0,0 +1,39 @@ + + + + + + + diff --git a/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarningDetail.vue b/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarningDetail.vue new file mode 100644 index 0000000..bd51fd9 --- /dev/null +++ b/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarningDetail.vue @@ -0,0 +1,106 @@ + + + + + \ No newline at end of file diff --git a/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarningOrganization.vue b/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarningOrganization.vue new file mode 100644 index 0000000..2f7492a --- /dev/null +++ b/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarningOrganization.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarningPerson.vue b/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarningPerson.vue new file mode 100644 index 0000000..f74c7c3 --- /dev/null +++ b/src/views/Jyh/PersonalCenter 2/Detail/EarlyWarningPerson.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/views/Jyh/PersonalCenter 2/Detail/InvitationNoticeList.vue b/src/views/Jyh/PersonalCenter 2/Detail/InvitationNoticeList.vue new file mode 100644 index 0000000..08b08d2 --- /dev/null +++ b/src/views/Jyh/PersonalCenter 2/Detail/InvitationNoticeList.vue @@ -0,0 +1,74 @@ + + + + + \ No newline at end of file diff --git a/src/views/Jyh/PersonalCenter 2/Detail/OrgSubscription.vue b/src/views/Jyh/PersonalCenter 2/Detail/OrgSubscription.vue new file mode 100644 index 0000000..b147f2d --- /dev/null +++ b/src/views/Jyh/PersonalCenter 2/Detail/OrgSubscription.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/views/Jyh/PersonalCenter 2/Detail/PersonageSubscription.vue b/src/views/Jyh/PersonalCenter 2/Detail/PersonageSubscription.vue new file mode 100644 index 0000000..256f89f --- /dev/null +++ b/src/views/Jyh/PersonalCenter 2/Detail/PersonageSubscription.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/views/Jyh/PersonalCenter 2/Detail/SubscribeList.vue b/src/views/Jyh/PersonalCenter 2/Detail/SubscribeList.vue new file mode 100644 index 0000000..f794160 --- /dev/null +++ b/src/views/Jyh/PersonalCenter 2/Detail/SubscribeList.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/views/Jyh/PersonalCenter 2/OrganizationManage/OrganizationManage.vue b/src/views/Jyh/PersonalCenter 2/OrganizationManage/OrganizationManage.vue new file mode 100644 index 0000000..079e5ac --- /dev/null +++ b/src/views/Jyh/PersonalCenter 2/OrganizationManage/OrganizationManage.vue @@ -0,0 +1,466 @@ + + + + + diff --git a/src/views/Jyh/PersonalCenter 2/index.vue b/src/views/Jyh/PersonalCenter 2/index.vue new file mode 100644 index 0000000..fab8244 --- /dev/null +++ b/src/views/Jyh/PersonalCenter 2/index.vue @@ -0,0 +1,288 @@ + + + + + diff --git a/src/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue index bd51fd9..6ab0c7b 100644 --- a/src/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue +++ b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue @@ -3,19 +3,32 @@
{{ warningData.title }}
- 重要性 - {{warningData.importance}} +
+ 重要性 + {{warningData.importance}} +
+
+ + 预览 +
-
+ +
可信开源代码库运营团队 {{ warningData.fromTime }}
@@ -35,12 +48,29 @@ const warningData = ref({ importance: '高', summary: '近日,安全中心发现Apache lgnite远程代码执行漏洞(CVE-2024-52577)。在 2.6.0 { emit('close'); }; +const handleModeChange = () => { + if (mode.value === 'editonly') { + mode.value = 'readonly'; + } else { + mode.value = 'editonly'; + } +}; + + diff --git a/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue b/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue index 079e5ac..7cc72ba 100644 --- a/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue +++ b/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue @@ -1,244 +1,153 @@ diff --git a/src/views/Jyh/PersonalCenter/PersonalBasic.vue b/src/views/Jyh/PersonalCenter/PersonalBasic.vue new file mode 100644 index 0000000..9b6fa2a --- /dev/null +++ b/src/views/Jyh/PersonalCenter/PersonalBasic.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/views/Jyh/PersonalCenter/index.vue b/src/views/Jyh/PersonalCenter/index.vue index fab8244..255d3a4 100644 --- a/src/views/Jyh/PersonalCenter/index.vue +++ b/src/views/Jyh/PersonalCenter/index.vue @@ -3,35 +3,35 @@
首页 - + 个人中心
- +
-
{{ accountInfo.username || '--' }}
+
UserName
- 介绍:包含项目管理、代码托管、CI/CD 和制品库等功能,提供完整的研发流程建议的新的团队… + 介绍:包含项目管理、代码托管、CI/CD 和制品库等功能,提供完整的研发流程建议的新的团队…
- - - + + +
- - +
- - - - + + +
@@ -42,15 +42,12 @@ import { useRouter, useRoute } from 'vue-router'; import { getOrgInfo } from '@/views/Org/hooks/orgInfo'; import EarlyWarning from './Detail/EarlyWarning.vue'; import SubscribeList from './Detail/SubscribeList.vue'; -import OrganizationManage from './OrganizationManage/OrganizationManage.vue'; -import InvitationNoticeList from './Detail/InvitationNoticeList.vue'; -import { useAccount } from '@/utils/hooks/useAccount'; +import PersonalSettings from './Detail/PersonalSettings.vue'; const { namespace } = getOrgInfo(); const avatarUrl = '/src/assets/imgs/avatar/male.png'; const selectTab = ref('yjtzlb'); -const { accountInfo, RemoveInfo } = useAccount(); // 删除弹窗 const item = ref(''); diff --git a/vite.config.ts b/vite.config.ts index dca6ada..aacfe7c 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -38,10 +38,10 @@ export default (config: any) => { }, proxy: { // 配置跨域代理 - '/official': { - target: 'http://222.20.126.217:9527', // 目标服务器地址 + '/gateway': { + target: 'http://223.76.236.155:20011', // 目标服务器地址 changeOrigin: true, // 允许跨域 - rewrite: (path) => path.replace(/^\/official/, '/official'), // 重写路径 + rewrite: (path) => path.replace(/^\/gateway/, '/gateway'), // 重写路径 } } },