This commit is contained in:
haozq 2025-09-09 16:35:54 +08:00
parent 22021fdeca
commit 10aa8c5648
2 changed files with 1 additions and 10 deletions

View File

@ -1,13 +1,8 @@
{ {
"name": "ruoyi", "name": "ruoyi",
"version": "3.9.0", "version": "3.9.0",
<<<<<<< HEAD
"description": "博诺思公共微服务平台", "description": "博诺思公共微服务平台",
"author": "博诺思", "author": "博诺思",
=======
"description": "公共服务平台",
"author": "bonus",
>>>>>>> 8bd21926c835e55a8bb041e202098e441d9398f4
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",

View File

@ -7,15 +7,11 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin') const CompressionPlugin = require('compression-webpack-plugin')
<<<<<<< HEAD
const name = process.env.VUE_APP_TITLE || '博诺思公共微服务平台' // 网页标题 const name = process.env.VUE_APP_TITLE || '博诺思公共微服务平台' // 网页标题
const baseUrl = 'http://192.168.0.38:58080' // 后端接口 const baseUrl = 'http://192.168.0.38:58080' // 后端接口
=======
const name = process.env.VUE_APP_TITLE || '公共服务平台' // 网页标题
const baseUrl = 'http://localhost:58080' // 后端接口
>>>>>>> 8bd21926c835e55a8bb041e202098e441d9398f4
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口