Merge branch 'dev/icss' into dev/icssNCD

icssman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -22,6 +22,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
 
     @Override
     public void configure(HttpSecurity http) throws Exception {
+        http.headers().frameOptions().disable();
         http
                 .csrf().disable()
                 .authorizeRequests()
@@ -32,7 +33,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/dictionaryInfo/getList").permitAll()
                 .antMatchers("/getIcssEnumsData").permitAll()
                 .antMatchers("/**").authenticated();
-//                .antMatchers("/**").permitAll();
+        //                .antMatchers("/**").permitAll();
+
+
     }
 
 

icssman-service/src/main/java/com/diagbot/web/UploadController.java

@@ -5,9 +5,10 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.UploadFacade;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
@@ -20,12 +21,12 @@ public class UploadController {
     @Autowired
     private UploadFacade uploadFacade;
 
-    @PostMapping("/uploadImage")
+    @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", methods = { RequestMethod.POST }, origins = "*")
+    @PostMapping(value = "/uploadImage", produces = "application/json;charset=UTF-8")
     public RespDTO<FileDTO> singleFileUpload(@RequestParam("upfile") MultipartFile file) {
         return RespDTO.onSuc(uploadFacade.singleFileUpload(file));
     }
 
-
     @PostMapping("/deleteRemoteFile")
     public RespDTO<Boolean> deleteRemoteFile(@RequestParam("path") String path) {
         return RespDTO.onSuc(uploadFacade.deleteRemoteFile(path));