diff --git a/.gitignore b/.gitignore index 5618f13338f682039379597620801e24796f56de..c246cfc60ea21d58451e61b355057eb048992c2d 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /src/main/webapp/WEB-INF/classes/* /src/main/webapp/userfiles/* /target/ +/bin/ diff --git a/pom.xml b/pom.xml index 7783dff9e6734e1fdd9d91b01efb0fb55d39e12b..7e9666011aebca5df584acd0d50e72998583fd26 100644 --- a/pom.xml +++ b/pom.xml @@ -43,12 +43,12 @@ 2.3.20 - 5.1.30 + 8.0.18 10.2.0.4.0 1.3.1 - 1.6 + 1.8 2.2 7.6.14.v20131031 8181 @@ -625,6 +625,16 @@ --> + + javax.xml.bind + jaxb-api + 2.3.1 + + + javax.annotation + javax.annotation-api + 1.3.2 + diff --git a/src/main/resources/jeesite.properties b/src/main/resources/jeesite.properties index e29492c639597a08c32ee761c76c6c045dca39c4..2cf7b57a8b98b83d23c43f5e81d13be0a897fc6b 100644 --- a/src/main/resources/jeesite.properties +++ b/src/main/resources/jeesite.properties @@ -11,10 +11,10 @@ #mysql database setting jdbc.type=mysql -jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost:3306/jeesite?useUnicode=true&characterEncoding=utf-8 +jdbc.driver=com.mysql.cj.jdbc.Driver +jdbc.url=jdbc:mysql://192.168.1.106:3306/jeesite?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC jdbc.username=root -jdbc.password=123456 +jdbc.password=root #mssql database settings #jdbc.type=mssql @@ -29,7 +29,7 @@ jdbc.pool.minIdle=3 jdbc.pool.maxActive=20 #jdbc.testSql=SELECT 'x' -jdbc.testSql=SELECT 'x' FROM DUAL +jdbc.testSql=SELECT 1 #redis settings redis.keyPrefix=jeesite