Merge branch 'dev'

renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java

@@ -54,7 +54,7 @@ import java.util.stream.Collectors;
 @RequestMapping("/ability/center/v2")
 public class AbilityCenterControllerV2 {
     private static final ExecutorService executor = Executors.newWorkStealingPool();
-    private static final Logger logger = LoggerFactory.getLogger(AbilityCenterController.class);
+    private static final Logger logger = LoggerFactory.getLogger(AbilityCenterControllerV2.class);
     private static final ObjectMapper oMapper = new ObjectMapper();
     @Autowired
     private ActProcessService actProcessService;

renren-admin/src/main/java/io/renren/modules/resourceMountApply/listener/ResourceOwnerListener.java

@@ -154,7 +154,6 @@ public class ResourceOwnerListener implements TaskListener, ExecutionListener, A
                         logger.error("发布到应用网关", exception);
                     }
                 }
-                return;
             }
         } else {
             logger.error("能力上架资源信息故障-->" + JSON.toJSONString(kv));