From 6921deb17d41d99121ea484546963086aa328167 Mon Sep 17 00:00:00 2001 From: 0027002591 Date: Wed, 12 Nov 2025 17:00:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?php=E5=89=A5=E7=A6=BB=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/assistance/service/impl/EmailServiceImpl.java | 9 ++++----- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) 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/resources/application-prod.yml b/servers/boe-server-all/src/main/resources/application-prod.yml index 8d6a8177..148db889 100644 --- a/servers/boe-server-all/src/main/resources/application-prod.yml +++ b/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: 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 7872413a..468049d4 100644 --- a/servers/boe-server-all/src/main/resources/application-test.yml +++ b/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: From b990d96f1d5d7b1b6b9a6311324ffb8f06faba7a Mon Sep 17 00:00:00 2001 From: 0027002591 Date: Tue, 18 Nov 2025 11:42:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?php=E5=89=A5=E7=A6=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PhpOnlineStudyRecordScheduledTasks.java | 2 +- .../school/study/api/StudyCourseESApi.java | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) 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); +// } } From 109c4ed428cf1710fad3d8fa695759ba2e913aa5 Mon Sep 17 00:00:00 2001 From: hehongqiang <13592503343@139.com> Date: Mon, 15 Dec 2025 18:09:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?php=E5=89=A5=E7=A6=BB=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=90=8E=EF=BC=8Cjava=E7=B3=BB=E7=BB=9F=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E8=8E=B7=E5=8F=96es=E4=B8=AD=E6=9D=A5=E8=87=AA=E8=80=81?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9A=84=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/api/CourseFullTextApi.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 c43f2a20..339031f6 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 @@ -265,14 +265,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);