diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/assistance/service/impl/EmailServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/assistance/service/impl/EmailServiceImpl.java index 424b942a..c9616e74 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/assistance/service/impl/EmailServiceImpl.java +++ b/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 data=new HashMap(); - 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); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java index 7f47f851..0c2db9ce 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java @@ -268,14 +268,16 @@ public class CourseFullTextApi extends ApiBaseController{ courseIds = String.join(",", courseIdList); } // String courseIds = String.join(",", courseId); - //只是查询已发布的 - dto.setPublish(true); + // 只查已发布，且仅查询 source=2 的课程 + dto.setPublish(true); if(this.fullTextSearch==null) { log.error("未实现全文检索的接口 ICourseFullTextSearch"); return badRequest("当前查询不可用，未实现检索接口"); } - CourseFullText paras=new CourseFullText(); + CourseFullText paras=new CourseFullText(); + //php剥离进行后，java系统不再获取es中来自老系统的课程 + paras.setSource(2); //paras.setAudience("");//权限查询，先不处理 paras.setDuration(minDuration); paras.setMaxDuration(maxDuration); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java index a65efa9a..988a4004 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java +++ b/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 phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException { log.info("开始同步PHP学习记录到ES"); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java index 38373eb8..5633abe0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java +++ b/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> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException { - List courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEs(syncTimePointOfBegin, syncTimePointOfEnd, isOnlyRead); - return success(courseStudyDtoList); - } - - @PostMapping("/phpOnlineStudyRecordSyncEsOfFull") - public JsonResponse> phpOnlineStudyRecordSyncEsOfFull(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException { - List courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEsOfFull(syncTimePointOfBegin, syncTimePointOfEnd, isOnlyRead); - return success(courseStudyDtoList); - } +// @PostMapping("/phpOnlineStudyRecordSyncEs") +// public JsonResponse> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException { +// List courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEs(syncTimePointOfBegin, syncTimePointOfEnd, isOnlyRead); +// return success(courseStudyDtoList); +// } +// +// @PostMapping("/phpOnlineStudyRecordSyncEsOfFull") +// public JsonResponse> phpOnlineStudyRecordSyncEsOfFull(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException { +// List courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEsOfFull(syncTimePointOfBegin, syncTimePointOfEnd, isOnlyRead); +// return success(courseStudyDtoList); +// } } diff --git a/servers/boe-server-all/src/main/resources/application-prod.yml b/servers/boe-server-all/src/main/resources/application-prod.yml index cd32f346..28684c57 100644 --- a/servers/boe-server-all/src/main/resources/application-prod.yml +++ b/servers/boe-server-all/src/main/resources/application-prod.yml @@ -72,7 +72,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: diff --git a/servers/boe-server-all/src/main/resources/application-test.yml b/servers/boe-server-all/src/main/resources/application-test.yml index 1f85718e..7c408cb7 100644 --- a/servers/boe-server-all/src/main/resources/application-test.yml +++ b/servers/boe-server-all/src/main/resources/application-test.yml @@ -110,7 +110,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: