From f3b3bec8b08658d4425b922c9c3fafbd19ecb054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B0=8F=E7=8E=8B=E5=AD=90?=
 <dataprince@163.com>
Date: Fri, 22 Mar 2024 21:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8ts=E5=89=8D=E7=AB=AF=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-prod.yml   |  15 ---
 .../main/resources/vm/api/element.ts.types.vm | 107 ++++++++----------
 2 files changed, 45 insertions(+), 77 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 52edd47..86d9829 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -39,21 +39,6 @@ mybatis-flex:
       username: postgres
       password: postgres@369
 
-#    # 数据源-2
-#    ds2:
-#      # 指定为HikariDataSource
-#      type: ${spring.datasource.type}
-#      # mysql数据库
-#      driver-class-name: com.mysql.cj.jdbc.Driver
-#      url: jdbc:mysql://localhost:3306/ruoyi-flex?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
-#      username: root
-#      password: Root@369
-#      #postgresql数据库
-##      driver-class-name: org.postgresql.Driver
-##      url: jdbc:postgresql://localhost:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-##      username: postgres
-##      password: postgres@369
-
 # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
 spring.data:
   redis:
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/api/element.ts.types.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/api/element.ts.types.vm
index 66cdc86..25a9394 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/api/element.ts.types.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/api/element.ts.types.vm
@@ -1,75 +1,58 @@
 export interface ${BusinessName}VO extends BaseEntity {
 #foreach ($column in $columns)
-#if($column.list)
-  /**
-   * $column.columnComment
-   */
-  $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
-                        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
-                        #elseif($column.javaType == 'Boolean') boolean;
-                        #else string;
-                    #end
-#end
+    #if($column.list)
+    /**
+    * $column.columnComment
+    */
+        $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
+    #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
+    #elseif($column.javaType == 'Boolean') boolean;
+    #else string;
+    #end
+    #end
 #end
 #if ($table.tree)
-  /**
-   * 子树对象
-   */
-  children: ${BusinessName}VO[];
+/**
+* 子树对象
+*/
+children: ${BusinessName}VO[];
 #end
 #if($table.sub)
-  /** $table.subTable.functionName信息 */
-  ${subclassName}List: Array<${subClassName}VO>;
+/** $table.subTable.functionName信息 */
+    ${subclassName}List: Array<${subClassName}VO>;
 #end
-}
+    }
 
-export interface ${subClassName}VO extends BaseEntity {
-  /** 列表序号 */
-  index:number;
-#foreach ($column in $subTable.columns)
-#if($column.list)
-  /**
-  * $column.columnComment
-  */
-  $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
-#elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
-#elseif($column.javaType == 'Boolean') boolean;
-#else string;
-#end
-#end
-#end
-}
-
-export interface ${BusinessName}Form {
+    export interface ${BusinessName}Form {
 #foreach ($column in $columns)
-#if($column.insert || $column.edit)
-  /**
-   * $column.columnComment
-   */
-  $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
-                        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
-                        #elseif($column.javaType == 'Boolean') boolean;
-                        #else string;
-                    #end
+    #if($column.insert || $column.edit)
+        /**
+        * $column.columnComment
+        */
+        $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
+    #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
+    #elseif($column.javaType == 'Boolean') boolean;
+    #else string;
+    #end
+    #end
 #end
-#end
-}
+    }
 
-export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{
+    export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{
 #foreach ($column in $columns)
-#if($column.query)
-  /**
-   * $column.columnComment
-   */
-  $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
-                        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
-                        #elseif($column.javaType == 'Boolean') boolean;
-                        #else string;
-                    #end
+    #if($column.query)
+        /**
+        * $column.columnComment
+        */
+        $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
+    #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
+    #elseif($column.javaType == 'Boolean') boolean;
+    #else string;
+    #end
+    #end
 #end
-#end
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}
+    /**
+    * 日期范围参数
+    */
+    params?: any;
+    }