Commit 8d18341d30623e10ff863810791e42c13d97b035
1 parent
7efaee3d
修改配置,及cookie
Showing
4 changed files
with
20 additions
and
10 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
... | ... | @@ -63,7 +63,7 @@ |
63 | 63 | <c:forEach items="${gradeInfos}" var="var" varStatus="vs"> |
64 | 64 | <li |
65 | 65 | onclick="event.stopPropagation();chooseListClass('${SCHOOL_ID}','${var.ID}')"> |
66 | - <p>${ var.NAME }</p> | |
66 | + <p>${ var.ENAME }</p> | |
67 | 67 | </li> |
68 | 68 | </c:forEach> |
69 | 69 | |
... | ... | @@ -92,7 +92,7 @@ |
92 | 92 | <c:forEach items="${gradeInfos}" var="var" varStatus="vs"> |
93 | 93 | <li |
94 | 94 | onclick="event.stopPropagation();subject('${SCHOOL_ID}','${var.ID }')"> |
95 | - <p>${ var.NAME }</p> | |
95 | + <p>${ var.ENAME }</p> | |
96 | 96 | </li> |
97 | 97 | </c:forEach> |
98 | 98 | </ul> | ... | ... |
resources/dbconfig.properties
1 | 1 | #数据源 1 |
2 | -url:jdbc:mysql://47.107.98.47:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | |
2 | +url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | |
3 | 3 | #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 |
4 | 4 | #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 |
5 | 5 | #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | ... | ... |
resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml
... | ... | @@ -107,7 +107,7 @@ |
107 | 107 | <!-- 列表(所有年级) --> |
108 | 108 | <select id="listAllGrade" parameterType="pd" resultType="pd"> |
109 | 109 | select |
110 | - SV_GRADE.NAME,SV_GRADE.DESC,REMARK,ID | |
110 | + SV_GRADE.NAME,SV_GRADE.ENAME,SV_GRADE.DESC,REMARK,ID | |
111 | 111 | from |
112 | 112 | SV_SCHOOLGRADESUBJECT inner join SV_GRADE on SV_SCHOOLGRADESUBJECT.GRADE_ID = SV_GRADE.ID |
113 | 113 | where 1=1 | ... | ... |
src/com/fh/controller/base/BaseController.java
... | ... | @@ -2,6 +2,7 @@ package com.fh.controller.base; |
2 | 2 | |
3 | 3 | import javax.servlet.http.Cookie; |
4 | 4 | import javax.servlet.http.HttpServletRequest; |
5 | +import javax.servlet.http.HttpServletResponse; | |
5 | 6 | |
6 | 7 | import org.apache.shiro.session.Session; |
7 | 8 | import org.springframework.web.context.request.RequestContextHolder; |
... | ... | @@ -53,6 +54,19 @@ public class BaseController { |
53 | 54 | .getRequestAttributes()).getRequest(); |
54 | 55 | return request; |
55 | 56 | } |
57 | + | |
58 | + /** | |
59 | + * 得到request对象 | |
60 | + * | |
61 | + * @return | |
62 | + */ | |
63 | + public HttpServletResponse getResponse() { | |
64 | + HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder | |
65 | + .getRequestAttributes()).getResponse(); | |
66 | + return response; | |
67 | + } | |
68 | + | |
69 | + | |
56 | 70 | |
57 | 71 | /** |
58 | 72 | * 得到32位的uuid |
... | ... | @@ -189,13 +203,9 @@ public class BaseController { |
189 | 203 | String lang = getCookieLanguage(); |
190 | 204 | if (lang == null) { |
191 | 205 | lang = getRequest().getLocale().getLanguage(); |
192 | - | |
193 | - Cookie cookies = new Cookie("lang", lang); | |
194 | - | |
195 | - | |
196 | - | |
197 | 206 | } |
198 | - | |
207 | + Cookie cookies = new Cookie("lang", lang); | |
208 | + getResponse().addCookie(cookies); | |
199 | 209 | return lang; |
200 | 210 | } |
201 | 211 | ... | ... |