内部测试

pom.xml

@@ -38,6 +38,36 @@
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-mpeople</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.oracle</groupId>
+			<artifactId>ojdbc6</artifactId>
+			<version>11.2.0.1.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/lib/ojdbc6.jar</systemPath>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-cache</artifactId>
+		</dependency>
 
 	</dependencies>
 

src/main/java/net/mingsoft/MSApplication.java

@@ -24,6 +24,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.ComponentScan;
 
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -35,6 +36,7 @@ import java.util.Locale;
 @ComponentScan(basePackages = {"net.mingsoft"})
 @MapperScan(basePackages={"**.dao","com.baomidou.**.mapper"})
 @ServletComponentScan(basePackages = {"net.mingsoft"})
+@EnableCaching
 public class MSApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(MSApplication.class, args);

src/main/java/net/mingsoft/cms/biz/ICacheBiz.java

+package net.mingsoft.cms.biz;
+
+public interface ICacheBiz {
+
+    void set(String cacheName, String key, Object value);
+
+    <T> T get(String cacheName, String key, Class<T> cls);
+
+    void del(String cacheName, String key);
+
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/biz/impl/EhcacheBizImpl.java

+package net.mingsoft.cms.biz.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import net.mingsoft.cms.biz.ICacheBiz;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.CacheManager;
+import org.springframework.stereotype.Service;
+
+@Service("abc")
+public class EhcacheBizImpl implements ICacheBiz {
+
+    @Autowired
+    private CacheManager cacheManager;
+
+    @Override
+    public void set(String cacheName, String key, Object value) {
+        this.cacheManager.getCache(cacheName).put(key, JSONObject.toJSONString(value));
+    }
+
+    @Override
+    public <T> T get(String cacheName, String key, Class<T> cls) {
+        String str = this.cacheManager.getCache(cacheName).get(key, String.class);
+        if (StringUtils.isBlank(str)) {
+            return null;
+        }
+
+        return JSONObject.parseObject(str, cls);
+    }
+
+    @Override
+    public void del(String cacheName, String key) {
+        this.cacheManager.getCache(cacheName).evictIfPresent(key);
+    }
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/dao/ICategoryDao.java

@@ -20,6 +20,7 @@
  */
 package net.mingsoft.cms.dao;
 
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import net.mingsoft.base.dao.IBaseDao;
 import net.mingsoft.cms.entity.CategoryEntity;
 import org.springframework.stereotype.Component;

src/main/resources/Dockerfile

-FROM java
-VOLUME /tmp
-ADD docker-springboot-0.0.1-SNAPSHOT.jar mcms.jar
-RUN bash -c 'touch /app.jar' ENV JAVA_OPTS=""
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]
\ No newline at end of file

src/main/resources/application-dev.yml

+#spring:
+#  datasource:
+#    url: jdbc:mysql://localhost:3306/mcms-5.2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true
+#    username: root
+#    password: root
+#    filters: wall,mergeStat
+#    type: com.alibaba.druid.pool.DruidDataSource
+
 spring:
   datasource:
-    url: jdbc:mysql://192.168.0.8:3316/mcms-5.2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true
+    driver-class-name: oracle.jdbc.driver.OracleDriver
+    url: jdbc:oracle:thin:@192.168.0.7:1521:helowin
     username: mcms
     password: mcms
     filters: wall,mergeStat
     type: com.alibaba.druid.pool.DruidDataSource
-

src/main/resources/application.yml

@@ -50,6 +50,9 @@ spring:
         enabled: true #启用druid监控
   profiles:
     active: dev
+  cache:
+    ehcache:
+      config: classpath:ehcache.xml
   mvc:
     pathmatch:
       use-suffix-pattern: true
@@ -89,6 +92,7 @@ spring:
 mybatis-plus:
   global-config:
     db-config:
+      column-format: "\"%s\""
       id-type: assign_id
   configuration:
-    database-id: mysql
\ No newline at end of file
+    database-id: oracle
\ No newline at end of file

src/main/resources/ehcache.xml

@@ -30,6 +30,18 @@
            transactionalMode="off">
     </cache>
 
+    <cache name="USER"
+           overflowToDisk="true"
+           maxElementsInMemory="10000"
+           maxElementsOnDisk="10000000"
+           eternal="false"
+           timeToIdleSeconds="120"
+           timeToLiveSeconds="120"
+           diskPersistent="false"
+           diskExpiryThreadIntervalSeconds="120"
+           memoryStoreEvictionPolicy="LRU">
+    </cache>
+
 </ehcache>
 
     <!--

src/main/webapp/template/1/default.bak/footer.htm

+
+
+
+
+        <!--底部导航-start-->
+
+<div class="footer">
+<!--友情链接-start-->
+<div class="links">
+<div class="body">
+<span >
+网站导航
+</span>
+<div class="link">
+<!--下拉框-start-->
+<select class="ms-select">
+{ms:arclist typeid=163 size=10 }
+<option value="">[field.title/]</option>
+{/ms:arclist}
+</select> <!--下拉框-end-->
+</div>
+<div class="link">
+<!--下拉框-start-->
+<select class="ms-select">
+{ms:arclist typeid=163 size=10 }
+<option value="">[field.title/]</option>
+{/ms:arclist}
+</select> <!--下拉框-end-->
+</div>
+<div class="link">
+<!--下拉框-start-->
+<select class="ms-select">
+{ms:arclist typeid=163 size=10 }
+<option value="">[field.title/]</option>
+{/ms:arclist}
+</select> <!--下拉框-end-->
+</div>
+<div class="link">
+<!--下拉框-start-->
+<select class="ms-select">
+{ms:arclist typeid=163 size=5 }
+<option value="">[field.title/]</option>
+{/ms:arclist}
+</select> <!--下拉框-end-->
+</div>
+<div class="link">
+<!--下拉框-start-->
+<select class="ms-select">
+{ms:arclist typeid=163 size=5 }
+<option value="">[field.title/]</option>
+{/ms:arclist}
+</select> <!--下拉框-end-->
+</div> </div> </div> <!--友情链接-end-->
+<!--版权信息-start-->
+<div class="copyright">
+<div class="body">
+<img
+title=""
+alt=""
+src="{ms:global.host/}/{ms:global.style/}/images/1602123532415.png"
+/>
+<div class="desc">
+<div class="text">
+<div >
+<a href="#"
+>
+关于我们
+</a>
+<span >
+｜
+</span>
+<a href="#"
+>
+网站地图
+</a>
+</div> </div>
+<div class="text">
+<a href="#"
+>
+主办：江西省人民政府办公厅
+</a>
+<a href="#"
+>
+承办：江西省信息中心
+</a>
+</div>
+<div class="text">
+<a href="#"
+>
+赣ICP备05004294号
+</a>
+<a href="#"
+>
+政府网站标识码3600000012
+</a>
+<a href="#"
+>
+赣公网安备 36010802000128号
+</a>
+</div>
+<div class="ms-designer">
+<a href="www.mingsoft.net"
+target="_blank"
+>
+@该网页由MDesigner制作完成
+</a>
+</div> </div>
+<div class="right">
+<div class="img">
+<img
+title=""
+alt=""
+src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1234.png"
+/>
+<span >
+国务院客户端
+</span>
+</div>
+<div class="img">
+<img
+title=""
+alt=""
+src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_724.png"
+/>
+<span >
+国务院小程序
+</span>
+</div>
+<div class="wx">
+<div >
+<img
+title=""
+alt=""
+src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1434.png"
+/>
+<img
+title=""
+alt=""
+src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1534.png"
+/>
+<span >
+中国政府网微博、微信
+</span>
+</div> </div> </div> </div> </div> <!--版权信息-end-->
+<!--左漂浮-start-->
+<div class="left-fixed">
+<div class="content">
+<img
+title=""
+alt=""
+src="https://iph.href.lu/100x100"
+/>
+</div> </div> <!--左漂浮-end-->
+<!--右漂浮-start-->
+<div class="right-fixed">
+<div class="content">
+<img
+title=""
+alt=""
+src="https://iph.href.lu/100x100"
+/>
+</div> </div> <!--右漂浮-end-->
+</div>        <!--底部导航-end-->

src/main/webapp/template/1/default/footer.htm

@@ -2,162 +2,52 @@
 
 
 
-        <!--底部导航-start-->
 
-<div class="footer">
-<!--友情链接-start-->
-<div class="links">
+<div class="ms-footer">
 <div class="body">
-<span >
-网站导航
-</span>
-<div class="link">
-<!--下拉框-start-->
-<select class="ms-select">
-{ms:arclist typeid=163 size=10 }
-<option value="">[field.title/]</option>
-{/ms:arclist}
-</select> <!--下拉框-end-->
-</div>
-<div class="link">
-<!--下拉框-start-->
-<select class="ms-select">
-{ms:arclist typeid=163 size=10 }
-<option value="">[field.title/]</option>
-{/ms:arclist}
-</select> <!--下拉框-end-->
-</div>
-<div class="link">
-<!--下拉框-start-->
-<select class="ms-select">
-{ms:arclist typeid=163 size=10 }
-<option value="">[field.title/]</option>
-{/ms:arclist}
-</select> <!--下拉框-end-->
-</div>
-<div class="link">
-<!--下拉框-start-->
-<select class="ms-select">
-{ms:arclist typeid=163 size=5 }
-<option value="">[field.title/]</option>
-{/ms:arclist}
-</select> <!--下拉框-end-->
-</div>
-<div class="link">
-<!--下拉框-start-->
-<select class="ms-select">
-{ms:arclist typeid=163 size=5 }
-<option value="">[field.title/]</option>
-{/ms:arclist}
-</select> <!--下拉框-end-->
-</div> </div> </div> <!--友情链接-end-->
-<!--版权信息-start-->
-<div class="copyright">
-<div class="body">
-<img
-title=""
-alt=""
-src="{ms:global.host/}/{ms:global.style/}/images/1602123532415.png"
-/>
-<div class="desc">
-<div class="text">
-<div >
-<a href="#"
->
-关于我们
-</a>
-<span >
-｜
-</span>
-<a href="#"
->
-网站地图
-</a>
-</div> </div>
-<div class="text">
-<a href="#"
->
-主办：江西省人民政府办公厅
-</a>
-<a href="#"
->
-承办：江西省信息中心
-</a>
-</div>
-<div class="text">
-<a href="#"
->
-赣ICP备05004294号
-</a>
-<a href="#"
->
-政府网站标识码3600000012
-</a>
-<a href="#"
->
-赣公网安备 36010802000128号
+<div class="top">
+<div class="top-left">
+{ms:channel flag='nav'}
+<div class="foot-nav">
+<a href="{ms:global.url/}${field.typelink}"
+target="_blank"
+class="nav-item">
+父栏目名称
 </a>
-</div>
-<div class="ms-designer">
-<a href="www.mingsoft.net"
+{ms:channel }
+<a href="{ms:global.url/}${field.typelink}"
 target="_blank"
->
-@该网页由MDesigner制作完成
+class="item">
+子栏目名称
 </a>
-</div> </div>
-<div class="right">
-<div class="img">
-<img
-title=""
-alt=""
-src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1234.png"
-/>
-<span >
-国务院客户端
-</span>
+{/ms:channel}
 </div>
-<div class="img">
+{/ms:channel} </div>
+<div class="top-right">
+<div class="qr">
 <img
 title=""
 alt=""
-src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_724.png"
-/>
-<span >
-国务院小程序
+src="https://iph.href.lu/100x100"
+class="pic" />
+<span class="text" >
+公众号
 </span>
 </div>
-<div class="wx">
-<div >
-<img
-title=""
-alt=""
-src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1434.png"
-/>
-<img
-title=""
-alt=""
-src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1534.png"
-/>
-<span >
-中国政府网微博、微信
-</span>
-</div> </div> </div> </div> </div> <!--版权信息-end-->
-<!--左漂浮-start-->
-<div class="left-fixed">
-<div class="content">
-<img
-title=""
-alt=""
-src="https://iph.href.lu/100x100"
-/>
-</div> </div> <!--左漂浮-end-->
-<!--右漂浮-start-->
-<div class="right-fixed">
-<div class="content">
+<div class="qr">
 <img
 title=""
 alt=""
 src="https://iph.href.lu/100x100"
-/>
-</div> </div> <!--右漂浮-end-->
-</div>        <!--底部导航-end-->
+class="pic" />
+<span class="text" >
+公众号
+</span>
+</div> </div> </div>
+<span class="copyright" >
+© 江西铭软科技有限公司 2020 All Rights Reserved. Powered by MCms
+</span>
+<span class="power" >
+@该网页由MDesigner制作完成
+</span>
+</div> </div>
\ No newline at end of file

src/main/webapp/template/1/default/nav.htm

+<div class="ms-nav">
+    <div class="body">
+        <div class="logo">
+            <img
+                    title=""
+                    alt=""
+                    src="{@ms:file global.logo/}"
+                    class="logo-pic"/>
+            <img
+                    title=""
+                    alt=""
+                    src="https://www.mingsoft.net//template/1/ms/images/1596437934982.png"
+                    class="logo-desc"/>
+        </div>
+        <div @click='switchShow(["1605172743000_96378"]);' class="nav-h5">
+            <i class="iconfont icon-caidan nav-h5-icon"></i>
+            <div id="key_1605172743000_96378"
+                 class="nav-h5-body">
+                <a href="#"
+                   class="nav-h5-item">
+                    首页
+                </a>
+            </div>
+        </div>
+        <div class="nav-item">
+            {ms:channel flag='n'}
+            <a href="{ms:global.url/}${field.typelink}"
+               target="_blank"
+               class="item">
+                ${field.typetitle}
+            </a>
+            {/ms:channel}
+        </div>
+        <div class="nav-search">
+            <!--搜索-start-->
+            <form id="searchDataForm" action="{ms:global.host/}/mcms/search.do" method="post" class="ms-search-input">
+                <div class="ms-search-input-div">
+                    <!--输入框 - start -->
+                    <input class="ms-input" placeholder="输入搜索关键字"/>
+                    <!--输入框 -end -->
+                </div>
+                <div class="ms-search-button" onclick="document.getElementById('searchDataForm').submit();">
+                    <i class="iconfont icon-fangdajing"></i>
+                </div>
+            </form>
+            <!--搜索-end-->
+        </div>
+    </div>
+</div>
\ No newline at end of file