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 @@ - + - + \ 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 @@ ${fastjson.version} - - org.anyline - anyline-environment-spring-data-jdbc - ${anyline.version} - - - - org.anyline - anyline-data-jdbc-mysql - ${anyline.version} - - - - org.anyline - anyline-data-jdbc-oracle - ${anyline.version} - - - - org.anyline - anyline-data-jdbc-postgresql - ${anyline.version} - - - - org.anyline - anyline-data-jdbc-mssql - ${anyline.version} - - org.dromara ruoyi-system 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 @@ org.anyline anyline-environment-spring-data-jdbc + ${anyline.version} org.anyline anyline-data-jdbc-mysql + ${anyline.version} + + + + 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;