diff --git a/pom.xml b/pom.xml index e6d29b1..9a744f5 100644 --- a/pom.xml +++ b/pom.xml @@ -621,7 +621,7 @@ - ${project.basedir}/src/main/resources/${env} + ${project.basedir}/src/main/profile/${env} * 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 @@ - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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