提交 12993d55 authored 作者: 王鹏飞's avatar 王鹏飞

feat: 添加SSO令牌处理,更新支付方式和环境配置

上级 413b2206
...@@ -9,13 +9,22 @@ import zhCN from 'antd/es/locale/zh_CN' ...@@ -9,13 +9,22 @@ import zhCN from 'antd/es/locale/zh_CN'
import MyApp from './App' import MyApp from './App'
function consumeSsoToken() {
const token = new URLSearchParams(window.location.hash.slice(1)).get('sso_token')
if (!token) return
localStorage.setItem('kiwi.token', token)
window.history.replaceState(null, '', window.location.pathname + window.location.search)
}
consumeSsoToken()
dayjs.locale('zh-cn') dayjs.locale('zh-cn')
createRoot(document.getElementById('root')).render( createRoot(document.getElementById('root')).render(
// <StrictMode> // <StrictMode>
<ConfigProvider locale={zhCN} theme={{ token: { colorPrimary: '#aa1941' } }}> <ConfigProvider locale={zhCN} theme={{ token: { colorPrimary: '#aa1941' } }}>
<App> <App>
<BrowserRouter basename='/admin'> <BrowserRouter>
<MyApp /> <MyApp />
</BrowserRouter> </BrowserRouter>
</App> </App>
......
...@@ -20,13 +20,13 @@ const records = { ...@@ -20,13 +20,13 @@ const records = {
{ {
title: '支付方式', title: '支付方式',
dataIndex: 'pay_type', dataIndex: 'pay_type',
render: (value: number) => ({ 1: '微信', 2: '支付宝', 3: '紫荆币' })[value] || '-', render: (value: number) => ({ 1: '微信', 2: '支付宝', 3: '紫荆币', 4: 'Apple' })[value] || '-',
}, },
{ {
title: '结算状态', title: '结算状态',
dataIndex: 'status', dataIndex: 'status',
render: (_: unknown, row: any) => render: (_: unknown, row: any) =>
({ 1: '待支付', 2: '取消支付', 3: '已支付' })[row.pay_type] || '-', ({ 1: '待支付', 2: '取消支付', 3: '已支付', 4: '已退款' })[row.status] || '-',
}, },
], ],
}, },
......
...@@ -6,7 +6,7 @@ import axios, { ...@@ -6,7 +6,7 @@ import axios, {
import md5 from 'js-md5' import md5 from 'js-md5'
import { message, Modal, notification } from 'antd' import { message, Modal, notification } from 'antd'
const ADMIN_LOGIN_PATH = '/admin/login' const ADMIN_LOGIN_PATH = '/login'
export interface ApiResponse<T = unknown> { export interface ApiResponse<T = unknown> {
code: number code: number
......
...@@ -7,35 +7,21 @@ import mkcert from 'vite-plugin-mkcert' ...@@ -7,35 +7,21 @@ import mkcert from 'vite-plugin-mkcert'
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default defineConfig(() => { export default defineConfig(() => {
return { return {
base: '/admin/', base: '/',
plugins: [react(), mkcert()], plugins: [react(), mkcert()],
server: { server: {
open: '/admin/', open: '/',
host: 'dev.ezijing.com', host: 'dev.ezijing.com',
port: 5174, port: 5174,
strictPort: true, strictPort: true,
proxy: { proxy: {
'/api/admin': { '/api': 'https://zijingebook.ezijing.com',
target: 'http://127.0.0.1:7419', // '/api/admin': {
changeOrigin: true, // target: 'http://127.0.0.1:7419',
secure: false, // changeOrigin: true,
rewrite: (path) => path.replace(/^\/api\/admin/, ''), // secure: false,
}, // rewrite: (path) => path.replace(/^\/api\/admin/, ''),
'/api/qwen': { // },
target: 'https://dashscope.aliyuncs.com',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api\/qwen/, ''),
},
'/api/qianfan': {
target: 'https://aip.baidubce.com',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api\/qianfan/, ''),
},
'/api/deepseek': {
target: 'https://api.deepseek.com',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api\/deepseek/, ''),
},
}, },
}, },
build: { build: {
......
VITE_ADMIN_URL=https://dev.ezijing.com:5174
VITE_ADMIN_URL=https://zijingebook.ezijing.com
...@@ -11,6 +11,8 @@ export function enterWorkbench(access: AdminAccess) { ...@@ -11,6 +11,8 @@ export function enterWorkbench(access: AdminAccess) {
if (!canOpenWorkbench(access)) return false if (!canOpenWorkbench(access)) return false
localStorage.setItem('kiwi.token', access.token!) localStorage.setItem('kiwi.token', access.token!)
window.open('/admin/', '_blank') const adminUrl = new URL(import.meta.env.VITE_ADMIN_URL)
adminUrl.hash = new URLSearchParams({ sso_token: access.token! }).toString()
window.open(adminUrl.toString(), '_blank')
return true return true
} }
/// <reference types="vite/client" /> /// <reference types="vite/client" />
interface ImportMetaEnv {
readonly VITE_ADMIN_URL: string
}
interface ImportMeta {
readonly env: ImportMetaEnv
}
...@@ -13,22 +13,17 @@ export default defineConfig(({ mode }) => { ...@@ -13,22 +13,17 @@ export default defineConfig(({ mode }) => {
port: 5173, port: 5173,
strictPort: true, strictPort: true,
proxy: { proxy: {
'/admin': { '/api': 'https://ebook.ezijing.com',
target: 'https://dev.ezijing.com:5174', // '/api/app': {
changeOrigin: true, // target: 'http://127.0.0.1:7421',
secure: false, // changeOrigin: true,
ws: true, // rewrite: (path) => path.replace(/^\/api\/app/, ''),
}, // },
'/api/app': { // '/api/admin': {
target: 'http://127.0.0.1:7421', // target: 'http://127.0.0.1:7419',
changeOrigin: true, // changeOrigin: true,
rewrite: (path) => path.replace(/^\/api\/app/, ''), // rewrite: (path) => path.replace(/^\/api\/admin/, ''),
}, // },
'/api/admin': {
target: 'http://127.0.0.1:7419',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api\/admin/, ''),
},
}, },
}, },
build: { build: {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论