diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-entity/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml similarity index 76% rename from hsweb-system/hsweb-system-file/hsweb-system-file-entity/pom.xml rename to hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml index e37544f69..fba18e0d0 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-entity/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml @@ -6,17 +6,18 @@ hsweb-system-file org.hswebframework.web 3.0.0-RC-SNAPSHOT + ../pom.xml 4.0.0 - hsweb-system-file-entity + 文件服务api + hsweb-system-file-api org.hswebframework.web - hsweb-commons-entity + hsweb-commons-service-api ${project.version} - \ No newline at end of file diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-entity/src/main/java/org/hswebframework/web/entity/file/FileInfoEntity.java b/hsweb-system/hsweb-system-file/hsweb-system-file-api/src/main/java/org/hswebframework/web/entity/file/FileInfoEntity.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-entity/src/main/java/org/hswebframework/web/entity/file/FileInfoEntity.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-api/src/main/java/org/hswebframework/web/entity/file/FileInfoEntity.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-entity/src/main/java/org/hswebframework/web/entity/file/SimpleFileInfoEntity.java b/hsweb-system/hsweb-system-file/hsweb-system-file-api/src/main/java/org/hswebframework/web/entity/file/SimpleFileInfoEntity.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-entity/src/main/java/org/hswebframework/web/entity/file/SimpleFileInfoEntity.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-api/src/main/java/org/hswebframework/web/entity/file/SimpleFileInfoEntity.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/src/main/java/org/hswebframework/web/service/file/FileInfoService.java b/hsweb-system/hsweb-system-file/hsweb-system-file-api/src/main/java/org/hswebframework/web/service/file/FileInfoService.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/src/main/java/org/hswebframework/web/service/file/FileInfoService.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-api/src/main/java/org/hswebframework/web/service/file/FileInfoService.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/src/main/java/org/hswebframework/web/service/file/FileService.java b/hsweb-system/hsweb-system-file/hsweb-system-file-api/src/main/java/org/hswebframework/web/service/file/FileService.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/src/main/java/org/hswebframework/web/service/file/FileService.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-api/src/main/java/org/hswebframework/web/service/file/FileService.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-api/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-api/pom.xml deleted file mode 100644 index ea5e545db..000000000 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-api/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - hsweb-system-file-dao - org.hswebframework.web - 3.0.0-RC-SNAPSHOT - - 4.0.0 - - hsweb-system-file-dao-api - - - - org.hswebframework.web - hsweb-system-file-entity - ${project.version} - - - org.hswebframework.web - hsweb-commons-dao-api - ${project.version} - - - - \ No newline at end of file diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-mybatis/pom.xml deleted file mode 100644 index c1e23d871..000000000 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-mybatis/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - hsweb-system-file-dao - org.hswebframework.web - 3.0.0-RC-SNAPSHOT - - 4.0.0 - - hsweb-system-file-dao-mybatis - - - - org.hswebframework.web - hsweb-system-file-dao-api - ${project.version} - - - org.hswebframework.web - hsweb-commons-dao-mybatis - ${project.version} - - - \ No newline at end of file diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-dao/pom.xml deleted file mode 100644 index 6844fe360..000000000 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - hsweb-system-file - org.hswebframework.web - 3.0.0-RC-SNAPSHOT - - 4.0.0 - - hsweb-system-file-dao - pom - - hsweb-system-file-dao-api - hsweb-system-file-dao-mybatis - - \ No newline at end of file diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml similarity index 71% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/pom.xml rename to hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml index 76e3f7e77..a0d95bca4 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml @@ -3,13 +3,15 @@ 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"> - hsweb-system-file-service + hsweb-system-file org.hswebframework.web 3.0.0-RC-SNAPSHOT + ../pom.xml 4.0.0 - hsweb-system-file-service-simple + hsweb-system-file-local + @@ -19,7 +21,7 @@ org.hswebframework.web - hsweb-system-file-service-api + hsweb-system-file-api ${project.version} @@ -28,5 +30,10 @@ 0.2.0 true + + org.hswebframework.web + hsweb-commons-dao-mybatis + ${project.version} + \ No newline at end of file diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-api/src/main/java/org/hswebframework/web/dao/file/FileInfoDao.java b/hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/dao/file/FileInfoDao.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-api/src/main/java/org/hswebframework/web/dao/file/FileInfoDao.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/dao/file/FileInfoDao.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/src/main/java/org/hswebframework/web/service/file/fastdfs/FdfsFileService.java b/hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/service/file/fastdfs/FdfsFileService.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/src/main/java/org/hswebframework/web/service/file/fastdfs/FdfsFileService.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/service/file/fastdfs/FdfsFileService.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/src/main/java/org/hswebframework/web/service/file/simple/LocalFileService.java b/hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/service/file/simple/LocalFileService.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/src/main/java/org/hswebframework/web/service/file/simple/LocalFileService.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/service/file/simple/LocalFileService.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/src/main/java/org/hswebframework/web/service/file/simple/SimpleFileInfoService.java b/hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/service/file/simple/SimpleFileInfoService.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/src/main/java/org/hswebframework/web/service/file/simple/SimpleFileInfoService.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/service/file/simple/SimpleFileInfoService.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/file/FileInfoMapper.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/file/FileInfoMapper.xml similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/file/FileInfoMapper.xml rename to hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/file/FileInfoMapper.xml diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml similarity index 72% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/pom.xml rename to hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml index 1831c8d72..4599e57ad 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml @@ -3,18 +3,21 @@ 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"> - hsweb-system-file-service + hsweb-system-file org.hswebframework.web 3.0.0-RC-SNAPSHOT + ../pom.xml 4.0.0 - hsweb-system-file-service-oauth2 + hsweb-system-file-oauth2 + + 基于hsweb oauth2的文件服务,通过oauth2调用远程文件服务. org.hswebframework.web - hsweb-system-file-service-api + hsweb-system-file-api ${project.version} diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileAutoConfiguration.java b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileAutoConfiguration.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileAutoConfiguration.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileAutoConfiguration.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileInfoService.java b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileInfoService.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileInfoService.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileInfoService.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileService.java b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileService.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileService.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileService.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/main/resources/META-INF/spring.factories b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/src/main/resources/META-INF/spring.factories similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/main/resources/META-INF/spring.factories rename to hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/src/main/resources/META-INF/spring.factories diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/pom.xml deleted file mode 100644 index f319fe3e0..000000000 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - hsweb-system-file-service - org.hswebframework.web - 3.0.0-RC-SNAPSHOT - - 4.0.0 - - hsweb-system-file-service-api - - - - org.hswebframework.web - hsweb-commons-service-api - ${project.version} - - - org.hswebframework.web - hsweb-system-file-dao-api - ${project.version} - - - \ No newline at end of file diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/test/java/org/hswebframework/web/service/file/oauth2/MockOAuth2Request.java b/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/test/java/org/hswebframework/web/service/file/oauth2/MockOAuth2Request.java deleted file mode 100644 index ba6675e33..000000000 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/test/java/org/hswebframework/web/service/file/oauth2/MockOAuth2Request.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.hswebframework.web.service.file.oauth2; - -import lombok.extern.slf4j.Slf4j; -import org.hswebframework.web.authorization.oauth2.client.request.OAuth2Request; -import org.hswebframework.web.authorization.oauth2.client.request.TokenExpiredCallBack; -import org.hswebframework.web.authorization.oauth2.client.response.OAuth2Response; - -import java.io.InputStream; -import java.util.Map; -import java.util.function.Consumer; -import java.util.function.Function; - -@Slf4j -public class MockOAuth2Request implements OAuth2Request { - - private Function responseGetter; - - public MockOAuth2Request(Function responseGetter) { - this.responseGetter = responseGetter; - } - - @Override - public OAuth2Request onRefreshTokenExpired(TokenExpiredCallBack refreshTokenExpiredCallBack) { - return this; - } - - @Override - public OAuth2Request onTokenExpired(TokenExpiredCallBack callback) { - return this; - } - - @Override - public OAuth2Request param(String name, Object value) { - log.info("set param :{}={}", name, value); - return this; - } - - @Override - public OAuth2Request params(Map params) { - log.info("set params :{}", params); - return this; - } - - @Override - public OAuth2Response upload(String name, InputStream inputStream) { - return responseGetter.apply("post"); - } - - @Override - public OAuth2Response upload(String name, InputStream inputStream, String fileName) { - return responseGetter.apply("post"); - } - - @Override - public OAuth2Request requestBody(String value) { - log.info("set request body :{}", value); - return this; - } - - @Override - public OAuth2Request header(String name, String value) { - return this; - } - - @Override - public OAuth2Request cookie(String cookie) { - return this; - } - - @Override - public OAuth2Request contentType(String contentType) { - return this; - } - - @Override - public OAuth2Request accept(String accept) { - return this; - } - - @Override - public OAuth2Request timeout(long millisecond, Consumer timeoutCallBack) { - return this; - } - - @Override - public OAuth2Response get() { - return responseGetter.apply("get"); - } - - @Override - public OAuth2Response put() { - return responseGetter.apply("put"); - } - - @Override - public OAuth2Response post() { - return responseGetter.apply("post"); - } - - @Override - public OAuth2Response delete() { - return responseGetter.apply("delete"); - } - - @Override - public OAuth2Response patch() { - return responseGetter.apply("patch"); - } -} diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/test/java/org/hswebframework/web/service/file/oauth2/MockOAuth2Response.java b/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/test/java/org/hswebframework/web/service/file/oauth2/MockOAuth2Response.java deleted file mode 100644 index a2cb737c5..000000000 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/test/java/org/hswebframework/web/service/file/oauth2/MockOAuth2Response.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.hswebframework.web.service.file.oauth2; - -import org.hswebframework.web.authorization.oauth2.client.request.ResponseConvertHandler; -import org.hswebframework.web.authorization.oauth2.client.response.OAuth2Response; -import org.hswebframework.web.authorization.oauth2.client.response.ResponseConvert; -import org.hswebframework.web.authorization.oauth2.client.simple.provider.HswebResponseConvertSupport; -import org.hswebframework.web.authorization.simple.builder.SimpleAuthenticationBuilderFactory; -import org.hswebframework.web.authorization.simple.builder.SimpleDataAccessConfigBuilderFactory; -import org.hswebframework.web.oauth2.core.ErrorType; -import org.springframework.util.StreamUtils; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.function.BiConsumer; - -public class MockOAuth2Response implements OAuth2Response { - - private InputStream result; - - private ResponseConvertHandler handler = new HswebResponseConvertSupport(new SimpleAuthenticationBuilderFactory(new SimpleDataAccessConfigBuilderFactory())); - - @Override - public InputStream asStream() { - return result; - } - - public MockOAuth2Response(InputStream result) { - this.result = result; - } - - @Override - public String asString() { - return new String(asBytes()); - } - - @Override - public byte[] asBytes() { - try { - return StreamUtils.copyToByteArray(result); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - public T as(ResponseConvert convert) { - return convert.convert(this); - } - - @Override - public T as(Class type) { - return handler.convert(this, type); - } - - @Override - public List asList(Class type) { - return handler.convertList(this, type); - } - - @Override - public int status() { - return 200; - } - - @Override - public OAuth2Response onError(BiConsumer onError) { - return this; - } -} diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/test/java/org/hswebframework/web/service/file/oauth2/OAuth2FileServiceTest.java b/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/test/java/org/hswebframework/web/service/file/oauth2/OAuth2FileServiceTest.java deleted file mode 100644 index 2e4ff248a..000000000 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/test/java/org/hswebframework/web/service/file/oauth2/OAuth2FileServiceTest.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.hswebframework.web.service.file.oauth2; - -import com.alibaba.fastjson.JSON; -import org.hswebframework.web.authorization.oauth2.client.OAuth2RequestService; -import org.hswebframework.web.authorization.oauth2.client.OAuth2SessionBuilder; -import org.hswebframework.web.authorization.oauth2.client.request.OAuth2Request; -import org.hswebframework.web.authorization.oauth2.client.request.OAuth2Session; -import org.hswebframework.web.commons.entity.PagerResult; -import org.hswebframework.web.controller.message.ResponseMessage; -import org.hswebframework.web.entity.file.FileInfoEntity; -import org.hswebframework.web.entity.file.SimpleFileInfoEntity; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - -/** - * @author zhouhao - * @since - */ -@RunWith(MockitoJUnitRunner.class) -public class OAuth2FileServiceTest { - - @InjectMocks - private OAuth2FileService fileService = new OAuth2FileService(); - - @Mock - private OAuth2RequestService auth2RequestService; - - @Mock - private OAuth2Session oAuth2Session; - - @Before - public void init() { - when(oAuth2Session.request("file/download/test")).thenReturn( - createFixedResponseRequest( - whenRequest("get", new ByteArrayInputStream("test".getBytes()))) - ); - - when(oAuth2Session.request("file/upload")).thenReturn( - createFixedResponseRequest( - whenRequest("post", ResponseMessage.ok(SimpleFileInfoEntity.builder() - .md5("test") - .build()).toString())) - ); - - when(oAuth2Session.request("file/upload-static")).thenReturn( - createFixedResponseRequest( - whenRequest("post", ResponseMessage.ok("http://file-server/upload/test.png").toString()))); - OAuth2SessionBuilder builder = mock(OAuth2SessionBuilder.class); - when(builder.byClientCredentials()).thenReturn(oAuth2Session); - - when(auth2RequestService.create(anyString())).thenReturn(builder); - - } - - @Test - public void uploadTest() throws IOException { - String staticFile = fileService.saveStaticFile(new ByteArrayInputStream("test".getBytes()), "test"); - Assert.assertEquals(staticFile, "http://file-server/upload/test.png"); - FileInfoEntity entity = fileService.saveFile(new ByteArrayInputStream("test".getBytes()), "test", "text/plain", "admin"); - Assert.assertNotNull(entity); - Assert.assertEquals(entity.getMd5(), "test"); - } - - interface OAuth2MethodRequest { - String getMethod(); - - InputStream getResponse(); - } - - public OAuth2MethodRequest whenRequest(String method, String json) { - return whenRequest(method, new ByteArrayInputStream(json.getBytes())); - } - - public OAuth2MethodRequest whenRequest(String method, InputStream stream) { - return new OAuth2MethodRequest() { - @Override - public String getMethod() { - return method; - } - - @Override - public InputStream getResponse() { - return stream; - } - }; - } - - private OAuth2Request createFixedResponseRequest(OAuth2MethodRequest... requests) { - return new MockOAuth2Request((method) -> { - for (OAuth2MethodRequest request : requests) { - if (request.getMethod().equals(method)) { - return new MockOAuth2Response(request.getResponse()); - } - } - return new MockOAuth2Response(new ByteArrayInputStream(ResponseMessage.error(404, "not found").toString().getBytes())); - }); - } -} \ No newline at end of file diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-service/pom.xml deleted file mode 100644 index f1615dcfc..000000000 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - hsweb-system-file - org.hswebframework.web - 3.0.0-RC-SNAPSHOT - - 4.0.0 - - hsweb-system-file-service - pom - - hsweb-system-file-service-api - hsweb-system-file-service-simple - hsweb-system-file-service-oauth2 - - - - \ No newline at end of file diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml index 6de142379..2939c272b 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml @@ -31,20 +31,19 @@ org.hswebframework.web - hsweb-system-file-service-simple + hsweb-system-file-local ${project.version} - + org.hswebframework.web - hsweb-system-file-dao-mybatis + hsweb-system-file-web ${project.version} - + - org.hswebframework.web - hsweb-system-file-controller - ${project.version} + org.springframework.boot + spring-boot-starter diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-controller/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml similarity index 88% rename from hsweb-system/hsweb-system-file/hsweb-system-file-controller/pom.xml rename to hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml index a0d527c0f..acc7e91ae 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-controller/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml @@ -9,8 +9,9 @@ 4.0.0 - hsweb-system-file-controller + hsweb-system-file-web + 通过SpringMvc实现文件上传,秒传等功能 javax.servlet @@ -20,7 +21,7 @@ org.hswebframework.web - hsweb-system-file-service-api + hsweb-system-file-api ${project.version} diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-controller/src/main/java/org/hswebframework/web/controller/file/FileController.java b/hsweb-system/hsweb-system-file/hsweb-system-file-web/src/main/java/org/hswebframework/web/controller/file/FileController.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-controller/src/main/java/org/hswebframework/web/controller/file/FileController.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-web/src/main/java/org/hswebframework/web/controller/file/FileController.java diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-controller/src/main/java/org/hswebframework/web/controller/file/FileInfoController.java b/hsweb-system/hsweb-system-file/hsweb-system-file-web/src/main/java/org/hswebframework/web/controller/file/FileInfoController.java similarity index 100% rename from hsweb-system/hsweb-system-file/hsweb-system-file-controller/src/main/java/org/hswebframework/web/controller/file/FileInfoController.java rename to hsweb-system/hsweb-system-file/hsweb-system-file-web/src/main/java/org/hswebframework/web/controller/file/FileInfoController.java diff --git a/hsweb-system/hsweb-system-file/pom.xml b/hsweb-system/hsweb-system-file/pom.xml index 0942b703d..929a2a4ca 100644 --- a/hsweb-system/hsweb-system-file/pom.xml +++ b/hsweb-system/hsweb-system-file/pom.xml @@ -12,11 +12,11 @@ hsweb-system-file pom - hsweb-system-file-service - hsweb-system-file-controller - hsweb-system-file-dao - hsweb-system-file-entity hsweb-system-file-starter + hsweb-system-file-api + hsweb-system-file-local + hsweb-system-file-web + hsweb-system-file-oauth2 diff --git a/hsweb-system/hsweb-system-monitor/pom.xml b/hsweb-system/hsweb-system-monitor/pom.xml deleted file mode 100644 index f5ea83605..000000000 --- a/hsweb-system/hsweb-system-monitor/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - hsweb-system - org.hswebframework.web - 3.0.0-RC-SNAPSHOT - - 4.0.0 - - hsweb-system-monitor - - - \ No newline at end of file