Merge remote-tracking branch 'origin/master'

src/main/resources/application.properties

@@ -53,7 +53,7 @@ system.login.path=admin
 
 system.login.enabled-kickout=true
 
-system.login.max-session=1
+system.login.max-session=10
 system.http.protocol=http
 system.http.host= 127.0.0.1:8080
 system.site.name=sookaCms

src/main/resources/static/www/tuiyijunren/images/basic.css

@@ -262,6 +262,12 @@ width: 330px;
 	padding-bottom: 15px;
 }
 .news_list_div .news_list_text span{
+	height: 69px !important;
+	overflow:hidden !important;
+	text-overflow: ellipsis !important;
+	-webkit-line-clamp: 3 !important;
+	display: -webkit-box !important;
+	-webkit-box-orient: vertical !important;
 	font-size: 16px;
 	line-height: 26px;
 	padding-bottom: 15px;

src/main/resources/templates/www/tuiyijunren/content-cyfw.html

@@ -5,7 +5,7 @@
 
 <!--中间内容开始-->
 <div class="er_content">
-	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1226.html">创业指导</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
+	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1226.html">创业服务</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
 	<div class="news_txt">
 		<h1>${content.title!}</h1>
 		<h5><i class="laiy">来源：${content.author!}</i><i class="date">时间：${content.inputdate,dateFormat="yyyy-MM-dd"}</i></h5>

src/main/resources/templates/www/tuiyijunren/content-hzqy.html

@@ -0,0 +1,18 @@
+<!--头部开始-->
+@includeFileTemplate("/www/tuiyijunren/include/header.html"){}
+<!--头部结束-->
+<!--中间内容开始-->
+<div class="er_content">
+	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1241.html">合作企业</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
+	<div class="news_txt">
+		<h1>${content.title!}</h1>
+		<h5><i class="laiy">来源：${content.author!}</i><i class="date">时间：${content.inputdate,dateFormat="yyyy-MM-dd"}</i></h5>
+		<p>${content.content}</p>
+	</div>
+</div>
+<!--中间内容结束-->
+<!--底部开始-->
+@includeFileTemplate("/www/tuiyijunren/include/footer.html"){}
+<!--底部结束-->
+</body>
+</html>

src/main/resources/templates/www/tuiyijunren/content-xlts.html

@@ -5,7 +5,7 @@
 
 <!--中间内容开始-->
 <div class="er_content">
-	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1229.html">专升本</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
+	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1229.html">学历提升</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
 	<div class="news_txt">
 		<h1>${content.title!}</h1>
 		<h5><i class="laiy">来源：${content.author!}</i><i class="date">时间：${content.inputdate,dateFormat="yyyy-MM-dd"}</i></h5>

src/main/resources/templates/www/tuiyijunren/content-zph.html

@@ -3,7 +3,7 @@
 <!--头部结束-->
 <!--中间内容开始-->
 <div class="er_content"> 
-	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
+	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
 	<div class="news_txt">
 		<h1>${content.title!}</h1>
 		<h5><i class="laiy">来源：${content.author!}</i><i class="date">时间：${content.inputdate,dateFormat="yyyy-MM-dd"}</i></h5>

src/main/resources/templates/www/tuiyijunren/include/header-index.html

@@ -41,7 +41,7 @@
         <a href="${frontPath}/${site.siteId}/1229.html">学历提升</a>
         <a href="${frontPath}/${site.siteId}/1236.html">综合服务</a>
         <a href="${frontPath}/${site.siteId}/1238.html">孵化基地</a>
-        <a>合作企业</a>
+        <a  href="${frontPath}/${site.siteId}/1241.html">合作企业</a>
         <a>证书认证</a>
     </div>
 </div>

src/main/resources/templates/www/tuiyijunren/include/header.html

@@ -32,16 +32,36 @@
         <a class="navi" href="${frontPath}/${site.siteId}/1229.html">学历提升</a>
         <a class="navi" href="${frontPath}/${site.siteId}/1236.html">综合服务</a>
         <a class="navi" href="${frontPath}/${site.siteId}/1238.html">孵化基地</a>
-        <a class="navi">合作企业</a>
+        <a class="navi" href="${frontPath}/${site.siteId}/1241.html">合作企业</a>
         <a class="navi">证书认证</a>
     </div>
 </div>
 <script>
+    let ids = [
+        [], // 网站首页
+        [1217], // 最新动态
+        [1213, 1215, 1216], // 政策宣传
+        // [1213], // 就业信息
+        [1226, 1227], // 创业服务
+        [1229, 1230, 1231], // 学历提升
+        [1236, 1235, 1234, 1233], // 综合服务
+        [1238, 1239, 1240], // 孵化基地
+        // [1213], // 合作企业
+        // [1213], // 证书认证
+    ]
     let url = window.location.href;
-    let id = url.split(".html")[0].split("/")[5];
+    let id = url.split(".html")[0].split("/")[5] * 1;
+    let navis = [id];
+    for (let i = 0; i < ids.length; i++) {
+        for (let j = 0; j < ids[i].length; j++) {
+            if(ids[i][j] == id){
+                navis = ids[i];
+            }
+        }
+    }
     let naviTags = document.getElementsByClassName("navi");
     for (let i = 0; i < naviTags.length; i++) {
-        if(id == naviTags[i].href.split(".html")[0].split("/")[5]){
+        if(navis.includes(naviTags[i].href.split(".html")[0].split("/")[5] * 1)){
             naviTags[i].className = "navi on";
         }else {
             naviTags[i].className = "navi";

src/main/resources/templates/www/tuiyijunren/index.html

@@ -31,7 +31,7 @@
         <div class="news_tab_list">
             <div class="news_list">
                 <#cms_content_list siteId="${site.siteId}" categoryId="1213" orderBy="2" isHot="0" hasChild="0" isRecommend="0" size="4" titleLen="24" var="bean">
-                    <a>
+                    <a href="${bean.url!}">
                         <div class="date"><b>${bean.inputdate,dateFormat="dd"}</b><i>${bean.inputdate,dateFormat="yyyy-MM"}</i></div>
                         <div class="text">
                             <p>${bean.title!}</p>
@@ -44,7 +44,7 @@
         <div class="news_tab_list">
             <div class="news_list">
                 <#cms_content_list siteId="${site.siteId}" categoryId="1215" orderBy="2" isHot="0" hasChild="0" isRecommend="0" size="4" titleLen="24" var="bean">
-                    <a>
+                    <a href="${bean.url!}">
                         <div class="date"><b>${bean.inputdate,dateFormat="dd"}</b><i>${bean.inputdate,dateFormat="yyyy-MM"}</i></div>
                         <div class="text">
                             <p>${bean.title!}</p>
@@ -57,7 +57,7 @@
         <div class="news_tab_list">
             <div class="news_list">
                 <#cms_content_list siteId="${site.siteId}" categoryId="1216" orderBy="2" isHot="0" hasChild="0" isRecommend="0" size="4" titleLen="24" var="bean">
-                    <a>
+                    <a href="${bean.url!}">
                         <div class="date"><b>${bean.inputdate,dateFormat="dd"}</b><i>${bean.inputdate,dateFormat="yyyy-MM"}</i></div>
                         <div class="text">
                             <p>${bean.title!}</p>
@@ -127,16 +127,18 @@
         </div>
         <div id="carousel" class="twjr_div_list">
             <ul>
-                <#cms_content_list siteId="${site.siteId}" categoryId="1229" orderBy="2" isHot="0" hasChild="0" isRecommend="0" size="4" titleLen="24" var="bean">
-                    <li aos="fade-up" aos-duration="500">
-                        <img src="${bean.thumb!}" alt="${bean.title!}"/>
-                        <a class="text">
-                            <h5>${bean.title!}</h5>
-                            <p><span>联系人：${bean.author!}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询电话：${bean.author!}</span></p>
-                            <span>${bean.description!}</span>
-                        </a>
-                        <a class="more">查看详细</a>
-                    </li>
+                <#cms_content_list siteId="${site.siteId}" categoryId="1229" orderBy="2" isHot="0" hasChild="0" isRecommend="0" size="3" titleLen="24" var="bean">
+                    <a href="${bean.url!}">
+                        <li aos="fade-up" aos-duration="500">
+                            <img src="${bean.thumb!}" alt="${bean.title!}"/>
+                            <a class="text" href="${bean.url!}">
+                                <h5>${bean.title!}</h5>
+                                <p><span>联系人：${bean.author!}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询电话：${bean.author!}</span></p>
+                                <span>${bean.description!}</span>
+                            </a>
+                            <a class="more">查看详细</a>
+                        </li>
+                    </a>
                 </#cms_content_list>
 
                 <!--<li aos="fade-up" aos-duration="500"><img src="${resPath}/tuiyijunren/images/twjr_img2.png"/> <a-->
@@ -188,8 +190,8 @@
             <span>-见效快&nbsp;&nbsp;成本低&nbsp;&nbsp;灵活性高-</span>
         </div>
         <div class="dpsg_list">
-            <#cms_content_list siteId="${site.siteId}" categoryId="1225" orderBy="2" isHot="0" hasChild="0" isRecommend="0" size="4" titleLen="24" var="bean">
-                <a class="dpsg_list_div clearfix" aos="fade-up">
+            <#cms_content_list siteId="${site.siteId}" categoryId="1225" orderBy="2" isHot="0" hasChild="0" isRecommend="0" size="3" titleLen="30" var="bean">
+                <a class="dpsg_list_div clearfix" aos="fade-up" href="${bean.url!}">
                     <img src="${resPath}/tuiyijunren/images/twjr_img5.png"/>
                     <div class="text">
                         <h1>${bean.title!}</h1>
@@ -245,8 +247,8 @@
             <span>-坚持追求卓越&nbsp;&nbsp;成就职业巅峰-</span>
         </div>
         <div class="yzgw_list clearfix">
-            <#cms_content_list siteId="${site.siteId}" categoryId="1223" orderBy="2" isHot="0" hasChild="0" isRecommend="0" size="4" titleLen="24" var="bean">
-                <a class="yzgw_list_div" aos="fade-up">
+            <#cms_content_list siteId="${site.siteId}" categoryId="1223" orderBy="2" isHot="0" hasChild="0" isRecommend="0" size="6" titleLen="12" var="bean">
+                <a class="yzgw_list_div" aos="fade-up" href="${bean.url!}">
                     <h1>${bean.title!}<b>5K-8K</b></h1>
                     <h4><span class="address">长春-南关</span><span>五险一金</span><span>周末双休</span></h4>
                     <h5>长春动画学院</h5>

src/main/resources/templates/www/tuiyijunren/list-cyfw.html

@@ -5,7 +5,7 @@
 <div class="er_content clearfix">
 	<div class="er_left fl">
 		<div class="er_nav">
-			<h4>创业服务${categoryId}</h4>
+			<h4>创业服务</h4>
 			<#cms_category_list  siteId="${site.siteId}" categoryId="1226" isNav="0" var="bean">
 				<a id="${bean.categoryId}" href="${frontPath}/${site.siteId}/${bean.categoryId}.html">${bean.categoryName}</a>
 			</#cms_category_list>

src/main/resources/templates/www/tuiyijunren/list-hzqy.html

@@ -0,0 +1,38 @@
+<!--头部开始-->
+@includeFileTemplate("/www/tuiyijunren/include/header.html"){}
+<!--头部结束-->
+<!--中间内容开始-->
+<div class="er_content clearfix">
+    <div class="er_right fl">
+        <div class="news_list">
+            <#cms_pagination siteId="${site.siteId}" categoryId="${categoryId}" page="${page}" moreNum="6" var="page">
+                <#cms_content_list pageNumber="${page.current}" siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="4" titleLen="22" var="bean">
+                    <a class="news_list_div clearfix" href="${bean.url!}">
+                        <img src="${bean.thumb!}" alt="${bean.title!}"/>
+                        <div class="news_list_text">
+                            <h2>${bean.title!}</h2>
+                            <h2>${bean.category.categoryId!}</h2>
+                            <span style="height: auto !important;">${bean.keywords!}</span>
+                            <span>${bean.description!}</span>
+<!--                            <p><i class="date">${bean.inputdate,dateFormat="yyyy年MM月dd日"}</i><i class="djl">点击量：${bean.viewNum!}</i></p>-->
+                        </div>
+                    </a>
+                </#cms_content_list>
+            </#cms_pagination>
+        </div>
+        <div class="fenye">
+            @includeFileTemplate("/www/tuiyijunren/include/page.html"){}
+        </div>
+    </div>
+</div>
+<script>
+    $(function () {
+        let id = "${categoryId}";
+        $("#"+id).addClass("on");
+    });
+</script>
+<!--中间内容结束-->
+<!--底部开始-->
+@includeFileTemplate("/www/tuiyijunren/include/footer.html"){}
+<!--底部结束-->
+

src/main/resources/templates/www/tuiyijunren/list-xlts.html

@@ -5,7 +5,7 @@
 <div class="er_content clearfix">
 	<div class="er_left fl">
 		<div class="er_nav">
-			<h4>学历提升${categoryId}</h4>
+			<h4>学历提升</h4>
 			<#cms_category_list  siteId="${site.siteId}" categoryId="1229" isNav="0" var="bean">
 				<a id="${bean.categoryId}" href="${frontPath}/${site.siteId}/${bean.categoryId}.html">${bean.categoryName}</a>
 			</#cms_category_list>

src/main/resources/templates/www/tuiyijunren/list-zhfw.html

@@ -20,7 +20,7 @@
                         <div class="news_list_text">
                             <h2>${bean.title!}</h2>
                             <h2>${bean.category.categoryId!}</h2>
-                            <span>${bean.keywords!}</span>
+                            <span style="height: auto !important;">${bean.keywords!}</span>
                             <span>${bean.description!}</span>
 <!--                            <p><i class="date">${bean.inputdate,dateFormat="yyyy年MM月dd日"}</i><i class="djl">点击量：${bean.viewNum!}</i></p>-->
                         </div>