From 8d18341d30623e10ff863810791e42c13d97b035 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Thu, 6 Jun 2019 16:59:30 +0800
Subject: [PATCH] 修改配置，及cookie

---
 WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp     |  4 ++--
 resources/dbconfig.properties                           |  2 +-
 resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml |  2 +-
 src/com/fh/controller/base/BaseController.java          | 22 ++++++++++++++++------
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
index 75f80d1..74820c5 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
@@ -63,7 +63,7 @@
 					<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
 						<li
 							onclick="event.stopPropagation();chooseListClass('${SCHOOL_ID}','${var.ID}')">
-							<p>${ var.NAME }</p>
+							<p>${ var.ENAME }</p>
 						</li>
 					</c:forEach>
 
@@ -92,7 +92,7 @@
 							<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
 								<li
 									onclick="event.stopPropagation();subject('${SCHOOL_ID}','${var.ID }')">
-									<p>${ var.NAME }</p>
+									<p>${ var.ENAME }</p>
 								</li>
 							</c:forEach>
 						</ul>
diff --git a/resources/dbconfig.properties b/resources/dbconfig.properties
index e2efa46..b6f432a 100644
--- a/resources/dbconfig.properties
+++ b/resources/dbconfig.properties
@@ -1,5 +1,5 @@
 #数据源 1
-url:jdbc:mysql://47.107.98.47:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
+url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
diff --git a/resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml b/resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml
index ee95085..7e6f1f5 100644
--- a/resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml
+++ b/resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml
@@ -107,7 +107,7 @@
 	<!-- 列表(所有年级) -->
 	<select id="listAllGrade" parameterType="pd" resultType="pd">
 		select
-		SV_GRADE.NAME,SV_GRADE.DESC,REMARK,ID
+		SV_GRADE.NAME,SV_GRADE.ENAME,SV_GRADE.DESC,REMARK,ID
 		from 
 		SV_SCHOOLGRADESUBJECT inner join SV_GRADE on SV_SCHOOLGRADESUBJECT.GRADE_ID = SV_GRADE.ID
 		where 1=1
diff --git a/src/com/fh/controller/base/BaseController.java b/src/com/fh/controller/base/BaseController.java
index 6769a61..64d15e7 100644
--- a/src/com/fh/controller/base/BaseController.java
+++ b/src/com/fh/controller/base/BaseController.java
@@ -2,6 +2,7 @@ package com.fh.controller.base;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.shiro.session.Session;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -53,6 +54,19 @@ public class BaseController {
 				.getRequestAttributes()).getRequest();
 		return request;
 	}
+	
+	/**
+	 * 得到request对象
+	 * 
+	 * @return
+	 */
+	public HttpServletResponse getResponse() {
+		HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder
+				.getRequestAttributes()).getResponse();
+		return response;
+	}
+	
+	
 
 	/**
 	 * 得到32位的uuid
@@ -189,13 +203,9 @@ public class BaseController {
 		String lang = getCookieLanguage();
 		if (lang == null) {
 			lang = getRequest().getLocale().getLanguage();
-
-			Cookie cookies = new Cookie("lang", lang);
-			
-			
-			
 		}
-
+		Cookie cookies = new Cookie("lang", lang);
+		getResponse().addCookie(cookies);
 		return lang;
 	}
 
--
libgit2 0.21.4