Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r29915 -r30237
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 29915)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 30237)
@@ -1,3 +1,5 @@
+<%@page import="com.forgon.directory.model.LoginInfo"%>
+<%@page import="com.forgon.tools.crypto.rsa.RSAEncrypt"%>
 <%@page import="org.apache.commons.lang.StringUtils"%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ include file="/common/taglibs.jsp" %>
@@ -88,7 +90,23 @@
 		request.setAttribute("logoPath","themes/portalPage/img/logo_dingxiangsoft.png");
 	}
 }
- 
+
+//条码的登录密码
+String barcodeLogonPassword = (String)application.getAttribute("barcodeLogonPassword");
+if(StringUtils.isBlank(barcodeLogonPassword)){
+	barcodeLogonPassword = LoginInfo.barcodeLogonDefalutPassword;
+}
+//登录密码的rsa公钥
+String logonRSAPublicKey = (String)application.getAttribute("logonRSAPublicKey");
+if(StringUtils.isBlank(logonRSAPublicKey)){
+	logonRSAPublicKey = RSAEncrypt.ENCRYPTPUBLICKEY;
+}
+//登录密码的rsa私钥
+String logonRSAPrivateKey = (String)application.getAttribute("logonRSAPrivateKey");
+if(StringUtils.isBlank(logonRSAPrivateKey)){
+	logonRSAPrivateKey = RSAEncrypt.DECRYPTPRIVATEKEY;
+}
+
 %>
 <html>
 <head>
@@ -139,14 +157,14 @@
 	</div>
 	<div class="copyright">${companyName}</div>
 </div>
-      
 </body>
 <script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/number.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/default/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/configUtils.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/rsa/jsencrypt.min.js"></script>
 <script type="text/javascript">
 var enalbeScanBarcodeLogin = true; //启用扫描条码登陆
 var ENABLE_SPEECH_RECOGNITION = '${ENABLE_SPEECH_RECOGNITION}';
@@ -244,9 +262,30 @@
 		}
 	}
 	function checkSubmit() {
-		document.loginForm.j_username.value = j_username_display.value;
-		document.loginForm.j_password.value = j_password_display.value;
+		var inputPassword = j_password_display.value;
+		var inputUserName = j_username_display.value;
 
+		var publicKey = "<%=logonRSAPublicKey %>";
+	    // Encrypt with the public key...
+	    var encrypt = new JSEncrypt();
+	    encrypt.setPublicKey(publicKey);
+	    var encryptedPassword = encrypt.encrypt(inputPassword);
+	    var encryptedUserName = encrypt.encrypt(inputUserName);
+	    
+		//用户名与密码传明文
+		//document.loginForm.j_username.value = inputUserName;
+		//document.loginForm.j_password.value = inputPassword;
+		//用户名与密码传rsa密文
+		document.loginForm.j_username.value = encryptedUserName;
+		document.loginForm.j_password.value = encryptedPassword;
+		
+		// Decrypt with the private key...
+        /*var decrypt = new JSEncrypt();
+      	//此处为RSA私钥
+      	decrypt.setPrivateKey("...私钥密钥...");
+        var uncrypted = decrypt.decrypt(passwordRSA);
+        console.log("uncrypted=" + uncrypted);*/
+
 		if (j_username_display.value == '') {
 			alert('<fmt:message key="error.required.login.username"/>');
 			j_username_display.focus();
@@ -501,7 +540,7 @@
     }else if(event.keyCode == 13){
         if (enalbeScanBarcodeLogin){
         	if(isValidBarcodeInput()){
-                $("#j_password_display").val("P@ssword");
+                $("#j_password_display").val("<%=barcodeLogonPassword %>");
         	}
         }
         checkSubmit();
