diff --git a/op-modules/op-file/src/main/java/com/op/file/config/MinioConfig.java b/op-modules/op-file/src/main/java/com/op/file/config/MinioConfig.java
index ea37322a..9a0881ea 100644
--- a/op-modules/op-file/src/main/java/com/op/file/config/MinioConfig.java
+++ b/op-modules/op-file/src/main/java/com/op/file/config/MinioConfig.java
@@ -69,4 +69,5 @@ public class MinioConfig {
public MinioClient getMinioClient() {
return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
}
+
}
diff --git a/op-modules/op-gen/pom.xml b/op-modules/op-gen/pom.xml
index b41b04d5..103cb326 100644
--- a/op-modules/op-gen/pom.xml
+++ b/op-modules/op-gen/pom.xml
@@ -59,12 +59,7 @@
mysql
mysql-connector-java
-
-
- com.microsoft.sqlserver
- mssql-jdbc
- 6.1.0.jre8
-
+
com.op
diff --git a/op-modules/op-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/op-modules/op-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index 59be5cff..c52bf3a6 100644
--- a/op-modules/op-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/op-modules/op-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -1,7 +1,7 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
@@ -40,53 +40,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ select column_name, (case when (is_nullable = 'no' column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
+ from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
+ order by ordinal_position
+
insert into gen_table_column (
- table_id,
- column_name,
- column_comment,
- column_type,
- java_type,
- java_field,
- is_pk,
- is_increment,
- is_required,
- is_insert,
- is_edit,
- is_list,
- is_query,
- query_type,
- html_type,
- dict_type,
- sort,
- create_by,
- create_time
- )values(
- #{tableId},
- #{columnName},
- (select SUBSTRING_INDEX(#{columnComment}, ' ', 1)),
- #{columnType},
- #{javaType},
- #{javaField},
- #{isPk},
- #{isIncrement},
- #{isRequired},
- #{isInsert},
- #{isEdit},
- #{isList},
- #{isQuery},
- #{queryType},
- #{htmlType},
- #{dictType},
- #{sort},
- #{createBy},
- GETDATE()
- )
+ table_id,
+ column_name,
+ column_comment,
+ column_type,
+ java_type,
+ java_field,
+ is_pk,
+ is_increment,
+ is_required,
+ is_insert,
+ is_edit,
+ is_list,
+ is_query,
+ query_type,
+ html_type,
+ dict_type,
+ sort,
+ create_by,
+ create_time
+ )values(
+ #{tableId},
+ #{columnName},
+ (select SUBSTRING_INDEX(#{columnComment}, ' ', 1)),
+ #{columnType},
+ #{javaType},
+ #{javaField},
+ #{isPk},
+ #{isIncrement},
+ #{isRequired},
+ #{isInsert},
+ #{isEdit},
+ #{isList},
+ #{isQuery},
+ #{queryType},
+ #{htmlType},
+ #{dictType},
+ #{sort},
+ #{createBy},
+ sysdate()
+ )
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dict_type = #{dictType},
sort = #{sort},
update_by = #{updateBy},
- update_time = GETDATE()
+ update_time = sysdate()
where column_id = #{columnId}
diff --git a/op-modules/op-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/op-modules/op-gen/src/main/resources/mapper/generator/GenTableMapper.xml
index aa5fa8ac..d76a0607 100644
--- a/op-modules/op-gen/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/op-modules/op-gen/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -1,11 +1,11 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -29,35 +29,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
-
+ select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
+
-
diff --git a/op-modules/op-job/op-modules-job.iml b/op-modules/op-job/op-modules-job.iml
index 767ff666..e40fd0ce 100644
--- a/op-modules/op-job/op-modules-job.iml
+++ b/op-modules/op-job/op-modules-job.iml
@@ -30,7 +30,6 @@
-
@@ -106,6 +105,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -146,7 +173,6 @@
-
diff --git a/op-modules/op-mes/op-modules-mes.iml b/op-modules/op-mes/op-modules-mes.iml
index 98be0bca..87189627 100644
--- a/op-modules/op-mes/op-modules-mes.iml
+++ b/op-modules/op-mes/op-modules-mes.iml
@@ -30,7 +30,6 @@
-
@@ -104,6 +103,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -149,7 +176,6 @@
-
diff --git a/op-modules/op-system/op-modules-system.iml b/op-modules/op-system/op-modules-system.iml
index 98be0bca..87189627 100644
--- a/op-modules/op-system/op-modules-system.iml
+++ b/op-modules/op-system/op-modules-system.iml
@@ -30,7 +30,6 @@
-
@@ -104,6 +103,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -149,7 +176,6 @@
-