From eaf14c6a4984cec6809436b62066f1f46162d065 Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Wed, 10 Aug 2016 22:37:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E4=B8=8D=E7=AC=A6=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=88=E6=9D=83=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skywalking/web/controller/AuthFileController.java     | 7 ++-----
 .../com/ai/cloud/skywalking/web/util/DBConnectUtil.java   | 8 +++-----
 .../webapp/pages/usr/applications/applicationMaintain.ftl | 6 +++---
 3 files changed, 8 insertions(+), 13 deletions(-)

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 @@
                             <label for="inputPassword3" class="col-sm-3 control-label">收件人地址:</label>
                             <div class="col-sm-9">
                                 <input type="text-are" class="form-control" id="mailTo" name="mailTo"
-                                       placeholder="Application Description">
+                                       placeholder="test@test.com,test@test.com">
                             </div>
                         </div>
                         <div class="form-group">
                             <label for="inputPassword3" class="col-sm-3 control-label">抄送人地址:</label>
                             <div class="col-sm-9">
                                 <input type="text" class="form-control" id="mailCc" name="mailCc"
-                                       placeholder="Application Description">
+                                       placeholder="test@test.com,test@test.com">
                             </div>
                         </div>
                     </div>
@@ -349,4 +349,4 @@
         </div>
     </div>
 </script>
-</#macro>
\ No newline at end of file
+</#macro>