From 7d14ed4345146d774c0d8c971bed37ad627c16a7 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Wed, 1 Nov 2023 12:52:05 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20Upgrading=20dependencies.=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=20javers=20mysql=20=E7=AD=89=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E9=81=BF=E5=85=8DCVE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/Dockerfile                                             | 2 +-
 pigx-common/pigx-common-bom/pom.xml                       | 8 ++++----
 .../pigx/codegen/service/impl/GeneratorServiceImpl.java   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/db/Dockerfile b/db/Dockerfile
index ba309758b..3e29b3107 100644
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -1,4 +1,4 @@
-FROM mysql/mysql-server:8.0.32
+FROM mysql/mysql-server:8.0.33
 
 MAINTAINER lengleng(wangiegie@gmail.com)
 
diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 5f293496b..015ce23f7 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -22,8 +22,8 @@
         <mybatis-plus-join.version>1.4.6</mybatis-plus-join.version>
         <dynamic-ds.version>4.1.3</dynamic-ds.version>
         <druid.version>1.2.20</druid.version>
-        <hutool.version>5.8.21</hutool.version>
-        <mysql.connector.version>8.0.32</mysql.connector.version>
+        <hutool.version>5.8.22</hutool.version>
+        <mysql.connector.version>8.0.33</mysql.connector.version>
         <oracle.version>21.3.0.0</oracle.version>
         <sqlserver.version>8.4.1.jre8</sqlserver.version>
         <dm.version>8.1.2.192</dm.version>
@@ -38,12 +38,12 @@
         <jsoup.version>1.13.1</jsoup.version>
         <aviator.version>5.3.3</aviator.version>
         <flowable.version>7.0.0.M1</flowable.version>
-        <security.oauth.version>2.3.6.RELEASE</security.oauth.version>
+        <security.oauth.version>2.5.2.RELEASE</security.oauth.version>
         <fastjson.version>1.2.83</fastjson.version>
         <xxl.job.version>2.3.0</xxl.job.version>
         <aliyun.version>3.0.52.ALL</aliyun.version>
         <aws.version>1.12.261</aws.version>
-        <javers.version>6.10.0</javers.version>
+        <javers.version>7.3.3</javers.version>
         <seata.version>1.6.1</seata.version>
         <asm.version>7.1</asm.version>
         <log4j2.version>2.17.1</log4j2.version>
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java
index 976f849c9..74e359e4a 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java
@@ -313,7 +313,7 @@ public class GeneratorServiceImpl implements GeneratorService {
      * @param dataModel 存储数据的 Map 对象
      * @param table     表信息对象
      */
-    private void setFieldTypeList(Map<String, Object> d ataModel, GenTable table) {
+    private void setFieldTypeList(Map<String, Object> dataModel, GenTable table) {
         // 按字段类型分组，使用 Map 存储不同类型的字段列表
         Map<Boolean, List<GenTableColumnEntity>> typeMap = table.getFieldList()
                 .stream()