升级各个jar的版本

ff8598d7 · stylefeng · 7bfead66 · ff8598d7 · ff8598d7 · ff8598d7
Commit ff8598d7 authored Jun 27, 2018 by stylefeng
8 changed files
--- a/guns-admin/pom.xml
+++ b/guns-admin/pom.xml
@@ -31,10 +31,6 @@
        <!--spring boot依赖-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>
        <dependency>
@@ -97,10 +93,6 @@
        </dependency>
        -->
        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
            <groupId>com.github.penggle</groupId>
            <artifactId>kaptcha</artifactId>
        </dependency>
@@ -120,10 +112,7 @@
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
    </dependencies>
    <build>

--- a/guns-admin/src/main/resources/META-INF/spring-devtools.properties
+++ b/guns-admin/src/main/resources/META-INF/spring-devtools.properties
-restart.include.beetl=/beetl-2.7.15.jar
+restart.include.beetl=/beetl-2.8.5.jar
\ No newline at end of file
--- a/guns-admin/src/main/resources/application.yml
+++ b/guns-admin/src/main/resources/application.yml
@@ -69,7 +69,7 @@ mybatis-plus:
 spring:
  profiles: local
  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/guns?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    url: jdbc:mysql://127.0.0.1:3306/guns?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=UTC
    username: root
    password: root
    db-name: guns
@@ -78,7 +78,7 @@ spring:
 #多数据源配置
 guns:
  muti-datasource:
-    url: jdbc:mysql://127.0.0.1:3306/guns2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    url: jdbc:mysql://127.0.0.1:3306/guns2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=UTC
    username: root
    password: root
    defaultDataSourceName: dataSourceGuns #默认的数据源名称
@@ -88,7 +88,7 @@ guns:
 spring:
  profiles: produce
  datasource:
-      url: jdbc:mysql://127.0.0.1:3306/guns?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+      url: jdbc:mysql://127.0.0.1:3306/guns?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=UTC
      username: root
      password: root
      filters: wall,mergeStat

--- a/guns-core/src/main/java/com/stylefeng/guns/core/datasource/DruidProperties.java
+++ b/guns-core/src/main/java/com/stylefeng/guns/core/datasource/DruidProperties.java
@@ -22,7 +22,7 @@ public class DruidProperties {
    private String password = "root";
-    private String driverClassName = "com.mysql.jdbc.Driver";
+    private String driverClassName = "com.mysql.cj.jdbc.Driver";
    private Integer initialSize = 2;

--- a/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java
+++ b/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java
 /**
 * Copyright (c) 2015-2016, Chill Zhuang 庄骞 (smallchill@163.com).
- *
+ * <p>
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
- *
+ * <p>
 * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -151,7 +151,7 @@ public class DateUtil {
     * @return
     */
    public static Date parseDate(String date) {
-		return parse(date,"yyyy-MM-dd");
+        return parse(date, "yyyy-MM-dd");
    }
    /**
@@ -160,7 +160,7 @@ public class DateUtil {
     * @return
     */
    public static Date parseTime(String date) {
-		return parse(date,"yyyy-MM-dd HH:mm:ss");
+        return parse(date, "yyyy-MM-dd HH:mm:ss");
    }
    /**
@@ -170,13 +170,17 @@ public class DateUtil {
     */
    public static Date parse(String date, String pattern) {
        try {
-			return DateUtils.parseDate(date,pattern);
+            return DateUtils.parseDate(date, pattern);
        } catch (ParseException e) {
            e.printStackTrace();
            return null;
        }
    }
    /**
     * 格式化日期
     *
@@ -291,19 +295,6 @@ public class DateUtil {
        return dateStr;
    }
-	/**
-	 * 格式化Oracle Date
-	 * @param value
-	 * @return
-	 */
-//	public static String buildDateValue(Object value){
-//		if(Func.isOracle()){
-//			return "to_date('"+ value +"','yyyy-mm-dd HH24:MI:SS')";
-//		}else{
-//			return Func.toStr(value);
-//		}
-//	}
    public static void main(String[] args) {
        System.out.println(getTime(new Date()));
        System.out.println(getAfterDayWeek("3"));

--- a/guns-generator/pom.xml
+++ b/guns-generator/pom.xml
@@ -25,6 +25,10 @@
            <groupId>com.ibeetl</groupId>
            <artifactId>beetl</artifactId>
        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generate</artifactId>
+        </dependency>
    </dependencies>

--- a/guns-rest/src/main/java/com/stylefeng/guns/rest/GunsRestServletInitializer.java
+++ b/guns-rest/src/main/java/com/stylefeng/guns/rest/GunsRestServletInitializer.java
 package com.stylefeng.guns.rest;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 /**
 * Guns REST Web程序启动类

--- a/pom.xml
+++ b/pom.xml
@@ -28,20 +28,19 @@
        <guns.version>1.0.0-SNAPSHOT</guns.version>
        <mybatisplus-spring-boot-starter.version>1.0.5</mybatisplus-spring-boot-starter.version>
        <shiro.version>1.4.0</shiro.version>
-        <mybatis-plus.version>2.1.8</mybatis-plus.version>
+        <mybatis-plus.version>2.3</mybatis-plus.version>
-        <fastjson.version>1.2.44</fastjson.version>
+        <fastjson.version>1.2.47</fastjson.version>
-        <commons.io.version>2.5</commons.io.version>
        <velocity.version>1.7</velocity.version>
        <kaptcha.version>2.3.2</kaptcha.version>
        <ehcache.version>3.3.1</ehcache.version>
        <zxing.version>3.2.1</zxing.version>
-        <druid.version>1.1.6</druid.version>
+        <druid.version>1.1.10</druid.version>
-        <beetl.version>2.7.15</beetl.version>
+        <beetl.version>2.8.5</beetl.version>
-        <swagger.version>2.2.2</swagger.version>
+        <swagger.version>2.9.2</swagger.version>
-        <commons-lang3.version>3.6</commons-lang3.version>
+        <commons-lang3.version>3.7</commons-lang3.version>
        <ehcache.core.version>2.6.11</ehcache.core.version>
-        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
+        <mysql-connector-java.version>6.0.6</mysql-connector-java.version>
-        <jwt.version>0.7.0</jwt.version>
+        <jwt.version>0.9.0</jwt.version>
        <hutool.version>4.1.1</hutool.version>
    </properties>
@@ -97,6 +96,11 @@
                <version>${mybatis-plus.version}</version>
            </dependency>
            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-generate</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+            <dependency>
                <groupId>com.alibaba</groupId>
                <artifactId>fastjson</artifactId>
                <version>${fastjson.version}</version>
@@ -107,11 +111,6 @@
                <version>${druid.version}</version>
            </dependency>
            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons.io.version}</version>
-            </dependency>
-            <dependency>
                <groupId>com.github.penggle</groupId>
                <artifactId>kaptcha</artifactId>
                <version>${kaptcha.version}</version>
@@ -163,12 +162,7 @@
            </dependency>
            <dependency>
                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-core</artifactId>
+                <artifactId>hutool-all</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-http</artifactId>
                <version>${hutool.version}</version>
            </dependency>
        </dependencies>