opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 01:25:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

在线h5 位置移动

Browse Source
This commit is contained in:
lizhengwei 2026-04-01 18:34:45 +08:00
parent c422799e92
commit df0dee5784
57 changed files with 102 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/PackageConstant.java
View File

@ -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";
}

46
ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Scripts.java
View File

@ -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;
/**
* <p>
* 作品
* </p>
*
* @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;
}

18
ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/ScriptsDao.java
View File

@ -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;
/**
* <p>
* 作品 Mapper 接口
* </p>
*
* @author lizhengwei
* @since 2024-06-21
*/
@Mapper
public interface ScriptsDao extends BaseMapper<Scripts> {
}

14
ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/ScriptsDao.xml
View File

@ -1,14 +0,0 @@
<?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="org.dromara.md.h5.mapper.mapper.ScriptsDao">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="org.dromara.md.h5.mapper.entity.Scripts">
<id column="id" property="id" />
<result column="title" property="title" />
<result column="content" property="content" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
</resultMap>
</mapper>

18
ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/pom.xml
View File

@ -16,6 +16,11 @@
</description>
<dependencies>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-form-service</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5-api</artifactId>
@ -46,6 +51,19 @@
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-tenant</artifactId>
</dependency>
<dependency>
<groupId>me.liuxp</groupId>
<artifactId>minio-plus-all-springboot-starter</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>me.liuxp</groupId>
<artifactId>s3-api-minio</artifactId>
<version>1.0.5</version>
</dependency>
</dependencies>
</project>

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/FontController.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentCategoryController.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ComponentCategoryController.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentController.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ComponentController.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5FormController.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5FormController.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5GroupController.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5GroupController.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ProjectController.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5TagController.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5TagController.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/UploadController.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/UploadController.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkController.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkFormsController.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkFormsController.java
View File

@ -1,4 +1,4 @@
package com.luban.api.controller;
package org.dromara.md.h5.controller;
import org.springframework.web.bind.annotation.RequestMapping;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/FormSubmissionConvert.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/FormSubmissionConvert.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5ComponentConvert.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5FormConvert.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5FormConvert.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ProjectConvert.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/convert/H5ProjectConvert.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/ExceptionHandle.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/exception/ExceptionHandle.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/UnifiedException.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/exception/UnifiedException.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/config/S3LoginUserInterceptor.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/config/S3LoginUserInterceptor.java
View File

@ -1,4 +1,4 @@
package com.luban.api.s3.config;
package org.dromara.md.h5.s3.config;
import cn.hutool.core.text.CharSequenceUtil;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/ctrl/Storage2Controller.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/ctrl/Storage2Controller.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/ctrl/StorageWebAPI.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/ctrl/StorageWebAPI.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/dao/FileMetadataInfoMapper.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/dao/FileMetadataInfoMapper.java
View File

@ -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<FileMetadataInfoEntity> {

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/entity/FileMetadataInfoEntity.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/entity/FileMetadataInfoEntity.java
View File

@ -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;

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/s3/service/MetadataRepositoryImpl.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/s3/service/MetadataRepositoryImpl.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/FontService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ComponentCategoryService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentService.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ComponentService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormDefinitionService.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5FormDefinitionService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormService.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5FormService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5GroupService.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5GroupService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectGroupService.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ProjectGroupService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectService.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5ProjectService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5TagService.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/H5TagService.java
View File

@ -1,4 +1,4 @@
package com.luban.api.service;
package org.dromara.md.h5.service;
import org.dromara.md.h5.mapper.entity.H5Tag;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/FontServiceImpl.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ComponentCategoryServiceImpl.java
View File

@ -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;

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentServiceImpl.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ComponentServiceImpl.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5FormDefinitionServiceImpl.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormDefinitionServiceImpl.java
View File

@ -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;

10
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5FormServiceImpl.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormServiceImpl.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5GroupServiceImpl.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5GroupServiceImpl.java
View File

@ -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;
/**

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectGroupServiceImpl.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ProjectGroupServiceImpl.java
View File

@ -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;
/**

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectServiceImpl.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5ProjectServiceImpl.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5TagServiceImpl.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5TagServiceImpl.java
View File

@ -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;

20
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/util/JSON.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/util/JSON.java
View File

@ -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;
}
}
}
}

5
ruoyi-site/ruoyi-h5/pom.xml
View File

@ -65,11 +65,6 @@
<artifactId>ruoyi-common-encrypt</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-form-service</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5-service</artifactId>

50
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/ScriptsController.java
View File

@ -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;
//
///**
// * <p>
// * 作品 前端控制器
// * </p>
// *
// * @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<ScriptsVO> listAllScriptss(@RequestParam Integer _limit) {
// QueryWrapper<Scripts> wrapper = new QueryWrapper<>();
// wrapper.last("limit " + _limit);
// return scriptsService.list(wrapper).stream().map(ScriptsConvert::toVO).collect(Collectors.toList());
// }
//
//}
//

21
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/P6SpyLogger.java
View File

@ -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;
// }
//}

20
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/StdoutLogger.java
View File

@ -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);
// }
// }
//}

16
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/ScriptsService.java
View File

@ -1,16 +0,0 @@
package com.luban.api.service;
import org.dromara.md.h5.mapper.entity.Scripts;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 作品 服务类
* </p>
*
* @author lizhengwei
* @since 2024-06-21
*/
public interface ScriptsService extends IService<Scripts> {
}

20
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/ScriptsServiceImpl.java
View File

@ -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;
/**
* <p>
* 作品 服务实现类
* </p>
*
* @author lizhengwei
* @since 2024-06-21
*/
@Service
public class ScriptsServiceImpl extends ServiceImpl<ScriptsDao, Scripts> implements ScriptsService {
}

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/MallH5Application.java → ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/MallH5Application.java
View File

@ -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) {

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java → ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/MybatisPlusAutoConfigTenant.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java → ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/PlusTenantLineHandler.java
View File

@ -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;

8
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/WebMvcConfig.java → ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/WebMvcConfig.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/test/java/com/luban/api/ImportH5Project.java → ruoyi-site/ruoyi-h5/src/test/java/org/dromara/h5/ImportH5Project.java
View File

@ -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;