登录页、首页，改为动态获取标题

sooka-admin/src/main/java/com/sooka/web/controller/system/SysIndexController.java

@@ -141,6 +141,7 @@ public class SysIndexController extends BaseController
     public String main(ModelMap mmap)
     {
         mmap.put("version", SookaConfig.getVersion());
+        mmap.put("title", noticeService.selectNoticeById(1L));
         return "main";
     }
 

sooka-admin/src/main/java/com/sooka/web/controller/system/SysLoginController.java

@@ -2,6 +2,8 @@ package com.sooka.web.controller.system;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.sooka.system.service.ISysNoticeService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.UsernamePasswordToken;
@@ -37,6 +39,9 @@ public class SysLoginController extends BaseController
     @Autowired
     private ConfigService configService;
 
+    @Autowired
+    private ISysNoticeService noticeService;
+
     @GetMapping("/login")
     public String login(HttpServletRequest request, HttpServletResponse response, ModelMap mmap)
     {
@@ -49,6 +54,7 @@ public class SysLoginController extends BaseController
         mmap.put("isRemembered", rememberMe);
         // 是否开启用户注册
         mmap.put("isAllowRegister", Convert.toBool(configService.getKey("sys.account.registerUser"), false));
+        mmap.put("title", noticeService.selectNoticeById(1L));
         return "login";
     }
 

sooka-admin/src/main/resources/static/sooka/js/ry-ui.js

@@ -1755,6 +1755,20 @@ var table = {
                 var patten = new RegExp(/^(?=.*[A-Za-z])(?=.*\d)(?=.*[~!@#\$%\^&\*\(\)\-=_\+])[A-Za-z\d~!@#\$%\^&\*\(\)\-=_\+]{6,}$/);
                 return patten.test(text);
             },
+            unescapeHtml : function(text){
+                if (Object.prototype.toString.call(text) !== '[object String]') {
+                    return '';
+                }
+                text = text.replace(/<|>|&|"/g, function (match) {
+                    return ({
+                        '&lt;': '<',
+                        '&gt;': '>',
+                        '&amp;': '&',
+                        '&quot;': '"'
+                    })[match];
+                });
+                return text;
+            }
         }
     });
 })(jQuery);

sooka-admin/src/main/resources/templates/eduindex.html

@@ -245,14 +245,14 @@
 	<script src="../static/sooka/js/ry-ui.js" th:src="@{/sooka/js/ry-ui.js?v=4.7.6}"></script>
     <script type="text/javascript">
 		var prefix = ctx + "schooldistrict/config", schoolType = 1;
-		$(".xit_logo").html(unescapeHtml('[[${title.noticeContent}]]'));
+		$(".xit_logo").html($.common.unescapeHtml('[[${title.noticeContent}]]'));
 		if ([[${flag}]]) {
 			$(".main").show();
-			$(".cksm p").html(unescapeHtml('[[${notice.noticeContent}]]'));
+			$(".cksm p").html($.common.unescapeHtml('[[${notice.noticeContent}]]'));
 		} else {
 			$(".main").remove();
 			$(".cksm").css("background", 'url(../../img/close_notice.png) no-repeat top');
-			$(".cksm p").html(unescapeHtml('[[${announcement.noticeContent}]]'));
+			$(".cksm p").html($.common.unescapeHtml('[[${announcement.noticeContent}]]'));
 		}
 
 		function submitHandler() {
@@ -290,21 +290,6 @@
 			});
 		}
 
-		function unescapeHtml(str) {
-			if (Object.prototype.toString.call(str) !== '[object String]') {
-				return '';
-			}
-			str = str.replace(/&lt;|&gt;|&amp;|&quot;/g, function (match) {
-				return ({
-					'&lt;': '<',
-					'&gt;': '>',
-					'&amp;': '&',
-					'&quot;': '"'
-				})[match];
-			});
-			return str;
-		}
-
 		function getData(array) {
 			var str = "<option value=''>请选择委(村)</option>";
 			$.each(array, function (index, item) {

sooka-admin/src/main/resources/templates/login.html

@@ -86,7 +86,7 @@
     </div>
     <div class="bigContent">
     <div class="top_logo">
-        <h1>南关区中、小学学区查询系统</h1>
+        <h1></h1>
         <img src="../img/logotit.png"/>
     </div>
         <div class="loginCont">
@@ -128,5 +128,8 @@
 <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
 <script src="../static/sooka/js/ry-ui.js" th:src="@{/sooka/js/ry-ui.js?v=4.7.6}"></script>
 <script src="../static/sooka/login.js" th:src="@{/sooka/login.js}"></script>
+<script type="text/javascript">
+    $(".top_logo h1").html($.common.unescapeHtml('[[${title.noticeContent}]]'));
+</script>
 </body>
 </html>

sooka-admin/src/main/resources/templates/main.html

@@ -33,10 +33,14 @@
 
 <body class="gray-bg">
 <div class="welcome">
-	<h1><b>欢迎</b>您登录南关区中、小学学区查询系统</h1>
+	<h1><b>欢迎您登录</b></h1>
 </div>
 <script th:src="@{/js/jquery.min.js}"></script>
 <script th:src="@{/js/bootstrap.min.js}"></script>
 <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
+<script src="../static/sooka/js/ry-ui.js" th:src="@{/sooka/js/ry-ui.js?v=4.7.6}"></script>
+<script type="text/javascript">
+	$("b").after($.common.unescapeHtml('[[${title.noticeContent}]]'));
+</script>
 </body>
 </html>