diff --git a/web/.umirc.ts b/web/.umirc.ts index 4b4b804b6a937c89de7d09c0c717a80d5cb887bb..acddf90661b6289894122475b0f6fdaaa184640f 100644 --- a/web/.umirc.ts +++ b/web/.umirc.ts @@ -7,14 +7,14 @@ export default defineConfig({ routes, npmClient: 'npm', base: '/', - publicPath: '/client/dist/', + publicPath: '/web/dist/', esbuildMinifyIIFE: true, icons: { }, hash: true, history: { - type: 'hash', + type: 'browser', }, plugins: ['@umijs/plugins/dist/dva'], dva: {}, diff --git a/web/package-lock.json b/web/package-lock.json index a3ae3d0cde6c5946281cf2d1ba2ef98817b002c2..a59b90787add42b11875c6721cbf3ec4cf204b3f 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -16,6 +16,7 @@ "js-base64": "^3.7.5", "jsencrypt": "^3.3.2", "lodash": "^4.17.21", + "moment": "^2.30.1", "react-i18next": "^14.0.0", "react-infinite-scroll-component": "^6.1.0", "umi": "^4.0.90", @@ -10771,7 +10772,6 @@ "version": "2.30.1", "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", - "devOptional": true, "engines": { "node": "*" } diff --git a/web/package.json b/web/package.json index 944f14d43d2481dd18118c48bafa1beaacd0c1ec..ff51bb016bd22c83acc48c3233b8a3e870480b5f 100644 --- a/web/package.json +++ b/web/package.json @@ -2,7 +2,7 @@ "private": true, "author": "zhaofengchao <13723060510@163.com>", "scripts": { - "dev": "umi dev", + "dev": "set PORT=9000&&umi dev", "build": "umi build", "postinstall": "umi setup", "setup": "umi setup", @@ -19,6 +19,7 @@ "js-base64": "^3.7.5", "jsencrypt": "^3.3.2", "lodash": "^4.17.21", + "moment": "^2.30.1", "react-i18next": "^14.0.0", "react-infinite-scroll-component": "^6.1.0", "umi": "^4.0.90", diff --git a/web/src/utils/api.ts b/web/src/utils/api.ts index a88c857e43c6e8d575a9ba475768b399ead37d02..c3bb133318a96e64e9c88a5eab6322283cd327f4 100644 --- a/web/src/utils/api.ts +++ b/web/src/utils/api.ts @@ -1,7 +1,7 @@ -let api_host = `http://54.80.112.79:9380/v1`; +let api_host = `/v1`; export { api_host };