From 0892395f902f0b3e0ddd92b734870cf9dab3563a Mon Sep 17 00:00:00 2001
From: wujj <1027418825@qq.com>
Date: Fri, 10 Jan 2020 15:03:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.yml        |  6 +-
 .../webapp/templets/1/default/menu-left.htm   | 55 +++++++------------
 .../webapp/templets/1/default/news-list.htm   |  1 -
 3 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index c62ccf0a..6307caca 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
 spring:
   datasource:
-    url: jdbc:mysql://imingsoft.cn:3307/db-mcms-5.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true
-    username: mcms
-    password: mcms@2020
+    url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true
+    username: root
+    password: root
     filters: wall,mergeStat
     type: com.alibaba.druid.pool.DruidDataSource
\ No newline at end of file
diff --git a/src/main/webapp/templets/1/default/menu-left.htm b/src/main/webapp/templets/1/default/menu-left.htm
index bdb4e6f8..848ee783 100644
--- a/src/main/webapp/templets/1/default/menu-left.htm
+++ b/src/main/webapp/templets/1/default/menu-left.htm
@@ -1,50 +1,35 @@
 <div class="ms-content-left">
     <div class="ms-content-left-title">走进铭飞</div>
     <ul class="ms-content-left-ul">
-       	<a target="_blank" href='{ms:global.url/}/53/index.html'>
-       		<li>关于我们<span class="ms-content-left-li-more">></span></li>
-       	</a>
+        <a target="_blank" href='{ms:global.url/}/53/index.html'>
+            <li>关于我们<span class="ms-content-left-li-more">></span></li>
+        </a>
         <a target="_blank" href='{ms:global.url/}/59/index.html'>
-        	<li>公司动态<span class="ms-content-left-li-more">></span></li>
+            <li>公司动态<span class="ms-content-left-li-more">></span></li>
         </a>
         <a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>
-        	<li>发展历程<span class="ms-content-left-li-more">></span></li>
+            <li>发展历程<span class="ms-content-left-li-more">></span></li>
         </a>
         <a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#lianx'>
-        	<li>加入我们<span class="ms-content-left-li-more">></span></li>
+            <li>加入我们<span class="ms-content-left-li-more">></span></li>
         </a>
         <a target="_blank" href={ms:global.url/}/19/141/index.html>
-        	<li>联系我们<span class="ms-content-left-li-more">></span></li>
+            <li>联系我们<span class="ms-content-left-li-more">></span></li>
         </a>
     </ul>
-    <style>.detailMainLeftMenu_cur{color:red}</style>
-    123
-    <ul>
-        {ms:channel type=62 type=son class=detailMainLeftMenu_cur}
-        [field.typeurl/]
-        <img src="{ms:global.url/}[field.typelitpic/]"/>
-        <li><a href="{ms:global.url/}[field.typelink/]"class="[field.class/]">[field.typetitle/]</a></li>
-        {/ms:channel}
-        456
-        {ms:channel type=62 type=son flag=t class=detailMainLeftMenu_cur}
-        [field.typeurl/]
-        <img src="{ms:global.host/}[field.typelitpic/]"/>
-        <li><a href="{ms:global.url/}[field.typelink/]"class="[field.class/]">[field.typetitle/]</a></li>
-        {/ms:channel}
-    </ul>
 </div>
 <script>
-$(function(){
-    var r=location.href;
-      if(r.match("53")){
-      $(".ms-content-left-ul a").removeClass("ms-content-left-li-first");
-      $(".ms-content-left-ul a").eq(0).addClass("ms-content-left-li-first");
-    }else if(r.match("19")){
-      $(".ms-content-left-ul a").removeClass("ms-content-left-li-first");
-      $(".ms-content-left-ul a").eq(4).addClass("ms-content-left-li-first");
-    }else if(r.match("59")){
-      $(".ms-content-left-ul a").removeClass("ms-content-left-li-first");
-      $(".ms-content-left-ul a").eq(1).addClass("ms-content-left-li-first");
-    }
-  })
+    $(function(){
+        var r=location.href;
+        if(r.match("53")){
+            $(".ms-content-left-ul a").removeClass("ms-content-left-li-first");
+            $(".ms-content-left-ul a").eq(0).addClass("ms-content-left-li-first");
+        }else if(r.match("19")){
+            $(".ms-content-left-ul a").removeClass("ms-content-left-li-first");
+            $(".ms-content-left-ul a").eq(4).addClass("ms-content-left-li-first");
+        }else if(r.match("59")){
+            $(".ms-content-left-ul a").removeClass("ms-content-left-li-first");
+            $(".ms-content-left-ul a").eq(1).addClass("ms-content-left-li-first");
+        }
+    })
 </script>
\ No newline at end of file
diff --git a/src/main/webapp/templets/1/default/news-list.htm b/src/main/webapp/templets/1/default/news-list.htm
index 01ac2e5c..11cb6b14 100644
--- a/src/main/webapp/templets/1/default/news-list.htm
+++ b/src/main/webapp/templets/1/default/news-list.htm
@@ -22,7 +22,6 @@
                     <div class="ms-content-main-div">
                         <ul class="ms-content-main-ul">
                             {ms:arclist size=10 ispaging=true}
-                            [field.date?string("yyyy-MM-dd")/]
                             <li>
                                 <a href="{ms:global.url/}[field.link/]">
                                     <!-- <span class="ms-content-main-li-span">·</span> -->