hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-20 00:06:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nyx/feature/20251130-hhq' into release-20250328-master

Browse Source
This commit is contained in:
joshen
2025-12-17 02:40:49 +08:00
parent c6323e2472 109c4ed428
commit 9fe87a6d83
6 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
View File

@@ -268,14 +268,16 @@ public class CourseFullTextApi extends ApiBaseController{
courseIds = String.join(",", courseIdList); courseIds = String.join(",", courseIdList);
} }
// String courseIds = String.join(",", courseId); // String courseIds = String.join(",", courseId);
//只是查询已发布的 // 只查已发布，且仅查询 source=2 的课程
dto.setPublish(true); dto.setPublish(true);
if(this.fullTextSearch==null) { if(this.fullTextSearch==null) {
log.error("未实现全文检索的接口 ICourseFullTextSearch"); log.error("未实现全文检索的接口 ICourseFullTextSearch");
return badRequest("当前查询不可用，未实现检索接口"); return badRequest("当前查询不可用，未实现检索接口");
} }
CourseFullText paras=new CourseFullText(); CourseFullText paras=new CourseFullText();
//php剥离进行后，java系统不再获取es中来自老系统的课程
paras.setSource(2);
//paras.setAudience("");//权限查询，先不处理 //paras.setAudience("");//权限查询，先不处理
paras.setDuration(minDuration); paras.setDuration(minDuration);
paras.setMaxDuration(maxDuration); paras.setMaxDuration(maxDuration);

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

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

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

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

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

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

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

@@ -110,7 +110,7 @@ xboe:
user: elastic user: elastic
password: Boe@es123 password: Boe@es123
email: 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 from: boeu_learning@boe.com.cn
user: user:
security: security: