Maven依赖版本升级

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberExample.java

@@ -13,7 +13,7 @@ public class UmsMemberExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -70,7 +70,7 @@ public class UmsMemberExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -117,7 +117,7 @@ public class UmsMemberExample {
             if (values == null || values.size() == 0) {
                 throw new RuntimeException("Value list for " + property + " cannot be null or empty");
             }
-            List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
+            List<java.sql.Date> dateList = new ArrayList<>();
             Iterator<Date> iter = values.iterator();
             while (iter.hasNext()) {
                 dateList.add(new java.sql.Date(iter.next().getTime()));
@@ -1354,7 +1354,6 @@ public class UmsMemberExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevelExample.java

@@ -12,7 +12,7 @@ public class UmsMemberLevelExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberLevelExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class UmsMemberLevelExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -907,7 +907,6 @@ public class UmsMemberLevelExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLogExample.java

@@ -12,7 +12,7 @@ public class UmsMemberLoginLogExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberLoginLogExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class UmsMemberLoginLogExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -557,7 +557,6 @@ public class UmsMemberLoginLogExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberMemberTagRelationExample.java

@@ -11,7 +11,7 @@ public class UmsMemberMemberTagRelationExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberMemberTagRelationExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class UmsMemberMemberTagRelationExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -286,7 +286,6 @@ public class UmsMemberMemberTagRelationExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberProductCategoryRelationExample.java

@@ -11,7 +11,7 @@ public class UmsMemberProductCategoryRelationExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberProductCategoryRelationExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class UmsMemberProductCategoryRelationExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -286,7 +286,6 @@ public class UmsMemberProductCategoryRelationExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddressExample.java

@@ -11,7 +11,7 @@ public class UmsMemberReceiveAddressExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberReceiveAddressExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class UmsMemberReceiveAddressExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -776,7 +776,6 @@ public class UmsMemberReceiveAddressExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSettingExample.java

@@ -12,7 +12,7 @@ public class UmsMemberRuleSettingExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberRuleSettingExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class UmsMemberRuleSettingExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -527,7 +527,6 @@ public class UmsMemberRuleSettingExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfoExample.java

@@ -13,7 +13,7 @@ public class UmsMemberStatisticsInfoExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberStatisticsInfoExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -70,7 +70,7 @@ public class UmsMemberStatisticsInfoExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -1068,7 +1068,6 @@ public class UmsMemberStatisticsInfoExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTagExample.java

@@ -12,7 +12,7 @@ public class UmsMemberTagExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberTagExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class UmsMemberTagExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -357,7 +357,6 @@ public class UmsMemberTagExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTaskExample.java

@@ -11,7 +11,7 @@ public class UmsMemberTaskExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberTaskExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class UmsMemberTaskExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -416,7 +416,6 @@ public class UmsMemberTaskExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsMenuExample.java

@@ -12,7 +12,7 @@ public class UmsMenuExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMenuExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class UmsMenuExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -677,7 +677,6 @@ public class UmsMenuExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsPermissionExample.java

@@ -12,7 +12,7 @@ public class UmsPermissionExample {
     protected List<Criteria> oredCriteria;
 
     public UmsPermissionExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class UmsPermissionExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -747,7 +747,6 @@ public class UmsPermissionExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsResourceCategoryExample.java

@@ -12,7 +12,7 @@ public class UmsResourceCategoryExample {
     protected List<Criteria> oredCriteria;
 
     public UmsResourceCategoryExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class UmsResourceCategoryExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -357,7 +357,6 @@ public class UmsResourceCategoryExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsResourceExample.java

@@ -12,7 +12,7 @@ public class UmsResourceExample {
     protected List<Criteria> oredCriteria;
 
     public UmsResourceExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class UmsResourceExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -497,7 +497,6 @@ public class UmsResourceExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsRoleExample.java

@@ -12,7 +12,7 @@ public class UmsRoleExample {
     protected List<Criteria> oredCriteria;
 
     public UmsRoleExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class UmsRoleExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -547,7 +547,6 @@ public class UmsRoleExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsRoleMenuRelationExample.java

@@ -11,7 +11,7 @@ public class UmsRoleMenuRelationExample {
     protected List<Criteria> oredCriteria;
 
     public UmsRoleMenuRelationExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class UmsRoleMenuRelationExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -286,7 +286,6 @@ public class UmsRoleMenuRelationExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsRolePermissionRelationExample.java

@@ -11,7 +11,7 @@ public class UmsRolePermissionRelationExample {
     protected List<Criteria> oredCriteria;
 
     public UmsRolePermissionRelationExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class UmsRolePermissionRelationExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -286,7 +286,6 @@ public class UmsRolePermissionRelationExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/UmsRoleResourceRelationExample.java

@@ -11,7 +11,7 @@ public class UmsRoleResourceRelationExample {
     protected List<Criteria> oredCriteria;
 
     public UmsRoleResourceRelationExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class UmsRoleResourceRelationExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -286,7 +286,6 @@ public class UmsRoleResourceRelationExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

pom.xml

@@ -33,16 +33,16 @@
         <skipTests>true</skipTests>
         <docker.host>http://192.168.3.101:2375</docker.host>
         <docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
-        <pagehelper-starter.version>1.2.10</pagehelper-starter.version>
-        <pagehelper.version>5.1.8</pagehelper.version>
-        <druid.version>1.1.10</druid.version>
-        <hutool.version>4.5.7</hutool.version>
+        <pagehelper-starter.version>1.3.0</pagehelper-starter.version>
+        <pagehelper.version>5.2.0</pagehelper.version>
+        <druid.version>1.1.23</druid.version>
+        <hutool.version>5.4.0</hutool.version>
         <swagger2.version>2.9.2</swagger2.version>
         <swagger-models.version>1.6.0</swagger-models.version>
         <swagger-annotations.version>1.6.0</swagger-annotations.version>
-        <mybatis-generator.version>1.3.7</mybatis-generator.version>
-        <mybatis.version>3.4.6</mybatis.version>
-        <mysql-connector.version>8.0.16</mysql-connector.version>
+        <mybatis-generator.version>1.4.0</mybatis-generator.version>
+        <mybatis.version>3.5.5</mybatis.version>
+        <mysql-connector.version>8.0.20</mysql-connector.version>
         <spring-data-commons.version>2.3.0.RELEASE</spring-data-commons.version>
         <jjwt.version>0.9.0</jjwt.version>
         <aliyun-oss.version>2.5.0</aliyun-oss.version>