Merge branch 'test6.9.22' of http://git.yoho.cn/ufo/ufo-platform into test6.9.22

@@ -83,7 +83,7 @@ public class ResourceController {
         } catch (ParseException e) {
         } catch (ParseException e) {
             return new ApiResponse.ApiResponseBuilder().code(400).message("日期格式有误").data("").build();
             return new ApiResponse.ApiResponseBuilder().code(400).message("日期格式有误").data("").build();
         } catch (Exception e) {
         } catch (Exception e) {
-            return new ApiResponse.ApiResponseBuilder().code(400).message(e.getMessage()).data("").build();
+            return new ApiResponse(400, e.getMessage(), "");
         }
         }
         return new ApiResponse.ApiResponseBuilder().code(200).data(result).build();
         return new ApiResponse.ApiResponseBuilder().code(200).data(result).build();
     }
     }

@@ -247,12 +247,11 @@ public class ResourceServiceImpl implements IResourceService{
 				throw new PlatformException("拷贝源资源位不存在", 500);
 				throw new PlatformException("拷贝源资源位不存在", 500);
 			}
 			}
 			if (r.getPublishTime() == 0) {
 			if (r.getPublishTime() == 0) {
-				bo.setPublishTime(now + 3600 * 24);
+				r.setPublishTime(now + 3600 * 24);
 			} else {
 			} else {
-				bo.setPublishTime(r.getPublishTime() + 3600 * 24);
+				r.setPublishTime(r.getPublishTime() + 3600 * 24);
 			}
 			}
 			r.setId(null);
 			r.setId(null);
-			r.setPublishTime((int) (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(bo.getPublishTimeStr()).getTime() / 1000));
 			r.setLockPersonId("");
 			r.setLockPersonId("");
 			r.setLockPersonName("");
 			r.setLockPersonName("");
 			r.setMatchCode("");
 			r.setMatchCode("");