From 300d85f548fc4636a8af4105106f80e76bf26a1a Mon Sep 17 00:00:00 2001 From: enlin Date: Thu, 22 Sep 2022 16:34:38 +0800 Subject: [PATCH 1/2] add health check --- .../src/main/java/org/dubhe/auth/rest/AuthController.java | 8 ++++++++ .../main/java/org/dubhe/biz/base/constant/AuthConst.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dubhe-server/auth/src/main/java/org/dubhe/auth/rest/AuthController.java b/dubhe-server/auth/src/main/java/org/dubhe/auth/rest/AuthController.java index a370fb0..f9da72f 100644 --- a/dubhe-server/auth/src/main/java/org/dubhe/auth/rest/AuthController.java +++ b/dubhe-server/auth/src/main/java/org/dubhe/auth/rest/AuthController.java @@ -115,4 +115,12 @@ public class AuthController { return DataResponseFactory.failed("Logout failed!"); } + /** + * 健康检查 + */ + @GetMapping(value="/health") + public DataResponseBody health(){ + return DataResponseFactory.successWithMsg("ok"); + } + } diff --git a/dubhe-server/common-biz/base/src/main/java/org/dubhe/biz/base/constant/AuthConst.java b/dubhe-server/common-biz/base/src/main/java/org/dubhe/biz/base/constant/AuthConst.java index 3a08ce2..6fdeee0 100644 --- a/dubhe-server/common-biz/base/src/main/java/org/dubhe/biz/base/constant/AuthConst.java +++ b/dubhe-server/common-biz/base/src/main/java/org/dubhe/biz/base/constant/AuthConst.java @@ -56,7 +56,7 @@ public class AuthConst { public final static String[] DEFAULT_PERMIT_PATHS = {"/swagger**/**", "/webjars/**", "/v2/api-docs/**", "/doc.html/**", "/users/findUserByUsername", "/auth/login", "/auth/code", "/datasets/files/annotations/auto","/datasets/versions/**/convert/finish", "/datasets/enhance/finish", - "/auth/getCodeBySentEmail","/auth/userRegister","/ws/**", + "/auth/getCodeBySentEmail","/auth/userRegister","/ws/**","/oauth/health", StringConstant.RECYCLE_CALL_URI+"**" }; From 7599db1ed0cb8eeb3a017dfd0bc2e32dbbc535d0 Mon Sep 17 00:00:00 2001 From: enlin Date: Tue, 27 Sep 2022 16:52:33 +0800 Subject: [PATCH 2/2] fix download --- webapp/src/utils/download.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/utils/download.js b/webapp/src/utils/download.js index 5ffcdca..eab02c0 100644 --- a/webapp/src/utils/download.js +++ b/webapp/src/utils/download.js @@ -20,7 +20,7 @@ import ZIP from './zip'; const pMap = require('p-map'); -streamSaver.mitm = 'https://static.zhejianglab.com/mitm.html'; +//streamSaver.mitm = 'https://static.zhejianglab.com/mitm.html'; // 默认名字解析 const defaultName = (file) => file.name;