From 7341f899fc3a66c2b8a58c20851f56a759e24db4 Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Thu, 24 Dec 2015 22:19:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=88=E6=9D=83=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=85=8D=E7=BD=AE=E5=8F=AF=E4=BB=A5=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=90=8C=E7=9A=84=E9=80=89=E9=A1=B9=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E5=90=84=E7=A7=8D=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=EF=BC=8C=E7=9B=AE=E5=89=8D=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=9C=A8=E7=95=8C=E9=9D=A2=E4=B8=8A=E8=BF=9B=E8=A1=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/cloud/controller/AuthFileCtl.java | 5 ++--- .../java/com/ai/cloud/dao/impl/AuthConfigMDAO.java | 8 ++++---- .../com/ai/cloud/dao/inter/IAuthConfigMDAO.java | 2 +- .../com/ai/cloud/service/impl/AuthFileSerImpl.java | 4 ++-- .../com/ai/cloud/service/inter/IAuthFileSer.java | 2 +- skywalking-webui/src/main/webapp/ftl/applist.ftl | 14 ++++++++++++++ 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/skywalking-webui/src/main/java/com/ai/cloud/controller/AuthFileCtl.java b/skywalking-webui/src/main/java/com/ai/cloud/controller/AuthFileCtl.java index 802f65fc3..fe82d1d39 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/controller/AuthFileCtl.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/controller/AuthFileCtl.java @@ -37,10 +37,9 @@ public class AuthFileCtl { @RequestMapping("/exportAuth/{appCode}") public void exportApplicationAuthFile(HttpServletRequest request, HttpServletResponse response, - @PathVariable("appCode") String appCode) throws Exception { + @PathVariable("appCode") String appCode, String authType) throws Exception { HttpSession session = request.getSession(); String uid = (String) session.getAttribute("uid"); - JSONObject reJson = new JSONObject(); if (StringUtil.isBlank(uid)) { @@ -56,7 +55,7 @@ public class AuthFileCtl { java.net.URLEncoder.encode(fileName, "utf-8"); response.addHeader("Content-Disposition", "attachment;" + "filename=\"" + URLEncoder.encode(fileName, "utf-8") + "\""); - Properties properties = authFileSer.queryAuthFile(); + Properties properties = authFileSer.queryAuthFile(authType); String propertyValue; for (Map.Entry value : properties.entrySet()) { propertyValue = String.valueOf(value.getValue()); diff --git a/skywalking-webui/src/main/java/com/ai/cloud/dao/impl/AuthConfigMDAO.java b/skywalking-webui/src/main/java/com/ai/cloud/dao/impl/AuthConfigMDAO.java index 6e5d2a284..cbad77553 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/dao/impl/AuthConfigMDAO.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/dao/impl/AuthConfigMDAO.java @@ -21,14 +21,14 @@ public class AuthConfigMDAO implements IAuthConfigMDAO { private static Logger logger = LogManager.getLogger(AuthConfigMDAO.class); @Override - public Properties queryAllAuthConfig() { + public Properties queryAllAuthConfig(final String authType) { final Properties properties = new Properties(); - String sql = "select auth_file_config.key, auth_file_config.value from auth_file_config where auth_file_config.sts = ? "; + String sql = "select auth_file_config.key, auth_file_config.value" + authType + " from auth_file_config where auth_file_config.sts = ? "; final Object[] params = new Object[]{"A"}; - jdbcTemplate.query(sql, params,new RowCallbackHandler() { + jdbcTemplate.query(sql, params, new RowCallbackHandler() { @Override public void processRow(ResultSet resultSet) throws SQLException { - properties.setProperty(resultSet.getString("key"), resultSet.getString("value")); + properties.setProperty(resultSet.getString("key"), resultSet.getString("value" + authType)); } }); return properties; diff --git a/skywalking-webui/src/main/java/com/ai/cloud/dao/inter/IAuthConfigMDAO.java b/skywalking-webui/src/main/java/com/ai/cloud/dao/inter/IAuthConfigMDAO.java index b2f9d2c3a..382d573f4 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/dao/inter/IAuthConfigMDAO.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/dao/inter/IAuthConfigMDAO.java @@ -3,5 +3,5 @@ package com.ai.cloud.dao.inter; import java.util.Properties; public interface IAuthConfigMDAO { - Properties queryAllAuthConfig(); + Properties queryAllAuthConfig(String authType); } diff --git a/skywalking-webui/src/main/java/com/ai/cloud/service/impl/AuthFileSerImpl.java b/skywalking-webui/src/main/java/com/ai/cloud/service/impl/AuthFileSerImpl.java index a5efea849..7a32fc37f 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/service/impl/AuthFileSerImpl.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/service/impl/AuthFileSerImpl.java @@ -14,7 +14,7 @@ public class AuthFileSerImpl implements IAuthFileSer { private IAuthConfigMDAO authConfigMDAO; @Override - public Properties queryAuthFile() { - return authConfigMDAO.queryAllAuthConfig(); + public Properties queryAuthFile(String authType) { + return authConfigMDAO.queryAllAuthConfig(authType); } } diff --git a/skywalking-webui/src/main/java/com/ai/cloud/service/inter/IAuthFileSer.java b/skywalking-webui/src/main/java/com/ai/cloud/service/inter/IAuthFileSer.java index 133288457..0382ef2f3 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/service/inter/IAuthFileSer.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/service/inter/IAuthFileSer.java @@ -3,5 +3,5 @@ package com.ai.cloud.service.inter; import java.util.Properties; public interface IAuthFileSer { - Properties queryAuthFile(); + Properties queryAuthFile(String authType); } diff --git a/skywalking-webui/src/main/webapp/ftl/applist.ftl b/skywalking-webui/src/main/webapp/ftl/applist.ftl index c39cf8ec1..73cf2644f 100644 --- a/skywalking-webui/src/main/webapp/ftl/applist.ftl +++ b/skywalking-webui/src/main/webapp/ftl/applist.ftl @@ -98,6 +98,15 @@ +
+ +
+ +
+
@@ -488,9 +497,14 @@ exclusiveException.attr("type","hidden"); exclusiveException.attr("name","exclusiveException"); exclusiveException.attr("value",$("#exclusiveException").val()); + var authType=$(""); + authType.attr("type","hidden"); + authType.attr("name","authType"); + authType.attr("value",$("#authType").val()); $("#authFiledownLoad").append(form);//将表单放置在web中 form.append(exportData); form.append(exclusiveException); + form.append(authType); form.submit();//表单提交 });