Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews

src/main/resources/application-dev.yml

@@ -1,4 +1,5 @@
-
+server:
+  port: 8989
 
 spring:
   jackson:

src/main/resources/application-prod.yml

@@ -1,3 +1,6 @@
+server:
+  port: 8989
+
 spring:
   jackson:
     ## 默认序列化时间格式

src/main/resources/application.yml

@@ -1,8 +1,4 @@
-server:
-  port: 8989
 spring:
-  main:
-    allow-circular-references: true
   application:
     name: youlai-boot
   profiles:
@@ -19,6 +15,7 @@ generator:
   # 默认配置
   defaultConfig:
     author: youlaitech
+    moduleName: system
   # 排除数据表
   excludeTables:
     - gen_config

src/main/resources/mapper/DatabaseMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.youlai.boot.platform.generator.mapper.DatabaseMapper">
 
     <!-- 查询数据库表分页 -->
-    <select id="getTablePage" resultType="com.youlai.boot.system.model.vo.TablePageVO">
+    <select id="getTablePage" resultType="com.youlai.boot.platform.generator.model.vo.TablePageVO">
         SELECT
             t1.TABLE_NAME ,
             t1.TABLE_COMMENT ,
@@ -33,7 +33,7 @@
             CREATE_TIME DESC
     </select>
 
-    <select id="getTableMetadata" resultType="com.youlai.boot.system.model.bo.TableMetaData">
+    <select id="getTableMetadata" resultType="com.youlai.boot.platform.generator.model.bo.TableMetaData">
         SELECT
             TABLE_NAME ,
             TABLE_COMMENT ,
@@ -47,7 +47,7 @@
           AND TABLE_NAME = #{tableName}
     </select>
 
-    <select id="getTableColumns" resultType="com.youlai.boot.system.model.bo.ColumnMetaData">
+    <select id="getTableColumns" resultType="com.youlai.boot.platform.generator.model.bo.ColumnMetaData">
         SELECT
             COLUMN_NAME,
             DATA_TYPE,

src/main/resources/templates/generator/api.ts.vm

@@ -65,7 +65,7 @@ export default ${entityName}API;
 /** ${businessName}分页查询参数 */
 export interface ${entityName}PageQuery extends PageQuery {
     #foreach($fieldConfig in $fieldConfigs)
-        #if($fieldConfig.isShowInList)
+        #if($fieldConfig.isShowInQuery)
             #if("$!fieldConfig.fieldComment" != "")
     /** ${fieldConfig.fieldComment} */
             #end