From 4005bafbc8bf8aa244ead6a86973cfaa6b9f8c15 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 25 Oct 2024 18:16:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(codegen):=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90API=E6=A8=A1=E6=9D=BF=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=9A=E4=B9=89=E6=96=B9=E5=BC=8F=E5=92=8C=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CodegenServiceImpl.java      |  7 +++++--
 .../resources/templates/codegen/api.ts.vm     | 20 +++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/youlai/boot/shared/codegen/service/impl/CodegenServiceImpl.java b/src/main/java/com/youlai/boot/shared/codegen/service/impl/CodegenServiceImpl.java
index 06431592..3f13170f 100644
--- a/src/main/java/com/youlai/boot/shared/codegen/service/impl/CodegenServiceImpl.java
+++ b/src/main/java/com/youlai/boot/shared/codegen/service/impl/CodegenServiceImpl.java
@@ -173,11 +173,14 @@ public class CodegenServiceImpl implements CodegenService {
                     + File.separator + subPackageName
             );
         } else if ("API".equals(templateName)) {
+            // path = "src/api/system";
             path = (codegenProperties.getFrontendAppName()
-                    + File.separator
-                    + "src" + File.separator + subPackageName
+                    + File.separator + "src"
+                    + File.separator + subPackageName
+                    + File.separator + moduleName
             );
         } else if ("VIEW".equals(templateName)) {
+            // path = "src/views/system/user";
             path = (codegenProperties.getFrontendAppName()
                     + File.separator + "src"
                     + File.separator + subPackageName
diff --git a/src/main/resources/templates/codegen/api.ts.vm b/src/main/resources/templates/codegen/api.ts.vm
index 580d5f93..1e2e6c97 100644
--- a/src/main/resources/templates/codegen/api.ts.vm
+++ b/src/main/resources/templates/codegen/api.ts.vm
@@ -2,36 +2,36 @@ import request from "@/utils/request";
 
 const ${entityName.toUpperCase()}_BASE_URL = "/api/v1/${lowerFirstEntityName}s";
 
-class ${entityName}API {
+const ${entityName}API = {
     /** 获取${businessName}分页数据 */
-    static getPage(queryParams?: ${entityName}PageQuery) {
+    getPage(queryParams?: ${entityName}PageQuery) {
         return request<any, PageResult<${entityName}PageVO[]>>({
             url: `${${entityName.toUpperCase()}_BASE_URL}/page`,
             method: "get",
             params: queryParams,
         });
-    }
+    },
     /**
      * 获取${businessName}表单数据
      *
      * @param id ${entityName}ID
      * @returns ${entityName}表单数据
      */
-    static getFormData(id: number) {
+    getFormData(id: number) {
         return request<any, ${entityName}Form>({
             url: `${${entityName.toUpperCase()}_BASE_URL}/${id}/form`,
             method: "get",
         });
-    }
+    },
 
     /** 添加${businessName}*/
-    static add(data: ${entityName}Form) {
+    add(data: ${entityName}Form) {
         return request({
             url: `${${entityName.toUpperCase()}_BASE_URL}`,
             method: "post",
             data: data,
         });
-    }
+    },
 
     /**
      * 更新${businessName}
@@ -39,20 +39,20 @@ class ${entityName}API {
      * @param id ${entityName}ID
      * @param data ${entityName}表单数据
      */
-    static update(id: number, data: ${entityName}Form) {
+     update(id: number, data: ${entityName}Form) {
         return request({
             url: `${${entityName.toUpperCase()}_BASE_URL}/${id}`,
             method: "put",
             data: data,
         });
-    }
+    },
 
     /**
      * 批量删除${businessName}，多个以英文逗号(,)分割
      *
      * @param ids ${businessName}ID字符串，多个以英文逗号(,)分割
      */
-    static deleteByIds(ids: string) {
+     deleteByIds(ids: string) {
         return request({
             url: `${${entityName.toUpperCase()}_BASE_URL}/${ids}`,
             method: "delete",