Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2022-12-11 23:56:24 +08:00
2 changed files with 61 additions and 57 deletions

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-11 16:57:58 * @Date: 2022-12-11 16:57:58
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-11 21:00:20 * @LastEditTime: 2022-12-11 21:21:16
* @FilePath: /fe-stu/src/api/api.js * @FilePath: /fe-stu/src/api/api.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@@ -40,7 +40,7 @@ export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndR
export const COMMENT_LIST = '/comment/list' export const COMMENT_LIST = '/comment/list'
export const VOTE_DETAIL2= ballotId => `/vote/queryStemByStemId?ballotId=${ballotId} post` export const VOTE_DETAIL2 = ballotId => `/vote/queryStemByStemId?ballotId=${ballotId} post`
export const COMMENT_ADD = '/comment post' export const COMMENT_ADD = '/comment post'
export const COMMENT_PRAISE = '/comment/praise post' export const COMMENT_PRAISE = '/comment/praise post'
export const COMMENT_COLLECTION = '/comment/collection post' export const COMMENT_COLLECTION = '/comment/collection post'

View File

@@ -2,20 +2,20 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 17:28:10 * @Date: 2022-11-21 17:28:10
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-22 12:45:57 * @LastEditTime: 2022-12-11 21:11:35
* @FilePath: /fe-stu/vite.config.js * @FilePath: /fe-stu/vite.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
import {defineConfig} from 'vite' import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue' import vue from '@vitejs/plugin-vue'
import legacy from '@vitejs/plugin-legacy' import legacy from '@vitejs/plugin-legacy'
import {viteMockServe} from 'vite-plugin-mock' import { viteMockServe } from 'vite-plugin-mock'
import topLevelAwait from "vite-plugin-top-level-await"; import topLevelAwait from "vite-plugin-top-level-await";
const path = require('path') const path = require('path')
export default defineConfig(({command}) => export default defineConfig(({ command }) =>
({ ({
base: '/fe-student', base: '/fe-student',
plugins: [ plugins: [
vue(), vue(),
@@ -32,7 +32,7 @@ export default defineConfig(({command}) =>
], ],
resolve: { resolve: {
alias: [ alias: [
{find: '@', replacement: path.resolve(__dirname, 'src')} { find: '@', replacement: path.resolve(__dirname, 'src') }
] ]
}, server: { }, server: {
proxy: { proxy: {
@@ -64,7 +64,11 @@ export default defineConfig(({command}) =>
target: 'http://localhost:30001', target: 'http://localhost:30001',
changeOrigin: true, changeOrigin: true,
}, },
'/vote': {
target: 'http://111.231.196.214:12013/manageApi',
changeOrigin: true,
},
} }
} }
}) })
) )