From bfb92fe66712a41d1ac52cee681302f8c35d4f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 19 Jul 2024 17:54:44 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .run/ruoyi-snailjob-server.run.xml            |  4 +--
 pom.xml                                       | 30 -------------------
 ruoyi-modules/ruoyi-generator/pom.xml         |  6 ++++
 .../service/GenTableServiceImpl.java          |  4 +--
 4 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/.run/ruoyi-snailjob-server.run.xml b/.run/ruoyi-snailjob-server.run.xml
index 914809dbf..9198acc55 100644
--- a/.run/ruoyi-snailjob-server.run.xml
+++ b/.run/ruoyi-snailjob-server.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+  <configuration default="false" name="ruoyi-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="演示机">
     <deployment type="dockerfile">
       <settings>
         <option name="imageTag" value="ruoyi/ruoyi-snailjob-server:5.2.1" />
@@ -9,4 +9,4 @@
     </deployment>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5635931ec..059fade3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -341,36 +341,6 @@
                 <version>${fastjson.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.anyline</groupId>
-                <artifactId>anyline-environment-spring-data-jdbc</artifactId>
-                <version>${anyline.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.anyline</groupId>
-                <artifactId>anyline-data-jdbc-mysql</artifactId>
-                <version>${anyline.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.anyline</groupId>
-                <artifactId>anyline-data-jdbc-oracle</artifactId>
-                <version>${anyline.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.anyline</groupId>
-                <artifactId>anyline-data-jdbc-postgresql</artifactId>
-                <version>${anyline.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.anyline</groupId>
-                <artifactId>anyline-data-jdbc-mssql</artifactId>
-                <version>${anyline.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-system</artifactId>
diff --git a/ruoyi-modules/ruoyi-generator/pom.xml b/ruoyi-modules/ruoyi-generator/pom.xml
index 17099d4a0..b7fd94f59 100644
--- a/ruoyi-modules/ruoyi-generator/pom.xml
+++ b/ruoyi-modules/ruoyi-generator/pom.xml
@@ -51,26 +51,32 @@
         <dependency>
             <groupId>org.anyline</groupId>
             <artifactId>anyline-environment-spring-data-jdbc</artifactId>
+            <version>${anyline.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.anyline</groupId>
             <artifactId>anyline-data-jdbc-mysql</artifactId>
+            <version>${anyline.version}</version>
         </dependency>
 
+        <!-- anyline支持100+种类型数据库 添加对应的jdbc依赖与anyline对应数据库依赖包即可 -->
 <!--        <dependency>-->
 <!--            <groupId>org.anyline</groupId>-->
 <!--            <artifactId>anyline-data-jdbc-oracle</artifactId>-->
+<!--        <version>${anyline.version}</version>-->
 <!--        </dependency>-->
 
 <!--        <dependency>-->
 <!--            <groupId>org.anyline</groupId>-->
 <!--            <artifactId>anyline-data-jdbc-postgresql</artifactId>-->
+<!--        <version>${anyline.version}</version>-->
 <!--        </dependency>-->
 
 <!--        <dependency>-->
 <!--            <groupId>org.anyline</groupId>-->
 <!--            <artifactId>anyline-data-jdbc-mssql</artifactId>-->
+<!--        <version>${anyline.version}</version>-->
 <!--        </dependency>-->
 
     </dependencies>
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
index 6ee23bd64..d7985f628 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
@@ -288,8 +288,8 @@ public class GenTableServiceImpl implements IGenTableService {
             tableColumn.setColumnComment(column.getComment());
             tableColumn.setColumnType(column.getTypeName().toLowerCase());
             tableColumn.setSort(column.getPosition());
-//            tableColumn.setIsRequired();
-//            tableColumn.setIsIncrement();
+            tableColumn.setIsRequired("0");
+            tableColumn.setIsIncrement("0");
             tableColumns.add(tableColumn);
         });
         return tableColumns;