From e7cc216d7d5973c7dcaa396f42b0b9fbde28879c Mon Sep 17 00:00:00 2001 From: zhouxin Date: Thu, 24 Nov 2022 10:13:49 +0800 Subject: [PATCH] =?UTF-8?q?(-=EF=BC=89=E5=8E=BB=E6=8E=89=E5=BA=9F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 23 ++++++++++++++++++++++- web/client/src/utils/webapi.js | 1 - web/routes/attachment/index.js | 23 ----------------------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 5b07b6a..0790a88 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,24 @@ # ReportCenter -项企-报表中心 \ No newline at end of file +项企-报表中心 +api启动环境变量 + +//Redis +IOTA_REDIS_SERVER_HOST +IOTA_REDIS_SERVER_PORT +IOTA_REDIS_SERVER_PWD + +API_EMIS_URL //企业管理api + +//七牛 +ANXINCLOUD_QINIU_DOMAIN_QNDMN_RESOURCE +ANXINCLOUD_QINIU_BUCKET_RESOURCE +ANXINCLOUD_QINIU_ACCESSKEY +ANXINCLOUD_QINIU_SECRETKEY + +//clickHouse +CLICKHOUST_URL +CLICKHOUST_PORT +CLICKHOUST_USER +CLICKHOUST_PASSWORD +CLICKHOUST_PEP_EMIS //clickhouse的emis库名 \ No newline at end of file diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js index 8a33b8d..1a1b3c4 100644 --- a/web/client/src/utils/webapi.js +++ b/web/client/src/utils/webapi.js @@ -25,5 +25,4 @@ export const RouteTable = { fileUpload: "/_upload/new", cleanUpUploadTrash: "/_upload/cleanup", getWeeklyService: '/_service/weekly', - qnDownload:'/file/qiniu/download' }; diff --git a/web/routes/attachment/index.js b/web/routes/attachment/index.js index 8cf9aa8..b289c62 100644 --- a/web/routes/attachment/index.js +++ b/web/routes/attachment/index.js @@ -82,28 +82,6 @@ module.exports = { } } } - let qnDownload = async function (ctx, next) { - try { - const { src, filename } = ctx.query; - const fkey = src.replace(/\.json$/, '.js'); - console.log("qnDownload->fkey: ", fkey); - const publicDownloadUrl = await ctx.app.fs.attachment.download(fkey); - if (filename) { - // download - ctx.attachment(filename); - } else { - // display - if (/\.(png)|(jpg)|(jpeg)|(gif)$/g.test(src.toLowerCase())) ctx.type = 'image/png'; - } - ctx.status = 200; - ctx.body = request.get(publicDownloadUrl); - } catch (err) { - ctx.fs.logger.error(`path: ${ctx.path}, error: ${err}`); - ctx.status = 400; - ctx.body = { name: 'FindError', message: '附件下载失败' }; - } - } - let remove = async function (ctx, next) { try { const { token } = ctx.request.query @@ -130,7 +108,6 @@ module.exports = { router.use(download); router.get('/api/root', getApiRoot); router.post('/file/qiniu/upload', upload); - router.get('/file/qiniu/download', qnDownload); router.post('/file/qiniu/remove', remove); } };