Merge remote-tracking branch 'origin/master'

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneReceiver.java

@@ -151,7 +151,7 @@ public class BuildSceneReceiver implements MessageListenerConcurrently {
         };
         Future<String> future = exec.submit(call);
         try {
-            future.get(SysConstants.modelTimeOut, TimeUnit.MILLISECONDS); //任务处理超时时间设为 24个小时
+            future.get(SysConstants.modelTimeOut, TimeUnit.HOURS); //任务处理超时时间设为 24个小时
         } catch (TimeoutException ex) {
             ex.printStackTrace();
             StringWriter trace=new StringWriter();