diff --git a/boot-starter/boot-starter-elasticsearch/pom.xml b/boot-starter/boot-starter-elasticsearch/pom.xml index a352a63..ff59484 100644 --- a/boot-starter/boot-starter-elasticsearch/pom.xml +++ b/boot-starter/boot-starter-elasticsearch/pom.xml @@ -41,18 +41,18 @@ - - org.springframework.boot - spring-boot-maven-plugin - + + + + org.apache.maven.plugins maven-compiler-plugin - - org.apache.maven.plugins - maven-javadoc-plugin - + + + + boot-starter-elasticsearch diff --git a/boot-starter/boot-starter-fastdfs-client/pom.xml b/boot-starter/boot-starter-fastdfs-client/pom.xml index 9563ac7..7cd32dd 100644 --- a/boot-starter/boot-starter-fastdfs-client/pom.xml +++ b/boot-starter/boot-starter-fastdfs-client/pom.xml @@ -41,18 +41,18 @@ - - org.springframework.boot - spring-boot-maven-plugin - + + + + org.apache.maven.plugins maven-compiler-plugin - - org.apache.maven.plugins - maven-javadoc-plugin - + + + + boot-starter-fastdfs-client diff --git a/boot-starter/boot-starter-security/boot-starter-security-app/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-app/pom.xml index 912f0be..713b1b0 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-app/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-app/pom.xml @@ -31,10 +31,10 @@ - - org.springframework.boot - spring-boot-maven-plugin - + + + + org.apache.maven.plugins maven-compiler-plugin diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml index 44ed939..9515125 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml @@ -35,10 +35,10 @@ - - org.springframework.boot - spring-boot-maven-plugin - + + + + org.apache.maven.plugins maven-compiler-plugin diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-core/pom.xml index b4808e1..a1c848d 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-core/pom.xml @@ -78,10 +78,10 @@ - - org.springframework.boot - spring-boot-maven-plugin - + + + + org.apache.maven.plugins maven-compiler-plugin diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml index 7f42ce3..ce9f759 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml @@ -27,6 +27,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-devtools + true + diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java index 386a55b..d864e33 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java @@ -14,7 +14,6 @@ public class BootStarterSecurityDemoApplication { } @GetMapping("/hello") public String hello(){ - - return "hello security"; + return "hello security!!!!!"; } } diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/Ineterceptor/MyInterceptor.java b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/Ineterceptor/MyInterceptor.java index 33fad10..72d9088 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/Ineterceptor/MyInterceptor.java +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/Ineterceptor/MyInterceptor.java @@ -23,7 +23,7 @@ public class MyInterceptor implements HandlerInterceptor { System.out.println(((HandlerMethod) handler).getBean().getClass().getName()); //获取拦截的方法 System.out.println(((HandlerMethod) handler).getMethod().getName()); - return false; + return true; } //** 请求之后，控制器中抛出了异常的话就不会执行 diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/aspect/MyAspect.java b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/aspect/MyAspect.java index 776eb82..f8fd303 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/aspect/MyAspect.java +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/aspect/MyAspect.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; @Component public class MyAspect { - @Pointcut("execution(* com.micro.fast.security.demo.controller.*(..))") + @Pointcut("execution(* com.micro.fast.security.demo.controller.RestfulController.*(..))") public void pointcut(){ } diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/controller/FileController.java b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/controller/FileController.java new file mode 100644 index 0000000..42c1101 --- /dev/null +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/controller/FileController.java @@ -0,0 +1,54 @@ +package com.micro.fast.security.demo.controller; + +import org.apache.tomcat.util.http.fileupload.IOUtils; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; + +@RestController +@RequestMapping("/file") +public class FileController { + /** + * 处理文件上传 + * @param file + */ + @PostMapping + public String upload(MultipartFile file){ + File localfile = new File("/file/name"); + try { + //将文件上传到本地路径 + file.transferTo(localfile); + } catch (IOException e) { + e.printStackTrace(); + } + String fileInfo = ""; + fileInfo += file.getName()+file.getOriginalFilename()+file.getContentType(); + return fileInfo; + } + + /** + * 文件的下载 + * @param id + * @param request + * @param response + */ + @GetMapping("/{id}") + public void download(@PathVariable String id , HttpServletRequest request, HttpServletResponse response){ + try (InputStream inputStream = new FileInputStream(new File("/root/file/name")); + OutputStream outputStream = response.getOutputStream(); + ){ + response.setContentType("application/x-download"); + //指定文件的名称 + response.addHeader("Content-Disposition","attachment;filename=test.txt"); + IOUtils.copy(inputStream,outputStream); + outputStream.flush(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml index e79d1cc..245f94d 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: session: store-type: none # 暂时不开启session存储 datasource: - url: jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true + url: jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false username: root password: studyj2e driver-class-name: com.mysql.jdbc.Driver diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/src/test/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplicationTests.java b/boot-starter/boot-starter-security/boot-starter-security-demo/src/test/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplicationTests.java index 7003baa..755ef3f 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-demo/src/test/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplicationTests.java +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/test/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplicationTests.java @@ -6,6 +6,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; +import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; @@ -21,44 +22,44 @@ import java.util.Date; @SpringBootTest public class BootStarterSecurityDemoApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } - @Autowired - private WebApplicationContext wac; + @Autowired + private WebApplicationContext wac; - private MockMvc mockMvc; + private MockMvc mockMvc; - /** - * 在每次测试执行前构建mvc环境 - */ - @Before - public void setup(){ - mockMvc = MockMvcBuilders.webAppContextSetup(wac).build(); - } + /** + * 在每次测试执行前构建mvc环境 + */ + @Before + public void setup() { + mockMvc = MockMvcBuilders.webAppContextSetup(wac).build(); + } /** * 用户信息查询 */ - @Test - public void whenQuerySuccess(){ - //测试接口的返回结果是否满足预期 - try { - mockMvc.perform(MockMvcRequestBuilders.get("/user").param("username","pojo") + @Test + public void whenQuerySuccess() { + //测试接口的返回结果是否满足预期 + try { + mockMvc.perform(MockMvcRequestBuilders.get("/user").param("username", "pojo") .contentType(MediaType.APPLICATION_JSON_UTF8)) .andExpect(MockMvcResultMatchers.status().isOk())//检查状态码 .andExpect(MockMvcResultMatchers.jsonPath("$.length()").value(3));//检查集合的长度是３个 - } catch (Exception e) { - e.printStackTrace(); - } - } + } catch (Exception e) { + e.printStackTrace(); + } + } /** * 获取用户的信息详情 */ - @Test - public void whenGetInfoSuccess(){ + @Test + public void whenGetInfoSuccess() { try { mockMvc.perform(MockMvcRequestBuilders.get("/user/1") .contentType(MediaType.APPLICATION_JSON_UTF8)) @@ -69,30 +70,51 @@ public class BootStarterSecurityDemoApplicationTests { } } - /** - * 创建用户 - */ - @Test - public void whenCreateSuccess(){ - //前台传入的是长整形 - Date date = new Date(); - String content = "{\"name\":\"tom\",\"password\":\"\",\"birthday\":"+date.getTime()+"}"; - try { - String tom = mockMvc.perform(MockMvcRequestBuilders.post("/user") - .contentType(MediaType.APPLICATION_JSON_UTF8).content(content)) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.jsonPath("$.name").value("tom")) - .andReturn().getResponse().getContentAsString(); - //后台返回的日期格式也是长整形 - System.out.println(tom); - } catch (Exception e) { - e.printStackTrace(); - } - } + /** + * 创建用户 + */ + @Test + public void whenCreateSuccess() { + //前台传入的是长整形 + Date date = new Date(); + String content = "{\"name\":\"tom\",\"password\":\"\",\"birthday\":" + date.getTime() + "}"; + try { + String tom = mockMvc.perform(MockMvcRequestBuilders.post("/user") + .contentType(MediaType.APPLICATION_JSON_UTF8).content(content)) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.jsonPath("$.name").value("tom")) + .andReturn().getResponse().getContentAsString(); + //后台返回的日期格式也是长整形 + System.out.println(tom); + } catch (Exception e) { + e.printStackTrace(); + } + } - public void whenUpdateSuccess(){ - //本地的时间加１年 - Date date = new Date(LocalDateTime.now().plusYears(1).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); + public void whenUpdateSuccess() { + //本地的时间加１年 + Date date = new Date(LocalDateTime.now().plusYears(1).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); - } + } + + /** + * 测试上传文件 + */ + @Test + public void whenUploadFileSuccess() { + try { + String result = mockMvc.perform( + MockMvcRequestBuilders + .fileUpload("/file") + .file( + new MockMultipartFile("file", "test.txt", ",multipart/form-data", "hello upload".getBytes("UTF-8")) + ) + ).andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn().getResponse().getContentAsString(); + System.out.println(result); + } catch (Exception e) { + e.printStackTrace(); + } + + } } diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000..56af04e --- /dev/null +++ b/dump.rdb @@ -0,0 +1 @@ +REDIS0006ܳCZV \ No newline at end of file diff --git a/ms/pom.xml b/ms/pom.xml index da1d81e..5fab3d0 100644 --- a/ms/pom.xml +++ b/ms/pom.xml @@ -15,6 +15,14 @@ 0.0.1-SNAPSHOT + + + org.springframework.boot + spring-boot-devtools + true + + + config-server register-center1 diff --git a/pa/pom.xml b/pa/pom.xml index e4888fa..dd5db0d 100644 --- a/pa/pom.xml +++ b/pa/pom.xml @@ -1,62 +1,66 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - performance-appraisal - jar + performance-appraisal + jar - performance-appraisal - performance-appraisal + performance-appraisal + performance-appraisal - - com.micro.fast - micro-fast - 0.0.1-SNAPSHOT - + + com.micro.fast + micro-fast + 0.0.1-SNAPSHOT + - - - com.micro.fast - boot-starter-ssm - ${micro.fast.version} - + + + com.micro.fast + boot-starter-ssm + ${micro.fast.version} + + + org.springframework.boot + spring-boot-devtools + true + + + org.springframework.boot + spring-boot-starter-test + test + + - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.mybatis.generator - mybatis-generator-maven-plugin - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.mybatis.generator + mybatis-generator-maven-plugin + + true + true + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + com.spotify docker-maven-plugin - - micro-fast-pa - + + micro-fast-pa +