= 7 rokov pred
rodič
commit
fa4a9a1ecf
54 zmenil súbory, kde vykonal 3 pridanie a 103 odobranie
  1. 0 42
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/assist/ISqlParser.java
  2. 0 58
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/assist/SqlInfo.java
  3. 0 0
      mybatis-plus-generator/build.gradle
  4. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java
  5. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/InjectionConfig.java
  6. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/ConstVal.java
  7. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/DataSourceConfig.java
  8. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/FileOutConfig.java
  9. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/GlobalConfig.java
  10. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/ITypeConvert.java
  11. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/PackageConfig.java
  12. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java
  13. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/TemplateConfig.java
  14. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java
  15. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/package-info.java
  16. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/converts/MySqlTypeConvert.java
  17. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/converts/OracleTypeConvert.java
  18. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/converts/PostgreSqlTypeConvert.java
  19. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/converts/SqlServerTypeConvert.java
  20. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/package-info.java
  21. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableField.java
  22. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableFill.java
  23. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableInfo.java
  24. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/package-info.java
  25. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/DbColumnType.java
  26. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/DbType.java
  27. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java
  28. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/QuerySQL.java
  29. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/package-info.java
  30. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/AbstractTemplateEngine.java
  31. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/FreemarkerTemplateEngine.java
  32. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/VelocityTemplateEngine.java
  33. 0 0
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/package-info.java
  34. 0 0
      mybatis-plus-generator/src/main/resources/templates/controller.java.ftl
  35. 0 0
      mybatis-plus-generator/src/main/resources/templates/controller.java.vm
  36. 0 0
      mybatis-plus-generator/src/main/resources/templates/entity.java.ftl
  37. 0 0
      mybatis-plus-generator/src/main/resources/templates/entity.java.vm
  38. 0 0
      mybatis-plus-generator/src/main/resources/templates/entity.kt.ftl
  39. 0 0
      mybatis-plus-generator/src/main/resources/templates/entity.kt.vm
  40. 0 0
      mybatis-plus-generator/src/main/resources/templates/mapper.java.ftl
  41. 0 0
      mybatis-plus-generator/src/main/resources/templates/mapper.java.vm
  42. 0 0
      mybatis-plus-generator/src/main/resources/templates/mapper.xml.ftl
  43. 0 0
      mybatis-plus-generator/src/main/resources/templates/mapper.xml.vm
  44. 0 0
      mybatis-plus-generator/src/main/resources/templates/service.java.ftl
  45. 0 0
      mybatis-plus-generator/src/main/resources/templates/service.java.vm
  46. 0 0
      mybatis-plus-generator/src/main/resources/templates/serviceImpl.java.ftl
  47. 0 0
      mybatis-plus-generator/src/main/resources/templates/serviceImpl.java.vm
  48. 0 0
      mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorTest.java
  49. 0 0
      mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/GeneratorTest.java
  50. 0 0
      mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java
  51. 0 0
      mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/PostgreSQLGenerator.java
  52. 0 0
      mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/SQLServerGenerator.java
  53. 2 2
      mybatis-plus/build.gradle
  54. 1 1
      settings.gradle

+ 0 - 42
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/assist/ISqlParser.java

@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2011-2020, hubin (jobob@qq.com).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.baomidou.mybatisplus.core.assist;
-
-import org.apache.ibatis.reflection.MetaObject;
-
-/**
- * <p>
- * SQL 解析接口
- * </p>
- *
- * @author hubin
- * @Date 2017-09-01
- */
-public interface ISqlParser {
-
-    /**
-     * <p>
-     * 获取优化 SQL 方法
-     * </p>
-     *
-     * @param metaObject 元对象
-     * @param sql        SQL 语句
-     * @return SQL 信息
-     */
-    //TODO 3.0 change name
-    SqlInfo optimizeSql(MetaObject metaObject, String sql);
-
-}

+ 0 - 58
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/assist/SqlInfo.java

@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2011-2020, hubin (jobob@qq.com).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.baomidou.mybatisplus.core.assist;
-
-/**
- * <p>
- * Sql Info
- * </p>
- *
- * @author hubin
- * @Date 2017-06-20
- */
-public class SqlInfo {
-
-    /**
-     * SQL 内容
-     */
-    private String sql;
-    /**
-     * 是否排序
-     */
-    private boolean orderBy = true;
-
-    public static SqlInfo newInstance() {
-        return new SqlInfo();
-    }
-
-    public String getSql() {
-        return sql;
-    }
-
-    public SqlInfo setSql(String sql) {
-        this.sql = sql;
-        return this;
-    }
-
-    public boolean isOrderBy() {
-        return orderBy;
-    }
-
-    public SqlInfo setOrderBy(boolean orderBy) {
-        this.orderBy = orderBy;
-        return this;
-    }
-}

+ 0 - 0
mybatis-plus-generate/build.gradle → mybatis-plus-generator/build.gradle


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/InjectionConfig.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/InjectionConfig.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/ConstVal.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/ConstVal.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/DataSourceConfig.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/DataSourceConfig.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/FileOutConfig.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/FileOutConfig.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/GlobalConfig.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/GlobalConfig.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/ITypeConvert.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/ITypeConvert.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/PackageConfig.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/PackageConfig.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/TemplateConfig.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/TemplateConfig.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/builder/package-info.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/package-info.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/converts/MySqlTypeConvert.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/converts/MySqlTypeConvert.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/converts/OracleTypeConvert.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/converts/OracleTypeConvert.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/converts/PostgreSqlTypeConvert.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/converts/PostgreSqlTypeConvert.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/converts/SqlServerTypeConvert.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/converts/SqlServerTypeConvert.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/package-info.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/package-info.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableField.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableField.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableFill.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableFill.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableInfo.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableInfo.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/po/package-info.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/package-info.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/rules/DbColumnType.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/DbColumnType.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/rules/DbType.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/DbType.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/rules/QuerySQL.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/QuerySQL.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/rules/package-info.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/package-info.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/engine/AbstractTemplateEngine.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/AbstractTemplateEngine.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/engine/FreemarkerTemplateEngine.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/FreemarkerTemplateEngine.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/engine/VelocityTemplateEngine.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/VelocityTemplateEngine.java


+ 0 - 0
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/package-info.java → mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/package-info.java


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/controller.java.ftl → mybatis-plus-generator/src/main/resources/templates/controller.java.ftl


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/controller.java.vm → mybatis-plus-generator/src/main/resources/templates/controller.java.vm


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/entity.java.ftl → mybatis-plus-generator/src/main/resources/templates/entity.java.ftl


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/entity.java.vm → mybatis-plus-generator/src/main/resources/templates/entity.java.vm


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/entity.kt.ftl → mybatis-plus-generator/src/main/resources/templates/entity.kt.ftl


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/entity.kt.vm → mybatis-plus-generator/src/main/resources/templates/entity.kt.vm


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/mapper.java.ftl → mybatis-plus-generator/src/main/resources/templates/mapper.java.ftl


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/mapper.java.vm → mybatis-plus-generator/src/main/resources/templates/mapper.java.vm


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/mapper.xml.ftl → mybatis-plus-generator/src/main/resources/templates/mapper.xml.ftl


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/mapper.xml.vm → mybatis-plus-generator/src/main/resources/templates/mapper.xml.vm


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/service.java.ftl → mybatis-plus-generator/src/main/resources/templates/service.java.ftl


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/service.java.vm → mybatis-plus-generator/src/main/resources/templates/service.java.vm


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/serviceImpl.java.ftl → mybatis-plus-generator/src/main/resources/templates/serviceImpl.java.ftl


+ 0 - 0
mybatis-plus-generate/src/main/resources/templates/serviceImpl.java.vm → mybatis-plus-generator/src/main/resources/templates/serviceImpl.java.vm


+ 0 - 0
mybatis-plus-generate/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorTest.java → mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorTest.java


+ 0 - 0
mybatis-plus-generate/src/test/java/com/baomidou/mybatisplus/test/generator/GeneratorTest.java → mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/GeneratorTest.java


+ 0 - 0
mybatis-plus-generate/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java → mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java


+ 0 - 0
mybatis-plus-generate/src/test/java/com/baomidou/mybatisplus/test/generator/PostgreSQLGenerator.java → mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/PostgreSQLGenerator.java


+ 0 - 0
mybatis-plus-generate/src/test/java/com/baomidou/mybatisplus/test/generator/SQLServerGenerator.java → mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/SQLServerGenerator.java


+ 2 - 2
mybatis-plus/build.gradle

@@ -1,5 +1,5 @@
 dependencies{
 dependencies{
-    compile project(":mybatis-plus-core")
-    compile project(":mybatis-plus-generate")
+    compile project(":mybatis-plus-extension")
+    compile project(":mybatis-plus-generator")
 
 
 }
 }

+ 1 - 1
settings.gradle

@@ -3,7 +3,7 @@ include 'mybatis-plus'
 include 'mybatis-plus-core'
 include 'mybatis-plus-core'
 include 'mybatis-plus-annotations'
 include 'mybatis-plus-annotations'
 include 'mybatis-plus-extension'
 include 'mybatis-plus-extension'
-include 'mybatis-plus-generate'
+include 'mybatis-plus-generator'
 include 'buildSrc'
 include 'buildSrc'