Merge branch 'feature/0721-tenant'

audio-analysis/src/main/java/com/yonge/netty/server/service/AudioCompareHandler.java

@@ -1,5 +1,6 @@
 package com.yonge.netty.server.service;
 
+import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
 import io.netty.channel.Channel;
 
 import java.io.File;
@@ -203,7 +204,7 @@ public class AudioCompareHandler implements MessageHandler {
 		            String url = null;
 		            try {
 		                String folder = UploadUtil.getFileFloder();
-		                url = storagePluginContext.asyncUploadFile(KS3StoragePlugin.PLUGIN_NAME,"soundCompare/" + folder, waveFileProcessor.getFile(), true);
+		                url = storagePluginContext.asyncUploadFile(TencentOssPlugin.PLUGIN_NAME,"soundCompare/" + folder, waveFileProcessor.getFile(), true);
 		            } catch (Exception e) {
 		                LOGGER.error("录音文件上传失败：{}", e);
 		            }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/provider/PhoneAuthenticationProvider.java

@@ -181,7 +181,7 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
                 }
 
                 // 同账号，用户信息存在的情况
-                if (Objects.nonNull(userInfo.getSysUser())) {
+                if (!user.getUserType().contains(clientId.toUpperCase())) {
                     // 自动添加系统默认IM帐号为好友，并自动发送通知消息
                     sysUserService.sendSysCustomerServiceFriendMessage(userInfo.getSysUser(), clientId.toUpperCase());
                 }