Merge remote-tracking branch 'origin/develop' into develop

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupController.java

@@ -111,7 +111,7 @@ public class ImGroupController extends BaseController {
     @ApiOperation("修改群信息")
     @PostMapping(value = "/update")
     public HttpResponseResult<Boolean> update(@Valid @RequestBody ImGroup imGroup) throws Exception {
-        return succeed(imGroupService.updateById(imGroup));
+        return succeed(imGroupService.updateImGroup(imGroup));
     }
 
     @ApiOperation("获取指定用户的群列表")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ImGroupService.java

@@ -205,5 +205,7 @@ public interface ImGroupService extends IService<ImGroup> {
     void updateStatus(List<ImHistoryMessage> info);
 
     RTCRoomPluginService getRTCRoomPluginService(String serviceProvider);
+
+    Boolean updateImGroup(ImGroup imGroup);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -1245,6 +1245,18 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
         return rtcRoomPluginContext.getPluginService(serviceProvider);
     }
 
+    @Override
+    public Boolean updateImGroup(ImGroup imGroup) {
+
+        this.updateById(imGroup);
+        try {
+            imGroupCoreService.modifyGroupInfo(imGroup.getId(),imGroup.getName(),imGroup.getImg());
+        } catch (Exception e) {
+            log.error("修改群组信息失败",e);
+        }
+        return true;
+    }
+
 
     private void groupTransfer(List<ImGroup> records) {
         String fansIcon = sysConfigService.findConfigValue(SysConfigConstant.ICON_FANS_GROUP_DEFAULT);

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupController.java

@@ -111,7 +111,7 @@ public class ImGroupController extends BaseController {
     @ApiOperation("修改群信息")
     @PostMapping(value = "/update")
     public HttpResponseResult<Boolean> update(@Valid @RequestBody ImGroup imGroup) throws Exception {
-        return succeed(imGroupService.updateById(imGroup));
+        return succeed(imGroupService.updateImGroup(imGroup));
     }
 
     @ApiOperation("获取指定用户的群列表")