移除target目录

.gitignore

@@ -8,6 +8,9 @@
 target/
 !.mvn/wrapper/maven-wrapper.jar
 
+*/target/
+**/target/
+
 ######################################################################
 # IDE
 

aidex-admin/target/classes/META-INF/spring-devtools.properties

@@ -1 +0,0 @@
-restart.include.json=/com.alibaba.fastjson.*.jar

aidex-admin/target/classes/application-druid.yml

@@ -1,57 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://152.136.217.148:3306/water_bus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&&allowMultiQueries=true
-                username: site
-                password: admin@2022.cn
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url:
-                username:
-                password:
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter:
-                enabled: true
-            statViewServlet:
-                enabled: false
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: aidex
-                login-password: 123456
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true

aidex-admin/target/classes/application.yml

@@ -1,147 +0,0 @@
-# 项目相关配置
-aidex:
-  # 名称 水上公交
-  name: water_bus
-  # 版本
-  version: 3.3.0
-  # 版权年份
-  copyrightYear: 2024
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/aidex/uploadPath，Linux配置 /home/aidex/uploadPath）
-  profile: D:/aidex/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
-
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为8080
-  port: 18080
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # 连接数满后的排队数，默认为100
-    accept-count: 1000
-    threads:
-      # tomcat最大线程数，默认为200
-      max: 800
-      # Tomcat启动初始化的线程数，默认值10
-      min-spare: 100
-
-# 日志配置
-logging:
-  level:
-    com.aidex: info
-    org.springframework: info
-
-# 用户配置
-user:
-  password:
-    # 密码最大错误次数
-    maxRetryCount: 5
-    # 密码锁定时间（默认10分钟）
-    lockTime: 10
-
-# Spring配置
-spring:
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: i18n/messages
-  profiles:
-    active: druid
-  # 文件上传
-  servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
-  # redis 配置
-  redis:
-    # 地址
-    host: 182.150.25.30
-    # 端口，默认为6379
-    port: 2212
-    # 数据库索引
-    database: 0
-    # 密码
-    password: Shs2514
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-
-# token配置
-token:
-    # 令牌自定义标识
-    header: Authorization
-    # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 令牌有效期（默认30分钟）
-    expireTime: 30
-    # 是否允许账户多终端同时登录（true允许 false不允许）
-    soloLogin: true
-
-# MyBatis配置
-mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.aidex.**.domain,com.aidex.**.entity,com.aidex.**.po
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:com/aidex/**/mapper/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
-    # 加载全局的配置文件
-    dbName: oracle
-    # 是否显示拦截器输出sql
-    isShowMyBatisSql: true
-
-# PageHelper分页插件
-pagehelper:
-  helperDialect: mysql
-  supportMethodsArguments: true
-  params: count=countSql
-
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-  # 请求前缀
-  pathMapping: /api
-
-# 防止XSS攻击
-xss:
-  # 过滤开关
-  enabled: true
-  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice
-  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*
-
-wx:
-  miniapp:
-    appid: wx89863f6cc3943d04 #微信小程序的appid
-    secret: 1d8a4519dd92e626e183c4c7e2dad14e  #微信小程序的Secret
-    msgDataFormat: JSON
-    token:
-    aesKey:
-
-

aidex-admin/target/classes/banner.txt

@@ -1,27 +0,0 @@
-Application Version: 3.4.0
-Spring Boot Version: ${spring-boot.version}
-///////////////////////////////////////////////////////////////////////////////////////////
-//                                                                                       //
-//                                                                                       //
-//                                               |                                       //
-//                                              -+-                                      //
-//                                             ==| ___                                   //
-//                                   _____       | _T                                    //
-//                                    |   \      / \                                     //
-//                                  +-+----+-------------+               |               //
-//               _______.._______   |  O   O   O   O  __[]_              |               //
-//      ( )\________/     ==)__     |_________________|___|              |      ==|      //
-//       \__=*=_/0/_   --+q+ l_\    |                    |     _         #________|_     //
-//       ___________\____l_l_l__D___|  O            O  O |    ( )       /     O   /      //
-//      | [] uscgc yukon                                 |___/___\_____/        /        //
-//      |                               U.S. COAST GUARD / _  /  14           /          //
-//      \                                               / (0)/              /            //
-//        \____________________________________________/____/______________/             //
-//                                                                                       //
-//                 by Enrico Piazza                                                      //
-//                                                                                       //
-//                                                                                       //
-///////////////////////////////////////////////////////////////////////////////////////////
-
-
-

aidex-admin/target/classes/i18n/messages.properties

@@ -1,37 +0,0 @@
-#错误消息
-not.null=* 必须填写
-user.jcaptcha.error=验证码错误
-user.jcaptcha.expire=验证码已失效
-user.not.exists=用户不存在/密码错误
-user.password.not.match=用户不存在/密码错误
-user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
-user.password.delete=对不起，您的账号已被删除
-user.blocked=用户已封禁，请联系管理员
-role.blocked=角色已封禁，请联系管理员
-user.logout.success=退出成功
-
-length.not.valid=长度必须在{min}到{max}个字符之间
-
-user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
-user.password.not.valid=* 5-50个字符
-
-user.email.not.valid=邮箱格式错误
-user.mobile.phone.number.not.valid=手机号格式错误
-user.login.success=登录成功
-user.register.success=注册成功
-user.notfound=请重新登录
-user.forcelogout=管理员强制退出，请重新登录
-user.unknown.error=未知错误，请重新登录
-
-##文件上传消息
-upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
-upload.filename.exceed.length=上传的文件名最长{0}个字符
-
-##权限
-no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
-no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
-no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
-no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
-no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
-no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]

aidex-admin/target/classes/logback.xml

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <!-- 日志存放路径 -->
-	<property name="log.path" value="./logs" />
-    <!-- 日志输出格式 -->
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
-
-	<!-- 控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-	</appender>
-
-	<!-- 系统日志输出 -->
-	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>error</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-	</appender>
-
-	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-			<!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-			<!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-	<!-- 用户访问日志输出  -->
-    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/sys-user.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 按天回滚 daily -->
-            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-	<!-- 系统模块日志级别控制  -->
-	<logger name="com.aidex" level="error" />
-	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="error" />
-
-	<root level="error">
-		<appender-ref ref="console" />
-	</root>
-
-	<!--系统操作日志-->
-    <root level="error">
-        <appender-ref ref="file_info" />
-        <appender-ref ref="file_error" />
-    </root>
-
-	<!--系统用户操作日志-->
-    <logger name="sys-user" level="error">
-        <appender-ref ref="sys-user"/>
-    </logger>
-</configuration>

aidex-admin/target/classes/mybatis/mybatis-config.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration
-		PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-		"http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-	<!-- 全局参数 -->
-	<settings>
-		<!-- 使全局的映射器启用或禁用缓存 -->
-		<setting name="cacheEnabled"             value="true"   />
-		<!-- 允许JDBC 支持自动生成主键 -->
-		<setting name="useGeneratedKeys"         value="true"   />
-		<!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
-		<setting name="defaultExecutorType"      value="SIMPLE" />
-		<!-- 指定 MyBatis 所用日志的具体实现 -->
-		<setting name="logImpl"                  value="SLF4J"  />
-		<!-- 使用驼峰命名法转换字段 -->
-		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
-	</settings>
-
-</configuration>

aidex-admin/target/classes/rebel.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
-  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
--->
-<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
-
-	<id>aidex-admin</id>
-
-	<classpath>
-		<dir name="C:/cloud-platform/AiDex/aidex-admin/target/classes">
-		</dir>
-	</classpath>
-
-</application>

aidex-controller/target/classes/rebel.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
-  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
--->
-<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
-
-	<id>aidex-controller</id>
-
-	<classpath>
-		<dir name="C:/cloud-platform/AiDex/aidex-controller/target/classes">
-		</dir>
-	</classpath>
-
-</application>

aidex-framework/target/classes/rebel.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
-  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
--->
-<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
-
-	<id>aidex-framework</id>
-
-	<classpath>
-		<dir name="C:/cloud-platform/AiDex/aidex-framework/target/classes">
-		</dir>
-	</classpath>
-
-</application>

aidex-generator/target/classes/com/aidex/generator/mapper/GenConfigTemplateMapper.xml

@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aidex.generator.mapper.GenConfigTemplateMapper">
-    <sql id="genConfigTemplateColumns">
-		a.id as "id",
-		a.template_name AS "templateName",
-		a.function_author AS "functionAuthor",
-        a.function_author_email AS "functionAuthorEmail",
-        a.workspace_path AS "workspacePath",
-        a.module_name AS "moduleName",
-        a.package_name AS "packageName",
-        a.web_workspace_path AS "webWorkspacePath",
-        a.template_default AS "templateDefault",
-		a.sort,
-		a.status,
-		a.create_by AS "createBy",
-		a.create_dept AS "createDept",
-		a.create_time AS "createTime",
-		a.update_by AS "updateBy",
-		a.update_time AS "updateTime",
-		a.update_ip AS "updateIp",
-		a.remark AS "remark",
-		a.version AS "version"
-	</sql>
-
-    <sql id="genConfigTemplateJoins">
-
-    </sql>
-
-    <sql id="genConfigTemplateOrderBy">
-		order by a.sort
-	</sql>
-
-    <select id="get" resultType="GenConfigTemplate">
-        SELECT
-        <include refid="genConfigTemplateColumns"/>
-        FROM gen_config_template a
-        <include refid="genConfigTemplateJoins"/>
-        WHERE id =  #{id}
-    </select>
-
-    <select id="findList"  resultType="GenConfigTemplate">
-        SELECT
-            <include refid="genConfigTemplateColumns"/>
-        FROM gen_config_template a
-        <include refid="genConfigTemplateJoins"/>
-        WHERE a.del_flag = #{DEL_FLAG_NORMAL}
-        <if test="templateName != null  and templateName != ''">
-            and template_name like concat('%', #{templateName}, '%')
-        </if>
-        <if test="functionAuthor != null  and functionAuthor != ''">
-            and function_author like concat('%', #{functionAuthor}, '%')
-        </if>
-        <if test="status != null  and status != ''">
-            and status = #{status}
-        </if>
-        <include refid="genConfigTemplateOrderBy"/>
-    </select>
-
-    <select id="findListWithUnique" resultType="GenConfigTemplate">
-        SELECT
-            a.id
-        FROM gen_config_template a
-        <include refid="genConfigTemplateJoins"/>
-        WHERE a.del_flag = #{DEL_FLAG_NORMAL}
-        <if test="templateName != null  and templateName != ''">
-            and template_name = #{templateName}
-        </if>
-        <if test="notEqualId != null and notEqualId != ''">
-            AND id != #{notEqualId}
-        </if>
-    </select>
-
-    <select id="findMaxSort" resultType="integer">
-        SELECT max(a.sort)
-        FROM gen_config_template a
-        WHERE a.del_flag = #{DEL_FLAG_NORMAL}
-    </select>
-
-    <insert id="insert">
-        insert into gen_config_template(
-            id,
-            template_name,
-            function_author,
-            function_author_email,
-            workspace_path,
-            module_name,
-            package_name,
-            web_workspace_path,
-            template_default,
-            sort,
-            status,
-            create_by,
-            create_dept,
-            create_time,
-            update_by,
-            update_time,
-            update_ip,
-            remark,
-            version
-        )values(
-            #{id},
-            #{templateName},
-            #{functionAuthor},
-            #{functionAuthorEmail},
-            #{workspacePath},
-            #{moduleName},
-            #{packageName},
-            #{webWorkspacePath},
-            #{templateDefault},
-            #{sort},
-            #{status},
-            #{createBy},
-            #{createDept},
-            #{createTime},
-            #{updateBy},
-            #{updateTime},
-            #{updateIp},
-            #{remark},
-            1
-        )
-    </insert>
-
-    <update id="update" parameterType="GenConfigTemplate">
-        update gen_config_template
-            <set>
-                <if test="templateName != null and templateName != ''">template_name = #{templateName},</if>
-                <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
-                <if test="functionAuthorEmail != null and functionAuthorEmail != ''">function_author_email = #{functionAuthorEmail},</if>
-                <if test="workspacePath != null">workspace_path = #{workspacePath},</if>
-                <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
-                <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
-                <if test="webWorkspacePath != null  and webWorkspacePath != ''">web_workspace_path = #{webWorkspacePath},</if>
-                <if test="templateDefault != null and templateDefault != ''">template_default = #{templateDefault},</if>
-                <if test="sort != null">sort = #{sort},</if>
-                <if test="status != null and status != ''">status = #{status},</if>
-                <if test="updateBy != null">update_by = #{updateBy},</if>
-                <if test="updateTime != null">update_time = #{updateTime},</if>
-                <if test="updateIp != null">update_ip = #{updateIp},</if>
-                <if test="remark != null">remark = #{remark},</if>
-                <if test="delFlag != null">del_flag = #{delFlag},</if>
-                version = version + 1
-            </set>
-        where id = #{id} and version = #{version}
-    </update>
-
-    <delete id="delete">
-        UPDATE gen_config_template SET
-			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id}
-    </delete>
-
-    <delete id="deleteGenConfigTemplateByIds">
-        UPDATE gen_config_template SET
-        del_flag = '1'
-        WHERE id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

aidex-generator/target/classes/com/aidex/generator/mapper/GenTableColumnMapper.xml

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aidex.generator.mapper.GenTableColumnMapper">
-    
-    <resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-        <result property="isUnique"       column="is_unique"      />
-        <result property="isLog"          column="is_log"         />
-        <result property="isColumnSort"   column="is_column_sort" />
-        <result property="isNewRow"       column="is_new_row"     />
-        <result property="colSpan"        column="col_span"       />
-        <result property="colCheck"       column="col_check"      />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_type"      />
-        <result property="alignType"      column="align_type"     />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
-    </resultMap>
-	
-	<sql id="selectGenTableColumnVo">
-        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,
-               is_unique,
-               is_log,
-               is_column_sort,
-               is_new_row,
-               col_span,
-               col_check,
-               query_type,
-               html_type,
-               dict_type,
-               align_type,
-               sort,
-               create_by,
-               create_time,
-               update_by,
-               update_time
-        from gen_table_column
-    </sql>
-	
-    <select id="selectGenTableColumnListByTableId" parameterType="Long" resultMap="GenTableColumnResult">
-        <include refid="selectGenTableColumnVo"/>
-        where table_id = #{tableId}
-        order by sort
-    </select>
-    
-    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
-		select column_name,
-		      (case when (is_nullable = 'no' <![CDATA[ && ]]> 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
-	</select>
-    
-    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
-        insert into gen_table_column (
-			<if test="tableId != null and tableId != ''">table_id,</if>
-			<if test="columnName != null and columnName != ''">column_name,</if>
-			<if test="columnComment != null and columnComment != ''">column_comment,</if>
-			<if test="columnType != null and columnType != ''">column_type,</if>
-			<if test="javaType != null and javaType != ''">java_type,</if>
-			<if test="javaField != null  and javaField != ''">java_field,</if>
-			<if test="isPk != null and isPk != ''">is_pk,</if>
-			<if test="isIncrement != null and isIncrement != ''">is_increment,</if>
-			<if test="isRequired != null and isRequired != ''">is_required,</if>
-			<if test="isInsert != null and isInsert != ''">is_insert,</if>
-			<if test="isEdit != null and isEdit != ''">is_edit,</if>
-			<if test="isList != null and isList != ''">is_list,</if>
-			<if test="isQuery != null and isQuery != ''">is_query,</if>
-            <if test="isUnique != null and isUnique != ''">is_unique,</if>
-            <if test="isLog != null and isLog != ''">is_log,</if>
-            <if test="isColumnSort != null and isColumnSort != ''">is_column_sort,</if>
-            <if test="isNewRow != null and isNewRow != ''">is_new_row,</if>
-            <if test="colSpan != null">col_span,</if>
-            <if test="colCheck != null and colCheck != ''">col_check,</if>
-			<if test="queryType != null and queryType != ''">query_type,</if>
-			<if test="htmlType != null and htmlType != ''">html_type,</if>
-			<if test="dictType != null and dictType != ''">dict_type,</if>
-            <if test="alignType != null and alignType != ''">align_type,</if>
-			<if test="sort != null">sort,</if>
-			<if test="createBy != null and createBy != ''">create_by,</if>
-			create_time
-         )values(
-			<if test="tableId != null and tableId != ''">#{tableId},</if>
-			<if test="columnName != null and columnName != ''">#{columnName},</if>
-			<if test="columnComment != null and columnComment != ''">#{columnComment},</if>
-			<if test="columnType != null and columnType != ''">#{columnType},</if>
-			<if test="javaType != null and javaType != ''">#{javaType},</if>
-			<if test="javaField != null and javaField != ''">#{javaField},</if>
-			<if test="isPk != null and isPk != ''">#{isPk},</if>
-			<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
-			<if test="isRequired != null and isRequired != ''">#{isRequired},</if>
-			<if test="isInsert != null and isInsert != ''">#{isInsert},</if>
-			<if test="isEdit != null and isEdit != ''">#{isEdit},</if>
-			<if test="isList != null and isList != ''">#{isList},</if>
-			<if test="isQuery != null and isQuery != ''">#{isQuery},</if>
-            <if test="isUnique != null and isUnique != ''">#{isUnique},</if>
-            <if test="isLog != null and isLog != ''">#{isLog},</if>
-            <if test="isColumnSort != null and isColumnLog != ''">#{isColumnSort},</if>
-            <if test="isNewRow != null and isNewRow != ''">#{isNewRow},</if>
-            <if test="colSpan != null">#{colSpan},</if>
-            <if test="colCheck != null and colCheck != ''">#{colCheck},</if>
-			<if test="queryType != null and queryType != ''">#{queryType},</if>
-			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
-			<if test="dictType != null and dictType != ''">#{dictType},</if>
-            <if test="alignType != null and alignType != ''">#{alignType},</if>
-			<if test="sort != null">#{sort},</if>
-			<if test="createBy != null and createBy != ''">#{createBy},</if>
-			sysdate()
-         )
-    </insert>
-	 
-    <update id="updateGenTableColumn" parameterType="GenTableColumn">
-        update gen_table_column
-        <set>
-            column_comment = #{columnComment},
-            java_type = #{javaType},
-            java_field = #{javaField},
-            is_insert = #{isInsert},
-            is_edit = #{isEdit},
-            is_list = #{isList},
-            is_query = #{isQuery},
-            is_unique = #{isUnique},
-            is_log = #{isLog},
-            is_column_sort = #{isColumnSort},
-            is_new_row = #{isNewRow},
-            col_span = #{colSpan},
-            col_check = #{colCheck},
-            is_required = #{isRequired},
-            query_type = #{queryType},
-            html_type = #{htmlType},
-            dict_type = #{dictType},
-            align_type = #{alignType},
-            sort = #{sort},
-            update_by = #{updateBy},
-            update_time = sysdate()
-        </set>
-        where column_id = #{columnId}
-    </update>
-
-    <delete id="deleteGenTableColumnByIds" parameterType="Long">
-        delete from gen_table_column where table_id in 
-        <foreach collection="array" item="tableId" open="(" separator="," close=")">
-            #{tableId}
-        </foreach>
-    </delete>
-    
-    <delete id="deleteGenTableColumns">
-        delete from gen_table_column where column_id in 
-        <foreach collection="list" item="item" open="(" separator="," close=")">
-            #{item.columnId}
-        </foreach>
-    </delete>
-
-</mapper>

aidex-generator/target/classes/com/aidex/generator/mapper/GenTableMapper.xml

@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aidex.generator.mapper.GenTableMapper">
-
-	<resultMap type="GenTable" id="GenTableResult">
-	    <id     property="tableId"        		column="table_id"          />
-		<result property="tableName"      		column="table_name"        />
-		<result property="tableComment"   		column="table_comment"     />
-		<result property="subTableName"   		column="sub_table_name"    />
-		<result property="subTableFkName" 		column="sub_table_fk_name" />
-		<result property="className"      		column="class_name"        />
-		<result property="tplCategory"    		column="tpl_category"      />
-		<result property="functionAuthor"      	column="function_author"   />
-		<result property="functionAuthorEmail"  column="function_author_email"/>
-		<result property="workspacePath"  		column="workspace_path"    />
-		<result property="webWorkspacePath" 	column="web_workspace_path"/>
-		<result property="moduleName"     		column="module_name"       />
-		<result property="packageName"    		column="package_name"      />
-		<result property="businessName"   		column="business_name"     />
-		<result property="functionName"   		column="function_name"     />
-		<result property="genType"        		column="gen_type"          />
-		<result property="colSpans"        		column="col_spans"          />
-		<result property="options"        		column="options"           />
-		<result property="createBy"       		column="create_by"         />
-		<result property="createTime"     		column="create_time"       />
-		<result property="updateBy"       		column="update_by"         />
-		<result property="updateTime"     		column="update_time"       />
-		<result property="remark"         		column="remark"            />
-		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
-	</resultMap>
-
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-		<result property="isUnique"       column="is_unique"      />
-		<result property="isLog"          column="is_log"         />
-		<result property="isColumnSort"   column="is_column_sort" />
-		<result property="isNewRow"       column="is_new_row"     />
-		<result property="colSpan"        column="col_span"       />
-		<result property="colCheck"       column="col_check"       />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_type"      />
-		<result property="alignType"       column="align_type"      />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
-    </resultMap>
-
-	<sql id="selectGenTableVo">
-        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,
-        	   function_author_email,
-        	   gen_type,
-        	   col_spans,
-        	   options,
-        	   create_by,
-        	   create_time,
-        	   update_by,
-        	   update_time,
-        	   remark
-        from gen_table
-        order by update_time desc
-    </sql>
-
-    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
-		<include refid="selectGenTableVo"/>
-		<where>
-			<if test="tableName != null and tableName != ''">
-				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
-			</if>
-			<if test="tableComment != null and tableComment != ''">
-				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-			</if>
-		</where>
-	</select>
-
-	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_schema = (select database())
-		AND table_name NOT LIKE 'qrtz_%'
-		<!--
-		AND table_name NOT LIKE 'gen_%'
-		-->
-		AND table_name NOT IN (select table_name from gen_table)
-		<if test="tableName != null and tableName != ''">
-			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
-		</if>
-		<if test="tableComment != null and tableComment != ''">
-			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-		</if>
-		order by create_time desc
-	</select>
-
-	<select id="selectDbTableListByNames" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_name NOT LIKE 'qrtz_%'
-		<!--
-		and table_name NOT LIKE 'gen_%'
-		-->
-		and table_schema = (select database())
-		and table_name in
-	    <foreach collection="array" item="name" open="(" separator="," close=")">
- 			#{name}
-        </foreach>
-	</select>
-
-	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
-		and table_name = #{tableName}
-	</select>
-
-	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
-	    SELECT t.table_id,
-	    	   t.table_name,
-	    	   t.table_comment,
-	    	   t.sub_table_name,
-	    	   t.sub_table_fk_name,
-	    	   t.class_name,
-	    	   t.tpl_category,
-	    	   t.package_name,
-	    	   t.module_name,
-	    	   t.business_name,
-	    	   t.function_name,
-	    	   t.function_author,
-	    	   t.gen_type,
-	    	   t.workspace_path,
-               t.function_author_email,
-               t.web_workspace_path,
-               t.col_spans,
-	    	   t.options,
-	    	   t.remark,
-			   c.column_id,
-			   c.column_name,
-			   c.column_comment,
-			   c.column_type,
-			   c.java_type,
-			   c.java_field,
-			   c.is_pk,
-			   c.is_increment,
-			   c.is_required,
-			   c.is_insert,
-			   c.is_edit,
-			   c.is_list,
-			   c.is_query,
-			   c.is_unique,
-               c.is_log,
-               c.is_column_sort,
-               c.is_new_row,
-               c.col_span,
-               c.col_check,
-               c.query_type,
-               c.html_type,
-               c.dict_type,
-               c.sort
-		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		where t.table_id = #{tableId} order by c.sort
-	</select>
-
-	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id,
-	    	   t.table_name,
-	    	   t.table_comment,
-	    	   t.sub_table_name,
-	    	   t.sub_table_fk_name,
-	    	   t.class_name,
-	    	   t.tpl_category,
-	    	   t.package_name,
-	    	   t.module_name,
-	    	   t.business_name,
-	    	   t.function_name,
-	    	   t.function_author,
-	    	   t.gen_type,
-	    	   t.workspace_path,
-               t.function_author_email,
-               t.web_workspace_path,
-	    	   t.options,
-	    	   t.col_spans,
-	    	   t.remark,
-			   c.column_id,
-			   c.column_name,
-			   c.column_comment,
-			   c.column_type,
-			   c.java_type,
-			   c.java_field,
-			   c.is_pk,
-			   c.is_increment,
-			   c.is_required,
-			   c.is_insert,
-			   c.is_edit,
-			   c.is_list,
-			   c.is_query,
-			   c.is_unique,
-               c.is_log,
-               c.is_column_sort,
-               c.is_new_row,
-               c.col_span,
-               c.col_check,
-			   c.query_type,
-			   c.html_type,
-			   c.dict_type,
-			   c.align_type,
-			   c.sort
-		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		where t.table_name = #{tableName} order by c.sort
-	</select>
-
-	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id,
-	    	   t.table_name,
-	    	   t.table_comment,
-	    	   t.sub_table_name,
-	    	   t.sub_table_fk_name,
-	    	   t.class_name,
-	    	   t.tpl_category,
-	    	   t.package_name,
-	    	   t.module_name,
-	    	   t.business_name,
-	    	   t.function_name,
-	    	   t.function_author,
-	    	   t.workspace_path,
-               t.function_author_email,
-               t.web_workspace_path,
-	    	   t.options,
-	    	   t.col_spans,
-	    	   t.remark,
-			   c.column_id,
-			   c.column_name,
-			   c.column_comment,
-			   c.column_type,
-			   c.java_type,
-			   c.java_field,
-			   c.is_pk,
-			   c.is_increment,
-			   c.is_required,
-			   c.is_insert,
-			   c.is_edit,
-			   c.is_list,
-			   c.is_query,
-			   c.is_unique,
-               c.is_log,
-               c.is_column_sort,
-               c.is_new_row,
-               c.col_span,
-               c.col_check,
-			   c.query_type,
-			   c.html_type,
-			   c.dict_type,
-			   c.align_type,
-			   c.sort
-		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		order by c.sort
-	</select>
-
-	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
-        insert into gen_table (
-			<if test="tableName != null">table_name,</if>
-			<if test="tableComment != null and tableComment != ''">table_comment,</if>
-			<if test="className != null and className != ''">class_name,</if>
-			<if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
-			<if test="packageName != null and packageName != ''">package_name,</if>
-			<if test="moduleName != null and moduleName != ''">module_name,</if>
-			<if test="businessName != null and businessName != ''">business_name,</if>
-			<if test="functionName != null and functionName != ''">function_name,</if>
-			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
-			<if test="functionAuthorEmail != null and functionAuthorEmail != ''">function_author_email,</if>
-			<if test="workspacePath != null">workspace_path,</if>
-			<if test="webWorkspacePath != null">web_workspace_path,</if>
-			<if test="genType != null and genType != ''">gen_type,</if>
-			<if test="colSpans != null and colSpans != ''">col_spans,</if>
-			<if test="options != null and options != ''">options,</if>
-			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
-			create_time,
-			update_time
-         )values(
-			<if test="tableName != null">#{tableName},</if>
-			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
-			<if test="className != null and className != ''">#{className},</if>
-			<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
-			<if test="packageName != null and packageName != ''">#{packageName},</if>
-			<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
-			<if test="businessName != null and businessName != ''">#{businessName},</if>
-			<if test="functionName != null and functionName != ''">#{functionName},</if>
-			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
-			<if test="functionAuthorEmail != null and functionAuthorEmail != ''">#{functionAuthorEmail},</if>
-			<if test="workspacePath != null">#{workspacePath},</if>
-			<if test="webWorkspacePath != null">#{webWorkspacePath},</if>
-			<if test="genType != null and genType != ''">#{genType},</if>
-			<if test="colSpans != null and colSpans != ''">#{colSpans},</if>
-			<if test="options != null and options != ''">#{options},</if>
-			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
-			sysdate(),
-		    sysdate()
-         )
-    </insert>
-    
-    <update id="updateGenTable" parameterType="GenTable">
-        update gen_table
-        <set>
-            <if test="tableName != null">table_name = #{tableName},</if>
-            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
-            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
-            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
-            <if test="className != null and className != ''">class_name = #{className},</if>
-            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
-            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
-			<if test="colSpans != null and colSpans != ''">col_spans = #{colSpans},</if>
-            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
-            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
-            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
-            <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
-            <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
-			<if test="workspacePath != null">workspace_path = #{workspacePath},</if>
-			<if test="webWorkspacePath != null">web_workspace_path = #{webWorkspacePath},</if>
-			<if test="functionAuthorEmail != null and functionAuthorEmail != ''">function_author_email = #{functionAuthorEmail},</if>
-			<if test="options != null and options != ''">options = #{options},</if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            update_time = sysdate()
-        </set>
-        where table_id = #{tableId}
-    </update>
-    
-    <delete id="deleteGenTableByIds" parameterType="Long">
-        delete from gen_table where table_id in 
-        <foreach collection="array" item="tableId" open="(" separator="," close=")">
-            #{tableId}
-        </foreach>
-    </delete>
-
-	<!-- 动态执行创建SQL的语句 -->
-	<insert id="addMenu">
-    	${sql}
-	</insert>
-
-</mapper>