update

edu-auth/edu-auth-api/pom.xml

@@ -34,8 +34,6 @@
 		<dependency>
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-thirdparty</artifactId>
-			<version>1.0</version>
-			<scope>compile</scope>
 		</dependency>
 	</dependencies>
 </project>

edu-auth/edu-auth-server/pom.xml

@@ -92,12 +92,6 @@
         </dependency>
         <dependency>
             <groupId>com.keao.edu</groupId>
-            <artifactId>edu-thirdparty</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.keao.edu</groupId>
             <artifactId>edu-user-client-api</artifactId>
         </dependency>
     </dependencies>

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/impl/SmsCodeServiceImpl.java

@@ -10,11 +10,11 @@ import org.springframework.stereotype.Service;
 import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.auth.service.SmsCodeService;
-import com.keao.edu.auth.service.SysMessageService;
 import com.keao.edu.common.entity.SysMessage;
 import com.keao.edu.common.enums.MessageSendMode;
 import com.keao.edu.common.enums.MessageTypeEnum;
 import com.keao.edu.common.exception.BizException;
+import com.keao.edu.common.service.SysMessageService;
 
 @Service
 public class SmsCodeServiceImpl implements SmsCodeService {

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/SysMessageController.java

@@ -1,19 +1,25 @@
 package com.keao.edu.auth.web.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysMessageParams;
 import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.auth.service.SysMessageService;
 import com.keao.edu.auth.web.controller.queryInfo.SysMessageQueryInfo;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.SysMessage;
 import com.keao.edu.common.enums.MessageSendMode;
 import com.keao.edu.common.page.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import com.keao.edu.common.service.SysMessageService;
 
 /**
  * @Author Joburgess

edu-common/pom.xml

@@ -16,6 +16,10 @@
 	</properties>
 
 	<dependencies>
+        <dependency>
+            <groupId>com.keao.edu</groupId>
+            <artifactId>edu-thirdparty</artifactId>
+        </dependency>
 
 		<dependency>
 			<groupId>com.keao.edu</groupId>
@@ -23,6 +27,11 @@
 		</dependency>
 
 		<dependency>
+			<groupId>com.keao.edu</groupId>
+			<artifactId>edu-auth-api</artifactId>
+		</dependency>
+
+		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 		</dependency>

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/SysMessageConfigService.java → edu-common/src/main/java/com/keao/edu/common/service/SysMessageConfigService.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.service;
+package com.keao.edu.common.service;
 
 
 import com.keao.edu.common.entity.SysMessageConfig;

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/SysMessageService.java → edu-common/src/main/java/com/keao/edu/common/service/SysMessageService.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.service;
+package com.keao.edu.common.service;
 
 
 import java.util.Date;
@@ -9,7 +9,6 @@ import java.util.Set;
 import com.keao.edu.common.entity.SysMessage;
 import com.keao.edu.common.enums.MessageSendMode;
 import com.keao.edu.common.enums.MessageTypeEnum;
-import com.keao.edu.common.service.BaseService;
 import com.keao.edu.thirdparty.message.MessageSenderPlugin;
 
 public interface SysMessageService extends BaseService<Long, SysMessage> {
@@ -30,22 +29,6 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType, String memo, Object... args);
 
 	/**
-	 * 推送im文本消息,包换调整链接
-	 * @param senderId
-	 * @param messageType
-	 * @return
-	 */
-	void batchSendImMessage(MessageTypeEnum messageType, String senderId, String extra, String[] targetIds, String url, Object... args);
-
-	/**
-	 * 推送im自定义节拍器消息
-	 * @param senderId
-	 * @param roomId
-	 * @param content
-	 */
-//	void batchSendImPlayMidiMessage(String senderId,String roomId, String content);
-
-	/**
 	 * 批量发送消息
 	 * @param messageSender 消息发送者
 	 * @param subject 消息主题
@@ -136,21 +119,6 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	public List<SysMessage> queryUserInRecentMinList(String mobile, int recentMin, MessageSendMode type);
 
 	/**
-	 * 发送私聊消息
-	 * @param studentId
-	 * @param content
-	 */
-    void sendPrivateMessage(String studentId, String content);
-
-	/**
-	 * 发送私聊消息
-	 * @param sender
-	 * @param receiver
-	 * @param content
-	 */
-	void sendNoAuthPrivateMessage(String sender, String receiver, String content);
-
-	/**
 	 * 删除消息
 	 * @param ids
 	 */

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/impl/SysMessageConfigServiceImpl.java → edu-common/src/main/java/com/keao/edu/common/service/impl/SysMessageConfigServiceImpl.java

@@ -1,14 +1,14 @@
-package com.keao.edu.auth.service.impl;
+package com.keao.edu.common.service.impl;
 
 
-import com.keao.edu.auth.service.SysMessageConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.dao.SysMessageConfigDao;
 import com.keao.edu.common.entity.SysMessageConfig;
 import com.keao.edu.common.enums.MessageTypeEnum;
-import com.keao.edu.common.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import com.keao.edu.common.service.SysMessageConfigService;
 
 @Service
 public class SysMessageConfigServiceImpl extends BaseServiceImpl<Integer, SysMessageConfig>  implements SysMessageConfigService {

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/impl/SysMessageServiceImpl.java → edu-common/src/main/java/com/keao/edu/common/service/impl/SysMessageServiceImpl.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.service.impl;
+package com.keao.edu.common.service.impl;
 
 
 import java.util.ArrayList;
@@ -19,8 +19,6 @@ import org.springframework.stereotype.Service;
 
 import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.auth.service.SysMessageConfigService;
-import com.keao.edu.auth.service.SysMessageService;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.dao.SysMessageDao;
 import com.keao.edu.common.entity.Mapper;
@@ -31,10 +29,8 @@ import com.keao.edu.common.enums.MessageTypeEnum;
 import com.keao.edu.common.enums.SendStatusEnum;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.redis.service.RedisCache;
-import com.keao.edu.common.service.impl.BaseServiceImpl;
-import com.keao.edu.im.api.client.ImFeignService;
-import com.keao.edu.im.api.entity.ImPrivateMessage;
-import com.keao.edu.im.api.entity.ImTxtMessage;
+import com.keao.edu.common.service.SysMessageConfigService;
+import com.keao.edu.common.service.SysMessageService;
 import com.keao.edu.thirdparty.message.MessageSenderPlugin;
 import com.keao.edu.thirdparty.message.MessageSenderPluginContext;
 import com.keao.edu.thirdparty.message.provider.YimeiSmsPlugin;
@@ -58,9 +54,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	private SysUserFeignService sysUserFeignService;
 
 	@Autowired
-	private ImFeignService imFeignService;
-
-	@Autowired
 	private RedisCache<String, Object> redisCache;
 
 	// 验证码有效期
@@ -179,61 +172,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public void batchSendImMessage(MessageTypeEnum type, String senderId,String extra, String[] targetIds, String url, Object... args) {
-		SysMessageConfig messageConfig = sysMessageConfigService.queryByType(type);
-		if (messageConfig == null) {
-			throw new BizException("消息类型错误");
-		}else if(messageConfig.getSendFlag() == null || messageConfig.getSendFlag() == 0){
-			return;
-		}
-		String content = MessageFormatter.arrayFormat(messageConfig.getContent(), args);
-		if(StringUtils.isNotEmpty(url)){
-			content += url;
-		}
-		ImPrivateMessage privateMessage = new ImPrivateMessage();
-		privateMessage.setObjectName("RC:TxtMsg");
-		privateMessage.setTargetId(targetIds);
-		privateMessage.setSenderId(senderId);
-		privateMessage.setContent(new ImTxtMessage(content,extra));
-		imFeignService.privateSend(privateMessage);
-	}
-
-	/*@Override
-	public void batchSendImPlayMidiMessage(String senderId,String roomId, String content) {
-		ImGroupMessage groupMessage = new ImGroupMessage();
-		privateMessage.setObjectName("DY:PlayMidiMessage");
-		groupMessage.setTargetId(roomId.split(","));
-		groupMessage.setSenderId(senderId);
-		groupMessage.setContent(new ImPlayMidiMessage(content,null));
-		groupMessage.setType("DY:PlayMidiMessage");
-		imFeignService.privateSendCustom(groupMessage);
-	}*/
-
-	@Override
-	public void sendPrivateMessage(String studentId, String content) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if(sysUser == null){
-			throw new BizException("用户信息获取失败");
-		}
-		ImPrivateMessage privateMessage = new ImPrivateMessage();
-		privateMessage.setObjectName("RC:TxtMsg");
-		privateMessage.setTargetId(studentId.split(","));
-		privateMessage.setSenderId(sysUser.getId().toString());
-		privateMessage.setContent(new ImTxtMessage(content,null));
-		imFeignService.privateSend(privateMessage);
-	}
-
-	@Override
-	public void sendNoAuthPrivateMessage(String sender, String receiver, String content) {
-		ImPrivateMessage privateMessage = new ImPrivateMessage();
-		privateMessage.setObjectName("RC:TxtMsg");
-		privateMessage.setTargetId(receiver.split(","));
-		privateMessage.setSenderId(sender);
-		privateMessage.setContent(new ImTxtMessage(content,null));
-		imFeignService.privateSend(privateMessage);
-	}
-
-	@Override
 	public void batchDelMessage(String ids) {
 		sysMessageDao.batchDelMessage(ids);
 	}

pom.xml

@@ -60,6 +60,12 @@
 				<artifactId>edu-datasource</artifactId>
 				<version>1.0</version>
 			</dependency>
+	        
+	        <dependency>
+	            <groupId>com.keao.edu</groupId>
+	            <artifactId>edu-thirdparty</artifactId>
+					<version>1.0</version>
+	        </dependency>
 
 			<!--֧��Spring Boot 2.1.X -->
 			<dependency>