Skip to content

G
guns-vip
Commit ff8598d7 by stylefeng
Options

升级各个jar的版本

parent 7bfead66
Showing with 299 additions and 321 deletions
guns-admin/pom.xml
...@@ -31,10 +31,6 @@ ...@@ -31,10 +31,6 @@
<!--spring boot依赖--> <!--spring boot依赖-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <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> <artifactId>spring-boot-starter-aop</artifactId>
</dependency> </dependency>
<dependency> <dependency>
...@@ -97,10 +93,6 @@ ...@@ -97,10 +93,6 @@
</dependency> </dependency>
--> -->
<dependency> <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>com.github.penggle</groupId> <groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId> <artifactId>kaptcha</artifactId>
</dependency> </dependency>
...@@ -120,10 +112,7 @@ ...@@ -120,10 +112,7 @@
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
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 \ No newline at end of file
guns-admin/src/main/resources/application.yml
...@@ -69,7 +69,7 @@ mybatis-plus: ...@@ -69,7 +69,7 @@ mybatis-plus:
spring: spring:
profiles: local profiles: local
datasource: 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 username: root
password: root password: root
db-name: guns db-name: guns
...@@ -78,7 +78,7 @@ spring: ...@@ -78,7 +78,7 @@ spring:
#多数据源配置 #多数据源配置
guns: guns:
muti-datasource: 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 username: root
password: root password: root
defaultDataSourceName: dataSourceGuns #默认的数据源名称 defaultDataSourceName: dataSourceGuns #默认的数据源名称
...@@ -88,7 +88,7 @@ guns: ...@@ -88,7 +88,7 @@ guns:
spring: spring:
profiles: produce profiles: produce
datasource: 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 username: root
password: root password: root
filters: wall,mergeStat filters: wall,mergeStat
......
guns-core/src/main/java/com/stylefeng/guns/core/datasource/DruidProperties.java
...@@ -22,7 +22,7 @@ public class DruidProperties { ...@@ -22,7 +22,7 @@ public class DruidProperties {
private String password = "root"; private String password = "root";
private String driverClassName = "com.mysql.jdbc.Driver"; private String driverClassName = "com.mysql.cj.jdbc.Driver";
private Integer initialSize = 2; private Integer initialSize = 2;
......
guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java
/** /**
* Copyright (c) 2015-2016, Chill Zhuang 庄骞 (smallchill@163.com). * Copyright (c) 2015-2016, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* * <p>
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* * <p>
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
...@@ -29,284 +29,275 @@ import java.util.Date; ...@@ -29,284 +29,275 @@ import java.util.Date;
public class DateUtil { public class DateUtil {
/** /**
* 获取YYYY格式 * 获取YYYY格式
* *
* @return * @return
*/ */
public static String getYear() { public static String getYear() {
return formatDate(new Date(), "yyyy"); return formatDate(new Date(), "yyyy");
} }
/** /**
* 获取YYYY格式 * 获取YYYY格式
* *
* @return * @return
*/ */
public static String getYear(Date date) { public static String getYear(Date date) {
return formatDate(date, "yyyy"); return formatDate(date, "yyyy");
} }
/** /**
* 获取YYYY-MM-DD格式 * 获取YYYY-MM-DD格式
* *
* @return * @return
*/ */
public static String getDay() { public static String getDay() {
return formatDate(new Date(), "yyyy-MM-dd"); return formatDate(new Date(), "yyyy-MM-dd");
} }
/** /**
* 获取YYYY-MM-DD格式 * 获取YYYY-MM-DD格式
* *
* @return * @return
*/ */
public static String getDay(Date date) { public static String getDay(Date date) {
return formatDate(date, "yyyy-MM-dd"); return formatDate(date, "yyyy-MM-dd");
} }
/** /**
* 获取YYYYMMDD格式 * 获取YYYYMMDD格式
* *
* @return * @return
*/ */
public static String getDays() { public static String getDays() {
return formatDate(new Date(), "yyyyMMdd"); return formatDate(new Date(), "yyyyMMdd");
} }
/** /**
* 获取YYYYMMDD格式 * 获取YYYYMMDD格式
* *
* @return * @return
*/ */
public static String getDays(Date date) { public static String getDays(Date date) {
return formatDate(date, "yyyyMMdd"); return formatDate(date, "yyyyMMdd");
} }
/** /**
* 获取YYYY-MM-DD HH:mm:ss格式 * 获取YYYY-MM-DD HH:mm:ss格式
* *
* @return * @return
*/ */
public static String getTime() { public static String getTime() {
return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"); return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss");
} }
/** /**
* 获取YYYY-MM-DD HH:mm:ss.SSS格式 * 获取YYYY-MM-DD HH:mm:ss.SSS格式
* *
* @return * @return
*/ */
public static String getMsTime() { public static String getMsTime() {
return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"); return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
} }
/** /**
* 获取YYYYMMDDHHmmss格式 * 获取YYYYMMDDHHmmss格式
* *
* @return * @return
*/ */
public static String getAllTime() { public static String getAllTime() {
return formatDate(new Date(), "yyyyMMddHHmmss"); return formatDate(new Date(), "yyyyMMddHHmmss");
} }
/** /**
* 获取YYYY-MM-DD HH:mm:ss格式 * 获取YYYY-MM-DD HH:mm:ss格式
* *
* @return * @return
*/ */
public static String getTime(Date date) { public static String getTime(Date date) {
return formatDate(date, "yyyy-MM-dd HH:mm:ss"); return formatDate(date, "yyyy-MM-dd HH:mm:ss");
} }
public static String formatDate(Date date, String pattern) { public static String formatDate(Date date, String pattern) {
String formatDate = null; String formatDate = null;
if (StringUtils.isNotBlank(pattern)) { if (StringUtils.isNotBlank(pattern)) {
formatDate = DateFormatUtils.format(date, pattern); formatDate = DateFormatUtils.format(date, pattern);
} else { } else {
formatDate = DateFormatUtils.format(date, "yyyy-MM-dd"); formatDate = DateFormatUtils.format(date, "yyyy-MM-dd");
} }
return formatDate; return formatDate;
} }
/** /**
* @Title: compareDate * @Title: compareDate
* @Description:(日期比较，如果s>=e 返回true 否则返回false) * @Description:(日期比较，如果s>=e 返回true 否则返回false)
* @param s * @param s
* @param e * @param e
* @return boolean * @return boolean
* @throws * @throws
* @author luguosui * @author luguosui
*/ */
public static boolean compareDate(String s, String e) { public static boolean compareDate(String s, String e) {
if (parseDate(s) == null || parseDate(e) == null) { if (parseDate(s) == null || parseDate(e) == null) {
return false; return false;
} }
return parseDate(s).getTime() >= parseDate(e).getTime(); return parseDate(s).getTime() >= parseDate(e).getTime();
} }
/** /**
* 格式化日期 * 格式化日期
* *
* @return * @return
*/ */
public static Date parseDate(String date) { public static Date parseDate(String date) {
return parse(date,"yyyy-MM-dd"); return parse(date, "yyyy-MM-dd");
} }
/** /**
* 格式化日期 * 格式化日期
* *
* @return * @return
*/ */
public static Date parseTime(String date) { public static Date parseTime(String date) {
return parse(date,"yyyy-MM-dd HH:mm:ss"); return parse(date, "yyyy-MM-dd HH:mm:ss");
} }
/** /**
* 格式化日期 * 格式化日期
* *
* @return * @return
*/ */
public static Date parse(String date, String pattern) { public static Date parse(String date, String pattern) {
try { try {
return DateUtils.parseDate(date,pattern); return DateUtils.parseDate(date, pattern);
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
} }
} }
/**
* 格式化日期
*
* @return
*/ /**
public static String format(Date date, String pattern) { * 格式化日期
return DateFormatUtils.format(date, pattern); *
} * @return
*/
/** public static String format(Date date, String pattern) {
* 把日期转换为Timestamp return DateFormatUtils.format(date, pattern);
* }
* @param date
* @return /**
*/ * 把日期转换为Timestamp
public static Timestamp format(Date date) { *
return new Timestamp(date.getTime()); * @param date
} * @return
*/
/** public static Timestamp format(Date date) {
* 校验日期是否合法 return new Timestamp(date.getTime());
* }
* @return
*/ /**
public static boolean isValidDate(String s) { * 校验日期是否合法
return parse(s, "yyyy-MM-dd HH:mm:ss") != null; *
} * @return
*/
/** public static boolean isValidDate(String s) {
* 校验日期是否合法 return parse(s, "yyyy-MM-dd HH:mm:ss") != null;
* }
* @return
*/ /**
public static boolean isValidDate(String s, String pattern) { * 校验日期是否合法
*
* @return
*/
public static boolean isValidDate(String s, String pattern) {
return parse(s, pattern) != null; return parse(s, pattern) != null;
} }
public static int getDiffYear(String startTime, String endTime) { public static int getDiffYear(String startTime, String endTime) {
DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
try { try {
int years = (int) (((fmt.parse(endTime).getTime() - fmt.parse( int years = (int) (((fmt.parse(endTime).getTime() - fmt.parse(
startTime).getTime()) / (1000 * 60 * 60 * 24)) / 365); startTime).getTime()) / (1000 * 60 * 60 * 24)) / 365);
return years; return years;
} catch (Exception e) { } catch (Exception e) {
// 如果throw java.text.ParseException或者NullPointerException，就说明格式不对 // 如果throw java.text.ParseException或者NullPointerException，就说明格式不对
return 0; return 0;
} }
} }
/** /**
* <li>功能描述：时间相减得到天数 * <li>功能描述：时间相减得到天数
* *
* @param beginDateStr * @param beginDateStr
* @param endDateStr * @param endDateStr
* @return long * @return long
* @author Administrator * @author Administrator
*/ */
public static long getDaySub(String beginDateStr, String endDateStr) { public static long getDaySub(String beginDateStr, String endDateStr) {
long day = 0; long day = 0;
SimpleDateFormat format = new SimpleDateFormat( SimpleDateFormat format = new SimpleDateFormat(
"yyyy-MM-dd"); "yyyy-MM-dd");
Date beginDate = null; Date beginDate = null;
Date endDate = null; Date endDate = null;
try { try {
beginDate = format.parse(beginDateStr); beginDate = format.parse(beginDateStr);
endDate = format.parse(endDateStr); endDate = format.parse(endDateStr);
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }
day = (endDate.getTime() - beginDate.getTime()) / (24 * 60 * 60 * 1000); day = (endDate.getTime() - beginDate.getTime()) / (24 * 60 * 60 * 1000);
// System.out.println("相隔的天数="+day); // System.out.println("相隔的天数="+day);
return day; return day;
} }
/** /**
* 得到n天之后的日期 * 得到n天之后的日期
* *
* @param days * @param days
* @return * @return
*/ */
public static String getAfterDayDate(String days) { public static String getAfterDayDate(String days) {
int daysInt = Integer.parseInt(days); int daysInt = Integer.parseInt(days);
Calendar canlendar = Calendar.getInstance(); // java.util包 Calendar canlendar = Calendar.getInstance(); // java.util包
canlendar.add(Calendar.DATE, daysInt); // 日期减 如果不够减会将月变动 canlendar.add(Calendar.DATE, daysInt); // 日期减 如果不够减会将月变动
Date date = canlendar.getTime(); Date date = canlendar.getTime();
SimpleDateFormat sdfd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdfd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateStr = sdfd.format(date); String dateStr = sdfd.format(date);
return dateStr; return dateStr;
} }
/** /**
* 得到n天之后是周几 * 得到n天之后是周几
* *
* @param days * @param days
* @return * @return
*/ */
public static String getAfterDayWeek(String days) { public static String getAfterDayWeek(String days) {
int daysInt = Integer.parseInt(days); int daysInt = Integer.parseInt(days);
Calendar canlendar = Calendar.getInstance(); // java.util包 Calendar canlendar = Calendar.getInstance(); // java.util包
canlendar.add(Calendar.DATE, daysInt); // 日期减 如果不够减会将月变动 canlendar.add(Calendar.DATE, daysInt); // 日期减 如果不够减会将月变动
Date date = canlendar.getTime(); Date date = canlendar.getTime();
SimpleDateFormat sdf = new SimpleDateFormat("E"); SimpleDateFormat sdf = new SimpleDateFormat("E");
String dateStr = sdf.format(date); String dateStr = sdf.format(date);
return dateStr; return dateStr;
} }
/** public static void main(String[] args) {
* 格式化Oracle Date System.out.println(getTime(new Date()));
* @param value System.out.println(getAfterDayWeek("3"));
* @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"));
}
} }
guns-generator/pom.xml
...@@ -25,6 +25,10 @@ ...@@ -25,6 +25,10 @@
<groupId>com.ibeetl</groupId> <groupId>com.ibeetl</groupId>
<artifactId>beetl</artifactId> <artifactId>beetl</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generate</artifactId>
</dependency>
</dependencies> </dependencies>
......
guns-rest/src/main/java/com/stylefeng/guns/rest/GunsRestServletInitializer.java
package com.stylefeng.guns.rest; package com.stylefeng.guns.rest;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
/** /**
* Guns REST Web程序启动类 * Guns REST Web程序启动类
......
pom.xml
...@@ -28,20 +28,19 @@ ...@@ -28,20 +28,19 @@
<guns.version>1.0.0-SNAPSHOT</guns.version> <guns.version>1.0.0-SNAPSHOT</guns.version>
<mybatisplus-spring-boot-starter.version>1.0.5</mybatisplus-spring-boot-starter.version> <mybatisplus-spring-boot-starter.version>1.0.5</mybatisplus-spring-boot-starter.version>
<shiro.version>1.4.0</shiro.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> <velocity.version>1.7</velocity.version>
<kaptcha.version>2.3.2</kaptcha.version> <kaptcha.version>2.3.2</kaptcha.version>
<ehcache.version>3.3.1</ehcache.version> <ehcache.version>3.3.1</ehcache.version>
<zxing.version>3.2.1</zxing.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> <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> <hutool.version>4.1.1</hutool.version>
</properties> </properties>
...@@ -97,6 +96,11 @@ ...@@ -97,6 +96,11 @@
<version>${mybatis-plus.version}</version> <version>${mybatis-plus.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generate</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>${fastjson.version}</version> <version>${fastjson.version}</version>
...@@ -107,11 +111,6 @@ ...@@ -107,11 +111,6 @@
<version>${druid.version}</version> <version>${druid.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>com.github.penggle</groupId> <groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId> <artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version> <version>${kaptcha.version}</version>
...@@ -163,12 +162,7 @@ ...@@ -163,12 +162,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.hutool</groupId> <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> <version>${hutool.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment