diff --git a/.env.development b/.env.development index ebe10b1..f67b802 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://192.168.100.90:2333' +VUE_APP_BASE_API = '/api' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/.env.production b/.env.production index 0646d7b..07d391e 100644 --- a/.env.production +++ b/.env.production @@ -2,5 +2,5 @@ ENV = 'production' # base api -VUE_APP_BASE_API = 'http://192.168.100.90:2333' +VUE_APP_BASE_API = '/api' diff --git a/.env.staging b/.env.staging index 2a82032..d69f663 100644 --- a/.env.staging +++ b/.env.staging @@ -4,5 +4,5 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API = 'http://192.168.100.90:2333' +VUE_APP_BASE_API = '/api' diff --git a/boundle.sh b/boundle.sh new file mode 100644 index 0000000..1451e16 --- /dev/null +++ b/boundle.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +source /etc/profile + +npm install --prefer-offline --loglevel info --unsafe-perm=true --allow-root >> boundle.log +echo 'copy node_modules to /data/publish/node_packages' >> boundle.log + +vue-cli-service build + +cd ./dist/ && tar -zcvf pikachu_fe.tar.gz ./ +cd .. +mkdir target && mv ./dist/pikachu_fe.tar.gz ./target/pikachu_fe.tar.gz +echo 'all done' 2>&1 >> boundle.log diff --git a/src/api/user.js b/src/api/user.js index bf51206..421c1f8 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function login(data) { return request({ - url: '/api/user/login', + url: '/user/login', method: 'post', data }) @@ -10,7 +10,7 @@ export function login(data) { export function getInfo(token) { return request({ - url: '/api/user/info', + url: '/user/info', method: 'get' // params: { token } }) @@ -18,7 +18,7 @@ export function getInfo(token) { export function logout() { return request({ - url: '/api/user/logout', + url: '/user/logout', method: 'post' }) } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 1cb0408..0f3c500 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -79,7 +79,7 @@ export default { methods: { getGameList() { request({ - url: '/api/games/list', + url: '/games/list', method: 'get' }).then(res => { const { data } = res diff --git a/src/views/games/details/info.vue b/src/views/games/details/info.vue index 1ef18ec..bcaa8ef 100644 --- a/src/views/games/details/info.vue +++ b/src/views/games/details/info.vue @@ -10,7 +10,7 @@ { const { data } = res @@ -186,7 +186,7 @@ export default { }, getGameType() { request({ - url: '/api/games/type', + url: '/games/type', method: 'get' }).then(res => { const { data } = res @@ -202,7 +202,7 @@ export default { }, getStatusList() { request({ - url: '/api/games/status', + url: '/games/status', method: 'get' }).then(res => { const { data } = res @@ -226,7 +226,7 @@ export default { saveEdit() { if (this.uid === 'new') { request({ - url: '/api/games/add', + url: '/games/add', method: 'post', data: this.gameForm }).then(res => { @@ -242,7 +242,7 @@ export default { }) } else { request({ - url: '/api/games/edit', + url: '/games/edit', method: 'post', data: this.gameForm }).then(res => { diff --git a/src/views/games/details/profile.vue b/src/views/games/details/profile.vue index c9fbbf9..f34f6c0 100644 --- a/src/views/games/details/profile.vue +++ b/src/views/games/details/profile.vue @@ -94,7 +94,7 @@ export default { methods: { getData() { request({ - url: '/api/games/list', + url: '/games/list', method: 'get', params: { _id: this.uid @@ -119,7 +119,7 @@ export default { }) .then(() => { request({ - url: '/api/games/del', + url: '/games/del', method: 'post', data: { gameList: [{ _id: this.uid }] diff --git a/src/views/games/details/settings/SettingPanel.vue b/src/views/games/details/settings/SettingPanel.vue index 0460b9a..26ab239 100644 --- a/src/views/games/details/settings/SettingPanel.vue +++ b/src/views/games/details/settings/SettingPanel.vue @@ -197,7 +197,7 @@ export default { // left getGameInfo(cb) { request({ - url: '/api/games/list', + url: '/games/list', method: 'get', params: { _id: this.uid @@ -218,7 +218,7 @@ export default { }, getGameSettings() { request({ - url: '/api/games/settings/one_game_cfg', + url: '/games/settings/one_game_cfg', method: 'get', params: { type: this.type === 'normal' ? 0 : 1, @@ -292,7 +292,7 @@ export default { this.saveSettings() .then(() => { request({ - url: '/api/games/settings/publish_cfg', + url: '/games/settings/publish_cfg', method: 'post', data: { cfgs: this.settingsForm.settings, @@ -328,7 +328,7 @@ export default { saveSettings() { return new Promise((resolve, reject) => { request({ - url: '/api/games/settings/save_cfg', + url: '/games/settings/save_cfg', method: 'post', data: { cfgs: this.settingsForm.settings, @@ -358,7 +358,7 @@ export default { // right getSettingsList() { request({ - url: '/api/games/settings/sys_dics?type=game_cfg', + url: '/games/settings/sys_dics?type=game_cfg', method: 'get' }).then(res => { const { data } = res @@ -437,7 +437,7 @@ export default { this.$refs['newSettingForm'].validate(valid => { if (valid) { request({ - url: '/api/games/settings/save_sys_dic', + url: '/games/settings/save_sys_dic', method: 'post', data: { record: { diff --git a/src/views/games/list.vue b/src/views/games/list.vue index 333834d..b37ab10 100644 --- a/src/views/games/list.vue +++ b/src/views/games/list.vue @@ -180,7 +180,7 @@ export default { }, getGameType() { request({ - url: '/api/games/type', + url: '/games/type', method: 'get' }).then(res => { const { data } = res @@ -214,7 +214,7 @@ export default { ) .then(() => { request({ - url: '/api/games/del', + url: '/games/del', method: 'post', data: { gameList: this.multipleSelection @@ -252,7 +252,7 @@ export default { getData(cb) { console.log('get data') request({ - url: '/api/games/list', + url: '/games/list', method: 'get' }).then(res => { const { data } = res @@ -306,7 +306,7 @@ export default { }) .then(() => { request({ - url: '/api/games/del', + url: '/games/del', method: 'post', data: { gameList: [{ _id: row._id }] diff --git a/src/views/games/settings.vue b/src/views/games/settings.vue index 9017377..0a977f4 100644 --- a/src/views/games/settings.vue +++ b/src/views/games/settings.vue @@ -84,6 +84,8 @@ export default { mounted() { this.getData() this.permissionWriteable = this.userInfo.permissions.includes(`settings-writeable`) + console.log(this.userInfo.permissions) + console.log(this.userInfo.permissions.includes(`settings-writeable`)) }, methods: { // toolbar @@ -96,7 +98,7 @@ export default { // table getData() { request({ - url: '/api/games/settings/sys_dics?type=game_cfg', + url: '/games/settings/sys_dics?type=game_cfg', method: 'get' }).then(res => { const { data } = res @@ -142,7 +144,7 @@ export default { this.$refs['modalForm'].validate(valid => { if (valid) { request({ - url: '/api/games/settings/save_sys_dic', + url: '/games/settings/save_sys_dic', method: 'post', data: { record: { diff --git a/src/views/personal/index.vue b/src/views/personal/index.vue index 02d4f5e..372b98a 100644 --- a/src/views/personal/index.vue +++ b/src/views/personal/index.vue @@ -29,7 +29,7 @@ { request({ - url: '/api/sys/permission/del', + url: '/sys/permission/del', method: 'post', data: { roleList: this.multipleSelection @@ -236,7 +236,7 @@ export default { // table getData() { request({ - url: '/api/sys/permission/list', + url: '/sys/permission/list', method: 'get' }).then(res => { const { data } = res @@ -262,7 +262,7 @@ export default { }) .then(() => { request({ - url: '/api/sys/permission/del', + url: '/sys/permission/del', method: 'post', data: { rolename: row.rolename @@ -319,7 +319,7 @@ export default { }, getGameList() { request({ - url: '/api/games/list', + url: '/games/list', method: 'get' }).then(res => { const { data } = res @@ -377,7 +377,7 @@ export default { // 提交 const method = this.isNew ? 'add' : 'edit' request({ - url: `/api/sys/permission/${method}`, + url: `/sys/permission/${method}`, method: 'post', data: this.modalForm }).then(res => { diff --git a/src/views/sys/users.vue b/src/views/sys/users.vue index 373ebc6..fa261ba 100644 --- a/src/views/sys/users.vue +++ b/src/views/sys/users.vue @@ -168,7 +168,7 @@ export default { // table getData(cb) { request({ - url: '/api/sys/users/list', + url: '/sys/users/list', method: 'get' }).then(res => { console.log(res) @@ -213,7 +213,7 @@ export default { // modal getRoleList() { request({ - url: '/api/sys/permission/list', + url: '/sys/permission/list', method: 'get' }).then(res => { const { data } = res @@ -241,7 +241,7 @@ export default { if (this.modalForm.roles.includes(role.name)) permissions.push(role._id) } request({ - url: '/api/sys/users/edit', + url: '/sys/users/edit', method: 'post', data: { username: this.modalForm.username, diff --git a/start.json b/start.json new file mode 100644 index 0000000..e69de29 diff --git a/vue.config.js b/vue.config.js index ba7fdd5..bf561ea 100644 --- a/vue.config.js +++ b/vue.config.js @@ -31,12 +31,13 @@ module.exports = { errors: true }, proxy: { - // proxy all requests starting with /api to jsonplaceholder - '^/api': { - target: 'http://localhost:2333', // 代理接口 + // change xxx-api/login => mock/login + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + target: `http://localhost:2333`, changeOrigin: true, pathRewrite: { - '^/api': '/' // 代理的路径 + ['^' + process.env.VUE_APP_BASE_API]: '/api' } } }