diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/PackageConstant.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/PackageConstant.java
deleted file mode 100644
index 76fcf208b..000000000
--- a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/PackageConstant.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.dromara.md.h5.api.constant;
-
-/**
- * 包名常量
- *
- * @author WeiHongBin
- */
-public final class PackageConstant {
-
-
- public static final String BASE_PACKAGE = "com.luban.api";
-
- public static final String CONTROLLER_PACKAGE = BASE_PACKAGE + ".controller";
-
- public static final String DAO_PACKAGE = BASE_PACKAGE + ".dao";
-
-
-}
diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Scripts.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Scripts.java
deleted file mode 100644
index fcef85cc3..000000000
--- a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Scripts.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.dromara.md.h5.mapper.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- *
- * 作品
- *
- *
- * @author lizhengwei
- * @since 2024-06-21
- */
-@Data
-
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@Schema(name = "Scripts对象", description = "作品")
-public class Scripts implements Serializable {
-
- @Serial
- private static final long serialVersionUID=1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @Schema(title = "标题")
- private String title;
-
- @Schema(title = "内容")
- private String content;
-
- private LocalDateTime createTime;
-
- private LocalDateTime updateTime;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/ScriptsDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/ScriptsDao.java
deleted file mode 100644
index e5e221b7a..000000000
--- a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/ScriptsDao.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.dromara.md.h5.mapper.mapper;
-
-import org.dromara.md.h5.mapper.entity.Scripts;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- *
- * 作品 Mapper 接口
- *
- *
- * @author lizhengwei
- * @since 2024-06-21
- */
-@Mapper
-public interface ScriptsDao extends BaseMapper {
-
-}
diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/ScriptsDao.xml b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/ScriptsDao.xml
deleted file mode 100644
index 8fbbaf3e7..000000000
--- a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/ScriptsDao.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/pom.xml b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/pom.xml
index c13230b88..5887e9a27 100644
--- a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/pom.xml
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/pom.xml
@@ -16,6 +16,11 @@
+
+ org.dromara
+ ruoyi-md-form-service
+
+
org.dromara
ruoyi-md-h5-api
@@ -46,6 +51,19 @@
org.dromara
ruoyi-common-tenant
+
+
+
+ me.liuxp
+ minio-plus-all-springboot-starter
+ 1.0.5
+
+
+ me.liuxp
+ s3-api-minio
+ 1.0.5
+
+
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/FontController.java
similarity index 95%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/FontController.java
index 18a7d71cd..7b833eb47 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/FontController.java
@@ -1,9 +1,9 @@
-package com.luban.api.controller;
+package org.dromara.md.h5.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.dromara.md.h5.mapper.entity.Font;
import org.dromara.md.h5.api.dto.FontDTO;
-import com.luban.api.service.FontService;
+import org.dromara.md.h5.service.FontService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentCategoryController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ComponentCategoryController.java
similarity index 96%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentCategoryController.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ComponentCategoryController.java
index db25593a3..433687bb5 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentCategoryController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ComponentCategoryController.java
@@ -1,9 +1,9 @@
-package com.luban.api.controller;
+package org.dromara.md.h5.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.dromara.md.h5.api.dto.H5ComponentCategoryQueryDTO;
import org.dromara.md.h5.mapper.entity.H5ComponentCategory;
-import com.luban.api.service.H5ComponentCategoryService;
+import org.dromara.md.h5.service.H5ComponentCategoryService;
import org.dromara.md.h5.api.vo.H5ComponentCategoryTreeVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ComponentController.java
similarity index 97%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentController.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ComponentController.java
index e2ff8faeb..73e47e4d2 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ComponentController.java
@@ -1,10 +1,10 @@
-package com.luban.api.controller;
+package org.dromara.md.h5.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.dromara.md.h5.api.dto.H5ComponentDTO;
import org.dromara.md.h5.api.dto.query.H5ComponentPageQueryDTO;
-import com.luban.api.service.H5ComponentService;
+import org.dromara.md.h5.service.H5ComponentService;
import org.dromara.md.h5.api.vo.H5ComponentVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5FormController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5FormController.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5FormController.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5FormController.java
index 70e1664c3..a35775c08 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5FormController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5FormController.java
@@ -1,8 +1,8 @@
-package com.luban.api.controller;
+package org.dromara.md.h5.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.dromara.md.h5.api.dto.H5FormSubmissionDTO;
-import com.luban.api.service.H5FormService;
+import org.dromara.md.h5.service.H5FormService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5GroupController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5GroupController.java
similarity index 97%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5GroupController.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5GroupController.java
index 0a82c20ed..4d2a7c4d3 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5GroupController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5GroupController.java
@@ -1,10 +1,10 @@
-package com.luban.api.controller;
+package org.dromara.md.h5.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.dromara.md.h5.mapper.entity.H5Group;
-import com.luban.api.service.H5GroupService;
+import org.dromara.md.h5.service.H5GroupService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ProjectController.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ProjectController.java
index bd435bb40..20d9164da 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ProjectController.java
@@ -1,4 +1,4 @@
-package com.luban.api.controller;
+package org.dromara.md.h5.controller;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +8,7 @@ import org.dromara.md.h5.api.constant.ProjectStatus;
import org.dromara.md.h5.api.dto.H5ProjectContentDTO;
import org.dromara.md.h5.api.dto.query.H5ProjectQueryDTO;
import org.dromara.md.h5.mapper.entity.H5Project;
-import com.luban.api.service.H5ProjectService;
+import org.dromara.md.h5.service.H5ProjectService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5TagController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5TagController.java
similarity index 96%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5TagController.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5TagController.java
index 3df2f8e41..90dd76b46 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5TagController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5TagController.java
@@ -1,7 +1,7 @@
-package com.luban.api.controller;
+package org.dromara.md.h5.controller;
import org.dromara.md.h5.mapper.entity.H5Tag;
-import com.luban.api.service.H5TagService;
+import org.dromara.md.h5.service.H5TagService;
import org.dromara.md.h5.api.vo.Result;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/UploadController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/UploadController.java
similarity index 96%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/UploadController.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/UploadController.java
index d2c0ec39e..ea5ed89c2 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/UploadController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/UploadController.java
@@ -1,4 +1,4 @@
-package com.luban.api.controller;
+package org.dromara.md.h5.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkController.java
similarity index 96%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkController.java
index f543a4a26..ec6eb4ccf 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkController.java
@@ -1,4 +1,4 @@
-package com.luban.api.controller;
+package org.dromara.md.h5.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +8,7 @@ import org.dromara.md.h5.api.constant.ProjectStatus;
import org.dromara.md.h5.api.dto.H5ProjectContentDTO;
import org.dromara.md.h5.api.dto.query.H5ProjectQueryDTO;
import org.dromara.md.h5.mapper.entity.H5Project;
-import com.luban.api.service.H5ProjectService;
+import org.dromara.md.h5.service.H5ProjectService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkFormsController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkFormsController.java
similarity index 88%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkFormsController.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkFormsController.java
index 4be91bc65..fb5cd7236 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkFormsController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkFormsController.java
@@ -1,4 +1,4 @@
-package com.luban.api.controller;
+package org.dromara.md.h5.controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/FormSubmissionConvert.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/FormSubmissionConvert.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/FormSubmissionConvert.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/FormSubmissionConvert.java
index 5c4edda9b..413e499be 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/FormSubmissionConvert.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/FormSubmissionConvert.java
@@ -1,4 +1,4 @@
-package com.luban.api.convert;
+package org.dromara.md.h5.convert;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5ComponentConvert.java
similarity index 97%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5ComponentConvert.java
index 61ebd64ff..dbdc67c12 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5ComponentConvert.java
@@ -1,4 +1,4 @@
-package com.luban.api.convert;
+package org.dromara.md.h5.convert;
import cn.hutool.json.JSONUtil;
import org.dromara.md.h5.api.dto.H5ComponentDTO;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5FormConvert.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5FormConvert.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5FormConvert.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5FormConvert.java
index 47bc4c992..c2c110e2a 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5FormConvert.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5FormConvert.java
@@ -1,4 +1,4 @@
-package com.luban.api.convert;
+package org.dromara.md.h5.convert;
import cn.hutool.json.JSONUtil;
import org.dromara.md.h5.api.dto.H5FormSubmissionDTO;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ProjectConvert.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5ProjectConvert.java
similarity index 97%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ProjectConvert.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5ProjectConvert.java
index dc1334e38..c787c5469 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ProjectConvert.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5ProjectConvert.java
@@ -1,4 +1,4 @@
-package com.luban.api.convert;
+package org.dromara.md.h5.convert;
import org.dromara.md.h5.mapper.entity.H5Project;
import org.dromara.md.h5.api.vo.H5ProjectVO;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/ExceptionHandle.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/exception/ExceptionHandle.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/ExceptionHandle.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/exception/ExceptionHandle.java
index ef862fdef..0f5a18329 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/ExceptionHandle.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/exception/ExceptionHandle.java
@@ -1,7 +1,7 @@
-package com.luban.api.exception;
+package org.dromara.md.h5.exception;
-import com.luban.api.util.JSON;
+import org.dromara.md.h5.util.JSON;
import org.dromara.md.h5.api.vo.Result;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/UnifiedException.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/exception/UnifiedException.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/UnifiedException.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/exception/UnifiedException.java
index 19f574b4a..09b45fea2 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/UnifiedException.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/exception/UnifiedException.java
@@ -1,4 +1,4 @@
-package com.luban.api.exception;
+package org.dromara.md.h5.exception;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/config/S3LoginUserInterceptor.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/config/S3LoginUserInterceptor.java
similarity index 97%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/config/S3LoginUserInterceptor.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/config/S3LoginUserInterceptor.java
index 595642d4c..c475b42dd 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/config/S3LoginUserInterceptor.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/config/S3LoginUserInterceptor.java
@@ -1,4 +1,4 @@
-package com.luban.api.s3.config;
+package org.dromara.md.h5.s3.config;
import cn.hutool.core.text.CharSequenceUtil;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/ctrl/Storage2Controller.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/ctrl/Storage2Controller.java
similarity index 99%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/ctrl/Storage2Controller.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/ctrl/Storage2Controller.java
index ebec2b6ac..f48376e4a 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/ctrl/Storage2Controller.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/ctrl/Storage2Controller.java
@@ -1,4 +1,4 @@
-package com.luban.api.s3.ctrl;
+package org.dromara.md.h5.s3.ctrl;
import cn.hutool.core.io.IoUtil;
import lombok.extern.slf4j.Slf4j;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/ctrl/StorageWebAPI.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/ctrl/StorageWebAPI.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/ctrl/StorageWebAPI.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/ctrl/StorageWebAPI.java
index f7644b026..16e6f3601 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/ctrl/StorageWebAPI.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/ctrl/StorageWebAPI.java
@@ -1,4 +1,4 @@
-package com.luban.api.s3.ctrl;
+package org.dromara.md.h5.s3.ctrl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/dao/FileMetadataInfoMapper.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/dao/FileMetadataInfoMapper.java
similarity index 68%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/dao/FileMetadataInfoMapper.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/dao/FileMetadataInfoMapper.java
index 0af9a293f..ac7d866bb 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/dao/FileMetadataInfoMapper.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/dao/FileMetadataInfoMapper.java
@@ -1,8 +1,8 @@
-package com.luban.api.s3.dao;
+package org.dromara.md.h5.s3.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
-import com.luban.api.s3.entity.FileMetadataInfoEntity;
+import org.dromara.md.h5.s3.entity.FileMetadataInfoEntity;
@Mapper
public interface FileMetadataInfoMapper extends BaseMapper {
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/entity/FileMetadataInfoEntity.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/entity/FileMetadataInfoEntity.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/entity/FileMetadataInfoEntity.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/entity/FileMetadataInfoEntity.java
index 4393a6470..0b90c7191 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/entity/FileMetadataInfoEntity.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/entity/FileMetadataInfoEntity.java
@@ -1,4 +1,4 @@
-package com.luban.api.s3.entity;
+package org.dromara.md.h5.s3.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/service/MetadataRepositoryImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/service/MetadataRepositoryImpl.java
similarity index 96%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/service/MetadataRepositoryImpl.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/service/MetadataRepositoryImpl.java
index 0051e6097..e07b60107 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/service/MetadataRepositoryImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/service/MetadataRepositoryImpl.java
@@ -1,4 +1,4 @@
-package com.luban.api.s3.service;
+package org.dromara.md.h5.s3.service;
import cn.hutool.core.text.CharSequenceUtil;
@@ -12,8 +12,8 @@ import org.liuxp.minioplus.api.model.vo.FileMetadataInfoVo;
import org.liuxp.minioplus.core.repository.MetadataRepository;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import com.luban.api.s3.dao.FileMetadataInfoMapper;
-import com.luban.api.s3.entity.FileMetadataInfoEntity;
+import org.dromara.md.h5.s3.dao.FileMetadataInfoMapper;
+import org.dromara.md.h5.s3.entity.FileMetadataInfoEntity;
import java.util.ArrayList;
import java.util.Date;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/FontService.java
similarity index 97%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/FontService.java
index 25122cdde..3a6bc1b29 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/FontService.java
@@ -1,4 +1,4 @@
-package com.luban.api.service;
+package org.dromara.md.h5.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ComponentCategoryService.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ComponentCategoryService.java
index 6a88c5b57..0886335b6 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ComponentCategoryService.java
@@ -1,4 +1,4 @@
-package com.luban.api.service;
+package org.dromara.md.h5.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.dromara.md.h5.api.dto.H5ComponentCategoryQueryDTO;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentService.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ComponentService.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentService.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ComponentService.java
index 03bad2655..f21f8bddc 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentService.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ComponentService.java
@@ -1,4 +1,4 @@
-package com.luban.api.service;
+package org.dromara.md.h5.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.dromara.md.h5.api.dto.H5ComponentDTO;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormDefinitionService.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5FormDefinitionService.java
similarity index 90%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormDefinitionService.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5FormDefinitionService.java
index 84023085c..828b9e26e 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormDefinitionService.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5FormDefinitionService.java
@@ -1,4 +1,4 @@
-package com.luban.api.service;
+package org.dromara.md.h5.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.md.h5.mapper.entity.H5Form;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormService.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5FormService.java
similarity index 97%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormService.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5FormService.java
index dff04ad77..df8ffa8d1 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormService.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5FormService.java
@@ -1,4 +1,4 @@
-package com.luban.api.service;
+package org.dromara.md.h5.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5GroupService.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5GroupService.java
similarity index 87%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5GroupService.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5GroupService.java
index 460494320..52a0b77e7 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5GroupService.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5GroupService.java
@@ -1,4 +1,4 @@
-package com.luban.api.service;
+package org.dromara.md.h5.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.md.h5.mapper.entity.H5Group;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectGroupService.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ProjectGroupService.java
similarity index 88%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectGroupService.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ProjectGroupService.java
index 6a9eb263f..41587bee8 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectGroupService.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ProjectGroupService.java
@@ -1,4 +1,4 @@
-package com.luban.api.service;
+package org.dromara.md.h5.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.md.h5.mapper.entity.H5ProjectGroup;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectService.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ProjectService.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectService.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ProjectService.java
index 68889e41f..116cd82c5 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectService.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ProjectService.java
@@ -1,4 +1,4 @@
-package com.luban.api.service;
+package org.dromara.md.h5.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5TagService.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5TagService.java
similarity index 96%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5TagService.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5TagService.java
index f96b525dc..108919325 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5TagService.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5TagService.java
@@ -1,4 +1,4 @@
-package com.luban.api.service;
+package org.dromara.md.h5.service;
import org.dromara.md.h5.mapper.entity.H5Tag;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/FontServiceImpl.java
similarity index 97%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/FontServiceImpl.java
index b70563ffb..5676968da 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/FontServiceImpl.java
@@ -1,4 +1,4 @@
-package com.luban.api.service.impl;
+package org.dromara.md.h5.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONUtil;
@@ -10,7 +10,7 @@ import org.dromara.md.h5.mapper.mapper.FontDao;
import org.dromara.md.h5.mapper.entity.Font;
// Removed MongoDB imports
import org.dromara.md.h5.api.dto.FontDTO;
-import com.luban.api.service.FontService;
+import org.dromara.md.h5.service.FontService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ComponentCategoryServiceImpl.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ComponentCategoryServiceImpl.java
index a67f9978c..a15a071ea 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ComponentCategoryServiceImpl.java
@@ -1,4 +1,4 @@
-package com.luban.api.service.impl;
+package org.dromara.md.h5.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.md.h5.mapper.mapper.H5ComponentCategoryDao;
import org.dromara.md.h5.api.dto.H5ComponentCategoryQueryDTO;
import org.dromara.md.h5.mapper.entity.H5ComponentCategory;
-import com.luban.api.service.H5ComponentCategoryService;
+import org.dromara.md.h5.service.H5ComponentCategoryService;
import org.dromara.md.h5.api.vo.H5ComponentCategoryTreeVO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentServiceImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ComponentServiceImpl.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentServiceImpl.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ComponentServiceImpl.java
index 5e266fdeb..1c3f9fa69 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ComponentServiceImpl.java
@@ -1,9 +1,10 @@
-package com.luban.api.service.impl;
+package org.dromara.md.h5.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.md.h5.convert.H5ComponentConvert;
import org.dromara.md.h5.mapper.mapper.H5ComponentCategoryDao;
import org.dromara.md.h5.mapper.mapper.H5ComponentCategoryRelDao;
import org.dromara.md.h5.mapper.mapper.H5ComponentDao;
@@ -14,8 +15,7 @@ import org.dromara.md.h5.mapper.entity.H5Component;
import org.dromara.md.h5.mapper.entity.H5ComponentCategory;
import org.dromara.md.h5.mapper.entity.H5ComponentCategoryRel;
import org.dromara.md.h5.mapper.entity.H5ComponentTagRel;
-import com.luban.api.service.H5ComponentService;
-import com.luban.api.convert.H5ComponentConvert;
+import org.dromara.md.h5.service.H5ComponentService;
import org.dromara.md.h5.api.vo.H5ComponentVO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5FormDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormDefinitionServiceImpl.java
similarity index 92%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5FormDefinitionServiceImpl.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormDefinitionServiceImpl.java
index 78c20586c..4e3bff67a 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5FormDefinitionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormDefinitionServiceImpl.java
@@ -1,10 +1,10 @@
-package com.luban.api.service.impl;
+package org.dromara.md.h5.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.md.h5.mapper.mapper.H5FormDao;
import org.dromara.md.h5.mapper.entity.H5Form;
-import com.luban.api.service.H5FormDefinitionService;
+import org.dromara.md.h5.service.H5FormDefinitionService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5FormServiceImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormServiceImpl.java
similarity index 95%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5FormServiceImpl.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormServiceImpl.java
index c4a30c783..aa1bc254b 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5FormServiceImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormServiceImpl.java
@@ -1,18 +1,18 @@
-package com.luban.api.service.impl;
+package org.dromara.md.h5.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dromara.md.form.service.FormService;
-import com.luban.api.convert.FormSubmissionConvert;
-import com.luban.api.convert.H5FormConvert;
+import org.dromara.md.h5.convert.FormSubmissionConvert;
+import org.dromara.md.h5.convert.H5FormConvert;
import org.dromara.md.h5.mapper.mapper.FormSubmissionDao;
import org.dromara.md.h5.api.dto.H5FormSubmissionDTO;
import org.dromara.md.h5.api.dto.H5ProjectContentDTO;
import org.dromara.md.h5.mapper.entity.FormSubmission;
import org.dromara.md.h5.mapper.entity.H5Form;
-import com.luban.api.service.H5FormDefinitionService;
-import com.luban.api.service.H5FormService;
+import org.dromara.md.h5.service.H5FormDefinitionService;
+import org.dromara.md.h5.service.H5FormService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5GroupServiceImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5GroupServiceImpl.java
similarity index 81%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5GroupServiceImpl.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5GroupServiceImpl.java
index 2d576da4d..256b4122a 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5GroupServiceImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5GroupServiceImpl.java
@@ -1,9 +1,9 @@
-package com.luban.api.service.impl;
+package org.dromara.md.h5.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.md.h5.mapper.mapper.H5GroupDao;
import org.dromara.md.h5.mapper.entity.H5Group;
-import com.luban.api.service.H5GroupService;
+import org.dromara.md.h5.service.H5GroupService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectGroupServiceImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ProjectGroupServiceImpl.java
similarity index 82%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectGroupServiceImpl.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ProjectGroupServiceImpl.java
index 9cb1f20ba..3c2bd47ab 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectGroupServiceImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ProjectGroupServiceImpl.java
@@ -1,9 +1,9 @@
-package com.luban.api.service.impl;
+package org.dromara.md.h5.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.md.h5.mapper.mapper.H5ProjectGroupDao;
import org.dromara.md.h5.mapper.entity.H5ProjectGroup;
-import com.luban.api.service.H5ProjectGroupService;
+import org.dromara.md.h5.service.H5ProjectGroupService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectServiceImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ProjectServiceImpl.java
similarity index 97%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectServiceImpl.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ProjectServiceImpl.java
index bb7a368c7..61e48eb38 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectServiceImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ProjectServiceImpl.java
@@ -1,4 +1,4 @@
-package com.luban.api.service.impl;
+package org.dromara.md.h5.service.impl;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,8 +12,8 @@ import org.dromara.md.h5.mapper.entity.H5Project;
import org.dromara.md.h5.mapper.entity.H5ProjectGroup;
import org.dromara.md.h5.api.dto.H5ProjectContentDTO;
import org.dromara.md.h5.api.dto.query.H5ProjectQueryDTO;
-import com.luban.api.service.H5ProjectService;
-import com.luban.api.util.JSON;
+import org.dromara.md.h5.service.H5ProjectService;
+import org.dromara.md.h5.util.JSON;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5TagServiceImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5TagServiceImpl.java
similarity index 96%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5TagServiceImpl.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5TagServiceImpl.java
index f9fa26df3..99bd24168 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5TagServiceImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5TagServiceImpl.java
@@ -1,11 +1,11 @@
-package com.luban.api.service.impl;
+package org.dromara.md.h5.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.md.h5.mapper.mapper.H5TagDao;
import org.dromara.md.h5.mapper.entity.H5Tag;
-import com.luban.api.service.H5TagService;
+import org.dromara.md.h5.service.H5TagService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/util/JSON.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/util/JSON.java
similarity index 97%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/util/JSON.java
rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/util/JSON.java
index b7842589f..5f36c2b30 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/util/JSON.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/util/JSON.java
@@ -1,4 +1,4 @@
-package com.luban.api.util;
+package org.dromara.md.h5.util;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -66,10 +66,10 @@ public class JSON {
}
return null;
}
-
+
/**
* 将IP地址字符串转换为数字形式
- *
+ *
* @param ipAddress IP地址字符串，如 "192.168.1.1"
* @return IP地址的数字表示形式
*/
@@ -77,11 +77,11 @@ public class JSON {
if (ipAddress == null || ipAddress.isEmpty()) {
return null;
}
-
+
try {
InetAddress inetAddress = InetAddress.getByName(ipAddress);
byte[] bytes = inetAddress.getAddress();
-
+
if (bytes.length == 4) {
// IPv4
long result = 0;
@@ -98,10 +98,10 @@ public class JSON {
return null;
}
}
-
+
/**
* 将数字形式的IP地址转换为字符串
- *
+ *
* @param ipLong 数字形式的IP地址
* @return IP地址字符串
*/
@@ -109,14 +109,14 @@ public class JSON {
if (ipLong == null) {
return null;
}
-
+
try {
byte[] bytes = new byte[4];
bytes[0] = (byte) ((ipLong >> 24) & 0xFF);
bytes[1] = (byte) ((ipLong >> 16) & 0xFF);
bytes[2] = (byte) ((ipLong >> 8) & 0xFF);
bytes[3] = (byte) (ipLong & 0xFF);
-
+
InetAddress inetAddress = InetAddress.getByAddress(bytes);
return inetAddress.getHostAddress();
} catch (UnknownHostException e) {
@@ -124,4 +124,4 @@ public class JSON {
return null;
}
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-site/ruoyi-h5/pom.xml b/ruoyi-site/ruoyi-h5/pom.xml
index 5d8b3a82b..d08ac4e79 100644
--- a/ruoyi-site/ruoyi-h5/pom.xml
+++ b/ruoyi-site/ruoyi-h5/pom.xml
@@ -65,11 +65,6 @@
ruoyi-common-encrypt
-
- org.dromara
- ruoyi-md-form-service
-
-
org.dromara
ruoyi-md-h5-service
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/ScriptsController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/ScriptsController.java
deleted file mode 100644
index c443bc4a3..000000000
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/ScriptsController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-//package com.luban.api.controller;
-//
-//
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import org.dromara.md.h5.mapper.entity.Scripts;
-//import com.luban.api.convert.ScriptsConvert;
-//import com.luban.api.service.ScriptsService;
-//import com.luban.api.vo.ScriptsVO;
-//import io.swagger.v3.oas.annotations.Operation;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-///**
-// *
-// * 作品 前端控制器
-// *
-// *
-// * @author lizhengwei
-// * @since 2024-06-21
-// */
-//@RestController
-//@RequestMapping("/scripts")
-//public class ScriptsController {
-//
-//
-// private final ScriptsService scriptsService;
-//
-// public ScriptsController(ScriptsService scriptsService) {
-// this.scriptsService = scriptsService;
-// }
-//
-//
-// @Operation(summary = "根据scriptsId查询")
-// @GetMapping("/{id}")
-// public ScriptsVO findScriptsById(@PathVariable Long id) {
-// return ScriptsConvert.toVO(scriptsService.getById(id));
-// }
-//
-// @Operation(summary = "查询所有scripts")
-// @GetMapping
-// public List listAllScriptss(@RequestParam Integer _limit) {
-// QueryWrapper wrapper = new QueryWrapper<>();
-// wrapper.last("limit " + _limit);
-// return scriptsService.list(wrapper).stream().map(ScriptsConvert::toVO).collect(Collectors.toList());
-// }
-//
-//}
-//
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/P6SpyLogger.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/P6SpyLogger.java
deleted file mode 100644
index 5ee9c0246..000000000
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/P6SpyLogger.java
+++ /dev/null
@@ -1,21 +0,0 @@
-//package com.luban.api.log;
-//
-//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-//import com.p6spy.engine.spy.appender.MessageFormattingStrategy;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.stereotype.Component;
-//
-///**
-// * P6Spy 日志自定义处理
-// *
-// * @author WeiHongBin
-// */
-//@Slf4j
-//@Component
-//public class P6SpyLogger implements MessageFormattingStrategy {
-// @Override
-// public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) {
-// return StringUtils.isNotEmpty(sql) ? " Consume Time：" + elapsed + " ms " + now +
-// "\n Execute SQL：" + sql.replaceAll("[\\s]+", " ") + "\n" : null;
-// }
-//}
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/StdoutLogger.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/StdoutLogger.java
deleted file mode 100644
index 8121515ea..000000000
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/StdoutLogger.java
+++ /dev/null
@@ -1,20 +0,0 @@
-//package com.luban.api.log;
-//
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.stereotype.Component;
-//
-///**
-// * 修改SQL执行输出到 日志，便于分析
-// *
-// * @author WeiHongBin
-// */
-//@Slf4j
-//@Component
-//public class StdoutLogger extends com.p6spy.engine.spy.appender.StdoutLogger {
-// @Override
-// public void logText(String text) {
-// if (log.isDebugEnabled()) {
-// log.debug(text);
-// }
-// }
-//}
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/ScriptsService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/ScriptsService.java
deleted file mode 100644
index 76e0fe24a..000000000
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/ScriptsService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.luban.api.service;
-
-import org.dromara.md.h5.mapper.entity.Scripts;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- *
- * 作品 服务类
- *
- *
- * @author lizhengwei
- * @since 2024-06-21
- */
-public interface ScriptsService extends IService {
-
-}
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/ScriptsServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/ScriptsServiceImpl.java
deleted file mode 100644
index 4ebe332b6..000000000
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/ScriptsServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.luban.api.service.impl;
-
-import org.dromara.md.h5.mapper.mapper.ScriptsDao;
-import org.dromara.md.h5.mapper.entity.Scripts;
-import com.luban.api.service.ScriptsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 作品 服务实现类
- *
- *
- * @author lizhengwei
- * @since 2024-06-21
- */
-@Service
-public class ScriptsServiceImpl extends ServiceImpl implements ScriptsService {
-
-}
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/MallH5Application.java b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/MallH5Application.java
similarity index 77%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/MallH5Application.java
rename to ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/MallH5Application.java
index 3770b98a3..2753a0c4b 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/MallH5Application.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/MallH5Application.java
@@ -1,4 +1,4 @@
-package com.luban.api;
+package org.dromara.h5;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.springframework.boot.SpringApplication;
@@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* @author WeiHongBin
*/
@EnableDubbo
-@SpringBootApplication(scanBasePackages = {"com.luban", "com.dromara.md.form", "org.dromara"})
+@SpringBootApplication(scanBasePackages = {"com.dromara.md.form", "org.dromara"})
public class MallH5Application {
public static void main(String[] args) {
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/MybatisPlusAutoConfigTenant.java
similarity index 95%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java
rename to ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/MybatisPlusAutoConfigTenant.java
index dd50eff00..4708109ed 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/MybatisPlusAutoConfigTenant.java
@@ -1,4 +1,4 @@
-package com.luban.api.config;
+package org.dromara.h5.config;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
import org.dromara.common.tenant.properties.TenantProperties;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/PlusTenantLineHandler.java
similarity index 98%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java
rename to ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/PlusTenantLineHandler.java
index 5e363f160..6ae7b06c7 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/PlusTenantLineHandler.java
@@ -1,4 +1,4 @@
-package com.luban.api.config;
+package org.dromara.h5.config;
import cn.hutool.core.collection.ListUtil;
import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/WebMvcConfig.java b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/WebMvcConfig.java
similarity index 87%
rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/WebMvcConfig.java
rename to ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/WebMvcConfig.java
index 919d59eb8..a799be51e 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/WebMvcConfig.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/WebMvcConfig.java
@@ -1,15 +1,11 @@
-package com.luban.api.config;
+package org.dromara.h5.config;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.luban.api.s3.config.S3LoginUserInterceptor;
+import org.dromara.md.h5.s3.config.S3LoginUserInterceptor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
import org.springframework.web.servlet.config.annotation.*;
import java.util.List;
diff --git a/ruoyi-site/ruoyi-h5/src/test/java/com/luban/api/ImportH5Project.java b/ruoyi-site/ruoyi-h5/src/test/java/org/dromara/h5/ImportH5Project.java
similarity index 99%
rename from ruoyi-site/ruoyi-h5/src/test/java/com/luban/api/ImportH5Project.java
rename to ruoyi-site/ruoyi-h5/src/test/java/org/dromara/h5/ImportH5Project.java
index 6d7efed88..5c9d36183 100644
--- a/ruoyi-site/ruoyi-h5/src/test/java/com/luban/api/ImportH5Project.java
+++ b/ruoyi-site/ruoyi-h5/src/test/java/org/dromara/h5/ImportH5Project.java
@@ -1,4 +1,4 @@
-package com.luban.api;
+package org.dromara.h5;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.exc.MismatchedInputException;
import org.dromara.md.h5.api.dto.H5ProjectContentDTO;
import org.dromara.md.h5.mapper.entity.H5Project;
-import com.luban.api.service.H5ProjectService;
+import org.dromara.md.h5.service.H5ProjectService;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;