Merge remote-tracking branch 'origin/master'

src/main/java/com/wb/domainserver/domain/mngr/ntcn/email/controller/EmailController.java

@@ -285,7 +285,7 @@ public class EmailController {
 	 * @return ResponseEntity<WnbtResponse>
 	 */
 	@Policy(AuthPolicy.RESTRICTED)
-	@RequestMapping(value="/insertEmailImage", method = RequestMethod.POST)
+	@RequestMapping(value="/insertEmailImage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> insertEmailImage(HttpServletRequest request, EmailVO vo, BindingResult bindingResult, @CookieValue(value = "authSopmalCd") String authSopmalCd){
 		vo.setSopmalCd(authSopmalCd);
 
@@ -322,7 +322,9 @@ public class EmailController {
 				log.error(e.getMessage(), e);
 			}
 
+			log.debug("fileInfo:::{}", fileInfo);
 			fileInfoList.add(fileInfo);
+			log.debug("fileInfoList:::{}", fileInfoList);
 		}
 
 		return ResponseEntity.ok(fileInfoList);

src/main/resources/application-local.yml

@@ -353,11 +353,12 @@ mngrfo:
     fileupload:
       uploaddirs:
         goods: C:/file/temp
-        doc: /docFile
-        web: /webFile
+        doc: /data/gcone/docFile
+        web: /data/gcone/webFile
       extensions:
         images: .gif,.jpg,.jpeg,.png
       cdnurl: https://19b0bde6dcdc15ad.kinxzone.com
+      upurl: https://www.soju1sake1.com
 
 
 secret:

src/main/resources/application-stage.yml

@@ -353,8 +353,8 @@ mngrfo:
     fileupload:
       uploaddirs:
         goods: C:/file/temp
-        doc: /docFile
-        web: /webFile
+        doc: /data/gcone/docFile
+        web: /data/gcone/webFile
       extensions:
         images: .gif,.jpg,.jpeg,.png
       cdnurl: https://19b0bde6dcdc15ad.kinxzone.com