diff --git a/package.json b/package.json index aa332f7..facfe06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202406181508", + "version": "1.0.202406201647", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 7ea4322..05af569 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -60,7 +60,7 @@ export default { }, data() { return { - uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 + uploadUrl: location.origin + '/api' + "/common/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken() }, @@ -194,7 +194,7 @@ export default { // 获取光标所在位置 let length = quill.getSelection().index; // 插入图片 res.url为服务器返回的图片地址 - quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); + quill.insertEmbed(length, "image", location.origin + '/api' + res.fileName); // 调整光标到最后 quill.setSelection(length + 1); } else { diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index c7f6b0a..3857b11 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -72,8 +72,8 @@ export default { return { number: 0, uploadList: [], - baseUrl: process.env.VUE_APP_BASE_API, - uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址 + baseUrl: location.origin + '/api', + uploadFileUrl: location.origin + '/api' + "/common/upload", // 上传文件服务器地址 headers: { Authorization: "Bearer " + getToken(), }, diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue index 3c770c7..20b16c3 100644 --- a/src/components/ImagePreview/index.vue +++ b/src/components/ImagePreview/index.vue @@ -39,7 +39,7 @@ export default { if (isExternal(real_src)) { return real_src; } - return process.env.VUE_APP_BASE_API + real_src; + return location.origin + '/api' + real_src; }, realSrcList() { if (!this.src) { @@ -51,7 +51,7 @@ export default { if (isExternal(item)) { return srcList.push(item); } - return srcList.push(process.env.VUE_APP_BASE_API + item); + return srcList.push(location.origin + '/api' + item); }); return srcList; }, diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 2e64c9b..7b5cfa6 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -76,8 +76,8 @@ export default { dialogImageUrl: "", dialogVisible: false, hideUpload: false, - baseUrl: process.env.VUE_APP_BASE_API, - uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 + baseUrl: location.origin + '/api', + uploadImgUrl: location.origin + '/api' + "/common/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken(), }, diff --git a/src/permission.js b/src/permission.js index 632b50e..4a0340b 100644 --- a/src/permission.js +++ b/src/permission.js @@ -53,7 +53,7 @@ router.beforeEach((to, from, next) => { }).catch((err) => { store.dispatch("LogOut").then(() => { Message.error(err); - location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login" + location.href = location.origin + '/api' + "/system/singlelogin/login" }); }); } else { diff --git a/src/plugins/download.js b/src/plugins/download.js index 42acd00..0bbc2de 100644 --- a/src/plugins/download.js +++ b/src/plugins/download.js @@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth' import errorCode from '@/utils/errorCode' import { blobValidate } from "@/utils/ruoyi"; -const baseURL = process.env.VUE_APP_BASE_API +const baseURL = location.origin + '/api' let downloadLoadingInstance; export default { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 8eb5c7b..040d878 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -111,7 +111,7 @@ const user = { return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user - const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; + const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : location.origin + '/api' + user.avatar; if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLES', res.roles) commit('SET_PERMISSIONS', res.permissions) diff --git a/src/utils/request.js b/src/utils/request.js index d273357..51538be 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,7 +16,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 - baseURL: process.env.VUE_APP_BASE_API, + // baseURL: process.env.VUE_APP_BASE_API, + baseURL: location.origin + '/api', // 超时 timeout: 10000 }) diff --git a/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue b/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue index 2f6b864..0067528 100644 --- a/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue +++ b/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue @@ -96,7 +96,7 @@ export default { info:[], fileInfo:[], loading:false, - VUE_APP_BASE_API:process.env.VUE_APP_BASE_API, + VUE_APP_BASE_API:location.origin + '/api', } }, mounted() { diff --git a/src/views/enterpriselibrary/index.vue b/src/views/enterpriselibrary/index.vue index b2a5d96..1916160 100644 --- a/src/views/enterpriselibrary/index.vue +++ b/src/views/enterpriselibrary/index.vue @@ -174,7 +174,7 @@ export default { }, title:"导入企业", infoVisible:false, - baseUrl: process.env.VUE_APP_BASE_API, + baseUrl: location.origin + '/api', // 用户导入参数 upload: { // 是否禁用上传 @@ -184,7 +184,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + "/system/enterpriseBasicInfo/importEnterprise" + url: location.origin + '/api' + "/system/enterpriseBasicInfo/importEnterprise" }, fileList: [], number: 0, diff --git a/src/views/login.vue b/src/views/login.vue index 7ec7c0b..7d7401f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -147,6 +147,7 @@ export default { }, }, created() { + console.log(process.env.VUE_APP_BASE_API); this.getCode(); this.getCookie(); }, @@ -174,7 +175,7 @@ export default { }, handleLogin() { if(this.userType == '01') { - location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login" + location.href = location.origin + '/api' + "/system/singlelogin/login" } else { this.$refs.loginForm.validate((valid) => { if (valid) { diff --git a/src/views/monitor/druid/index.vue b/src/views/monitor/druid/index.vue index c6ad585..5128dea 100644 --- a/src/views/monitor/druid/index.vue +++ b/src/views/monitor/druid/index.vue @@ -8,7 +8,7 @@ export default { components: { iFrame }, data() { return { - url: process.env.VUE_APP_BASE_API + "/druid/login.html" + url: location.origin + '/api' + "/druid/login.html" }; }, }; diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue index c4e5153..cef4787 100644 --- a/src/views/onlineDeclaration/declareDetailContent/index.vue +++ b/src/views/onlineDeclaration/declareDetailContent/index.vue @@ -1945,7 +1945,7 @@ export default { dicts: ['bms_responsibility_unit', 'bms_level', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type', 'template_industry', 'new_template_type'], data() { return { - VUE_APP_BASE_API:process.env.VUE_APP_BASE_API, + VUE_APP_BASE_API:location.origin + '/api', size: '', templateInfo: {}, baseInfo: {}, diff --git a/src/views/onlineDeclaration/records/components/index.vue b/src/views/onlineDeclaration/records/components/index.vue index 845e121..bd402fa 100644 --- a/src/views/onlineDeclaration/records/components/index.vue +++ b/src/views/onlineDeclaration/records/components/index.vue @@ -714,7 +714,7 @@ export default { name:"updataChange", data() { return { - VUE_APP_BASE_API:process.env.VUE_APP_BASE_API, + VUE_APP_BASE_API:location.origin + '/api', openCity: false, enterpriseInfo: {}, form:{ diff --git a/src/views/project/index.vue b/src/views/project/index.vue index e02487b..c14c510 100644 --- a/src/views/project/index.vue +++ b/src/views/project/index.vue @@ -283,7 +283,7 @@ export default { headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 // url: process.env.VUE_APP_BASE_API + "/jjh/jProject/export" - url: process.env.VUE_APP_BASE_API + "/jjh/jProject/importTemplateProject" + url: location.origin + '/api' + "/jjh/jProject/importTemplateProject" }, tabHeader: undefined, }; diff --git a/src/views/project/projectInfo/components/tabOne/index.vue b/src/views/project/projectInfo/components/tabOne/index.vue index ef5100c..3fb2ccb 100644 --- a/src/views/project/projectInfo/components/tabOne/index.vue +++ b/src/views/project/projectInfo/components/tabOne/index.vue @@ -161,7 +161,7 @@ export default { info:[], fileInfo:[], loading:false, - VUE_APP_BASE_API:process.env.VUE_APP_BASE_API, + VUE_APP_BASE_API:location.origin + '/api', } }, mounted() { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index fc75041..982e106 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -431,7 +431,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + "/system/user/importData" + url: location.origin + '/api' + "/system/user/importData" }, // 查询参数 queryParams: { diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue index c4fdeeb..01a0e56 100644 --- a/src/views/system/user/profile/userAvatar.vue +++ b/src/views/system/user/profile/userAvatar.vue @@ -137,7 +137,7 @@ export default { formData.append("avatarfile", data, this.options.filename); uploadAvatar(formData).then(response => { this.open = false; - this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; + this.options.img = location.origin + '/api' + response.imgUrl; store.commit('SET_AVATAR', this.options.img); this.$modal.msgSuccess("修改成功"); this.visible = false; diff --git a/src/views/tool/swagger/index.vue b/src/views/tool/swagger/index.vue index b8becc6..6f55f72 100644 --- a/src/views/tool/swagger/index.vue +++ b/src/views/tool/swagger/index.vue @@ -8,7 +8,7 @@ export default { components: { iFrame }, data() { return { - url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html" + url: location.origin + '/api' + "/swagger-ui/index.html" }; }, };