From 6d7f2a86afc5b0659344fe52c509cf98c1562350 Mon Sep 17 00:00:00 2001
From: zhang chengzhi <3144712872@qq.com>
Date: Sat, 10 Aug 2024 20:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8E=A8=E9=80=81=E5=BE=AE?=
=?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
cloud-resource-common/pom.xml | 1 +
.../muyu/{cloud => }/resource/domain/ResourceInfo.java | 3 +--
.../com/muyu/{cloud => }/resource/domain/SysParam.java | 2 +-
.../com/muyu/resource/controller/ResourceController.java | 3 +--
.../java/com/muyu/resource/mapper/ResourceMapper.java | 2 +-
.../muyu/resource/service/Impl/ResourceServiceImpl.java | 8 --------
.../java/com/muyu/resource/service/ResourceService.java | 5 -----
.../src/main/resources/mapper/resource/ResourceMapper.xml | 2 +-
8 files changed, 6 insertions(+), 20 deletions(-)
rename cloud-resource-common/src/main/java/com/muyu/{cloud => }/resource/domain/ResourceInfo.java (96%)
rename cloud-resource-common/src/main/java/com/muyu/{cloud => }/resource/domain/SysParam.java (94%)
diff --git a/cloud-resource-common/pom.xml b/cloud-resource-common/pom.xml
index 8ed7ea0..1a35ce9 100644
--- a/cloud-resource-common/pom.xml
+++ b/cloud-resource-common/pom.xml
@@ -9,6 +9,7 @@
1.0.0
+
cloud-resource-common
diff --git a/cloud-resource-common/src/main/java/com/muyu/cloud/resource/domain/ResourceInfo.java b/cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java
similarity index 96%
rename from cloud-resource-common/src/main/java/com/muyu/cloud/resource/domain/ResourceInfo.java
rename to cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java
index 8c92961..8b4aea5 100644
--- a/cloud-resource-common/src/main/java/com/muyu/cloud/resource/domain/ResourceInfo.java
+++ b/cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java
@@ -1,4 +1,4 @@
-package com.muyu.cloud.resource.domain;
+package com.muyu.resource.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -19,7 +19,6 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class ResourceInfo {
-@Excel(name = "")
private String id;
private String recommendId;
private String title;
diff --git a/cloud-resource-common/src/main/java/com/muyu/cloud/resource/domain/SysParam.java b/cloud-resource-common/src/main/java/com/muyu/resource/domain/SysParam.java
similarity index 94%
rename from cloud-resource-common/src/main/java/com/muyu/cloud/resource/domain/SysParam.java
rename to cloud-resource-common/src/main/java/com/muyu/resource/domain/SysParam.java
index ca25752..1ff305d 100644
--- a/cloud-resource-common/src/main/java/com/muyu/cloud/resource/domain/SysParam.java
+++ b/cloud-resource-common/src/main/java/com/muyu/resource/domain/SysParam.java
@@ -1,4 +1,4 @@
-package com.muyu.cloud.resource.domain;
+package com.muyu.resource.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java b/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java
index 2d699d9..1c4680c 100644
--- a/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java
+++ b/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java
@@ -1,12 +1,11 @@
package com.muyu.resource.controller;
-import com.muyu.cloud.resource.domain.ResourceInfo;
+import com.muyu.resource.domain.ResourceInfo;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.SysUser;
import com.muyu.resource.service.ResourceService;
import jakarta.servlet.http.HttpServletResponse;
diff --git a/cloud-resource-server/src/main/java/com/muyu/resource/mapper/ResourceMapper.java b/cloud-resource-server/src/main/java/com/muyu/resource/mapper/ResourceMapper.java
index 9fb1eef..9f98372 100644
--- a/cloud-resource-server/src/main/java/com/muyu/resource/mapper/ResourceMapper.java
+++ b/cloud-resource-server/src/main/java/com/muyu/resource/mapper/ResourceMapper.java
@@ -1,6 +1,6 @@
package com.muyu.resource.mapper;
-import com.muyu.cloud.resource.domain.ResourceInfo;
+import com.muyu.resource.domain.ResourceInfo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/cloud-resource-server/src/main/java/com/muyu/resource/service/Impl/ResourceServiceImpl.java b/cloud-resource-server/src/main/java/com/muyu/resource/service/Impl/ResourceServiceImpl.java
index 759edc3..da5f6e3 100644
--- a/cloud-resource-server/src/main/java/com/muyu/resource/service/Impl/ResourceServiceImpl.java
+++ b/cloud-resource-server/src/main/java/com/muyu/resource/service/Impl/ResourceServiceImpl.java
@@ -1,11 +1,5 @@
package com.muyu.resource.service.Impl;
-import com.muyu.cloud.resource.domain.ResourceInfo;
-import com.muyu.common.core.exception.ServiceException;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.utils.bean.BeanValidators;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.SysUser;
import com.muyu.resource.mapper.ResourceMapper;
import com.muyu.resource.service.ResourceService;
import jakarta.validation.Validator;
@@ -14,8 +8,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.List;
-
/**
* @Author：zhangchengzhi
* @Package：com.muyu.resource.service.Impl
diff --git a/cloud-resource-server/src/main/java/com/muyu/resource/service/ResourceService.java b/cloud-resource-server/src/main/java/com/muyu/resource/service/ResourceService.java
index 2353c2c..0fb1d33 100644
--- a/cloud-resource-server/src/main/java/com/muyu/resource/service/ResourceService.java
+++ b/cloud-resource-server/src/main/java/com/muyu/resource/service/ResourceService.java
@@ -1,10 +1,5 @@
package com.muyu.resource.service;
-import com.muyu.cloud.resource.domain.ResourceInfo;
-import com.muyu.common.system.domain.SysUser;
-
-import java.util.List;
-
/**
* @Author：zhangchengzhi
* @Package：com.muyu.resource.service
diff --git a/cloud-resource-server/src/main/resources/mapper/resource/ResourceMapper.xml b/cloud-resource-server/src/main/resources/mapper/resource/ResourceMapper.xml
index 5d8abf6..2bc341f 100644
--- a/cloud-resource-server/src/main/resources/mapper/resource/ResourceMapper.xml
+++ b/cloud-resource-server/src/main/resources/mapper/resource/ResourceMapper.xml
@@ -5,7 +5,7 @@
-