feat(h5): unify WeChat OAuth under m.runxian.top path routing

Serve user/shop/partner H5 under /user/, /shop/, /partner/ on a single authorized domain; update nginx, SSL script, and router base paths.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-07-07 22:07:47 +08:00
parent e32ccebc80
commit eb961c3a74
19 changed files with 178 additions and 68 deletions
@@ -1,4 +1,5 @@
import { createContext, useCallback, useContext, useEffect, useState, type ReactNode } from 'react';
import { toAppPath } from '@dukang/weixin-sdk';
import { clearAuth, isLoggedIn, request } from '../lib/api';
export type PartnerAccount = {
@@ -43,7 +44,7 @@ export function PartnerSessionProvider({ children }: { children: ReactNode }) {
const logout = useCallback(() => {
clearAuth();
setAccount(null);
window.location.href = '/login';
window.location.href = toAppPath('/login');
}, []);
useEffect(() => {
+4 -2
View File
@@ -1,3 +1,5 @@
import { isOnAppPath, toAppPath } from '@dukang/weixin-sdk';
export const apiBase = '/api/v1';
export async function request<T>(clientApp: string, path: string, options: RequestInit = {}): Promise<T> {
@@ -12,8 +14,8 @@ export async function request<T>(clientApp: string, path: string, options: Reque
const json = await res.json().catch(() => ({ code: res.status, message: '网络异常' }));
if (res.status === 401 || json.code === 401) {
clearAuth();
if (typeof window !== 'undefined' && !window.location.pathname.startsWith('/login')) {
window.location.href = '/login';
if (typeof window !== 'undefined' && !isOnAppPath('/login')) {
window.location.href = toAppPath('/login');
}
throw new Error(json.message || '登录已过期,请重新登录');
}
+2 -1
View File
@@ -1,13 +1,14 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { BrowserRouter } from 'react-router-dom';
import { getRouterBasename } from '@dukang/weixin-sdk';
import App from './App';
import { PartnerSessionProvider } from './contexts/PartnerSessionContext';
import './styles.css';
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<BrowserRouter>
<BrowserRouter basename={getRouterBasename()}>
<PartnerSessionProvider>
<App />
</PartnerSessionProvider>
+1
View File
@@ -3,6 +3,7 @@ import react from '@vitejs/plugin-react';
import path from 'path';
export default defineConfig({
base: '/partner/',
plugins: [react()],
resolve: {
alias: {
+2 -1
View File
@@ -1,13 +1,14 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { BrowserRouter } from 'react-router-dom';
import { getRouterBasename } from '@dukang/weixin-sdk';
import { StoreSessionProvider } from './contexts/StoreSessionContext';
import App from './App';
import './styles.css';
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<BrowserRouter>
<BrowserRouter basename={getRouterBasename()}>
<StoreSessionProvider>
<App />
</StoreSessionProvider>
+1 -1
View File
@@ -24,7 +24,7 @@ function formatMoney(n: number) {
function formatScanError(e: unknown): string {
const msg = e instanceof Error ? e.message : '扫码失败,请重试';
if (/invalid signature/i.test(msg)) {
return '微信 JSSDK 签名校验失败:请确认公众号已配置 JS 接口安全域名为 shop.runxian.top,并刷新页面后重试';
return '微信 JSSDK 签名校验失败:请确认公众号已配置 JS 接口安全域名为 m.runxian.top,并刷新页面后重试';
}
return msg;
}
+1
View File
@@ -3,6 +3,7 @@ import react from '@vitejs/plugin-react';
import path from 'path';
export default defineConfig({
base: '/shop/',
plugins: [react()],
resolve: {
alias: {
+2 -1
View File
@@ -1,5 +1,6 @@
import type { ClientRuntimeConfig, WechatLoginResult } from '@dukang/shared-types';
import { isWxAuthorizeEnabled } from '@dukang/shared-types';
import { toAppPath } from '@dukang/weixin-sdk';
import { isWechatEnv, weixinSdk } from './weixin';
import { request, saveSession, type UserProfile } from './api';
@@ -48,5 +49,5 @@ export async function authorizeWechatForPay(): Promise<WechatLoginResult | void>
}
export function buildLoginReturnUrl(pathname: string, search: string) {
return `/login?return=${encodeURIComponent(`${pathname}${search}`)}`;
return `${toAppPath('/login')}?return=${encodeURIComponent(`${pathname}${search}`)}`;
}
+2 -1
View File
@@ -1,12 +1,13 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { BrowserRouter } from 'react-router-dom';
import { getRouterBasename } from '@dukang/weixin-sdk';
import App from './App';
import './styles.css';
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<BrowserRouter>
<BrowserRouter basename={getRouterBasename()}>
<App />
</BrowserRouter>
</React.StrictMode>,
+1
View File
@@ -3,6 +3,7 @@ import react from '@vitejs/plugin-react';
import path from 'path';
export default defineConfig({
base: '/user/',
plugins: [react()],
resolve: {
alias: {