php剥离修改

servers/boe-server-all/src/main/java/com/xboe/module/assistance/service/impl/EmailServiceImpl.java

@@ -56,12 +56,11 @@ public class EmailServiceImpl implements IEmailService {
 		String cfgWord=SysConstant.getConfigValue("xboe.email.security");
 		
 		Map<String,Object> data=new HashMap<String,Object>();
-		data.put("to",to);
-		data.put("subject",subject);
+		// php剥离，不再使用老系统发邮件，使用基础服务的发邮件功能
+		data.put("email",to);
+		data.put("title",subject);
 		data.put("content", htmlMsg);
-		data.put("fromName", cfgFrom);
-		data.put("cc", "");
-		data.put("type", 0);
+		data.put("userName", cfgUser);
 		ObjectMapper mapper=new ObjectMapper();
 		String json=mapper.writeValueAsString(data);
 		

servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java

@@ -44,7 +44,7 @@ public class PhpOnlineStudyRecordScheduledTasks {
     RestHighLevelClient restHighLevelClient;
 
     // todo 定时、分批、数据库名
-    @XxlJob("phpOnlineStudyRecordSyncEsTask")
+    //@XxlJob("phpOnlineStudyRecordSyncEsTask")
     public List<String> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
 
         log.info("开始同步PHP学习记录到ES");

servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java

@@ -240,17 +240,17 @@ public class StudyCourseESApi extends ApiBaseController{
 	 * @return
 	 * @throws IOException
 	 */
-	@PostMapping("/phpOnlineStudyRecordSyncEs")
-	public JsonResponse<List<String>> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
-		List<String> courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEs(syncTimePointOfBegin, syncTimePointOfEnd, isOnlyRead);
-		return success(courseStudyDtoList);
-	}
-
-	@PostMapping("/phpOnlineStudyRecordSyncEsOfFull")
-	public JsonResponse<List<String>> phpOnlineStudyRecordSyncEsOfFull(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
-		List<String> courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEsOfFull(syncTimePointOfBegin, syncTimePointOfEnd, isOnlyRead);
-		return success(courseStudyDtoList);
-	}
+//	@PostMapping("/phpOnlineStudyRecordSyncEs")
+//	public JsonResponse<List<String>> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
+//		List<String> courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEs(syncTimePointOfBegin, syncTimePointOfEnd, isOnlyRead);
+//		return success(courseStudyDtoList);
+//	}
+//
+//	@PostMapping("/phpOnlineStudyRecordSyncEsOfFull")
+//	public JsonResponse<List<String>> phpOnlineStudyRecordSyncEsOfFull(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
+//		List<String> courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEsOfFull(syncTimePointOfBegin, syncTimePointOfEnd, isOnlyRead);
+//		return success(courseStudyDtoList);
+//	}
 
 
 }

servers/boe-server-all/src/main/resources/application-prod.yml

@@ -66,7 +66,7 @@ xboe:
       user:
       password:
   email:
-    url: https://u.boe.com/api/b1/email/send
+    url: http://u.boe.com/infrasApi/sendMsg/sendMail
     from: boeu_learning@boe.com.cn
     user:
     security:

servers/boe-server-all/src/main/resources/application-test.yml

@@ -104,7 +104,7 @@ xboe:
       user: elastic
       password: Boe@es123
   email:
-    url: http://10.251.186.27/api/b1/email/send
+    url: http://127.0.0.1/infrasApi/sendMsg/sendMail
     from: boeu_learning@boe.com.cn
     user:
     security: