Index: ssts-web/src/main/webapp/buttjoint/dataQueryAsistant.jsp
===================================================================
diff -u -r24872 -r39766
--- ssts-web/src/main/webapp/buttjoint/dataQueryAsistant.jsp	(.../dataQueryAsistant.jsp)	(revision 24872)
+++ ssts-web/src/main/webapp/buttjoint/dataQueryAsistant.jsp	(.../dataQueryAsistant.jsp)	(revision 39766)
@@ -1,5 +1,4 @@
 <%@page import="com.forgon.disinfectsystem.datasynchronization.model.CommonVo"%>
-<%@page import="sun.misc.BASE64Decoder"%>
 <%@page import="org.w3c.tools.codec.Base64Decoder"%>
 <%@page import="org.apache.commons.collections4.CollectionUtils"%>
 <%@page import="java.util.HashMap"%>
@@ -11,6 +10,7 @@
 <%@page import="java.sql.DriverManager"%>
 <%@page import="org.apache.commons.lang3.StringUtils"%>
 <%@page import="com.forgon.disinfectsystem.common.CssdUtils"%>
+<%@page import="com.forgon.tools.crypto.coder.CoderEncryption"%>
 <%@page import="java.sql.ResultSet"%>
 <%@page import="java.sql.Statement"%>
 <%@ page contentType="text/html; charset=UTF-8" %>
@@ -36,8 +36,8 @@
 			 && StringUtils.isBlank(username) && StringUtils.isBlank(password) && StringUtils.isBlank(sql)){
 		driver = CssdUtils.getConfigProperty("jdbc.driverClassName");
 		url = CssdUtils.getConfigProperty("jdbc.url");
-		username = new String(new BASE64Decoder().decodeBuffer(CssdUtils.getConfigProperty("jdbc.username")));
-		password = new String(new BASE64Decoder().decodeBuffer(CssdUtils.getConfigProperty("jdbc.password")));
+		username = CoderEncryption.decryptBASE64(CssdUtils.getConfigProperty("jdbc.username"));
+		password = CoderEncryption.decryptBASE64(CssdUtils.getConfigProperty("jdbc.password"));
 	}else{
 		if(StringUtils.isBlank(driver)){
 			message += "driver is null";