From 29bc60670bb0c6b7903154a04ebf473aeca5def3 Mon Sep 17 00:00:00 2001 From: zhaowei Date: Mon, 25 Aug 2025 10:35:21 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E5=BF=98=E8=AE=B0=E4=BF=9D=E5=AD=98=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- react-ui/config/proxy.ts | 4 ---- react-ui/src/utils/sessionStorage.ts | 3 --- 2 files changed, 7 deletions(-) diff --git a/react-ui/config/proxy.ts b/react-ui/config/proxy.ts index a742933c..20769b3c 100644 --- a/react-ui/config/proxy.ts +++ b/react-ui/config/proxy.ts @@ -23,11 +23,7 @@ export default { target: 'http://172.20.32.197:31213', // 开发环境 // target: 'http://172.20.32.235:31213', // 测试环境 // target: 'http://172.20.32.44:8082', -<<<<<<< HEAD // target: 'http://172.20.32.164:8082', -======= - target: 'http://172.20.32.164:8082', ->>>>>>> dev-zw // 配置了这个可以从 http 代理到 https // 依赖 origin 的功能可能需要这个，比如 cookie changeOrigin: true, diff --git a/react-ui/src/utils/sessionStorage.ts b/react-ui/src/utils/sessionStorage.ts index 8b981916..58d26682 100644 --- a/react-ui/src/utils/sessionStorage.ts +++ b/react-ui/src/utils/sessionStorage.ts @@ -13,13 +13,10 @@ export default class SessionStorage { static readonly aimUrlKey = 'aim-url'; /** tensorBoard url */ static readonly tensorBoardUrlKey = 'tensor-board-url'; -<<<<<<< HEAD /** 登录之前的地址 */ static readonly redirectUrl = 'redirect-url'; -======= // /** 云际系统 Token */ // static readonly jccTokenKey = 'jcc-token'; ->>>>>>> dev-zw /** * 获取 SessionStorage 值