diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/AuthFileController.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/AuthFileController.java index 260228b69..28398670a 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/AuthFileController.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/AuthFileController.java @@ -50,7 +50,7 @@ public class AuthFileController extends BaseController { return; } LoginUserInfo loginUserInfo = fetchLoginUserInfoFromSession(request); - String filepath = loginUserInfo.getUserName() + "-" + applicationCode + ".jar"; + String filepath = "sky-walking.auth"; response.reset(); response.setContentType("application/octet-stream"); String fileName = URLDecoder.decode(filepath, "utf-8"); @@ -79,10 +79,7 @@ public class AuthFileController extends BaseController { File file = new File(request.getServletContext().getRealPath("/") + File.separator + "download" + File.separator + fileName); file.delete(); - // 生成JarFile - JarOutputStream stream = new JarOutputStream(new FileOutputStream(file)); - JarEntry entry = new JarEntry("sky-walking.auth"); - stream.putNextEntry(entry); + FileOutputStream stream = new FileOutputStream(file); properties.store(stream, ""); stream.flush(); stream.close(); diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java index 8f19d2a20..c9ae9157e 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java @@ -6,22 +6,20 @@ import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; +import javax.annotation.PostConstruct; import java.sql.Connection; import java.sql.SQLException; @Repository public class DBConnectUtil { - - private static Logger logger = LogManager.getLogger(DBConnectUtil.class); @Autowired - private static HikariDataSource hikariDataSource; + private HikariDataSource dataSource; public Connection getConnection() { - try { - return hikariDataSource.getConnection(); + return dataSource.getConnection(); } catch (SQLException e) { logger.error("Failed to get connection", e); throw new RuntimeException("Cannot get connection."); diff --git a/skywalking-webui/src/main/webapp/pages/usr/applications/applicationMaintain.ftl b/skywalking-webui/src/main/webapp/pages/usr/applications/applicationMaintain.ftl index d9b940923..20060e2dc 100644 --- a/skywalking-webui/src/main/webapp/pages/usr/applications/applicationMaintain.ftl +++ b/skywalking-webui/src/main/webapp/pages/usr/applications/applicationMaintain.ftl @@ -214,14 +214,14 @@
+ placeholder="test@test.com,test@test.com">
+ placeholder="test@test.com,test@test.com">
@@ -349,4 +349,4 @@ - \ No newline at end of file +