diff --git a/web/client/src/sections/auth/actions/auth.js b/web/client/src/sections/auth/actions/auth.js index 23340b3..b785135 100644 --- a/web/client/src/sections/auth/actions/auth.js +++ b/web/client/src/sections/auth/actions/auth.js @@ -1,6 +1,6 @@ 'use strict'; -import { ApiTable, AxyRequest } from '$utils' +import { ApiTable, AxyRequest, EmisRequest } from '$utils' export const INIT_AUTH = 'INIT_AUTH'; export function initAuth (userData) { @@ -32,17 +32,17 @@ export function login (username, password) { return Promise.resolve(); } - return dispatch({ - type: LOGIN_SUCCESS, - payload: { - user: { - authorized: true, - namePresent: 'TEST' - } - }, - }); + // return dispatch({ + // type: LOGIN_SUCCESS, + // payload: { + // user: { + // authorized: true, + // namePresent: 'TEST' + // } + // }, + // }); - return AxyRequest.post(ApiTable.login, { username, password, domain: 'anxinyun' }) + return EmisRequest.post(ApiTable.login, { username, password, code: 'POMS' }) .then(user => { sessionStorage.setItem('pomsUser', JSON.stringify(user)); return dispatch({ @@ -65,8 +65,9 @@ export const LOGOUT = 'LOGOUT'; export function logout () { const user = JSON.parse(sessionStorage.getItem('pomsUser')) user && user.token ? - AxyRequest.post(ApiTable.logout, { - token: user.token + EmisRequest.post(ApiTable.logout, { + token: user.token, + code: 'POMS' }) : null; sessionStorage.removeItem('pomsUser'); return { diff --git a/web/client/src/utils/index.js b/web/client/src/utils/index.js index 1f5a1f3..0084428 100644 --- a/web/client/src/utils/index.js +++ b/web/client/src/utils/index.js @@ -3,7 +3,7 @@ import { isAuthorized } from './func'; import { AuthorizationCode } from './authCode'; import { ApiTable, RouteTable, - AxyRequest, + AxyRequest, EmisRequest, basicAction, RouteRequest } from './webapi' @@ -14,7 +14,7 @@ export { RouteTable, ApiTable, AxyRequest, + EmisRequest, basicAction, RouteRequest, - } \ No newline at end of file diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js index af61d7d..f7969d1 100644 --- a/web/client/src/utils/webapi.js +++ b/web/client/src/utils/webapi.js @@ -2,6 +2,7 @@ import { ProxyRequest, customWebUtils } from "@peace/utils"; export const AxyRequest = new ProxyRequest("_axy"); +export const EmisRequest = new ProxyRequest("_emis") export const webUtils = new customWebUtils({ userKey: 'pomsUser' @@ -16,8 +17,7 @@ export const ApiTable = { logout: "logout", }; export const RouteTable = { - apiRoot: "/api/root", - fileUpload: "/_upload/new", - cleanUpUploadTrash: "/_upload/cleanup", - }; - \ No newline at end of file + apiRoot: "/api/root", + fileUpload: "/_upload/new", + cleanUpUploadTrash: "/_upload/cleanup", +}; diff --git a/web/config.js b/web/config.js index 848a206..827347b 100644 --- a/web/config.js +++ b/web/config.js @@ -14,13 +14,16 @@ args.option(['p', 'port'], '启动端口'); args.option(['u', 'api-url'], 'webapi的URL'); args.option('apiPomsUrl', 'webapi的URL 外网可访问'); args.option('apiAnxinyunUrl', '安心云 api'); +args.option('apiEmisUrl', '企业管理 api'); const flags = args.parse(process.argv); const API_URL = process.env.API_URL || flags.apiUrl; const API_POMS_URL = process.env.API_POMS_URL || flags.apiPomsUrl; +const API_EMIS_URL = process.env.API_EMIS_URL || flags.apiEmisUrl; const API_ANXINYUN_URL = process.env.API_ANXINYUN_URL || flags.apiAnxinyunUrl; + if (!API_URL || !API_ANXINYUN_URL) { console.log('缺少启动参数,异常退出'); args.showHelp(); @@ -42,6 +45,12 @@ const product = { host: API_ANXINYUN_URL, match: /^\/_axy\//, } + }, { + entry: require('./middlewares/proxy').entry, + opts: { + host: API_EMIS_URL, + match: /^\/_emis\//, + } }, { entry: require('./routes').entry, opts: { diff --git a/web/package.json b/web/package.json index 202be9a..27b3bc2 100644 --- a/web/package.json +++ b/web/package.json @@ -7,7 +7,7 @@ "test": "mocha", "start-vite": "cross-env NODE_ENV=developmentVite npm run start-params", "start": "cross-env NODE_ENV=development npm run start-params", - "start-params": "node server -p 5600 -u http://localhost:4600 --apiPomsUrl http://localhost:4600 --apiAnxinyunUrl http://localhost:4100", + "start-params": "node server -p 5600 -u http://localhost:4600 --apiPomsUrl http://localhost:4600 --apiAnxinyunUrl http://10.8.30.112:4100 --apiEmisUrl http://10.8.30.112:14000", "deploy": "export NODE_ENV=production&& npm run build && node server", "build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js", "build": "cross-env NODE_ENV=production&&webpack --config webpack.config.prod.js" @@ -79,4 +79,4 @@ "webpack-dev-server": "^3.11.2", "webpack-hot-middleware": "^2.25.0" } -} +} \ No newline at end of file