From 103de6f9f4315c002c6aa506d0e08743af027b1f Mon Sep 17 00:00:00 2001
From: qi_liang <qi_liang_gz@163.com>
Date: Sun, 25 Aug 2019 02:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../java/com/lq/code/util/jdbc/JdbcUtils.java |  1 +
 .../dev/email.properties                      |  0
 .../dev/file.properties                       |  0
 .../dev/jdbc.properties                       |  0
 .../dev/log4j.properties                      |  0
 .../dev/redis.properties                      |  0
 .../pro/email.properties                      |  0
 .../test => profile/pro}/file.properties      |  0
 .../test => profile/pro}/jdbc.properties      |  6 ++---
 .../pro/log4j.properties                      |  0
 .../test => profile/pro}/redis.properties     |  0
 .../test/email.properties                     |  0
 src/main/profile/test/file.properties         |  1 +
 .../pro => profile/test}/jdbc.properties      |  6 ++---
 .../test/log4j.properties                     |  0
 .../pro => profile/test}/redis.properties     |  4 +--
 src/main/resources/ehcache/ehcache-shiro.xml  | 20 ---------------
 src/main/resources/ehcache/ehcache.xml        | 25 -------------------
 src/main/resources/pro/file.properties        |  1 -
 20 files changed, 11 insertions(+), 55 deletions(-)
 rename src/main/{resources => profile}/dev/email.properties (100%)
 rename src/main/{resources => profile}/dev/file.properties (100%)
 rename src/main/{resources => profile}/dev/jdbc.properties (100%)
 rename src/main/{resources => profile}/dev/log4j.properties (100%)
 rename src/main/{resources => profile}/dev/redis.properties (100%)
 rename src/main/{resources => profile}/pro/email.properties (100%)
 rename src/main/{resources/test => profile/pro}/file.properties (100%)
 rename src/main/{resources/test => profile/pro}/jdbc.properties (82%)
 rename src/main/{resources => profile}/pro/log4j.properties (100%)
 rename src/main/{resources/test => profile/pro}/redis.properties (100%)
 rename src/main/{resources => profile}/test/email.properties (100%)
 create mode 100644 src/main/profile/test/file.properties
 rename src/main/{resources/pro => profile/test}/jdbc.properties (74%)
 rename src/main/{resources => profile}/test/log4j.properties (100%)
 rename src/main/{resources/pro => profile/test}/redis.properties (82%)
 delete mode 100644 src/main/resources/ehcache/ehcache-shiro.xml
 delete mode 100644 src/main/resources/ehcache/ehcache.xml
 delete mode 100644 src/main/resources/pro/file.properties

diff --git a/pom.xml b/pom.xml
index e6d29b1..9a744f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -621,7 +621,7 @@
 
     <resources>
       <resource>
-        <directory>${project.basedir}/src/main/resources/${env}</directory>
+        <directory>${project.basedir}/src/main/profile/${env}</directory>
         <includes>
           <include>*</include>
         </includes>
diff --git a/src/main/java/com/lq/code/util/jdbc/JdbcUtils.java b/src/main/java/com/lq/code/util/jdbc/JdbcUtils.java
index d775131..a963764 100755
--- a/src/main/java/com/lq/code/util/jdbc/JdbcUtils.java
+++ b/src/main/java/com/lq/code/util/jdbc/JdbcUtils.java
@@ -12,6 +12,7 @@ import java.util.Properties;
 
 public class JdbcUtils {
 
+
 	private static String driver = null;
 
 	private static String url = null;
diff --git a/src/main/resources/dev/email.properties b/src/main/profile/dev/email.properties
similarity index 100%
rename from src/main/resources/dev/email.properties
rename to src/main/profile/dev/email.properties
diff --git a/src/main/resources/dev/file.properties b/src/main/profile/dev/file.properties
similarity index 100%
rename from src/main/resources/dev/file.properties
rename to src/main/profile/dev/file.properties
diff --git a/src/main/resources/dev/jdbc.properties b/src/main/profile/dev/jdbc.properties
similarity index 100%
rename from src/main/resources/dev/jdbc.properties
rename to src/main/profile/dev/jdbc.properties
diff --git a/src/main/resources/dev/log4j.properties b/src/main/profile/dev/log4j.properties
similarity index 100%
rename from src/main/resources/dev/log4j.properties
rename to src/main/profile/dev/log4j.properties
diff --git a/src/main/resources/dev/redis.properties b/src/main/profile/dev/redis.properties
similarity index 100%
rename from src/main/resources/dev/redis.properties
rename to src/main/profile/dev/redis.properties
diff --git a/src/main/resources/pro/email.properties b/src/main/profile/pro/email.properties
similarity index 100%
rename from src/main/resources/pro/email.properties
rename to src/main/profile/pro/email.properties
diff --git a/src/main/resources/test/file.properties b/src/main/profile/pro/file.properties
similarity index 100%
rename from src/main/resources/test/file.properties
rename to src/main/profile/pro/file.properties
diff --git a/src/main/resources/test/jdbc.properties b/src/main/profile/pro/jdbc.properties
similarity index 82%
rename from src/main/resources/test/jdbc.properties
rename to src/main/profile/pro/jdbc.properties
index 93886b7..cf92f01 100644
--- a/src/main/resources/test/jdbc.properties
+++ b/src/main/profile/pro/jdbc.properties
@@ -1,9 +1,9 @@
-#--------- jdbc ����---------
+#--------- jdbc 配置---------
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://127.0.0.1:3306/ssm?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8
+jdbc.url=jdbc:mysql://localhost:3306/ssm?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8
 jdbc.user=root
 jdbc.password=mysql
-#--------���ݿ����ӳ����� -------
+#--------数据库连接池配置 -------
 durid.pool.initialSize=5  
 durid.pool.maxActive=5 
 durid.pool.minIdle=1  
diff --git a/src/main/resources/pro/log4j.properties b/src/main/profile/pro/log4j.properties
similarity index 100%
rename from src/main/resources/pro/log4j.properties
rename to src/main/profile/pro/log4j.properties
diff --git a/src/main/resources/test/redis.properties b/src/main/profile/pro/redis.properties
similarity index 100%
rename from src/main/resources/test/redis.properties
rename to src/main/profile/pro/redis.properties
diff --git a/src/main/resources/test/email.properties b/src/main/profile/test/email.properties
similarity index 100%
rename from src/main/resources/test/email.properties
rename to src/main/profile/test/email.properties
diff --git a/src/main/profile/test/file.properties b/src/main/profile/test/file.properties
new file mode 100644
index 0000000..70c8c53
--- /dev/null
+++ b/src/main/profile/test/file.properties
@@ -0,0 +1 @@
+file.upload=/Users/qi/java/fileManger/
\ No newline at end of file
diff --git a/src/main/resources/pro/jdbc.properties b/src/main/profile/test/jdbc.properties
similarity index 74%
rename from src/main/resources/pro/jdbc.properties
rename to src/main/profile/test/jdbc.properties
index 537c374..cf92f01 100644
--- a/src/main/resources/pro/jdbc.properties
+++ b/src/main/profile/test/jdbc.properties
@@ -1,9 +1,9 @@
-#--------- jdbc ����---------
+#--------- jdbc 配置---------
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.31.19:3306/ssm?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8
+jdbc.url=jdbc:mysql://localhost:3306/ssm?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8
 jdbc.user=root
 jdbc.password=mysql
-#--------���ݿ����ӳ����� -------
+#--------数据库连接池配置 -------
 durid.pool.initialSize=5  
 durid.pool.maxActive=5 
 durid.pool.minIdle=1  
diff --git a/src/main/resources/test/log4j.properties b/src/main/profile/test/log4j.properties
similarity index 100%
rename from src/main/resources/test/log4j.properties
rename to src/main/profile/test/log4j.properties
diff --git a/src/main/resources/pro/redis.properties b/src/main/profile/test/redis.properties
similarity index 82%
rename from src/main/resources/pro/redis.properties
rename to src/main/profile/test/redis.properties
index d8a745a..80be888 100644
--- a/src/main/resources/pro/redis.properties
+++ b/src/main/profile/test/redis.properties
@@ -1,9 +1,9 @@
-redis.host=192.168.31.19
+redis.host=127.0.0.1
 redis.port=6379
 redis.pass=
 redis.timeout=-1
 
-redis.maxTotal=20
+redis.maxTotal=15
 redis.maxIdle=10
 redis.numTestsPerEvictionRun=1024
 redis.timeBetweenEvictionRunsMillis=30000
diff --git a/src/main/resources/ehcache/ehcache-shiro.xml b/src/main/resources/ehcache/ehcache-shiro.xml
deleted file mode 100644
index 4c674d5..0000000
--- a/src/main/resources/ehcache/ehcache-shiro.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<ehcache updateCheck="false" name="shiroCache">
-
-    <defaultCache
-            maxElementsInMemory="10000"
-            eternal="false"
-            timeToIdleSeconds="120"
-            timeToLiveSeconds="120"
-            overflowToDisk="false"
-            diskPersistent="false"
-            diskExpiryThreadIntervalSeconds="120"
-    />
-
-    <cache name="sessioncache"
-           maxElementsInMemory="1000"
-           eternal="false"
-           overflowToDisk="true"
-           timeToIdleSeconds="0"
-           timeToLiveSeconds="200"/>
-
-</ehcache>
\ No newline at end of file
diff --git a/src/main/resources/ehcache/ehcache.xml b/src/main/resources/ehcache/ehcache.xml
deleted file mode 100644
index e7f5ae7..0000000
--- a/src/main/resources/ehcache/ehcache.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ehcache>
-    <!-- 指定一个文件目录，当EhCache把数据写到硬盘上时，将把数据写到这个文件目录下 -->
-    <diskStore path="java.io.tmpdir"/>
-
-    <!-- 设定缓存的默认数据过期策略 -->
-    <defaultCache
-            maxElementsInMemory="10000"
-            eternal="false"
-            overflowToDisk="true"
-            timeToIdleSeconds="10"
-            timeToLiveSeconds="20"
-            diskPersistent="false"
-            diskExpiryThreadIntervalSeconds="120"/>
-
-    <cache name="cacheTest"
-           maxElementsInMemory="1000"
-           eternal="false"
-           overflowToDisk="true"
-           timeToIdleSeconds="0"
-           timeToLiveSeconds="200"/>
-
-
-
-</ehcache>
\ No newline at end of file
diff --git a/src/main/resources/pro/file.properties b/src/main/resources/pro/file.properties
deleted file mode 100644
index 6c6a3a8..0000000
--- a/src/main/resources/pro/file.properties
+++ /dev/null
@@ -1 +0,0 @@
-file.upload=/home/nfs/fileManger/
\ No newline at end of file