From a4c923ac5ed2004c1e97c6affbb91ad077955f36 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 31 May 2021 17:52:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/AdcDaApplication.java     |  2 +
 .../main/resources/application-dev.properties |  8 +--
 .../src/main/resources/cache/ehcache.xml      | 66 +++++++++++++++++++
 .../mybatis/mapper/sys/DictionaryEOMapper.xml |  2 +-
 4 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 adc-da-main/src/main/resources/cache/ehcache.xml

diff --git a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java
index 5525d6cc..8353b814 100644
--- a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java
+++ b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java
@@ -1,5 +1,6 @@
 package com.adc.da;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
@@ -7,6 +8,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 
 @ServletComponentScan
 @SpringBootApplication(exclude = SecurityAutoConfiguration.class)
+@MapperScan(value = {"com.adc.da.file.store"})
 public class AdcDaApplication {
 
     public static void main(String[] args) {
diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index 1b77a4b0..2b4ee553 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -2,10 +2,10 @@
 #=============================================
 # 数据库配置
 #=============================================
-spring.datasource.driverClassName = oracle.jdbc.OracleDriver
-spring.datasource.url = jdbc:oracle:thin:@//192.168.10.140:1521/orcl
-spring.datasource.username = LAWSDB
-spring.datasource.password = 1q2w3e4r
+spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
+spring.datasource.url = jdbc:mysql://127.0.0.1:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.username = root
+spring.datasource.password = root
 
 #==============================================
 # 应用设置
diff --git a/adc-da-main/src/main/resources/cache/ehcache.xml b/adc-da-main/src/main/resources/cache/ehcache.xml
new file mode 100644
index 00000000..b580e227
--- /dev/null
+++ b/adc-da-main/src/main/resources/cache/ehcache.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd"
+         updateCheck="false" monitoring="autodetect"
+         dynamicConfig="true">
+
+    <diskStore path="java.io.tmpdir/ehcache"/>
+
+    <defaultCache
+            maxElementsInMemory="50000"
+            eternal="false"
+            timeToIdleSeconds="3600"
+            timeToLiveSeconds="3600"
+            overflowToDisk="true"
+            diskPersistent="false"
+            diskExpiryThreadIntervalSeconds="120"
+    />
+
+    <cache name="authorizationCache"
+           maxEntriesLocalHeap="2000"
+           eternal="false"
+           timeToIdleSeconds="3600"
+           timeToLiveSeconds="3600"
+           overflowToDisk="false"
+           statistics="true">
+    </cache>
+
+    <cache name="authenticationCache"
+           maxEntriesLocalHeap="2000"
+           eternal="false"
+           timeToIdleSeconds="3600"
+           timeToLiveSeconds="3600"
+           overflowToDisk="false"
+           statistics="true">
+    </cache>
+
+    <cache name="org.apache.shiro.realm.text.PropertiesRealm-0-accounts"
+           maxElementsInMemory="1000"
+           eternal="true"
+           overflowToDisk="true"/>
+
+</ehcache>
+
+        <!--
+            maxElementsInMemory="10000" 	//Cache中最多允许保存的数据对象的数量
+            external="false" 				//缓存中对象是否为永久的，如果是，超时设置将被忽略，对象从不过期
+            timeToLiveSeconds="3600"  		//缓存的存活时间，从开始创建的时间算起
+            timeToIdleSeconds="3600"  		//多长时间不访问该缓存，那么ehcache 就会清除该缓存
+
+            这两个参数很容易误解，看文档根本没用，我仔细分析了ehcache的代码。结论如下：
+            1、timeToLiveSeconds的定义是：以创建时间为基准开始计算的超时时长；
+            2、timeToIdleSeconds的定义是：在创建时间和最近访问时间中取出离现在最近的时间作为基准计算的超时时长；
+            3、如果仅设置了timeToLiveSeconds，则该对象的超时时间=创建时间+timeToLiveSeconds，假设为A；
+            4、如果没设置timeToLiveSeconds，则该对象的超时时间=min(创建时间，最近访问时间)+timeToIdleSeconds，假设为B；
+            5、如果两者都设置了，则取出A、B最少的值，即min(A,B)，表示只要有一个超时成立即算超时。
+
+            overflowToDisk="true"    		//内存不足时，是否启用磁盘缓存
+            diskSpoolBufferSizeMB	//设置DiskStore（磁盘缓存）的缓存区大小。默认是30MB。每个Cache都应该有自己的一个缓冲区
+            maxElementsOnDisk		//硬盘最大缓存个数
+            diskPersistent			//是否缓存虚拟机重启期数据The default value is false
+            diskExpiryThreadIntervalSeconds	//磁盘失效线程运行时间间隔，默认是120秒。
+            memoryStoreEvictionPolicy="LRU" //当达到maxElementsInMemory限制时，Ehcache将会根据指定的策略去清理内存。默认策略是LRU（最近最少使用）。你可以设置为FIFO（先进先出）或是LFU（较少使用）。
+            clearOnFlush	//内存数量最大时是否清除
+            maxEntriesLocalHeap="0"
+            maxEntriesLocalDisk="1000"
+        -->
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml
index aea6c3f5..898dc60e 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml
@@ -24,7 +24,7 @@
 	</sql>
 
 	<resultMap id="DicTypeMap" extends="BaseResultMap" type="com.adc.da.sys.entity.DictionaryEO">
-		<collection property="dicTypeEOList" ofType="com.adc.da.sys.entity.DicTypeEO">
+		<collection property="dicTypeEOList" ofType="com.adc.da.sys.entity.DicTypeEO" javaType="java.util.List">
 			<id column="type_id" property="id" />
 			<result column="dic_type_code" property="dicTypeCode" />
 			<result column="dic_type_name" property="dicTypeName" />