diff --git a/.env.dev b/.env.dev index f295bd254..7e7f16ba0 100644 --- a/.env.dev +++ b/.env.dev @@ -5,7 +5,7 @@ ENV = 'development' VUE_APP_TITLE = 闻荫管理系统 # 闻荫管理系统/开发环境 -VUE_APP_BASE_API = 'http://localhost:48080' +VUE_APP_BASE_API = 'http://localhost:12080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.static b/.env.static index b8b453a7d..6471d8191 100644 --- a/.env.static +++ b/.env.static @@ -7,7 +7,7 @@ ENV = 'staging' VUE_APP_TITLE = 闻荫管理系统 # 闻荫管理系统/测试环境 -VUE_APP_BASE_API = 'http://127.0.0.1:48080' +VUE_APP_BASE_API = 'http://127.0.0.1:12080' # 根据服务器或域名修改 PUBLIC_PATH = '/admin-ui-vue2/' diff --git a/nginx.conf b/nginx.conf index a06097194..2e1d2b9f0 100644 --- a/nginx.conf +++ b/nginx.conf @@ -17,7 +17,7 @@ server { } location /prod-api/ { ## 后端项目 - 管理后台 - proxy_pass http://win-server:48080/; ## 重要!!!proxy_pass 需要设置为后端项目所在服务器的 IP + proxy_pass http://win-server:12080/; ## 重要!!!proxy_pass 需要设置为后端项目所在服务器的 IP proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header REMOTE-HOST $remote_addr; diff --git a/src/views/login.vue b/src/views/login.vue index 4d3c6c1a9..3602a802b 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -293,8 +293,8 @@ export default { // 计算 redirectUri const redirectUri = location.origin + '/social-login?' + encodeURIComponent('type=' + socialTypeEnum.type + '&redirect=' + (this.redirect || "/")); // 重定向不能丢 - // const redirectUri = 'http://127.0.0.1:48080/api/gitee/callback'; - // const redirectUri = 'http://127.0.0.1:48080/api/dingtalk/callback'; + // const redirectUri = 'http://127.0.0.1:12080/api/gitee/callback'; + // const redirectUri = 'http://127.0.0.1:4801208080/api/dingtalk/callback'; // 进行跳转 socialAuthRedirect(socialTypeEnum.type, encodeURIComponent(redirectUri)).then((res) => { // console.log(res.url); diff --git a/vue.config.js b/vue.config.js index 16a78f5db..623197642 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,7 +36,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy ['/proxy-api']: { - target: `http://localhost:48080`, + target: `http://localhost:12080`, // target: `http://api-dashboard.win.iocoder.cn`, changeOrigin: true, pathRewrite: {