Skip to content

Commit ba1599f

Browse files
bay-testbay-test
committed
20171102
1 parent 233198b commit ba1599f

File tree

112 files changed

+4794
-464
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+4794
-464
lines changed

‎cscbms/.classpath

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
5-
<attributes>
6-
<attribute name="owner.project.facets" value="jst.web"/>
7-
</attributes>
8-
</classpathentry>
94
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
105
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
11-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_17">
12-
<attributes>
13-
<attribute name="owner.project.facets" value="java"/>
14-
</attributes>
15-
</classpathentry>
16-
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/junit4.12"/>
6+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
7+
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
8+
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
179
<classpathentry kind="output" path="build/classes"/>
1810
</classpath>

‎cscbms/.settings/org.eclipse.core.resources.prefs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#Sun Apr 09 22:22:04 CST 2017
21
eclipse.preferences.version=1
32
encoding//src/com/cscbms/controller/AccountController.java=UTF-8
43
encoding//src/com/cscbms/controller/AdminController.java=UTF-8
@@ -8,3 +7,4 @@ encoding//src/com/cscbms/entity/page/Page.java=UTF-8
87
encoding//src/com/cscbms/interceptor/CheckModuleInterceptor.java=UTF-8
98
encoding//src/com/cscbms/test/TestLog4j.java=UTF-8
109
encoding//src/com/cscbms/util/ImageUtil.java=UTF-8
10+
separateDerivedEncodings=true

‎cscbms/WebContent/WEB-INF/account/accountList.jsp

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@
88
<title>CSCBMS</title>
99
<link type="text/css" rel="stylesheet" media="all" href="../styles/global.css" />
1010
<link type="text/css" rel="stylesheet" media="all" href="../styles/global_color.css" />
11+
<script language="javascript" type="text/javascript" src="../js/jquery-1.11.1.js"></script>
1112
<script language="javascript" type="text/javascript">
1213
//开通
1314
function start_account(id) {
1415
var r = window.confirm("确定要开通此账务账号吗？");
1516
if(r) {
16-
window.location.href = "startAccount.do?account_id="+id;
17+
window.location.href = "startAccount.do?accountId="+id;
1718
}
1819
}
1920
//暂停
2021
function pause_account(id) {
2122
var r = window.confirm("确定要暂停此账务账号吗？");
2223
if(r) {
23-
window.location.href = "pauseAccount.do?account_id="+id;
24+
window.location.href = "pauseAccount.do?accountId="+id;
2425
}
2526
}
2627
//删除
@@ -36,7 +37,7 @@
3637
<!--Logo区域开始-->
3738
<div id="header">
3839
<img src="../images/logo.jpg" alt="logo" class="left"/>
39-
<a href="#">[退出]</a>
40+
<a href="<%=request.getContextPath() %>/login/toLogin.do">[退出]</a>
4041
</div>
4142
<!--Logo区域结束-->
4243
<!--导航区域开始-->
@@ -96,33 +97,39 @@
9697
<th class="width150">上次登录时间</th>
9798
<th class="width200"></th>
9899
</tr>
99-
<c:forEach items="${accounts }" var="acc">
100+
<c:forEach items="${accountList }" var="a">
100101
<tr>
101-
<td>${acc.accountId }</td>
102-
<td><a href="account_detail.html">${acc.realName }</a></td>
103-
<td>${acc.idcardNo }</td>
104-
<td>${acc.loginUserName }</td>
105-
<td>
106-
<c:choose>
107-
<c:when test="${acc.status eq 0}">开通</c:when>
108-
<c:when test="${acc.status eq 1}">暂停</c:when>
109-
<c:otherwise>删除</c:otherwise>
102+
<td>${a.accountId }</td>
103+
<td>${a.realName }</td>
104+
<td>${a.idcardNo }</td>
105+
<td>${a.loginUserName }</td>
106+
<td>
107+
<c:choose>
108+
<c:when test="${a.status == 0 }">
109+
开通
110+
</c:when>
111+
<c:when test="${a.status == 1 }">
112+
暂停
113+
</c:when>
114+
<c:otherwise>
115+
删除
116+
</c:otherwise>
110117
</c:choose>
111118

112119
</td>
113-
<td><fmt:formatDate value="${acc.createDate }" pattern="yyyy-MM-dd"/></td>
114-
<td><fmt:formatDate value="${acc.lastLoginTime }" pattern="yyyy-MM-dd"/></td>
120+
<td><fmt:formatDate value="${a.createDate }" pattern="yyyy-MM-dd"/></td>
121+
<td><fmt:formatDate value="${a.lastLoginTime }" pattern="yyyy-MM-dd"/></td>
115122
<td class="td_modi">
116123
<c:choose>
117-
<c:when test="${acc.status==0 }">
118-
<input type="button" value="暂停" class="btn_pause" onclick="pause_account(${acc.accountId });" />
119-
<input type="button" value="修改" class="btn_modify" onclick="location.href='https://github.com/toUpdateAccount.do?accountId=%3Cspan%20class="pl-pse">${acc.accountId }';" />
120-
<input type="button" value="删除" class="btn_delete" onclick="delete_account(${acc.accountId });" />
124+
<c:when test="${a.status==0 }">
125+
<input type="button" value="暂停" class="btn_pause" onclick="pause_account(${a.accountId });" />
126+
<input type="button" value="修改" class="btn_modify" onclick="location.href='https://github.com/toUpdateAccount.do?accountId=%3Cspan%20class="pl-pse">${a.accountId }';" />
127+
<input type="button" value="删除" class="btn_delete" onclick="delete_account(${a.accountId });" />
121128
</c:when>
122-
<c:when test="${acc.status==1 }">
123-
<input type="button" value="开通" class="btn_start" onclick="start_account(${acc.accountId });" />
124-
<input type="button" value="修改" class="btn_modify" onclick="location.href='https://github.com/toUpdateAccount.do?account_id=%3Cspan%20class="pl-pse">${acc.accountId }';" />
125-
<input type="button" value="删除" class="btn_delete" onclick="delete_account(${acc.accountId });" />
129+
<c:when test="${a.status==1 }">
130+
<input type="button" value="开通" class="btn_start" onclick="start_account(${a.accountId });" />
131+
<input type="button" value="修改" class="btn_modify" onclick="location.href='https://github.com/toUpdateAccount.do?account_id=%3Cspan%20class="pl-pse">${a.accountId }';" />
132+
<input type="button" value="删除" class="btn_delete" onclick="delete_account(${a.accountId });" />
126133
</c:when>
127134
<c:otherwise>
128135

‎cscbms/WebContent/WEB-INF/account/addAccount.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<!--Logo区域开始-->
9999
<div id="header">
100100
<img src="../images/logo.jpg" alt="logo" class="left"/>
101-
<a href="#">[退出]</a>
101+
<a href="<%=request.getContextPath() %>/login/toLogin.do">[退出]</a>
102102
</div>
103103
<!--Logo区域结束-->
104104
<!--导航区域开始-->

‎cscbms/WebContent/WEB-INF/account/updateAccount.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<!--Logo区域开始-->
7070
<div id="header">
7171
<img src="../images/logo.jpg" alt="logo" class="left"/>
72-
<a href="#">[退出]</a>
72+
<a href="<%=request.getContextPath() %>/login/toLogin.do">[退出]</a>
7373
</div>
7474
<!--Logo区域结束-->
7575
<!--导航区域开始-->

‎cscbms/WebContent/WEB-INF/admin/addAdmin.jsp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<!--Logo区域开始-->
2727
<div id="header">
2828
<img src="../images/logo.jpg" alt="logo" class="left"/>
29-
<a href="#">[退出]</a>
29+
<a href="<%=request.getContextPath() %>/login/toLogin.do">[退出]</a>
3030
</div>
3131
<!--Logo区域结束-->
3232
<!--导航区域开始-->
@@ -58,33 +58,33 @@
5858
</div>
5959
<div class="text_info clearfix"><span>管理员账号：</span></div>
6060
<div class="input_info">
61-
<input type="text" name="admin_code"/>
61+
<input type="text" name="adminCode"/>
6262
<span class="required">*</span>
6363
<div class="validate_msg_long">30长度以内的字母、数字和下划线的组合</div>
6464
</div>
6565
<div class="text_info clearfix"><span>密码：</span></div>
6666
<div class="input_info">
6767
<input type="password" name="password"/>
6868
<span class="required">*</span>
69-
<div class="validate_msg_long error_msg">30长度以内的字母、数字和下划线的组合</div>
69+
<div class="validate_msg_long">30长度以内的字母、数字和下划线的组合</div>
7070
</div>
7171
<div class="text_info clearfix"><span>重复密码：</span></div>
7272
<div class="input_info">
7373
<input type="password" />
7474
<span class="required">*</span>
75-
<div class="validate_msg_long error_msg">两次密码必须相同</div>
75+
<div class="validate_msg_long">两次密码必须相同</div>
7676
</div>
7777
<div class="text_info clearfix"><span>电话：</span></div>
7878
<div class="input_info">
7979
<input type="text" class="width200" name="telephone"/>
8080
<span class="required">*</span>
81-
<div class="validate_msg_medium error_msg">正确的电话号码格式：手机或固话</div>
81+
<div class="validate_msg_medium">正确的电话号码格式：手机或固话</div>
8282
</div>
8383
<div class="text_info clearfix"><span>Email：</span></div>
8484
<div class="input_info">
8585
<input type="text" class="width200" name="email"/>
8686
<span class="required">*</span>
87-
<div class="validate_msg_medium error_msg">50长度以内，正确的 email 格式</div>
87+
<div class="validate_msg_medium">50长度以内，正确的 email 格式</div>
8888
</div>
8989
<div class="text_info clearfix"><span>角色：</span></div>
9090
<div class="input_info_high">
@@ -96,7 +96,7 @@
9696
</ul>
9797
</div>
9898
<span class="required">*</span>
99-
<div class="validate_msg_tiny error_msg">至少选择一个</div>
99+
<div class="validate_msg_tiny">至少选择一个</div>
100100
</div>
101101
<div class="button_info clearfix">
102102
<input type="submit" value="保存" class="btn_save" />

‎cscbms/WebContent/WEB-INF/admin/adminInfo.jsp

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<%@page pageEncoding="utf-8"%>
2+
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
3+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4+
<html xmlns="http://www.w3.org/1999/xhtml">
5+
<head>
6+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
7+
<title>CSCBMS</title>
8+
<link type="text/css" rel="stylesheet" media="all" href="../styles/global.css" />
9+
<link type="text/css" rel="stylesheet" media="all" href="../styles/global_color.css" />
10+
<script language="javascript" type="text/javascript" src="../js/jquery-1.11.1.js"></script>
11+
<script language="javascript" type="text/javascript">
12+
13+
//保存成功的提示消息
14+
function showResult() {
15+
showResultDiv(true);
16+
window.setTimeout("showResultDiv(true);", 50000);
17+
}
18+
function showResultDiv(flag) {
19+
var divResult = document.getElementById("save_result_info");
20+
if (flag)
21+
divResult.style.display = "block";
22+
else
23+
divResult.style.display = "none";
24+
}
25+
$(function(){
26+
if($("#flag").val()){
27+
showResultDiv($("#flag").val());
28+
window.location.href = "/cscbms/userInfo/touserInfo.do"
29+
}
30+
31+
})
32+
</script>
33+
</head>
34+
<body>
35+
<!--Logo区域开始-->
36+
<div id="header">
37+
<img src="../images/logo.jpg" alt="logo" class="left"/>
38+
<a href="<%=request.getContextPath() %>/login/toLogin.do">[退出]</a>
39+
</div>
40+
<!--Logo区域结束-->
41+
<!--导航区域开始-->
42+
<div id="navi">
43+
<jsp:include page="/WEB-INF/main/menu.jsp" />
44+
</div>
45+
<!--导航区域结束-->
46+
<!--主要区域开始-->
47+
<div id="main">
48+
<input type="hidden" id="flag" name="flag" value="${flag }"/>
49+
<div id="save_result_info" class="save_success">保存成功！</div>
50+
<form action="update.do" method="post" class="main_form">
51+
<input type="hidden" name="adminId" value="${admin.adminId }"/>
52+
53+
54+
<div class="text_info clearfix"><span>姓名：</span></div>
55+
<div class="input_info">
56+
<input type="text" name="name" value="${admin.name }" />
57+
<span class="required">*</span>
58+
</div>
59+
<div class="text_info clearfix"><span>管理员账号：</span></div>
60+
<div class="input_info"><input type="text" readonly="readonly" class="readonly" name="adminCode" value="${admin.adminCode }" /></div>
61+
<div class="text_info clearfix"><span>电话：</span></div>
62+
<div class="input_info">
63+
<input type="text" name="telephone" value="${admin.telephone }" />
64+
<span class="required">*</span>
65+
</div>
66+
<div class="text_info clearfix"><span>Email：</span></div>
67+
<div class="input_info">
68+
<input type="text" class="width200" name="email" value="${admin.email }"/>
69+
<span class="required">*</span>
70+
</div>
71+
<div class="button_info clearfix">
72+
<input type="submit" value="修改" class="btn_save" />
73+
<input type="button" value="取消" class="btn_save" onclick="history.back();"/>
74+
</div>
75+
</form>
76+
</div>
77+
<!--主要区域结束-->
78+
<div id="footer">
79+
<span>[简单不先于复杂，而是在复杂之后]</span>
80+
<br />
81+
<span>版权所有(C)brother </span>
82+
</div>
83+
</body>
84+
</html>

‎cscbms/WebContent/WEB-INF/admin/adminList.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<!--Logo区域开始-->
7171
<div id="header">
7272
<img src="../images/logo.jpg" alt="logo" class="left"/>
73-
<a href="#">[退出]</a>
73+
<a href="<%=request.getContextPath() %>/login/toLogin.do">[退出]</a>
7474
</div>
7575
<!--Logo区域结束-->
7676
<!--导航区域开始-->

0 commit comments

Comments
 (0)