Ver Fonte

用户信息及密码更新

KeYuan há 8 anos atrás
pai
commit
d72ea8f5d4

+ 15 - 1
src/main/java/com/key/common/base/service/AccountManager.java

@@ -77,7 +77,20 @@ public class AccountManager {
 		}
 		userDao.save(user);
 	}
-	
+
+	@Transactional
+	public void updatePwd(String curpwd, String newPwd) {
+		User user = getCurUser();
+		if(user!=null){
+			//判断是否有重复用户
+			String curShaPassword = DigestUtils.sha1Hex(curpwd);
+			if(user.getShaPassword().equals(curShaPassword)){
+				String shaPassword = DigestUtils.sha1Hex(newPwd);
+				user.setShaPassword(shaPassword);
+				userDao.save(user);
+			}
+		}
+	}
 	/*public User getByUid(String userSource,String uid){
 		Criterion cri1=Restrictions.eq("thirdSource", userSource);
 		Criterion cri2=Restrictions.eq("thirdUid", uid);
@@ -183,4 +196,5 @@ public class AccountManager {
 		return null;
 	}
 
+
 }

+ 12 - 6
src/main/java/com/key/dwsurvey/action/UserAction.java

@@ -22,14 +22,13 @@ import com.opensymphony.xwork2.ActionSupport;
 @InterceptorRefs({ @InterceptorRef("paramsPrepareParamsStack")})
 @Results({
 	@Result(name=UserAction.MYACCOUNT,location="/WEB-INF/page/content/diaowen-center/my-account.jsp",type=Struts2Utils.DISPATCHER),
-		@Result(name="editPwd",location="/WEB-INF/page/content/diaowen-center/resetpwd.jsp",type=Struts2Utils.DISPATCHER),
+		@Result(name="editPwd",location="/WEB-INF/page/content/diaowen-center/reset-pwd.jsp",type=Struts2Utils.DISPATCHER),
 		@Result(name=UserAction.SUCCESS,location="user!myaccount.action",type=Struts2Utils.REDIRECT)
 })
-@AllowedMethods({"myaccount","editpwd"})
+@AllowedMethods({"myaccount","pwd","updatePwd"})
 public class UserAction extends ActionSupport{
 	
 	public final static String MYACCOUNT="myaccount";
-
 	@Autowired
 	private AccountManager accountManager;
 	
@@ -41,11 +40,20 @@ public class UserAction extends ActionSupport{
 	}
 
 
-	public String editpwd() throws Exception {
+	public String pwd() throws Exception {
 		HttpServletRequest request = Struts2Utils.getRequest();
 		return "editPwd";
 	}
 
+	public String updatePwd() throws Exception {
+		HttpServletRequest request = Struts2Utils.getRequest();
+		String curpwd=request.getParameter("curpwd");
+		String newPwd = request.getParameter("pwd");
+		//先检查原密码是否正确
+		accountManager.updatePwd(curpwd,newPwd);
+		return SUCCESS;
+	}
+
 	public String save() throws Exception {
 		HttpServletRequest request=Struts2Utils.getRequest();
 		User user=accountManager.getCurUser();
@@ -59,6 +67,4 @@ public class UserAction extends ActionSupport{
 		return SUCCESS;
 	}
 
-
-
 }

+ 27 - 4
src/main/webapp/WEB-INF/page/content/diaowen-center/my-account.jsp

@@ -6,6 +6,13 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="${ctx }/js/plugs/jquery-ui-1.10.3.custom/css/mycss/jquery-ui-1.10.3.custom.css" rel="stylesheet" type="text/css" />
+	<script src="${ctx }/js/plugs/jquery-ui-1.10.3.custom/js/jquery-1.10.1.js" type="text/javascript" ></script>
+
+	<link href="${ctx}/js/plugs/validate/jquery.validate.css" type="text/css" rel="stylesheet" />
+	<script src="${ctx}/js/plugs/validate/jquery.validate.js" type="text/javascript"></script>
+	<script src="${ctx}/js/plugs/validate/messages_cn.js" type="text/javascript"></script>
+	<script src="${ctx }/js/plugs/validate/jquery.metadata.js" type="text/javascript"></script>
+	<script src="${ctx }/js/common/common.js" type="text/javascript"></script>
 <title>我的账号</title>
 	<style type="text/css>">
 		.pwdTd{
@@ -15,7 +22,23 @@
 <script type="text/javascript">
 	
 $(document).ready(function(){
-	
+	var inputFormValidate=$("#input_form").validate({
+		rules: {
+			email: {required: true, email: true, maxlength: 60},
+		},
+		messages: {
+			email: {
+				email: "格式不正确!",
+				remote: "邮箱已存在"
+			}
+		},
+		errorPlacement: function(error, element) {
+			//error.appendTo(element.parent().parent());
+			element.parent().append(error);
+			//	$(element).css("borderColor","#C40000");
+		}
+	});
+
 });
 
 	
@@ -48,7 +71,7 @@ $(document).ready(function(){
 					<div style="padding: 25px 45px;overflow: auto;padding-top: 35px;">
 							<div style="border-bottom: 1px solid #DFDFDF;padding: 5px;color: #666565;">账号信息</div>
 							<div style="padding: 5px;color:#666565; ">
-								<form action="${ctx }/ic/user!save.action" method="post" >
+								<form id="input_form" action="${ctx }/ic/user!save.action" method="post" >
 								<table class="ac-form-table">
 									<tr>
 										<td width="80" align="right">账号</td>
@@ -56,7 +79,7 @@ $(document).ready(function(){
 									</tr>
 									<tr>
 										<td width="80" align="right">邮箱</td>
-										<td class="ac-input-td"><input type="text" name="email" value="${user.email }"> </td>
+										<td class="ac-input-td"><input type="text" id="email" name="email" value="${user.email }"> </td>
 									</tr>
 									<tr>
 										<td width="80" align="right">手机号</td>
@@ -68,7 +91,7 @@ $(document).ready(function(){
 									</tr>
 									<tr>
 										<td width="80" align="right">密码</td>
-										<td class="ac-input-td"><a href="${ctx}" >修改密码</a> </td>
+										<td class="ac-input-td"><a href="${ctx}/ic/user!pwd.action" >修改密码</a> </td>
 									</tr>
 									<tr>
 										<td></td>

+ 111 - 0
src/main/webapp/WEB-INF/page/content/diaowen-center/reset-pwd.jsp

@@ -0,0 +1,111 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+ <%@include file="/common/taglibs.jsp" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link href="${ctx }/js/plugs/jquery-ui-1.10.3.custom/css/mycss/jquery-ui-1.10.3.custom.css" rel="stylesheet" type="text/css" />
+	<script src="${ctx }/js/plugs/jquery-ui-1.10.3.custom/js/jquery-1.10.1.js" type="text/javascript" ></script>
+
+	<link href="${ctx}/js/plugs/validate/jquery.validate.css" type="text/css" rel="stylesheet" />
+	<script src="${ctx}/js/plugs/validate/jquery.validate.js" type="text/javascript"></script>
+	<script src="${ctx}/js/plugs/validate/messages_cn.js" type="text/javascript"></script>
+	<script src="${ctx }/js/plugs/validate/jquery.metadata.js" type="text/javascript"></script>
+	<script src="${ctx }/js/common/common.js" type="text/javascript"></script>
+<title>我的账号</title>
+	<style type="text/css>">
+		.pwdTd{
+			display: none;
+		}
+	</style>
+<script type="text/javascript">
+	
+$(document).ready(function(){
+	var inputFormValidate=$("#input_form").validate({
+		rules:{
+			curpwd:{required:true},
+			pwd:{required:true,minlength:6,maxlength:20},
+			pwd1:{required:true,equalTo:"#pwd"}
+		},
+		messages: {
+			pwd1:{
+				equalTo: "前后密码不一致!"
+			}
+		},
+		errorPlacement: function(error, element) {
+			//error.appendTo(element.parent().parent());
+			element.parent().append(error);
+			//	$(element).css("borderColor","#C40000");
+		}
+	});
+});
+
+	
+</script>
+</head>
+<body>
+	<input type="hidden" id="id" name="id" value="${survey.id }">
+	
+	<div style="margin-top: 15px;">
+		<div class="main-tabs-content bodyCenter">
+			<div class="tab-content">
+				<div class="tab-content-collectTab" style="text-align: left;">
+					<a href="" class="nav_a">我的账号</a>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div style="clear: both;"></div>
+	<div id="dwBody" >
+		<div id="dwBodyContent" class="bodyCenter" style="">
+		<div class="tab-content" style="background: #D9D9D9;padding: 0px 5px;">
+				<div class="tab-content-collectTab icTab" style="text-align: left;">
+					<a href="${ctx }/ic/user!myaccount.action" class="collectTab tabItem_1 active"><span class="collectTabItemLeft">&nbsp;</span><span>我的账号</span></a>
+				</div>
+		</div>
+		<div id="dwBodyUser">
+			<div class="surveyCollectMiddle">
+				
+				<div class="surveyCollectMiddleContent">
+					<div style="padding: 25px 45px;overflow: auto;padding-top: 35px;">
+
+							<div style="font-size: 18px;color: red;padding-bottom: 12px;">提醒:请一定要记住修改后的密码,不然您将无法进入调问问卷系统。</div>
+
+							<div style="border-bottom: 1px solid #DFDFDF;padding: 5px;color: #666565;">修改密码</div>
+							<div style="padding: 5px;color:#666565; ">
+								<form id="input_form" action="${ctx }/ic/user!updatePwd.action" method="post" >
+								<table class="ac-form-table">
+									<tr>
+										<td width="80" align="right">原密码</td>
+										<td class="ac-input-td"><input type="password" name="curpwd" value="${user.name }"> </td>
+									</tr>
+									<tr>
+										<td width="80" align="right">新密码</td>
+										<td class="ac-input-td"><input type="password" id="pwd" name="pwd" value="${user.name }"> </td>
+									</tr>
+									<tr>
+										<td width="80" align="right">确认密码</td>
+										<td class="ac-input-td"><input type="password" id="pwd1" name="pwd1" value="${user.name }"> </td>
+									</tr>
+									<tr>
+										<td></td>
+										<td class="ac-input-td"> <button type="submit" class="sbtn25 sbtn25_1" > 更新密码 </button></td>
+									</tr>
+								</table>
+								</form>
+							</div>
+
+					</div>
+					
+				</div>
+			</div>
+			
+		</div>
+		</div>
+	</div>
+<script type="text/javascript">
+
+</script>
+</body>
+</html>

+ 1 - 1
src/main/webapp/WEB-INF/page/layouts/logo-img.jsp

@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8"%>
-<a href="${ctx }/"><img alt="调问网" src="${ctx }/images/logo/LOGO-17.png" align="middle" height="46" ></a>
+<a href="${ctx }/"><img alt="调问网" src="${ctx }/images/logo/LOGO.png" align="middle" height="46" ></a>
 <%-- <div style="font-family: '微软雅黑';font-size:26px;padding-left:10px;">
 <a href="${ctx }/" ></a>
 </div> --%>

+ 1 - 1
src/main/webapp/css/dw-user.css

@@ -1413,7 +1413,7 @@ body{
 .ac-input-td{
 	padding-left: 30px! important;
 }
-.ac-input-td input[type='text']{
+.ac-input-td input[type='text'],.ac-input-td input[type='password']{
 	padding: 8px 8px;
 	-moz-border-radius: 2px;
 	-khtml-border-radius: 2px;