Ecosystem/ai-gateway
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: allow baseUrl

Browse Source
This commit is contained in:
Bibo Hao 2024-08-06 23:54:40 +08:00
parent f9774698e9
commit 204f2ae0c6
17 changed files with 69 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/embed-file-system.go
View File

@ -5,6 +5,7 @@ import (
"github.com/gin-contrib/static" "github.com/gin-contrib/static"
"io/fs" "io/fs"
"net/http" "net/http"
"strings"
) )
// Credit: https://github.com/gin-contrib/static/issues/19 // Credit: https://github.com/gin-contrib/static/issues/19
@ -14,7 +15,8 @@ type embedFileSystem struct {
} }
func (e embedFileSystem) Exists(prefix string, path string) bool { func (e embedFileSystem) Exists(prefix string, path string) bool {
_, err := e.Open(path) relPath := strings.TrimPrefix(path, prefix)
_, err := e.Open(relPath)
return err == nil return err == nil
} }

2
router/api.go
View File

@ -9,7 +9,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
func SetApiRouter(router *gin.Engine) { func SetApiRouter(router *gin.RouterGroup) {
apiRouter := router.Group("/api") apiRouter := router.Group("/api")
apiRouter.Use(gzip.Gzip(gzip.DefaultCompression)) apiRouter.Use(gzip.Gzip(gzip.DefaultCompression))
apiRouter.Use(middleware.GlobalAPIRateLimit()) apiRouter.Use(middleware.GlobalAPIRateLimit())

2
router/dashboard.go
View File

@ -7,7 +7,7 @@ import (
"github.com/songquanpeng/one-api/middleware" "github.com/songquanpeng/one-api/middleware"
) )
func SetDashboardRouter(router *gin.Engine) { func SetDashboardRouter(router *gin.RouterGroup) {
apiRouter := router.Group("/") apiRouter := router.Group("/")
apiRouter.Use(middleware.CORS()) apiRouter.Use(middleware.CORS())
apiRouter.Use(gzip.Gzip(gzip.DefaultCompression)) apiRouter.Use(gzip.Gzip(gzip.DefaultCompression))

12
router/main.go
View File

@ -11,7 +11,13 @@ import (
"strings" "strings"
) )
func SetRouter(router *gin.Engine, buildFS embed.FS) { func SetRouter(engine *gin.Engine, buildFS embed.FS) {
var baseUrl = os.Getenv("BASE_URL")
if baseUrl == "" {
baseUrl = "/"
}
router := engine.Group(baseUrl)
SetApiRouter(router) SetApiRouter(router)
SetDashboardRouter(router) SetDashboardRouter(router)
SetRelayRouter(router) SetRelayRouter(router)
@ -21,10 +27,10 @@ func SetRouter(router *gin.Engine, buildFS embed.FS) {
logger.SysLog("FRONTEND_BASE_URL is ignored on master node") logger.SysLog("FRONTEND_BASE_URL is ignored on master node")
} }
if frontendBaseUrl == "" { if frontendBaseUrl == "" {
SetWebRouter(router, buildFS) SetWebRouter(engine, baseUrl, buildFS)
} else { } else {
frontendBaseUrl = strings.TrimSuffix(frontendBaseUrl, "/") frontendBaseUrl = strings.TrimSuffix(frontendBaseUrl, "/")
router.NoRoute(func(c *gin.Context) { engine.NoRoute(func(c *gin.Context) {
c.Redirect(http.StatusMovedPermanently, fmt.Sprintf("%s%s", frontendBaseUrl, c.Request.RequestURI)) c.Redirect(http.StatusMovedPermanently, fmt.Sprintf("%s%s", frontendBaseUrl, c.Request.RequestURI))
}) })
} }

2
router/relay.go
View File

@ -7,7 +7,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
func SetRelayRouter(router *gin.Engine) { func SetRelayRouter(router *gin.RouterGroup) {
router.Use(middleware.CORS()) router.Use(middleware.CORS())
// https://platform.openai.com/docs/api-reference/introduction // https://platform.openai.com/docs/api-reference/introduction
modelsRouter := router.Group("/v1/models") modelsRouter := router.Group("/v1/models")

16
router/web.go
View File

@ -14,13 +14,15 @@ import (
"strings" "strings"
) )
func SetWebRouter(router *gin.Engine, buildFS embed.FS) { func SetWebRouter(engine *gin.Engine, baseUrl string, buildFS embed.FS) {
indexPageData, _ := buildFS.ReadFile(fmt.Sprintf("web/build/%s/index.html", config.Theme)) basePath := fmt.Sprintf("web/build/%s", config.Theme)
router.Use(gzip.Gzip(gzip.DefaultCompression)) indexPageData, _ := buildFS.ReadFile(fmt.Sprintf("%s/index.html", basePath))
router.Use(middleware.GlobalWebRateLimit()) engine.Use(gzip.Gzip(gzip.DefaultCompression))
router.Use(middleware.Cache()) engine.Use(middleware.GlobalWebRateLimit())
router.Use(static.Serve("/", common.EmbedFolder(buildFS, fmt.Sprintf("web/build/%s", config.Theme)))) engine.Use(middleware.Cache())
router.NoRoute(func(c *gin.Context) { engine.Use(static.Serve(baseUrl, common.EmbedFolder(buildFS, basePath)))
engine.NoRoute(func(c *gin.Context) {
if strings.HasPrefix(c.Request.RequestURI, "/v1") || strings.HasPrefix(c.Request.RequestURI, "/api") { if strings.HasPrefix(c.Request.RequestURI, "/v1") || strings.HasPrefix(c.Request.RequestURI, "/api") {
controller.RelayNotFound(c) controller.RelayNotFound(c)
return return

1
web/build.sh
View File

@ -8,6 +8,7 @@ while IFS= read -r theme; do
rm -r build/$theme rm -r build/$theme
cd "$theme" cd "$theme"
npm install npm install
jq ".homepage=\"${REACT_APP_BASE_URL}\"" package.json > tmp.json && mv tmp.json package.json ;
DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$version npm run build DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$version npm run build
cd .. cd ..
done < THEMES done < THEMES

1
web/default/package.json
View File

@ -1,6 +1,7 @@
{ {
"name": "react-template", "name": "react-template",
"version": "0.1.0", "version": "0.1.0",
"homepage": "",
"private": true, "private": true,
"dependencies": { "dependencies": {
"axios": "^0.27.2", "axios": "^0.27.2",

2
web/default/public/index.html
View File

@ -2,7 +2,7 @@
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="logo.png" /> <link id="favicon" rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#ffffff" /> <meta name="theme-color" content="#ffffff" />
<meta <meta

13
web/default/src/components/Header.js
View File

@ -1,7 +1,7 @@
import React, { useContext, useState } from 'react'; import React, { useContext, useState } from 'react';
import { Link, useNavigate } from 'react-router-dom'; import { Link, useNavigate } from 'react-router-dom';
import { UserContext } from '../context/User'; import { UserContext } from '../context/User';
import { BASE_URL } from "../config";
import { Button, Container, Dropdown, Icon, Menu, Segment } from 'semantic-ui-react'; import { Button, Container, Dropdown, Icon, Menu, Segment } from 'semantic-ui-react';
import { API, getLogo, getSystemName, isAdmin, isMobile, showSuccess } from '../helpers'; import { API, getLogo, getSystemName, isAdmin, isMobile, showSuccess } from '../helpers';
import '../index.css'; import '../index.css';
@ -119,19 +119,14 @@ const Header = () => {
size='large' size='large'
style={ style={
showSidebar showSidebar
? { ? { borderBottom: 'none', marginBottom: '0', borderTop: 'none', height: '51px' }
borderBottom: 'none',
marginBottom: '0',
borderTop: 'none',
height: '51px'
}
: { borderTop: 'none', height: '52px' } : { borderTop: 'none', height: '52px' }
} }
> >
<Container> <Container>
<Menu.Item as={Link} to='/'> <Menu.Item as={Link} to='/'>
<img <img
src={logo} src={ BASE_URL + logo}
alt='logo' alt='logo'
style={{ marginRight: '0.75em' }} style={{ marginRight: '0.75em' }}
/> />
@ -188,7 +183,7 @@ const Header = () => {
<Menu borderless style={{ borderTop: 'none' }}> <Menu borderless style={{ borderTop: 'none' }}>
<Container> <Container>
<Menu.Item as={Link} to='/' className={'hide-on-mobile'}> <Menu.Item as={Link} to='/' className={'hide-on-mobile'}>
<img src={logo} alt='logo' style={{ marginRight: '0.75em' }} /> <img src={ BASE_URL + logo} alt='logo' style={{ marginRight: '0.75em' }} />
<div style={{ fontSize: '20px' }}> <div style={{ fontSize: '20px' }}>
<b>{systemName}</b> <b>{systemName}</b>
</div> </div>

17
web/default/src/components/LoginForm.js
View File

@ -4,6 +4,7 @@ import { Link, useNavigate, useSearchParams } from 'react-router-dom';
import { UserContext } from '../context/User'; import { UserContext } from '../context/User';
import { API, getLogo, showError, showSuccess, showWarning } from '../helpers'; import { API, getLogo, showError, showSuccess, showWarning } from '../helpers';
import { onGitHubOAuthClicked, onLarkOAuthClicked } from './utils'; import { onGitHubOAuthClicked, onLarkOAuthClicked } from './utils';
import { BASE_URL } from '../config';
import larkIcon from '../images/lark.svg'; import larkIcon from '../images/lark.svg';
const LoginForm = () => { const LoginForm = () => {
@ -87,7 +88,7 @@ const LoginForm = () => {
<Grid textAlign='center' style={{ marginTop: '48px' }}> <Grid textAlign='center' style={{ marginTop: '48px' }}>
<Grid.Column style={{ maxWidth: 450 }}> <Grid.Column style={{ maxWidth: 450 }}>
<Header as='h2' color='' textAlign='center'> <Header as='h2' color='' textAlign='center'>
<Image src={logo} /> 用户登录 <Image src={ BASE_URL + logo} /> 用户登录
</Header> </Header>
<Form size='large'> <Form size='large'>
<Segment> <Segment>
@ -151,13 +152,13 @@ const LoginForm = () => {
)} )}
{status.lark_client_id ? ( {status.lark_client_id ? (
<div style={{ <div style={{
background: "radial-gradient(circle, #FFFFFF, #FFFFFF, #00D6B9, #2F73FF, #0a3A9C)", background: "radial-gradient(circle, #FFFFFF, #FFFFFF, #00D6B9, #2F73FF, #0a3A9C)",
width: "36px", width: "36px",
height: "36px", height: "36px",
borderRadius: "10em", borderRadius: "10em",
display: "flex", display: "flex",
cursor: "pointer" cursor: "pointer"
}} }}
onClick={() => onLarkOAuthClicked(status.lark_client_id)} onClick={() => onLarkOAuthClicked(status.lark_client_id)}
> >
<Image <Image

35
web/default/src/components/PasswordResetConfirm.js
View File

@ -1,6 +1,7 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Button, Form, Grid, Header, Image, Segment } from 'semantic-ui-react'; import { Button, Form, Grid, Header, Image, Segment } from 'semantic-ui-react';
import { API, copy, showError, showInfo, showNotice, showSuccess } from '../helpers'; import { API, copy, showError, showInfo, showNotice, showSuccess } from '../helpers';
import { BASE_URL } from '../config';
import { useSearchParams } from 'react-router-dom'; import { useSearchParams } from 'react-router-dom';
const PasswordResetConfirm = () => { const PasswordResetConfirm = () => {
@ -37,7 +38,7 @@ const PasswordResetConfirm = () => {
setDisableButton(false); setDisableButton(false);
setCountdown(30); setCountdown(30);
} }
return () => clearInterval(countdownInterval); return () => clearInterval(countdownInterval);
}, [disableButton, countdown]); }, [disableButton, countdown]);
async function handleSubmit(e) { async function handleSubmit(e) {
@ -59,12 +60,12 @@ const PasswordResetConfirm = () => {
} }
setLoading(false); setLoading(false);
} }
return ( return (
<Grid textAlign='center' style={{ marginTop: '48px' }}> <Grid textAlign='center' style={{ marginTop: '48px' }}>
<Grid.Column style={{ maxWidth: 450 }}> <Grid.Column style={{ maxWidth: 450 }}>
<Header as='h2' color='' textAlign='center'> <Header as='h2' color='' textAlign='center'>
<Image src='/logo.png' /> 密码重置确认 <Image src={ BASE_URL + '/logo.png'} /> 密码重置确认
</Header> </Header>
<Form size='large'> <Form size='large'>
<Segment> <Segment>
@ -79,19 +80,19 @@ const PasswordResetConfirm = () => {
/> />
{newPassword && ( {newPassword && (
<Form.Input <Form.Input
fluid fluid
icon='lock' icon='lock'
iconPosition='left' iconPosition='left'
placeholder='新密码' placeholder='新密码'
name='newPassword' name='newPassword'
value={newPassword} value={newPassword}
readOnly readOnly
onClick={(e) => { onClick={(e) => {
e.target.select(); e.target.select();
navigator.clipboard.writeText(newPassword); navigator.clipboard.writeText(newPassword);
showNotice(`密码已复制到剪贴板：${newPassword}`); showNotice(`密码已复制到剪贴板：${newPassword}`);
}} }}
/> />
)} )}
<Button <Button
color='green' color='green'
@ -107,7 +108,7 @@ const PasswordResetConfirm = () => {
</Form> </Form>
</Grid.Column> </Grid.Column>
</Grid> </Grid>
); );
}; };
export default PasswordResetConfirm; export default PasswordResetConfirm;

3
web/default/src/components/PasswordResetForm.js
View File

@ -1,6 +1,7 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Button, Form, Grid, Header, Image, Segment } from 'semantic-ui-react'; import { Button, Form, Grid, Header, Image, Segment } from 'semantic-ui-react';
import { API, showError, showInfo, showSuccess } from '../helpers'; import { API, showError, showInfo, showSuccess } from '../helpers';
import { BASE_URL } from '../config';
import Turnstile from 'react-turnstile'; import Turnstile from 'react-turnstile';
const PasswordResetForm = () => { const PasswordResetForm = () => {
@ -70,7 +71,7 @@ const PasswordResetForm = () => {
<Grid textAlign='center' style={{ marginTop: '48px' }}> <Grid textAlign='center' style={{ marginTop: '48px' }}>
<Grid.Column style={{ maxWidth: 450 }}> <Grid.Column style={{ maxWidth: 450 }}>
<Header as='h2' color='' textAlign='center'> <Header as='h2' color='' textAlign='center'>
<Image src='/logo.png' /> 密码重置 <Image src={ BASE_URL + '/logo.png'} /> 密码重置
</Header> </Header>
<Form size='large'> <Form size='large'>
<Segment> <Segment>

3
web/default/src/components/RegisterForm.js
View File

@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
import { Button, Form, Grid, Header, Image, Message, Segment } from 'semantic-ui-react'; import { Button, Form, Grid, Header, Image, Message, Segment } from 'semantic-ui-react';
import { Link, useNavigate } from 'react-router-dom'; import { Link, useNavigate } from 'react-router-dom';
import { API, getLogo, showError, showInfo, showSuccess } from '../helpers'; import { API, getLogo, showError, showInfo, showSuccess } from '../helpers';
import { BASE_URL } from '../config';
import Turnstile from 'react-turnstile'; import Turnstile from 'react-turnstile';
const RegisterForm = () => { const RegisterForm = () => {
@ -101,7 +102,7 @@ const RegisterForm = () => {
<Grid textAlign='center' style={{ marginTop: '48px' }}> <Grid textAlign='center' style={{ marginTop: '48px' }}>
<Grid.Column style={{ maxWidth: 450 }}> <Grid.Column style={{ maxWidth: 450 }}>
<Header as='h2' color='' textAlign='center'> <Header as='h2' color='' textAlign='center'>
<Image src={logo} /> 新用户注册 <Image src={ BASE_URL + logo} /> 新用户注册
</Header> </Header>
<Form size='large'> <Form size='large'>
<Segment> <Segment>

1
web/default/src/config.js Normal file
View File

@ -0,0 +1 @@
export const BASE_URL = process.env.REACT_APP_BASE_URL || '';

5
web/default/src/helpers/api.js
View File

@ -1,8 +1,11 @@
import { showError } from './utils'; import { showError } from './utils';
import { BASE_URL } from '../config';
import axios from 'axios'; import axios from 'axios';
export const API = axios.create({ export const API = axios.create({
baseURL: process.env.REACT_APP_SERVER ? process.env.REACT_APP_SERVER : '', baseURL:
(process.env.REACT_APP_SERVER ? process.env.REACT_APP_SERVER : '') +
BASE_URL,
}); });
API.interceptors.response.use( API.interceptors.response.use(

3
web/default/src/index.js
View File

@ -11,13 +11,14 @@ import { UserProvider } from './context/User';
import { ToastContainer } from 'react-toastify'; import { ToastContainer } from 'react-toastify';
import 'react-toastify/dist/ReactToastify.css'; import 'react-toastify/dist/ReactToastify.css';
import { StatusProvider } from './context/Status'; import { StatusProvider } from './context/Status';
import { BASE_URL } from './config';
const root = ReactDOM.createRoot(document.getElementById('root')); const root = ReactDOM.createRoot(document.getElementById('root'));
root.render( root.render(
<React.StrictMode> <React.StrictMode>
<StatusProvider> <StatusProvider>
<UserProvider> <UserProvider>
<BrowserRouter> <BrowserRouter basename={BASE_URL}>
<Header /> <Header />
<Container className={'main-content'}> <Container className={'main-content'}>
<App /> <App />