Index: ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
===================================================================
diff -u -r22276 -r28961
--- ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 22276)
+++ ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 28961)
@@ -60,8 +60,9 @@
     		return false;
     	}
     	//暂时屏蔽验证复杂密码
-    	if(testPasswordReg(Ext.getCmp('newPassword').getValue())){
-    		Ext.MessageBox.show({title:'错误提示', msg:'密码必须是数字与字母组合，长度不小于6！',buttons:Ext.Msg.OK,icon:Ext.Msg.ERROR});
+    	var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue())
+    	if(!checkPasswordResult.success){
+    		Ext.MessageBox.show({title:'错误提示', msg:checkPasswordResult.msg, buttons:Ext.Msg.OK,icon:Ext.Msg.ERROR});
     		return false;
     	}
     	if(Ext.getCmp('newPassword').getValue() != Ext.getCmp('confirmNewPassword').getValue()){