diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index 520fa71d..b5310141 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -113,7 +113,7 @@ service.interceptors.response.use(res => { console.log('err' + error) let { message } = error // 对于blob类型的错误响应,尝试解析错误信息 - if (error.response && error.response.config && + if (error.response && error.response.config && (error.response.config.responseType === 'blob' || error.response.config.responseType === 'arraybuffer') && error.response.data instanceof Blob) { try { @@ -134,7 +134,7 @@ service.interceptors.response.use(res => { message = "系统接口" + message.substr(message.length - 3) + "异常" } // 对于文件导出错误,不自动显示Message,让调用方处理 - const isExportError = error.response && error.response.config && + const isExportError = error.response && error.response.config && (error.response.config.responseType === 'blob' || error.response.config.responseType === 'arraybuffer') if (!isExportError) { Message({ message: message, type: 'error', duration: 5 * 1000 }) diff --git a/ry-news-admin/src/main/resources/application-druid.yml b/ry-news-admin/src/main/resources/application-druid.yml index 32f4866f..4cf41fe8 100644 --- a/ry-news-admin/src/main/resources/application-druid.yml +++ b/ry-news-admin/src/main/resources/application-druid.yml @@ -6,8 +6,8 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://1.15.149.240:3306/ry_news?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: ry_news + url: jdbc:mysql://1.15.149.240:3306/ry_xinli?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: ry_xinli password: ZLZBcfGtsWJe5r4z # 从库数据源 slave: