Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -173,6 +173,9 @@ public interface SysUserService extends BaseService<Long, SysUser> {
      */
     void submitSetDetail(UserSetReq setReq, Long id);
 
+    //修改融云用户基本信息
+    void updateRongCloudUserInfo(Long userId);
+
     /**
      *  商城同步管理用户
      *

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -3,7 +3,9 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.yonge.cooleshow.auth.config.RongCloudConfig;
 import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
+import io.rong.models.user.UserModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -214,11 +216,22 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     @Override
     public void submitSetDetail(UserSetReq setReq, Long id) {
         sysUserDao.updatetSetDetail(setReq, id);
+        //更新融云用户基本信息
+        this.updateRongCloudUserInfo(id);
     }
 
     @Override
-    public List<SysUser> queryEmployeeList(SysUserQueryInfo queryInfo) {
+    public void updateRongCloudUserInfo(Long userId) {
+        UserSetVo setDetail = this.getSetDetail(userId);
+        try {
+            RongCloudConfig.rongCloud.user.update(new UserModel(userId.toString(), setDetail.getUsername(), setDetail.getAvatar()));
+        } catch (Exception e) {
+            throw new BizException("更新用户信息失败");
+        }
+    }
 
+    @Override
+    public List<SysUser> queryEmployeeList(SysUserQueryInfo queryInfo) {
         return sysUserDao.queryEmployeeList(queryInfo);
     }