Merge branch 'master' of shine/esb_chenweifeng into master

Hos-resource/src/main/java/com/yihu/ehr/system/controller/UserController.java

@@ -180,31 +180,16 @@ public class UserController extends BaseController {
            String s="username";
            SystemUser user = (SystemUser) session.getAttribute("userInfo");
            String oldPassword = request.getParameter("oldPassword");
            MessageDigest md = MessageDigest.getInstance("MD5");
            byte[] bByte=md.digest(oldPassword.getBytes());
            StringBuffer sBuffer = new StringBuffer();
            String[] strDigits = { "0", "1", "2", "3", "4", "5",
                    "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
            for (int i = 0; i < bByte.length; i++) {
                int iRet = bByte[i];
                if (iRet < 0) {
                    iRet += 256;
                }
                int iD1 = iRet / 16;
                int iD2 = iRet % 16;
                sBuffer.append(strDigits[iD1] + strDigits[iD2]);
            }
            if(!userManager.getUserByLoginCode(user.getLoginCode()).getPassword().equals(sBuffer.toString())){
            userManager.getUserByLoginCode(user.getLoginCode()).getSaltValue();
            String test= DigestUtils.md5Hex(oldPassword +  userManager.getUserByLoginCode(user.getLoginCode()).getSaltValue());
            if(!userManager.getUserByLoginCode(user.getLoginCode()).getPassword().equals(test)){
                return Result.error("旧密码输入错误");
            }
            String newPassword = request.getParameter("newPassword");
           return userManager.changePassword(userManager.getUserByLoginCode(user.getLoginCode()).getId(), newPassword);
            String newPassword = request.getParameter("newPassword");
            if(userManager.changePassword(userManager.getUserByLoginCode(user.getLoginCode()).getId(), newPassword)!=null)
               return Result.success("修改成功");
            else
                return Result.error("修改错误");
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp

@@ -157,11 +157,11 @@
            });
            
            $('#btnIndexPassword').click(function(){
                $.ligerDialog.open({
               me.dialog= $.ligerDialog.open({
                    height: 300,
                    width: 500,
                    width: 600,
                    title: "修改密码",
                    url: '${contextRoot}/user/renewPassword',
@@ -172,6 +172,7 @@
            me.openMenuByText("任务跟踪");
        },
        //加载中
        loading:function(){
            $('#divIndexContent').html("loading...");
        },
@@ -265,6 +266,13 @@
                return;
            }
        },
        //弹窗返回
        dialogSuccess:function(message){
            this.dialog.close();
            $.ligerDialog.success(message);
        },
        //打开子功能页面
        openChildPage:function(text,url,targetType,data,fun){
            try {

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/changePasswordJS.jsp

@@ -17,10 +17,21 @@
      $("#div_info_form").ligerAutoForm({
        data:data,
        validate:{
          oldPassword:"required",
          TwoNewPassword: "required",
          newPassword:"required",
          oldPassword:{
            required:true
          },
          TwoNewPassword:{
            required:true,
            equalTo: "newPassword"
          },
          newPassword:{
            required:true
          }
        },
        message:{
          TwoNewPassword: "密码不一致！"
          }
      });
    },
@@ -34,15 +45,6 @@
          return;
        }
        //alert(document.getElementsByName("newPassword"))
        //debugger
        if($("#newPassword").val()!=$("#TwoNewPassword").val())
        {
          debugger
          $("#diff").show();
        }
        var data = $("#div_info_form").ligerAutoForm("getData");
        $.ajax({ //ajax处理
          type: "POST",
@@ -52,7 +54,7 @@
          cache:false,
          success :function(data){
            if(data.successFlg) {
              $.ligerDialog.success(data.message);
             // $.ligerDialog.success(data.message);
              parent.indexPage.dialogSuccess(data.message);
            }
            else{

Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js

@@ -1017,6 +1017,7 @@
                };
                var message = me.defaultMessage[rule];
                if(rule=="required" && (ruleValue ==true ||ruleValue=="true"))
                {
                    if(value == null || value.length ==0)
@@ -1025,6 +1026,7 @@
                    }
                }
                else{
                    debugger
                    if(value !=null &&value.length>0)
                    {
                        switch (rule)
@@ -1053,9 +1055,16 @@
                            {
                                break;
                            }
                            case "equalTo"://你的输入不相同
                            case "equalTo":
                            {
                                break;
                                if(ruleValue=="") {
                                    break;
                                }
                                else if(ruleValue!=value) {
                                    return message;
                                    break;
                                }
                            }
                            case "extension"://请输入有效的后缀
                            {
@@ -1118,9 +1127,12 @@
                    {
                        var control = me.controls[i];
                        var name = control["name"];
                        var rule = control["rule"];
                        var message = control["message"];
                        var error = "";
                        if(rule!=null)
                        {
                            var value = data[name];
@@ -1132,6 +1144,13 @@
                                for(var o in rule)
                                {
                                    var val = rule[o];
                                    //判断相等情况，以赋值替代val
                                    if(o=="equalTo")
                                    {debugger
                                        val=data[val];
                                    }
                                    var re = me.validateRule(o,val,value);
                                    if(error.length>0)
                                    {
@@ -1147,7 +1166,10 @@
                        //是否报错
                        if(error.length>0)
                        {
                            if(message!=null && message.length > 0)
                            if(error=="必填项;") {
                                me.showError(control, "必填项");//必填项优先级高
                            }
                            else if(message!=null && message.length > 0)
                            {
                                me.showError(control,message);
                            }