Merge branch 'developer' into 'master'

Developer

See merge request !157

haoban-manage3-web/pom.xml

@@ -91,6 +91,12 @@
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi</artifactId>
 			<version>3.9</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/UploadController.java

@@ -8,6 +8,8 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.qcloud.BucketNameEnum;
 import com.gic.qcloud.FileUploadUtil;
 import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -22,7 +24,7 @@ import java.util.Set;
 
 @RestController
 public class UploadController extends WebBaseController{
-	
+	private static Logger logger= LoggerFactory.getLogger(UploadController.class);
 	private static Set<String> FILE_TYPE = new HashSet<>(  );
     static {
         for(BucketNameEnum value: BucketNameEnum.values()){
@@ -56,20 +58,26 @@ public class UploadController extends WebBaseController{
 
         String key = "haoban/"+dayFilePath+"/"+name;
         fileType = FILE_TYPE.contains( fileType )?fileType:BucketNameEnum.OTHER_90000.getName();
-        String url = FileUploadUtil.simpleUploadFileFromLocal( templateFile,key,fileType);
+        try {
+            String url = FileUploadUtil.simpleUploadFileFromLocal(templateFile, key, fileType);
 
-        if(templateFile != null){
-            templateFile.delete();
-        }
+            if (templateFile != null) {
+                templateFile.delete();
+            }
 
-        JSONObject res = new JSONObject(  );
-        res.put( "name",name );
-        res.put( "mediaName",mediaName );
-        res.put( "ext", suffix );
-        res.put( "size",len );
-        res.put( "key",key );
-        res.put( "url", "https://"+url );
-        return resultResponse(HaoBanErrCode.ERR_1, res);
+            JSONObject res = new JSONObject();
+            res.put("name", name);
+            res.put("mediaName", mediaName);
+            res.put("ext", suffix);
+            res.put("size", len);
+            res.put("key", key);
+            res.put("url", "https://" + url);
+            return resultResponse(HaoBanErrCode.ERR_1, res);
+        }catch (Exception e) {
+            e.printStackTrace();
+            logger.info("异常:{}",e);
+            return resultResponse(HaoBanErrCode.ERR_0);
+        }
     }
 
 }