diff --git a/file-common/pom.xml b/file-common/pom.xml index 92e0396..a010b44 100644 --- a/file-common/pom.xml +++ b/file-common/pom.xml @@ -3,12 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.qiwen + com.qiwenshare file 1.0-SNAPSHOT 4.0.0 - com.qiwen + com.qiwenshare file-common 0.0.1-SNAPSHOT jar diff --git a/file-common/scp-common.iml b/file-common/scp-common.iml deleted file mode 100644 index 1522e4a..0000000 --- a/file-common/scp-common.iml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/file-common/src/main/java/com/mac/common/cbb/DateUtil.java b/file-common/src/main/java/com/qiwenshare/common/cbb/DateUtil.java similarity index 99% rename from file-common/src/main/java/com/mac/common/cbb/DateUtil.java rename to file-common/src/main/java/com/qiwenshare/common/cbb/DateUtil.java index 55069e6..17927dc 100644 --- a/file-common/src/main/java/com/mac/common/cbb/DateUtil.java +++ b/file-common/src/main/java/com/qiwenshare/common/cbb/DateUtil.java @@ -1,4 +1,4 @@ -package com.mac.common.cbb; +package com.qiwenshare.common.cbb; import java.text.DateFormat; import java.text.ParseException; diff --git a/file-common/src/main/java/com/mac/common/cbb/MiniuiUtil.java b/file-common/src/main/java/com/qiwenshare/common/cbb/MiniuiUtil.java similarity index 80% rename from file-common/src/main/java/com/mac/common/cbb/MiniuiUtil.java rename to file-common/src/main/java/com/qiwenshare/common/cbb/MiniuiUtil.java index 91433b8..08d254c 100644 --- a/file-common/src/main/java/com/mac/common/cbb/MiniuiUtil.java +++ b/file-common/src/main/java/com/qiwenshare/common/cbb/MiniuiUtil.java @@ -1,7 +1,7 @@ -package com.mac.common.cbb; +package com.qiwenshare.common.cbb; -import com.mac.common.domain.TableQueryBean; +import com.qiwenshare.common.domain.TableQueryBean; public class MiniuiUtil { diff --git a/file-common/src/main/java/com/mac/common/cbb/RestResult.java b/file-common/src/main/java/com/qiwenshare/common/cbb/RestResult.java similarity index 95% rename from file-common/src/main/java/com/mac/common/cbb/RestResult.java rename to file-common/src/main/java/com/qiwenshare/common/cbb/RestResult.java index 641a4ab..7518363 100644 --- a/file-common/src/main/java/com/mac/common/cbb/RestResult.java +++ b/file-common/src/main/java/com/qiwenshare/common/cbb/RestResult.java @@ -1,4 +1,4 @@ -package com.mac.common.cbb; +package com.qiwenshare.common.cbb; public class RestResult { private boolean success = true; diff --git a/file-common/src/main/java/com/mac/common/cbb/Uploader.java b/file-common/src/main/java/com/qiwenshare/common/cbb/Uploader.java similarity index 97% rename from file-common/src/main/java/com/mac/common/cbb/Uploader.java rename to file-common/src/main/java/com/qiwenshare/common/cbb/Uploader.java index 493a900..d72a862 100644 --- a/file-common/src/main/java/com/mac/common/cbb/Uploader.java +++ b/file-common/src/main/java/com/qiwenshare/common/cbb/Uploader.java @@ -1,9 +1,9 @@ -package com.mac.common.cbb; +package com.qiwenshare.common.cbb; -import com.mac.common.domain.UploadFile; -import com.mac.common.operation.ImageOperation; -import com.mac.common.util.FileUtil; -import com.mac.common.util.PathUtil; +import com.qiwenshare.common.domain.UploadFile; +import com.qiwenshare.common.operation.ImageOperation; +import com.qiwenshare.common.util.FileUtil; +import com.qiwenshare.common.util.PathUtil; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.util.Streams; diff --git a/file-common/src/main/java/com/mac/common/domain/ProxyBean.java b/file-common/src/main/java/com/qiwenshare/common/domain/ProxyBean.java similarity index 96% rename from file-common/src/main/java/com/mac/common/domain/ProxyBean.java rename to file-common/src/main/java/com/qiwenshare/common/domain/ProxyBean.java index cfb8dea..4319df3 100644 --- a/file-common/src/main/java/com/mac/common/domain/ProxyBean.java +++ b/file-common/src/main/java/com/qiwenshare/common/domain/ProxyBean.java @@ -1,4 +1,4 @@ -package com.mac.common.domain; +package com.qiwenshare.common.domain; import javax.persistence.*; diff --git a/file-common/src/main/java/com/mac/common/domain/TableData.java b/file-common/src/main/java/com/qiwenshare/common/domain/TableData.java similarity index 95% rename from file-common/src/main/java/com/mac/common/domain/TableData.java rename to file-common/src/main/java/com/qiwenshare/common/domain/TableData.java index 706bddf..fca656c 100644 --- a/file-common/src/main/java/com/mac/common/domain/TableData.java +++ b/file-common/src/main/java/com/qiwenshare/common/domain/TableData.java @@ -1,4 +1,4 @@ -package com.mac.common.domain; +package com.qiwenshare.common.domain; public class TableData { private T data; diff --git a/file-common/src/main/java/com/mac/common/domain/TableQueryBean.java b/file-common/src/main/java/com/qiwenshare/common/domain/TableQueryBean.java similarity index 96% rename from file-common/src/main/java/com/mac/common/domain/TableQueryBean.java rename to file-common/src/main/java/com/qiwenshare/common/domain/TableQueryBean.java index 930a833..70d21b3 100644 --- a/file-common/src/main/java/com/mac/common/domain/TableQueryBean.java +++ b/file-common/src/main/java/com/qiwenshare/common/domain/TableQueryBean.java @@ -1,4 +1,4 @@ -package com.mac.common.domain; +package com.qiwenshare.common.domain; public class TableQueryBean { //key, pageIndex, pageSize, sortField, sortOrder diff --git a/file-common/src/main/java/com/mac/common/domain/UploadFile.java b/file-common/src/main/java/com/qiwenshare/common/domain/UploadFile.java similarity index 97% rename from file-common/src/main/java/com/mac/common/domain/UploadFile.java rename to file-common/src/main/java/com/qiwenshare/common/domain/UploadFile.java index 04eca2c..2cd2539 100644 --- a/file-common/src/main/java/com/mac/common/domain/UploadFile.java +++ b/file-common/src/main/java/com/qiwenshare/common/domain/UploadFile.java @@ -1,4 +1,4 @@ -package com.mac.common.domain; +package com.qiwenshare.common.domain; /** * md-edit插件上传图片返回数据实体类 diff --git a/file-common/src/main/java/com/mac/common/operation/EncryptOperation.java b/file-common/src/main/java/com/qiwenshare/common/operation/EncryptOperation.java similarity index 88% rename from file-common/src/main/java/com/mac/common/operation/EncryptOperation.java rename to file-common/src/main/java/com/qiwenshare/common/operation/EncryptOperation.java index 09743f9..c3e4b76 100644 --- a/file-common/src/main/java/com/mac/common/operation/EncryptOperation.java +++ b/file-common/src/main/java/com/qiwenshare/common/operation/EncryptOperation.java @@ -1,4 +1,4 @@ -package com.mac.common.operation; +package com.qiwenshare.common.operation; import org.springframework.util.DigestUtils; diff --git a/file-common/src/main/java/com/mac/common/operation/FileOperation.java b/file-common/src/main/java/com/qiwenshare/common/operation/FileOperation.java similarity index 98% rename from file-common/src/main/java/com/mac/common/operation/FileOperation.java rename to file-common/src/main/java/com/qiwenshare/common/operation/FileOperation.java index 6f06114..eaebe8a 100644 --- a/file-common/src/main/java/com/mac/common/operation/FileOperation.java +++ b/file-common/src/main/java/com/qiwenshare/common/operation/FileOperation.java @@ -1,13 +1,11 @@ -package com.mac.common.operation; +package com.qiwenshare.common.operation; -import com.mac.common.util.FileUtil; -import com.mac.common.util.PathUtil; +import com.qiwenshare.common.util.FileUtil; +import com.qiwenshare.common.util.PathUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.*; -import java.sql.Array; -import java.sql.SQLOutput; import java.util.*; import java.util.zip.ZipEntry; diff --git a/file-common/src/main/java/com/mac/common/operation/ImageOperation.java b/file-common/src/main/java/com/qiwenshare/common/operation/ImageOperation.java similarity index 96% rename from file-common/src/main/java/com/mac/common/operation/ImageOperation.java rename to file-common/src/main/java/com/qiwenshare/common/operation/ImageOperation.java index 477ccd8..4f6820c 100644 --- a/file-common/src/main/java/com/mac/common/operation/ImageOperation.java +++ b/file-common/src/main/java/com/qiwenshare/common/operation/ImageOperation.java @@ -1,4 +1,4 @@ -package com.mac.common.operation; +package com.qiwenshare.common.operation; import net.coobird.thumbnailator.Thumbnails; diff --git a/file-common/src/main/java/com/mac/common/util/FileUtil.java b/file-common/src/main/java/com/qiwenshare/common/util/FileUtil.java similarity index 98% rename from file-common/src/main/java/com/mac/common/util/FileUtil.java rename to file-common/src/main/java/com/qiwenshare/common/util/FileUtil.java index dc72e7b..fbf3ff8 100644 --- a/file-common/src/main/java/com/mac/common/util/FileUtil.java +++ b/file-common/src/main/java/com/qiwenshare/common/util/FileUtil.java @@ -1,4 +1,4 @@ -package com.mac.common.util; +package com.qiwenshare.common.util; import java.io.*; import java.util.ArrayList; diff --git a/file-common/src/main/java/com/mac/common/util/PasswordUtil.java b/file-common/src/main/java/com/qiwenshare/common/util/PasswordUtil.java similarity index 92% rename from file-common/src/main/java/com/mac/common/util/PasswordUtil.java rename to file-common/src/main/java/com/qiwenshare/common/util/PasswordUtil.java index 91f2f25..7fb3e8e 100644 --- a/file-common/src/main/java/com/mac/common/util/PasswordUtil.java +++ b/file-common/src/main/java/com/qiwenshare/common/util/PasswordUtil.java @@ -1,4 +1,4 @@ -package com.mac.common.util; +package com.qiwenshare.common.util; import java.util.Random; diff --git a/file-common/src/main/java/com/mac/common/util/PathUtil.java b/file-common/src/main/java/com/qiwenshare/common/util/PathUtil.java similarity index 98% rename from file-common/src/main/java/com/mac/common/util/PathUtil.java rename to file-common/src/main/java/com/qiwenshare/common/util/PathUtil.java index af44c48..8923ab2 100644 --- a/file-common/src/main/java/com/mac/common/util/PathUtil.java +++ b/file-common/src/main/java/com/qiwenshare/common/util/PathUtil.java @@ -1,4 +1,4 @@ -package com.mac.common.util; +package com.qiwenshare.common.util; import org.springframework.util.ResourceUtils; diff --git a/file-web/pom.xml b/file-web/pom.xml index 44c5213..c384cba 100644 --- a/file-web/pom.xml +++ b/file-web/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.qiwen + com.qiwenshare file 1.0-SNAPSHOT - com.qiwen + com.qiwenshare file-web 0.0.1-SNAPSHOT - web + file-web www.qiwenshare.com/file jar @@ -91,7 +91,7 @@ 1.3.3 - com.qiwen + com.qiwenshare file-common 0.0.1-SNAPSHOT @@ -155,8 +155,9 @@ - - + + + diff --git a/file-web/src/main/java/com/mac/scp/FileApplication.java b/file-web/src/main/java/com/qiwenshare/file/FileApplication.java similarity index 70% rename from file-web/src/main/java/com/mac/scp/FileApplication.java rename to file-web/src/main/java/com/qiwenshare/file/FileApplication.java index af16e00..10e36d7 100644 --- a/file-web/src/main/java/com/mac/scp/FileApplication.java +++ b/file-web/src/main/java/com/qiwenshare/file/FileApplication.java @@ -1,19 +1,15 @@ -package com.mac.scp; +package com.qiwenshare.file; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.server.ConfigurableWebServerFactory; -import org.springframework.boot.web.server.ErrorPage; -import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; -import org.springframework.http.HttpStatus; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.web.client.RestTemplate; @SpringBootApplication -@MapperScan("com.mac.scp.mapper") +@MapperScan("com.qiwenshare.file.mapper") @EnableScheduling //启用定时任务 public class FileApplication { diff --git a/file-web/src/main/java/com/mac/scp/api/IFileService.java b/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java similarity index 85% rename from file-web/src/main/java/com/mac/scp/api/IFileService.java rename to file-web/src/main/java/com/qiwenshare/file/api/IFileService.java index 621c40b..4123147 100644 --- a/file-web/src/main/java/com/mac/scp/api/IFileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java @@ -1,9 +1,7 @@ -package com.mac.scp.api; +package com.qiwenshare.file.api; -import com.mac.common.cbb.RestResult; -import com.mac.scp.domain.*; +import com.qiwenshare.file.domain.FileBean; -import javax.servlet.http.HttpServletRequest; import java.util.List; public interface IFileService { diff --git a/file-web/src/main/java/com/mac/scp/api/IFiletransferService.java b/file-web/src/main/java/com/qiwenshare/file/api/IFiletransferService.java similarity index 87% rename from file-web/src/main/java/com/mac/scp/api/IFiletransferService.java rename to file-web/src/main/java/com/qiwenshare/file/api/IFiletransferService.java index 1c0643a..0ca8e54 100644 --- a/file-web/src/main/java/com/mac/scp/api/IFiletransferService.java +++ b/file-web/src/main/java/com/qiwenshare/file/api/IFiletransferService.java @@ -1,7 +1,9 @@ -package com.mac.scp.api; +package com.qiwenshare.file.api; -import com.mac.common.cbb.RestResult; -import com.mac.scp.domain.*; +import com.qiwenshare.common.cbb.RestResult; +import com.qiwenshare.file.domain.FileBean; +import com.qiwenshare.file.domain.StorageBean; +import com.qiwenshare.file.domain.UserImageBean; import java.util.List; diff --git a/file-web/src/main/java/com/mac/scp/api/IUserService.java b/file-web/src/main/java/com/qiwenshare/file/api/IUserService.java similarity index 90% rename from file-web/src/main/java/com/mac/scp/api/IUserService.java rename to file-web/src/main/java/com/qiwenshare/file/api/IUserService.java index 95abcea..4e13132 100644 --- a/file-web/src/main/java/com/mac/scp/api/IUserService.java +++ b/file-web/src/main/java/com/qiwenshare/file/api/IUserService.java @@ -1,8 +1,10 @@ -package com.mac.scp.api; +package com.qiwenshare.file.api; -import com.mac.common.cbb.RestResult; -import com.mac.common.domain.TableQueryBean; -import com.mac.scp.domain.*; +import com.qiwenshare.common.cbb.RestResult; +import com.qiwenshare.common.domain.TableQueryBean; +import com.qiwenshare.file.domain.Permission; +import com.qiwenshare.file.domain.Role; +import com.qiwenshare.file.domain.UserBean; import java.util.List; diff --git a/file-web/src/main/java/com/mac/scp/config/cors/MyCorsRegistration.java b/file-web/src/main/java/com/qiwenshare/file/config/cors/MyCorsRegistration.java similarity index 90% rename from file-web/src/main/java/com/mac/scp/config/cors/MyCorsRegistration.java rename to file-web/src/main/java/com/qiwenshare/file/config/cors/MyCorsRegistration.java index 20132bc..09541fc 100644 --- a/file-web/src/main/java/com/mac/scp/config/cors/MyCorsRegistration.java +++ b/file-web/src/main/java/com/qiwenshare/file/config/cors/MyCorsRegistration.java @@ -1,4 +1,4 @@ -package com.mac.scp.config.cors; +package com.qiwenshare.file.config.cors; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.servlet.config.annotation.CorsRegistration; diff --git a/file-web/src/main/java/com/mac/scp/config/exception/ExceptionConfig.java b/file-web/src/main/java/com/qiwenshare/file/config/exception/ExceptionConfig.java similarity index 93% rename from file-web/src/main/java/com/mac/scp/config/exception/ExceptionConfig.java rename to file-web/src/main/java/com/qiwenshare/file/config/exception/ExceptionConfig.java index e65d91e..ec3e96e 100644 --- a/file-web/src/main/java/com/mac/scp/config/exception/ExceptionConfig.java +++ b/file-web/src/main/java/com/qiwenshare/file/config/exception/ExceptionConfig.java @@ -1,4 +1,4 @@ -package com.mac.scp.config.exception; +package com.qiwenshare.file.config.exception; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/file-web/src/main/java/com/mac/scp/config/exception/MyExceptionHandler.java b/file-web/src/main/java/com/qiwenshare/file/config/exception/MyExceptionHandler.java similarity index 94% rename from file-web/src/main/java/com/mac/scp/config/exception/MyExceptionHandler.java rename to file-web/src/main/java/com/qiwenshare/file/config/exception/MyExceptionHandler.java index dd2865c..26b0e91 100644 --- a/file-web/src/main/java/com/mac/scp/config/exception/MyExceptionHandler.java +++ b/file-web/src/main/java/com/qiwenshare/file/config/exception/MyExceptionHandler.java @@ -1,4 +1,4 @@ -package com.mac.scp.config.exception; +package com.qiwenshare.file.config.exception; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/file-web/src/main/java/com/mac/scp/config/shiro/MyShiroRealm.java b/file-web/src/main/java/com/qiwenshare/file/config/shiro/MyShiroRealm.java similarity index 93% rename from file-web/src/main/java/com/mac/scp/config/shiro/MyShiroRealm.java rename to file-web/src/main/java/com/qiwenshare/file/config/shiro/MyShiroRealm.java index 36734bd..9c47443 100644 --- a/file-web/src/main/java/com/mac/scp/config/shiro/MyShiroRealm.java +++ b/file-web/src/main/java/com/qiwenshare/file/config/shiro/MyShiroRealm.java @@ -1,9 +1,9 @@ -package com.mac.scp.config.shiro; +package com.qiwenshare.file.config.shiro; -import com.mac.scp.domain.Permission; -import com.mac.scp.domain.Role; -import com.mac.scp.domain.UserBean; -import com.mac.scp.service.UserService; +import com.qiwenshare.file.domain.Permission; +import com.qiwenshare.file.domain.Role; +import com.qiwenshare.file.domain.UserBean; +import com.qiwenshare.file.service.UserService; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; diff --git a/file-web/src/main/java/com/mac/scp/config/shiro/ShiroConfig.java b/file-web/src/main/java/com/qiwenshare/file/config/shiro/ShiroConfig.java similarity index 98% rename from file-web/src/main/java/com/mac/scp/config/shiro/ShiroConfig.java rename to file-web/src/main/java/com/qiwenshare/file/config/shiro/ShiroConfig.java index ecce07c..8141282 100644 --- a/file-web/src/main/java/com/mac/scp/config/shiro/ShiroConfig.java +++ b/file-web/src/main/java/com/qiwenshare/file/config/shiro/ShiroConfig.java @@ -1,6 +1,6 @@ -package com.mac.scp.config.shiro; +package com.qiwenshare.file.config.shiro; -import com.mac.scp.config.cors.MyCorsRegistration; +import com.qiwenshare.file.config.cors.MyCorsRegistration; import org.apache.shiro.authc.credential.HashedCredentialsMatcher; import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; diff --git a/file-web/src/main/java/com/mac/scp/config/shiro/ShiroLoginFilter.java b/file-web/src/main/java/com/qiwenshare/file/config/shiro/ShiroLoginFilter.java similarity index 97% rename from file-web/src/main/java/com/mac/scp/config/shiro/ShiroLoginFilter.java rename to file-web/src/main/java/com/qiwenshare/file/config/shiro/ShiroLoginFilter.java index a049372..9b303a9 100644 --- a/file-web/src/main/java/com/mac/scp/config/shiro/ShiroLoginFilter.java +++ b/file-web/src/main/java/com/qiwenshare/file/config/shiro/ShiroLoginFilter.java @@ -1,4 +1,4 @@ -package com.mac.scp.config.shiro; +package com.qiwenshare.file.config.shiro; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.core.annotation.Order; diff --git a/file-web/src/main/java/com/mac/scp/controller/FileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java similarity index 95% rename from file-web/src/main/java/com/mac/scp/controller/FileController.java rename to file-web/src/main/java/com/qiwenshare/file/controller/FileController.java index 60bc678..de0b343 100644 --- a/file-web/src/main/java/com/mac/scp/controller/FileController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java @@ -1,24 +1,25 @@ -package com.mac.scp.controller; +package com.qiwenshare.file.controller; import com.alibaba.fastjson.JSON; -import com.mac.common.cbb.DateUtil; -import com.mac.common.cbb.RestResult; -import com.mac.common.operation.FileOperation; -import com.mac.common.util.FileUtil; -import com.mac.common.util.PathUtil; -import com.mac.scp.api.IFileService; -import com.mac.scp.api.IFiletransferService; -import com.mac.scp.domain.*; +import com.qiwenshare.common.cbb.DateUtil; +import com.qiwenshare.common.cbb.RestResult; +import com.qiwenshare.common.operation.FileOperation; +import com.qiwenshare.common.util.FileUtil; +import com.qiwenshare.common.util.PathUtil; +import com.qiwenshare.file.api.IFileService; +import com.qiwenshare.file.api.IFiletransferService; +import com.qiwenshare.file.domain.FileBean; +import com.qiwenshare.file.domain.TreeNode; +import com.qiwenshare.file.domain.UserBean; import org.apache.shiro.SecurityUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import java.io.File; import java.util.*; -import static com.mac.common.util.FileUtil.getFileExtendsByType; +import static com.qiwenshare.common.util.FileUtil.getFileExtendsByType; @RestController @RequestMapping("/file") diff --git a/file-web/src/main/java/com/mac/scp/controller/FiletransferController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FiletransferController.java similarity index 95% rename from file-web/src/main/java/com/mac/scp/controller/FiletransferController.java rename to file-web/src/main/java/com/qiwenshare/file/controller/FiletransferController.java index b26113c..37e21e1 100644 --- a/file-web/src/main/java/com/mac/scp/controller/FiletransferController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/FiletransferController.java @@ -1,13 +1,15 @@ -package com.mac.scp.controller; +package com.qiwenshare.file.controller; import com.alibaba.fastjson.JSON; -import com.mac.common.operation.FileOperation; -import com.mac.common.util.PathUtil; -import com.mac.common.cbb.RestResult; -import com.mac.common.operation.ImageOperation; -import com.mac.scp.api.IFileService; -import com.mac.scp.api.IFiletransferService; -import com.mac.scp.domain.*; +import com.qiwenshare.common.operation.FileOperation; +import com.qiwenshare.common.util.PathUtil; +import com.qiwenshare.common.cbb.RestResult; +import com.qiwenshare.common.operation.ImageOperation; +import com.qiwenshare.file.api.IFileService; +import com.qiwenshare.file.api.IFiletransferService; +import com.qiwenshare.file.domain.FileBean; +import com.qiwenshare.file.domain.StorageBean; +import com.qiwenshare.file.domain.UserBean; import org.apache.shiro.SecurityUtils; import org.springframework.web.bind.annotation.*; @@ -15,7 +17,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; -import java.net.URLDecoder; import java.util.List; @RestController diff --git a/file-web/src/main/java/com/mac/scp/controller/RouterController.java b/file-web/src/main/java/com/qiwenshare/file/controller/RouterController.java similarity index 100% rename from file-web/src/main/java/com/mac/scp/controller/RouterController.java rename to file-web/src/main/java/com/qiwenshare/file/controller/RouterController.java diff --git a/file-web/src/main/java/com/mac/scp/controller/UserController.java b/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java similarity index 93% rename from file-web/src/main/java/com/mac/scp/controller/UserController.java rename to file-web/src/main/java/com/qiwenshare/file/controller/UserController.java index 39b1927..dec0c49 100644 --- a/file-web/src/main/java/com/mac/scp/controller/UserController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java @@ -1,15 +1,15 @@ -package com.mac.scp.controller; +package com.qiwenshare.file.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.mac.common.cbb.RestResult; -import com.mac.common.domain.TableData; -import com.mac.common.domain.TableQueryBean; -import com.mac.scp.api.IFiletransferService; -import com.mac.scp.api.IUserService; -import com.mac.scp.domain.Permission; -import com.mac.scp.domain.Role; -import com.mac.scp.domain.UserBean; +import com.qiwenshare.common.cbb.RestResult; +import com.qiwenshare.common.domain.TableData; +import com.qiwenshare.common.domain.TableQueryBean; +import com.qiwenshare.file.api.IFiletransferService; +import com.qiwenshare.file.api.IUserService; +import com.qiwenshare.file.domain.Permission; +import com.qiwenshare.file.domain.Role; +import com.qiwenshare.file.domain.UserBean; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.UsernamePasswordToken; import org.springframework.web.bind.annotation.*; diff --git a/file-web/src/main/java/com/mac/scp/domain/FileBean.java b/file-web/src/main/java/com/qiwenshare/file/domain/FileBean.java similarity index 99% rename from file-web/src/main/java/com/mac/scp/domain/FileBean.java rename to file-web/src/main/java/com/qiwenshare/file/domain/FileBean.java index 38df60e..b8b2366 100644 --- a/file-web/src/main/java/com/mac/scp/domain/FileBean.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/FileBean.java @@ -1,4 +1,4 @@ -package com.mac.scp.domain; +package com.qiwenshare.file.domain; import javax.persistence.*; diff --git a/file-web/src/main/java/com/mac/scp/domain/Permission.java b/file-web/src/main/java/com/qiwenshare/file/domain/Permission.java similarity index 98% rename from file-web/src/main/java/com/mac/scp/domain/Permission.java rename to file-web/src/main/java/com/qiwenshare/file/domain/Permission.java index 88578a7..5a4de41 100644 --- a/file-web/src/main/java/com/mac/scp/domain/Permission.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/Permission.java @@ -1,4 +1,4 @@ -package com.mac.scp.domain; +package com.qiwenshare.file.domain; import javax.persistence.*; import java.util.List; diff --git a/file-web/src/main/java/com/mac/scp/domain/Role.java b/file-web/src/main/java/com/qiwenshare/file/domain/Role.java similarity index 98% rename from file-web/src/main/java/com/mac/scp/domain/Role.java rename to file-web/src/main/java/com/qiwenshare/file/domain/Role.java index 472fd33..c6153d6 100644 --- a/file-web/src/main/java/com/mac/scp/domain/Role.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/Role.java @@ -1,4 +1,4 @@ -package com.mac.scp.domain; +package com.qiwenshare.file.domain; import javax.persistence.*; import java.util.List; diff --git a/file-web/src/main/java/com/mac/scp/domain/StorageBean.java b/file-web/src/main/java/com/qiwenshare/file/domain/StorageBean.java similarity index 96% rename from file-web/src/main/java/com/mac/scp/domain/StorageBean.java rename to file-web/src/main/java/com/qiwenshare/file/domain/StorageBean.java index 657ff92..4bc61c0 100644 --- a/file-web/src/main/java/com/mac/scp/domain/StorageBean.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/StorageBean.java @@ -1,4 +1,4 @@ -package com.mac.scp.domain; +package com.qiwenshare.file.domain; import javax.persistence.*; diff --git a/file-web/src/main/java/com/mac/scp/domain/TreeNode.java b/file-web/src/main/java/com/qiwenshare/file/domain/TreeNode.java similarity index 97% rename from file-web/src/main/java/com/mac/scp/domain/TreeNode.java rename to file-web/src/main/java/com/qiwenshare/file/domain/TreeNode.java index 87746a4..38a3c43 100644 --- a/file-web/src/main/java/com/mac/scp/domain/TreeNode.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/TreeNode.java @@ -1,4 +1,4 @@ -package com.mac.scp.domain; +package com.qiwenshare.file.domain; import java.util.ArrayList; import java.util.HashMap; diff --git a/file-web/src/main/java/com/mac/scp/domain/UserBean.java b/file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java similarity index 99% rename from file-web/src/main/java/com/mac/scp/domain/UserBean.java rename to file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java index 0f34040..4cc305b 100644 --- a/file-web/src/main/java/com/mac/scp/domain/UserBean.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java @@ -1,4 +1,4 @@ -package com.mac.scp.domain; +package com.qiwenshare.file.domain; import javax.persistence.*; import javax.websocket.Session; diff --git a/file-web/src/main/java/com/mac/scp/domain/UserImageBean.java b/file-web/src/main/java/com/qiwenshare/file/domain/UserImageBean.java similarity index 97% rename from file-web/src/main/java/com/mac/scp/domain/UserImageBean.java rename to file-web/src/main/java/com/qiwenshare/file/domain/UserImageBean.java index e83aa43..375203a 100644 --- a/file-web/src/main/java/com/mac/scp/domain/UserImageBean.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/UserImageBean.java @@ -1,4 +1,4 @@ -package com.mac.scp.domain; +package com.qiwenshare.file.domain; import javax.persistence.*; import java.io.Serializable; diff --git a/file-web/src/main/java/com/mac/scp/mapper/FileMapper.java b/file-web/src/main/java/com/qiwenshare/file/mapper/FileMapper.java similarity index 92% rename from file-web/src/main/java/com/mac/scp/mapper/FileMapper.java rename to file-web/src/main/java/com/qiwenshare/file/mapper/FileMapper.java index 3f898c0..00adc18 100644 --- a/file-web/src/main/java/com/mac/scp/mapper/FileMapper.java +++ b/file-web/src/main/java/com/qiwenshare/file/mapper/FileMapper.java @@ -1,9 +1,9 @@ -package com.mac.scp.mapper; +package com.qiwenshare.file.mapper; -import com.mac.scp.domain.*; + +import com.qiwenshare.file.domain.FileBean; import org.apache.ibatis.annotations.Param; -import java.io.File; import java.util.List; public interface FileMapper { diff --git a/file-web/src/main/java/com/mac/scp/mapper/FiletransferMapper.java b/file-web/src/main/java/com/qiwenshare/file/mapper/FiletransferMapper.java similarity index 82% rename from file-web/src/main/java/com/mac/scp/mapper/FiletransferMapper.java rename to file-web/src/main/java/com/qiwenshare/file/mapper/FiletransferMapper.java index e0f77cb..ba673ba 100644 --- a/file-web/src/main/java/com/mac/scp/mapper/FiletransferMapper.java +++ b/file-web/src/main/java/com/qiwenshare/file/mapper/FiletransferMapper.java @@ -1,7 +1,8 @@ -package com.mac.scp.mapper; +package com.qiwenshare.file.mapper; -import com.mac.scp.domain.*; -import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoProperties; + +import com.qiwenshare.file.domain.StorageBean; +import com.qiwenshare.file.domain.UserImageBean; import java.util.List; diff --git a/file-web/src/main/java/com/mac/scp/mapper/UserMapper.java b/file-web/src/main/java/com/qiwenshare/file/mapper/UserMapper.java similarity index 86% rename from file-web/src/main/java/com/mac/scp/mapper/UserMapper.java rename to file-web/src/main/java/com/qiwenshare/file/mapper/UserMapper.java index 7b9e324..a4d516d 100644 --- a/file-web/src/main/java/com/mac/scp/mapper/UserMapper.java +++ b/file-web/src/main/java/com/qiwenshare/file/mapper/UserMapper.java @@ -1,7 +1,10 @@ -package com.mac.scp.mapper; +package com.qiwenshare.file.mapper; -import com.mac.common.domain.TableQueryBean; -import com.mac.scp.domain.*; +import com.qiwenshare.common.domain.TableQueryBean; + +import com.qiwenshare.file.domain.Permission; +import com.qiwenshare.file.domain.Role; +import com.qiwenshare.file.domain.UserBean; import java.util.List; diff --git a/file-web/src/main/java/com/mac/scp/service/FileService.java b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java similarity index 93% rename from file-web/src/main/java/com/mac/scp/service/FileService.java rename to file-web/src/main/java/com/qiwenshare/file/service/FileService.java index b780630..5c15b15 100644 --- a/file-web/src/main/java/com/mac/scp/service/FileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java @@ -1,11 +1,13 @@ -package com.mac.scp.service; +package com.qiwenshare.file.service; -import com.mac.common.cbb.DateUtil; -import com.mac.common.operation.FileOperation; -import com.mac.common.util.PathUtil; -import com.mac.scp.api.IFileService; -import com.mac.scp.domain.*; -import com.mac.scp.mapper.FileMapper; +import com.qiwenshare.common.cbb.DateUtil; +import com.qiwenshare.common.operation.FileOperation; +import com.qiwenshare.common.util.PathUtil; +import com.qiwenshare.file.api.IFileService; +import com.qiwenshare.file.mapper.FileMapper; +import com.qiwenshare.file.domain.FileBean; +import com.qiwenshare.file.domain.StorageBean; +import com.qiwenshare.file.domain.UserBean; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; diff --git a/file-web/src/main/java/com/mac/scp/service/FiletransferService.java b/file-web/src/main/java/com/qiwenshare/file/service/FiletransferService.java similarity index 90% rename from file-web/src/main/java/com/mac/scp/service/FiletransferService.java rename to file-web/src/main/java/com/qiwenshare/file/service/FiletransferService.java index 82e3b7f..5d3206f 100644 --- a/file-web/src/main/java/com/mac/scp/service/FiletransferService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/FiletransferService.java @@ -1,19 +1,22 @@ -package com.mac.scp.service; +package com.qiwenshare.file.service; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import com.mac.common.cbb.DateUtil; -import com.mac.common.cbb.RestResult; -import com.mac.common.cbb.Uploader; -import com.mac.common.domain.UploadFile; -import com.mac.scp.api.IFiletransferService; +import com.qiwenshare.common.cbb.DateUtil; +import com.qiwenshare.common.cbb.RestResult; +import com.qiwenshare.common.cbb.Uploader; +import com.qiwenshare.common.domain.UploadFile; +import com.qiwenshare.file.api.IFiletransferService; -import com.mac.scp.domain.*; -import com.mac.scp.mapper.FileMapper; -import com.mac.scp.mapper.FiletransferMapper; +import com.qiwenshare.file.mapper.FileMapper; +import com.qiwenshare.file.mapper.FiletransferMapper; +import com.qiwenshare.file.domain.FileBean; +import com.qiwenshare.file.domain.StorageBean; +import com.qiwenshare.file.domain.UserBean; +import com.qiwenshare.file.domain.UserImageBean; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; diff --git a/file-web/src/main/java/com/mac/scp/service/RequestListener.java b/file-web/src/main/java/com/qiwenshare/file/service/RequestListener.java similarity index 94% rename from file-web/src/main/java/com/mac/scp/service/RequestListener.java rename to file-web/src/main/java/com/qiwenshare/file/service/RequestListener.java index 1a40a07..01967b4 100644 --- a/file-web/src/main/java/com/mac/scp/service/RequestListener.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/RequestListener.java @@ -1,4 +1,4 @@ -package com.mac.scp.service; +package com.qiwenshare.file.service; import javax.servlet.ServletRequestEvent; import javax.servlet.ServletRequestListener; diff --git a/file-web/src/main/java/com/mac/scp/service/UserService.java b/file-web/src/main/java/com/qiwenshare/file/service/UserService.java similarity index 93% rename from file-web/src/main/java/com/mac/scp/service/UserService.java rename to file-web/src/main/java/com/qiwenshare/file/service/UserService.java index 7fbf7d3..9f55cc5 100644 --- a/file-web/src/main/java/com/mac/scp/service/UserService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/UserService.java @@ -1,17 +1,17 @@ -package com.mac.scp.service; +package com.qiwenshare.file.service; -import com.mac.common.cbb.DateUtil; -import com.mac.common.cbb.MiniuiUtil; -import com.mac.common.cbb.RestResult; -import com.mac.common.domain.TableQueryBean; -import com.mac.common.util.PasswordUtil; -import com.mac.scp.api.IUserService; -import com.mac.scp.controller.UserController; -import com.mac.scp.domain.Permission; -import com.mac.scp.domain.Role; -import com.mac.scp.domain.UserBean; -import com.mac.scp.domain.UserImageBean; -import com.mac.scp.mapper.UserMapper; +import com.qiwenshare.common.cbb.DateUtil; +import com.qiwenshare.common.cbb.MiniuiUtil; +import com.qiwenshare.common.cbb.RestResult; +import com.qiwenshare.common.domain.TableQueryBean; +import com.qiwenshare.common.util.PasswordUtil; +import com.qiwenshare.file.api.IUserService; +import com.qiwenshare.file.controller.UserController; +import com.qiwenshare.file.domain.Permission; +import com.qiwenshare.file.domain.Role; +import com.qiwenshare.file.domain.UserBean; +import com.qiwenshare.file.domain.UserImageBean; +import com.qiwenshare.file.mapper.UserMapper; import org.apache.shiro.crypto.hash.SimpleHash; import org.springframework.stereotype.Service; diff --git a/file-web/src/main/resources/application.properties b/file-web/src/main/resources/application.properties index 62b72d0..f2a0e2f 100644 --- a/file-web/src/main/resources/application.properties +++ b/file-web/src/main/resources/application.properties @@ -15,14 +15,14 @@ logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %boldYe logging.pattern.file=%d{yyyy-MM-dd HH:mm:ss.SSS} = [%thread] = %-5level = %logger{50} - %msg%n #mybatis配置 -mybatis.type-aliases-package=com.mac.scp.domain +mybatis.type-aliases-package=com.qiwenshare.file.domain mybatis.config-locations=classpath:mybatis/mybatis-config.xml mybatis.mapper-locations=classpath:mybatis/mapper/*.xml #jdbc连接 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver spring.datasource.url = jdbc:mysql://localhost:3306/file?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 spring.datasource.username=root -spring.datasource.password=password123 +spring.datasource.password=ma123456 #数据库初始化 spring.datasource.data=classpath:database/data.sql diff --git a/file-web/src/main/resources/mybatis/mapper/FileMapper.xml b/file-web/src/main/resources/mybatis/mapper/FileMapper.xml index 52abea3..e949a42 100644 --- a/file-web/src/main/resources/mybatis/mapper/FileMapper.xml +++ b/file-web/src/main/resources/mybatis/mapper/FileMapper.xml @@ -4,9 +4,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + INSERT ignore INTO file (essayid,albumid,userid, filename,timestampname, fileurl, filepath, extendname, uploadtime, filesize, isdir) VALUES (#{essayid},#{albumid},#{userid}, #{filename},#{timestampname}, @@ -25,7 +25,7 @@ - + update file SET filename = #{filename}, uploadtime = #{uploadtime} where fileid = #{fileid} @@ -48,25 +48,25 @@ - select * from file where fileid = #{fileid} - select * from file where filepath = #{filepath} and userid = #{userid} order by isdir desc, filename - select * from file where fileid in #{fileid} - select * from file where extendname in @@ -75,12 +75,12 @@ and userid = #{userid} - select * from file where filepath like N'${filepath}%' - + DELETE FROM file WHERE fileid = #{fileid} @@ -91,12 +91,12 @@ - SELECT * FROM file WHERE isdir = 1 and userid=#{userid} - + diff --git a/file-web/src/main/resources/mybatis/mapper/FiletransferMapper.xml b/file-web/src/main/resources/mybatis/mapper/FiletransferMapper.xml index 46bbf27..b46dc6b 100644 --- a/file-web/src/main/resources/mybatis/mapper/FiletransferMapper.xml +++ b/file-web/src/main/resources/mybatis/mapper/FiletransferMapper.xml @@ -4,13 +4,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + DELETE FROM userimage WHERE imageid = #{imageid} - + @@ -19,36 +19,36 @@ SELECT imageid, userid, imageurl FROM userimage where userid = #{userid} - + INSERT INTO userimage (userid, imageurl, uploadtime) VALUES (#{userid}, #{imageurl}, #{uploadtime}); - SELECT * FROM userimage where userid = #{userId} - SELECT * FROM userimage WHERE imageurl =#{imageurl} - select * from storage where userid = #{userid}; - + update storage set storagesize = #{storagesize} where userid = #{userid} and storageid = #{storageid} - + insert into storage (storageid, userid, storagesize) values (#{storageid}, #{userid}, #{storagesize}) - select * from storage where userid=#{userid} \ No newline at end of file diff --git a/file-web/src/main/resources/mybatis/mapper/UserMapper.xml b/file-web/src/main/resources/mybatis/mapper/UserMapper.xml index 7c6b6fb..e4d0bd9 100644 --- a/file-web/src/main/resources/mybatis/mapper/UserMapper.xml +++ b/file-web/src/main/resources/mybatis/mapper/UserMapper.xml @@ -4,9 +4,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + @@ -21,18 +21,18 @@ - + - + - + INSERT INTO user (username, salt, PASSWORD, qqpassword, telephone, sex, openid, imageurl, registertime) VALUES (#{username},#{salt}, #{password}, #{qqpassword}, #{telephone}, #{sex}, #{openid}, #{imageurl}, #{registertime}); @@ -42,7 +42,7 @@ VALUES (#{param1}, #{param2}); - SELECT * FROM user WHERE (username=#{username} OR telephone=#{telephone}) AND PASSWORD=#{password}; @@ -56,7 +56,7 @@ - select * from permission inner join role_permission on role_permission.permissionid = permission.permissionid where permission.permissionid = #{roleid} @@ -68,7 +68,7 @@ WHERE user.userId = #{userId} - SELECT * FROM user WHERE user.openid = #{openid} @@ -80,7 +80,7 @@ - SELECT count(*) FROM user where username LIKE '%${key}%' @@ -99,11 +99,11 @@ limit #{beginCount}, #{limit} - + delete from user where userId = #{userId} - + update user set username = #{username}, realname = #{realname}, @@ -119,37 +119,37 @@ - + update user set email = #{email} where userId = #{userId} - + update user set imageurl = #{imageurl} where userId = #{userId} - select * from user left join user_role on user_role.userId = user.userId left join role on role.roleid = user_role.roleid where (username = #{username}) AND openid IS NULL - select * from user where telephone = #{telephone} - SELECT * FROM role - SELECT * FROM permission where permission LIKE '%${key}%' diff --git a/file-web/src/main/resources/script/startWeb.bat b/file-web/src/main/resources/script/startup.bat similarity index 100% rename from file-web/src/main/resources/script/startWeb.bat rename to file-web/src/main/resources/script/startup.bat diff --git a/file-web/src/main/resources/script/startup.sh b/file-web/src/main/resources/script/startup.sh new file mode 100644 index 0000000..305a6a1 --- /dev/null +++ b/file-web/src/main/resources/script/startup.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +BUILD_ID=dontKillMe + +nohup java -jar app/file-web/file-web-0.0.1-SNAPSHOT.jar --server.port=8763 & + + + diff --git a/file-web/src/main/resources/script/stop.sh b/file-web/src/main/resources/script/stop.sh new file mode 100644 index 0000000..117e53e --- /dev/null +++ b/file-web/src/main/resources/script/stop.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +PID=$(ps -ef | grep app/file-web |grep -v grep | awk '{ print $2 }') +if [ -z "$PID" ] +then + echo Application is already stopped +else + echo kill $PID + kill $PID +fi + diff --git a/file-web/src/test/java/com/mac/scp/ScpApplicationTests.java b/file-web/src/test/java/com/qiwenshare/file/ScpApplicationTests.java similarity index 91% rename from file-web/src/test/java/com/mac/scp/ScpApplicationTests.java rename to file-web/src/test/java/com/qiwenshare/file/ScpApplicationTests.java index 15ebc32..b81c73e 100644 --- a/file-web/src/test/java/com/mac/scp/ScpApplicationTests.java +++ b/file-web/src/test/java/com/qiwenshare/file/ScpApplicationTests.java @@ -1,4 +1,4 @@ -package com.mac.scp; +package com.qiwenshare.file; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/file-web/src/test/java/com/mac/scp/config/redis/TestRedis.java b/file-web/src/test/java/com/qiwenshare/file/config/redis/TestRedis.java similarity index 97% rename from file-web/src/test/java/com/mac/scp/config/redis/TestRedis.java rename to file-web/src/test/java/com/qiwenshare/file/config/redis/TestRedis.java index 7ea880a..638d680 100644 --- a/file-web/src/test/java/com/mac/scp/config/redis/TestRedis.java +++ b/file-web/src/test/java/com/qiwenshare/file/config/redis/TestRedis.java @@ -1,4 +1,4 @@ -package com.mac.scp.config.redis; +package com.qiwenshare.file.config.redis; import org.junit.Assert; import org.junit.Test; diff --git a/pom.xml b/pom.xml index 5a4644e..99c1dcf 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 2.1.4.RELEASE - com.qiwen + com.qiwenshare file 1.0-SNAPSHOT pom