From 9d2c4af54f0c8ce498bf00216825192cee21dab4 Mon Sep 17 00:00:00 2001
From: "defeng.wang" <defeng.wang@abssqr.com>
Date: Tue, 23 Apr 2019 10:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=87=86=E5=A4=87=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dalgen/abssqrTables/COLL_ORG.xml | 189 +++++++++++++++++++++++++++++++
 dalgen/config.xml                | 102 +++++++++++++++++
 dalgen/config/config.xml         |   2 +-
 mybatis-maven-plugin.iml         |  10 +-
 pom.xml                          |  41 ++++---
 5 files changed, 317 insertions(+), 27 deletions(-)
 create mode 100644 dalgen/abssqrTables/COLL_ORG.xml
 create mode 100644 dalgen/config.xml

diff --git a/dalgen/abssqrTables/COLL_ORG.xml b/dalgen/abssqrTables/COLL_ORG.xml
new file mode 100644
index 0000000..3c8588e
--- /dev/null
+++ b/dalgen/abssqrTables/COLL_ORG.xml
@@ -0,0 +1,189 @@
+<!DOCTYPE table SYSTEM "../config/table-config-1.0.dtd">
+<table sqlname="coll_org" physicalName="coll_org" remark="催收机构">
+    <!--  特殊字符说明 &lt;&gt; <> -->
+    <!-- baseSql option中 select * 会自动替换为 include -->
+    <sql id="BaseColumnList">
+        ID,API_KEY,STATUS,ORG_CODE,ORG_NAME 
+        ,ORG_TYPE,SECRET_KEY,GMT_CREATE,GMT_MODIFIED
+    </sql>
+
+    <!-- baseSql option中 select sf.* 会自动替换为 include -->
+    <sql id="Base_SF_Column_List">
+        sf.ID,sf.API_KEY,sf.STATUS,sf.ORG_CODE,sf.ORG_NAME 
+        ,sf.ORG_TYPE,sf.SECRET_KEY,sf.GMT_CREATE,sf.GMT_MODIFIED
+    </sql>
+
+    <operation name="insert" paramtype="object" remark="插入表:coll_org" autoGen="true">
+            <selectKey resultType="java.lang.Long" keyProperty="id" order="AFTER">
+                SELECT
+                LAST_INSERT_ID()
+            </selectKey>
+            <![CDATA[
+            INSERT INTO coll_org(
+                    ID
+                    ,API_KEY
+                    ,STATUS
+                    ,ORG_CODE
+                    ,ORG_NAME
+                    ,ORG_TYPE
+                    ,SECRET_KEY
+                    ,GMT_CREATE
+                    ,GMT_MODIFIED
+            )VALUES(
+                     null
+                    , #{apiKey,jdbcType=VARCHAR}
+                    , #{status,jdbcType=VARCHAR}
+                    , #{orgCode,jdbcType=VARCHAR}
+                    , #{orgName,jdbcType=VARCHAR}
+                    , #{orgType,jdbcType=VARCHAR}
+                    , #{secretKey,jdbcType=VARCHAR}
+                    , now()
+                    , now()
+            )
+            ]]>
+    </operation>
+
+    <!-- foreach 可以自定义类型，paramtype="primitive" foreach->javatype="自己书写的类"  -->
+    <!-- 只有一个参数且为List时必须将参数命名为list -->
+    <operation name="insertBatch" paramtype="objectList" remark="批量插入表:coll_org"  autoGen="true">
+            INSERT INTO coll_org(
+                    ID
+                    ,API_KEY
+                    ,STATUS
+                    ,ORG_CODE
+                    ,ORG_NAME
+                    ,ORG_TYPE
+                    ,SECRET_KEY
+                    ,GMT_CREATE
+                    ,GMT_MODIFIED
+            )VALUES
+            <foreach collection="list"  item="item" separator=",">
+                (
+                     null
+                    , #{item.apiKey,jdbcType=VARCHAR}
+                    , #{item.status,jdbcType=VARCHAR}
+                    , #{item.orgCode,jdbcType=VARCHAR}
+                    , #{item.orgName,jdbcType=VARCHAR}
+                    , #{item.orgType,jdbcType=VARCHAR}
+                    , #{item.secretKey,jdbcType=VARCHAR}
+                    , now()
+                    , now()
+                )
+            </foreach>
+    </operation>
+
+    <!-- 不推荐使用全 update 有需要自己打开
+    <operation name="update" paramtype="object" remark="更新表:coll_org"  autoGen="true">
+        <![CDATA[
+        UPDATE coll_org
+        SET
+            API_KEY         = #{apiKey,jdbcType=VARCHAR}
+            ,STATUS          = #{status,jdbcType=VARCHAR}
+            ,ORG_CODE        = #{orgCode,jdbcType=VARCHAR}
+            ,ORG_NAME        = #{orgName,jdbcType=VARCHAR}
+            ,ORG_TYPE        = #{orgType,jdbcType=VARCHAR}
+            ,SECRET_KEY      = #{secretKey,jdbcType=VARCHAR}
+            ,GMT_MODIFIED    = now()
+        WHERE
+            ID              = #{id,jdbcType=BIGINT}
+        ]]>
+    </operation>
+    -->
+    <operation name="deleteById"  remark="根据主键删除数据:coll_org">
+        <![CDATA[
+        DELETE FROM coll_org
+        WHERE
+            ID = #{id,jdbcType=BIGINT}
+        ]]>
+    </operation>
+
+    <operation name="getById" multiplicity="one" remark="根据主键获取数据:coll_org">
+        SELECT *
+        FROM coll_org
+        WHERE
+        <![CDATA[
+            ID = #{id,jdbcType=BIGINT}
+        ]]>
+    </operation>
+
+    <!-- 根据唯一约束操作数据 -->
+    <operation name="updateByApiKey" paramtype="object" remark="根据唯一约束ApiKey更新表:coll_org">
+        <![CDATA[
+        UPDATE coll_org
+        SET
+            STATUS          = #{status,jdbcType=VARCHAR}
+            ,ORG_CODE        = #{orgCode,jdbcType=VARCHAR}
+            ,ORG_NAME        = #{orgName,jdbcType=VARCHAR}
+            ,ORG_TYPE        = #{orgType,jdbcType=VARCHAR}
+            ,SECRET_KEY      = #{secretKey,jdbcType=VARCHAR}
+            ,GMT_MODIFIED    = now()
+        WHERE
+            API_KEY         = #{apiKey,jdbcType=VARCHAR}
+        ]]>
+    </operation>
+
+    <operation name="deleteByApiKey" remark="根据唯一约束ApiKey删除数据:coll_org">
+        <![CDATA[
+        DELETE FROM coll_org
+        WHERE
+            API_KEY         = #{apiKey,jdbcType=VARCHAR}
+        ]]>
+    </operation>
+
+    <operation name="getByApiKey" multiplicity="one" remark="根据唯一约束ApiKey获取数据:coll_org">
+        SELECT *
+        FROM coll_org
+        WHERE
+        <![CDATA[
+            API_KEY         = #{apiKey,jdbcType=VARCHAR}
+        ]]>
+    </operation>
+
+    <!-- 根据唯一约束操作数据 -->
+    <operation name="updateByOrgCode" paramtype="object" remark="根据唯一约束OrgCode更新表:coll_org">
+        <![CDATA[
+        UPDATE coll_org
+        SET
+            API_KEY         = #{apiKey,jdbcType=VARCHAR}
+            ,STATUS          = #{status,jdbcType=VARCHAR}
+            ,ORG_NAME        = #{orgName,jdbcType=VARCHAR}
+            ,ORG_TYPE        = #{orgType,jdbcType=VARCHAR}
+            ,SECRET_KEY      = #{secretKey,jdbcType=VARCHAR}
+            ,GMT_MODIFIED    = now()
+        WHERE
+            ORG_CODE        = #{orgCode,jdbcType=VARCHAR}
+        ]]>
+    </operation>
+
+    <operation name="deleteByOrgCode" remark="根据唯一约束OrgCode删除数据:coll_org">
+        <![CDATA[
+        DELETE FROM coll_org
+        WHERE
+            ORG_CODE        = #{orgCode,jdbcType=VARCHAR}
+        ]]>
+    </operation>
+
+    <operation name="getByOrgCode" multiplicity="one" remark="根据唯一约束OrgCode获取数据:coll_org">
+        SELECT *
+        FROM coll_org
+        WHERE
+        <![CDATA[
+            ORG_CODE        = #{orgCode,jdbcType=VARCHAR}
+        ]]>
+    </operation>
+
+    <operation name="getByOrgCodexx" multiplicity="one" remark="根据唯一约束OrgCode获取数据:coll_org">
+        <extraparams>
+            <param name="objSimple" javatype="com.Simple"/>
+        </extraparams>
+        SELECT *
+        FROM coll_org
+        WHERE
+        <![CDATA[
+            ORG_CODE        = #{objSimple.xx,jdbcType=VARCHAR}
+        ]]>
+    </operation>
+
+
+
+</table>
diff --git a/dalgen/config.xml b/dalgen/config.xml
new file mode 100644
index 0000000..7b7dbbb
--- /dev/null
+++ b/dalgen/config.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================== -->
+<!-- Master configuration file for auto-generation of iPaycore dal. -->
+<!-- ============================================================== -->
+
+<config>
+    <!-- ========================================================== -->
+    <!-- The typemap("Type Map") maps from one java type to another -->
+    <!-- java type. If you feel the original sql data type to java -->
+    <!-- type mapping is not satisfactory, you can use typemap to -->
+    <!-- convert it to a more appropriate one. -->
+    <!-- ========================================================== -->
+    <typemap from="java.sql.Date" to="java.util.Date"/>
+    <typemap from="java.sql.Time" to="java.util.Date"/>
+    <typemap from="java.sql.Timestamp" to="java.util.Date"/>
+    <typemap from="java.math.BigDecimal" to="Long"/>
+    <typemap from="byte" to="int"/>
+    <typemap from="short" to="int"/>
+
+    <!-- ========================================================== -->
+    <!-- datasource config  可以配置多个-->
+    <!-- database name 自定义-->
+    <!-- ========================================================== -->
+    <!-- -->
+    <!--<database name="dalgen" class="org.gjt.mm.mysql.Driver" type="mysql">
+        <property name="url" value="jdbc:mysql://127.0.0.1:3306/dalgen"/>
+        <property name="userid" value="root"/>
+        <property name="password" value="123456"/>
+        <property name="schema" value="dalgen"/>
+    </database> -->
+    <database name="abssqr" class="org.gjt.mm.mysql.Driver" type="mysql">
+        <property name="url" value="jdbc:mysql://dev.db.**.cn:80/coll"/>
+        <property name="userid" value="Abssqr_coll"/>
+        <property name="password" value="Abssq"/>
+        <property name="schema" value="coll"/>
+    </database>
+
+    <!-- ========project.name pom.xml中的值========================= -->
+    <!--<package value="com.bgdf.${project.name}.common.dal.${database.name}.auto"/>-->
+    <!--database="fbi" 此参数可选，多数据源时如果不使用此参数则为通用-->
+    <package value="example.${database.name}">
+        <subClass name="dal" value="dal"/>
+        <subClass name="mapper" value="mapper"/>
+        <subClass name="mapper.xml" value="/mapper.${database.name}"/>
+        <subClass name="paging" value="paging"/>
+        <subClass name="dao" value="dao"/>
+        <subClass name="dataobject" value="do"/>
+        <subClass name="resultmap" value="resultmap"/>
+    </package>
+
+    <package value="cn.dalgen.dal.${database.name}" database="dbName2">
+        <subClass name="dal" value="dal"/>
+        <subClass name="mapper" value="mapper"/>
+        <subClass name="mapper.xml" value="/mappers.${database.name}"/><!-- 绝对路径 -->
+        <subClass name="paging" value="paging"/>
+        <subClass name="dao" value="dao"/>
+        <subClass name="dataobject" value="do"/>
+        <subClass name="resultmap" value="resultmap"/>
+    </package>
+    <!-- ========================================================== -->
+
+    <!--分库分表规则  分表后缀 支持多个-->
+    <splitTableSuffixs>
+        <splitTableSuffix value="_000"/>
+    </splitTableSuffixs>
+
+    <!-- 表省略前置 支持多个 -->
+    <tablePrefixs database="dalgen">
+        <!--长的放前面-->
+        <tablePrefix value="my_" replace=""/>
+    </tablePrefixs>
+
+    <!-- 表省略前置 支持多个 -->
+    <tablePrefixs database="db2">
+        <!--长的放前面-->
+        <tablePrefix value="db2_pre_" replace=""/>
+        <tablePrefix value="pre_"/>
+    </tablePrefixs>
+    <!-- 索引省略前置 支持多个 -->
+    <indexPrefixs>
+        <!--长的放前面-->
+        <indexPrefix value="idx_"/>
+        <indexPrefix value="uk_" replace=""/>
+    </indexPrefixs>
+
+    <!-- 软删除字段 软删除存在唯一约束问题,如果defVal为数字 则当前数字为未删除,大于此数字为删除,为数值是delVal不生效-->
+    <softDelete cloumn="is_deleted" defVal="N" delVal="Y"/>
+
+    <!-- 表模板路径 -->
+    <tablePath value="${database.name}Tables/"/>
+
+    <extParams>
+        <extParam name="Repository" value="true"/>
+        <!-- insert update delete 返回结果 -->
+        <extParam name="IUD" value="Long"/>
+        <!-- DOMapp name中默认出现DO，如需不出现则将DO去掉即可  -->
+        <extParam name="DoMapperName" />
+        <!--默认DAO中方法参数排序，设定为false时与xml模板中顺序一致-->
+        <extParam name="MethodParamSort" value="false"/>
+    </extParams>
+</config>
diff --git a/dalgen/config/config.xml b/dalgen/config/config.xml
index d267009..de6d71d 100644
--- a/dalgen/config/config.xml
+++ b/dalgen/config/config.xml
@@ -95,7 +95,7 @@
         <!-- insert update delete 返回结果 -->
         <extParam name="IUD" value="Long"/>
         <!-- DOMapp name中默认出现DO，如需不出现则将DO去掉即可  -->
-        <extParam name="DoMapperName"/>
+        <extParam name="DoMapperName" />
         <!--默认DAO中方法参数排序，设定为false时与xml模板中顺序一致-->
         <extParam name="MethodParamSort" value="false"/>
     </extParams>
diff --git a/mybatis-maven-plugin.iml b/mybatis-maven-plugin.iml
index 21ad38d..f26e155 100644
--- a/mybatis-maven-plugin.iml
+++ b/mybatis-maven-plugin.iml
@@ -24,7 +24,8 @@
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.38" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-project:3.0-alpha-2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0-alpha-2" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:1.5.6" level="project" />
@@ -58,17 +59,16 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-archiver:1.0-alpha-7" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.fmpp:fmpp:0.9.15" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.26-incubating" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.21" level="project" />
     <orderEntry type="library" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
     <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.devlib.schmidt:imageinfo:1.9" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.33" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.1" level="project" />
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.10.19" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cfb6195..eab9cc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,17 +9,16 @@
     <packaging>maven-plugin</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>1.2.6.2</version>
+    <version>1.2.4.0</version>
 
     <url>https://gitee.com/bangis/mybatis.generator</url>
     <description>mybatis generator mapper.xml mapper.java dao.java do.java paging map list</description>
     <inceptionYear>2017</inceptionYear>
 
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.8.RELEASE</version>
-        <relativePath/>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>7</version>
     </parent>
 
     <licenses>
@@ -50,14 +49,12 @@
     </issueManagement>
     <distributionManagement>
         <repository>
-            <id>central</id>
-            <name>central</name>
-            <url>http://dev.maven.abssqr.cn/repository/maven-releases/</url>
+            <id>releases</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
         <snapshotRepository>
-            <id>snapshot</id>
-            <name>snapshot</name>
-            <url>http://dev.maven.abssqr.cn/repository/maven-snapshots</url>
+            <id>snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
     <properties>
@@ -145,15 +142,15 @@
     <build>
         <plugins>
             <!--<plugin>-->
-                <!--<groupId>org.sonatype.plugins</groupId>-->
-                <!--<artifactId>nexus-staging-maven-plugin</artifactId>-->
-                <!--<version>1.6.7</version>-->
-                <!--<extensions>true</extensions>-->
-                <!--<configuration>-->
-                    <!--<serverId>releases</serverId>-->
-                    <!--<nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
-                    <!--<autoReleaseAfterClose>true</autoReleaseAfterClose>-->
-                <!--</configuration>-->
+            <!--<groupId>org.sonatype.plugins</groupId>-->
+            <!--<artifactId>nexus-staging-maven-plugin</artifactId>-->
+            <!--<version>1.6.7</version>-->
+            <!--<extensions>true</extensions>-->
+            <!--<configuration>-->
+            <!--<serverId>releases</serverId>-->
+            <!--<nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
+            <!--<autoReleaseAfterClose>true</autoReleaseAfterClose>-->
+            <!--</configuration>-->
             <!--</plugin>-->
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -210,9 +207,11 @@
             <plugin>
                 <groupId>cn.dalgen.plugins</groupId>
                 <artifactId>mybatis-maven-plugin</artifactId>
-                <version>1.2.6.1</version>
+                <version>1.2.4.0</version>
                 <configuration>
                     <outputDirectory>srcTmp</outputDirectory>
+                    <copyTemplate>false</copyTemplate>
+                    <templateDirectory>dalgen/template</templateDirectory>
                 </configuration>
             </plugin>
         </plugins>
-- 
Gitee