ccjgmwz 3 éve
szülő
commit
d75db20ca8

+ 1 - 1
pom.xml

@@ -106,7 +106,7 @@
 			<dependency>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok</artifactId>
-				<version>1.18.24</version>
+				<version>1.18.4</version>
 				<scope>provided</scope>
 			</dependency>
 

+ 0 - 5
unimall-core/src/main/resources/vm/xml/mapper.xml.vm

@@ -4,11 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.data.mapper.${moduleName}.${ClassName}Mapper">
     
-    <resultMap type="${ClassName}" id="${ClassName}Result">
-#foreach ($column in $columns)
-      <result property="${column.javaField}" column="${column.columnName}"/>
-#end
-    </resultMap>
 
 
 </mapper>

+ 0 - 1
unimall-data/src/main/java/com/iotechn/unimall/data/config/db/MybatisPlusConfig.java

@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Configuration
-//@MapperScan({"com.iotechn.unimall.data.mapper*"})
 @EnableConfigurationProperties(value = {MybatisPlusProperties.class})
 public class MybatisPlusConfig {
 

+ 14 - 14
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/shop/ShopAccountMapper.xml

@@ -4,20 +4,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.shop.ShopAccountMapper">
     
-    <resultMap type="ShopAccount" id="ShopAccountResult">
-      <result property="id" column="id"/>
-      <result property="dangAccount" column="dang_account"/>
-      <result property="dangPassword" column="dang_password"/>
-      <result property="fuziAccount" column="fuzi_account"/>
-      <result property="fuziPassword" column="fuzi_password"/>
-      <result property="fuziCookie" column="fuzi_cookie"/>
-      <result property="remark" column="remark"/>
-      <result property="deleteFlag" column="delete_flag"/>
-      <result property="gmtCreate" column="gmt_create"/>
-      <result property="gmtUpdate" column="gmt_update"/>
-      <result property="userId" column="user_id"/>
-      <result property="adminId" column="admin_id"/>
-    </resultMap>
+<!--    <resultMap type="ShopAccount" id="ShopAccountResult">-->
+<!--      <result property="id" column="id"/>-->
+<!--      <result property="dangAccount" column="dang_account"/>-->
+<!--      <result property="dangPassword" column="dang_password"/>-->
+<!--      <result property="fuziAccount" column="fuzi_account"/>-->
+<!--      <result property="fuziPassword" column="fuzi_password"/>-->
+<!--      <result property="fuziCookie" column="fuzi_cookie"/>-->
+<!--      <result property="remark" column="remark"/>-->
+<!--      <result property="deleteFlag" column="delete_flag"/>-->
+<!--      <result property="gmtCreate" column="gmt_create"/>-->
+<!--      <result property="gmtUpdate" column="gmt_update"/>-->
+<!--      <result property="userId" column="user_id"/>-->
+<!--      <result property="adminId" column="admin_id"/>-->
+<!--    </resultMap>-->
 
 
 </mapper>

+ 11 - 11
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/shop/ShopLogMapper.xml

@@ -4,17 +4,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.shop.ShopLogMapper">
     
-    <resultMap type="ShopLog" id="ShopLogResult">
-      <result property="id" column="id"/>
-      <result property="title" column="title"/>
-      <result property="content" column="content"/>
-      <result property="remark" column="remark"/>
-      <result property="deleteFlag" column="delete_flag"/>
-      <result property="gmtCreate" column="gmt_create"/>
-      <result property="gmtUpdate" column="gmt_update"/>
-      <result property="userId" column="user_id"/>
-      <result property="adminId" column="admin_id"/>
-    </resultMap>
+<!--    <resultMap type="ShopLog" id="ShopLogResult">-->
+<!--      <result property="id" column="id"/>-->
+<!--      <result property="title" column="title"/>-->
+<!--      <result property="content" column="content"/>-->
+<!--      <result property="remark" column="remark"/>-->
+<!--      <result property="deleteFlag" column="delete_flag"/>-->
+<!--      <result property="gmtCreate" column="gmt_create"/>-->
+<!--      <result property="gmtUpdate" column="gmt_update"/>-->
+<!--      <result property="userId" column="user_id"/>-->
+<!--      <result property="adminId" column="admin_id"/>-->
+<!--    </resultMap>-->
 
 
 </mapper>

+ 23 - 23
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/shop/ShopOrderMapper.xml

@@ -4,29 +4,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.shop.ShopOrderMapper">
     
-    <resultMap type="ShopOrder" id="ShopOrderResult">
-      <result property="id" column="id"/>
-      <result property="accountId" column="account_id"/>
-      <result property="orderId" column="order_id"/>
-      <result property="dangOrder" column="dang_order"/>
-      <result property="address" column="address"/>
-      <result property="provName" column="prov_name"/>
-      <result property="cityName" column="city_name"/>
-      <result property="areaName" column="area_name"/>
-      <result property="orderStatus" column="order_status"/>
-      <result property="orderStatusName" column="order_status_name"/>
-      <result property="payStatus" column="pay_status"/>
-      <result property="payName" column="pay_name"/>
-      <result property="receiverName" column="receiver_name"/>
-      <result property="mobile" column="mobile"/>
-      <result property="receiver" column="receiver"/>
-      <result property="remark" column="remark"/>
-      <result property="deleteFlag" column="delete_flag"/>
-      <result property="gmtCreate" column="gmt_create"/>
-      <result property="gmtUpdate" column="gmt_update"/>
-      <result property="userId" column="user_id"/>
-      <result property="adminId" column="admin_id"/>
-    </resultMap>
+<!--    <resultMap type="ShopOrder" id="ShopOrderResult">-->
+<!--      <result property="id" column="id"/>-->
+<!--      <result property="accountId" column="account_id"/>-->
+<!--      <result property="orderId" column="order_id"/>-->
+<!--      <result property="dangOrder" column="dang_order"/>-->
+<!--      <result property="address" column="address"/>-->
+<!--      <result property="provName" column="prov_name"/>-->
+<!--      <result property="cityName" column="city_name"/>-->
+<!--      <result property="areaName" column="area_name"/>-->
+<!--      <result property="orderStatus" column="order_status"/>-->
+<!--      <result property="orderStatusName" column="order_status_name"/>-->
+<!--      <result property="payStatus" column="pay_status"/>-->
+<!--      <result property="payName" column="pay_name"/>-->
+<!--      <result property="receiverName" column="receiver_name"/>-->
+<!--      <result property="mobile" column="mobile"/>-->
+<!--      <result property="receiver" column="receiver"/>-->
+<!--      <result property="remark" column="remark"/>-->
+<!--      <result property="deleteFlag" column="delete_flag"/>-->
+<!--      <result property="gmtCreate" column="gmt_create"/>-->
+<!--      <result property="gmtUpdate" column="gmt_update"/>-->
+<!--      <result property="userId" column="user_id"/>-->
+<!--      <result property="adminId" column="admin_id"/>-->
+<!--    </resultMap>-->
 
 
 </mapper>

+ 54 - 54
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/tools/gen/GenTableColumnMapper.xml

@@ -3,59 +3,59 @@
 <mapper
 	namespace="com.iotechn.unimall.data.mapper.tools.gen.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="queryType" column="query_type" />
-		<result property="htmlType" column="html_type" />
-		<result property="dictType" column="dict_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="selectDictTypeVo">
-		SELECT
-		table_id AS tableId,
-		`table_name` AS tableName,
-		table_comment AS tableComment,
-		class_name AS className,
-		tpl_category AS tplCategory,
-		package_name AS packageName,
-		module_name AS moduleName,
-		business_name AS businessName,
-		function_name AS functionName,
-		function_author AS functionAuthor,
-		create_by AS createBy,
-		create_time AS createTime,
-		update_by AS updateBy,
-		update_time AS updateTime,
-		`options`
-		FROM
-		sys_gen_table
-	</sql>
-	<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>
+<!--	<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="queryType" column="query_type" />-->
+<!--		<result property="htmlType" column="html_type" />-->
+<!--		<result property="dictType" column="dict_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="selectDictTypeVo">-->
+<!--		SELECT-->
+<!--		table_id AS tableId,-->
+<!--		`table_name` AS tableName,-->
+<!--		table_comment AS tableComment,-->
+<!--		class_name AS className,-->
+<!--		tpl_category AS tplCategory,-->
+<!--		package_name AS packageName,-->
+<!--		module_name AS moduleName,-->
+<!--		business_name AS businessName,-->
+<!--		function_name AS functionName,-->
+<!--		function_author AS functionAuthor,-->
+<!--		create_by AS createBy,-->
+<!--		create_time AS createTime,-->
+<!--		update_by AS updateBy,-->
+<!--		update_time AS updateTime,-->
+<!--		`options`-->
+<!--		FROM-->
+<!--		sys_gen_table-->
+<!--	</sql>-->
+<!--	<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>-->
 
 </mapper>

+ 120 - 120
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/tools/gen/GenTableMapper.xml

@@ -1,125 +1,125 @@
 <?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.iotechn.unimall.data.mapper.tools.gen.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="className"      column="class_name"      />
-		<result property="tplCategory"    column="tpl_category"    />
-		<result property="packageName"    column="package_name"    />
-		<result property="moduleName"     column="module_name"     />
-		<result property="businessName"   column="business_name"   />
-		<result property="functionName"   column="function_name"   />
-		<result property="functionAuthor" column="function_author" />
-		<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="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_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="selectDictTypeVo">
-		SELECT
-			table_id AS tableId,
-			`table_name` AS tableName,
-			table_comment AS tableComment,
-			class_name AS className,
-			tpl_category AS tplCategory,
-			package_name AS packageName,
-			module_name AS moduleName,
-			business_name AS businessName,
-			function_name AS functionName,
-			function_author AS functionAuthor,
-			create_by AS createBy,
-			create_time AS createTime,
-			update_by AS updateBy,
-			update_time AS updateTime,
-			`options` 
-		FROM
-			sys_gen_table 
-	</sql>
-	<select id="selectDbTableListByNames" 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 sys_gen_table )	
-			AND table_name in 
-			<foreach  item="item" collection="array" index="index"  open="(" separator="," close=")">
-			#{item}
-			</foreach>
-	</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 sys_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>
-	</select>
-	<select id="selectDbTableCount" parameterType="GenTable" resultType="java.lang.Integer">
-		SELECT
-			COUNT(*)
-		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 sys_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>
-	</select>
+
+<!--	<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="className"      column="class_name"      />-->
+<!--		<result property="tplCategory"    column="tpl_category"    />-->
+<!--		<result property="packageName"    column="package_name"    />-->
+<!--		<result property="moduleName"     column="module_name"     />-->
+<!--		<result property="businessName"   column="business_name"   />-->
+<!--		<result property="functionName"   column="function_name"   />-->
+<!--		<result property="functionAuthor" column="function_author" />-->
+<!--		<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="queryType"      column="query_type"     />-->
+<!--        <result property="htmlType"       column="html_type"      />-->
+<!--        <result property="dictType"       column="dict_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="selectDictTypeVo">-->
+<!--		SELECT-->
+<!--			table_id AS tableId,-->
+<!--			`table_name` AS tableName,-->
+<!--			table_comment AS tableComment,-->
+<!--			class_name AS className,-->
+<!--			tpl_category AS tplCategory,-->
+<!--			package_name AS packageName,-->
+<!--			module_name AS moduleName,-->
+<!--			business_name AS businessName,-->
+<!--			function_name AS functionName,-->
+<!--			function_author AS functionAuthor,-->
+<!--			create_by AS createBy,-->
+<!--			create_time AS createTime,-->
+<!--			update_by AS updateBy,-->
+<!--			update_time AS updateTime,-->
+<!--			`options`-->
+<!--		FROM-->
+<!--			sys_gen_table-->
+<!--	</sql>-->
+<!--	<select id="selectDbTableListByNames" 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 sys_gen_table )-->
+<!--			AND table_name in-->
+<!--			<foreach  item="item" collection="array" index="index"  open="(" separator="," close=")">-->
+<!--			#{item}-->
+<!--			</foreach>-->
+<!--	</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 sys_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>-->
+<!--	</select>-->
+<!--	<select id="selectDbTableCount" parameterType="GenTable" resultType="java.lang.Integer">-->
+<!--		SELECT-->
+<!--			COUNT(*)-->
+<!--		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 sys_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>-->
+<!--	</select>-->
 	
 </mapper>

+ 1 - 0
unimall-launcher/pom.xml

@@ -73,6 +73,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
+			<version>1.18.4</version>
 			<scope>provided</scope>
 		</dependency>
 

+ 2 - 2
unimall-launcher/src/main/java/com/iotechn/unimall/launcher/UnimallLauncherApplication.java

@@ -13,8 +13,8 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @ServletComponentScan("com.iotechn.unimall.launcher.config*")
-@MapperScan({"com.iotechn.unimall.data.mapper*"})
-@SpringBootApplication(scanBasePackages = {"com.iotechn.unimall"}, exclude = {RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class})
+@MapperScan({"com.iotechn.unimall.data"})
+@SpringBootApplication(scanBasePackages = {"com.iotechn.unimall"}, exclude = {RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class,org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class})
 @EnableTransactionManagement
 public class UnimallLauncherApplication {