boenewlogin band处理

# Conflicts:
#	servers/boe-server-all/pom.xml
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/resources/application-pro.properties
#	servers/boe-server-all/src/main/resources/application-test.properties
#	servers/boe-server-all/src/main/resources/application.properties

servers/boe-server-all/pom.xml

@@ -219,13 +219,13 @@
         <dependency>
             <groupId>org.elasticsearch</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>7.10.2</version> <!-- 请根据实际需求选择合适的版本 -->
+            <version>7.9.0</version> <!-- 请根据实际需求选择合适的版本 -->
         </dependency>
 
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-high-level-client</artifactId>
-            <version>7.10.2</version> <!-- 请根据实际需求选择合适的版本 -->
+            <version>7.9.0</version> <!-- 请根据实际需求选择合适的版本 -->
         </dependency>
 
         <dependency>
@@ -234,6 +234,12 @@
             <version>1.1.24</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+            <version>2.3.0</version> <!-- 请根据实际需求选择版本 -->
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>
@@ -263,9 +269,9 @@
     </build>
     <profiles>
         <profile>
-            <id>pro</id>
+            <id>prod</id>
             <properties>
-                <profileActive>pro</profileActive>
+                <profileActive>prod</profileActive>
             </properties>
         </profile>
         <profile>

servers/boe-server-all/src/main/java/com/xboe/XxlJobConfig.java

@@ -0,0 +1,40 @@
+package com.xboe;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class XxlJobConfig {
+
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+    @Value("${xxl.job.executor.appname}")
+    private String appName;
+    @Value("${xxl.job.executor.ip}")
+    private String ip;
+    @Value("${xxl.job.executor.port}")
+    private int port;
+    @Value("${xxl.job.accessToken}")
+    private String accessToken;
+    @Value("${xxl.job.executor.logpath}")
+    private String logPath;
+    @Value("${xxl.job.executor.logretentiondays}")
+    private int logRetentionDays;
+
+    @Bean
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        // 创建 XxlJobSpringExecutor 执行器
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppname(appName);
+        xxlJobSpringExecutor.setIp(ip);
+        xxlJobSpringExecutor.setPort(port);
+        xxlJobSpringExecutor.setAccessToken(accessToken);
+        xxlJobSpringExecutor.setLogPath(logPath);
+        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+        // 返回
+        return xxlJobSpringExecutor;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java

@@ -22,6 +22,8 @@ import com.boe.feign.api.usercenter.reps.AudienceMemberVo;
 import com.boe.feign.api.usercenter.reps.Response;
 import com.xboe.api.infrastructure.res.InfraResult;
 import com.xboe.api.vo.*;
+import com.xboe.module.course.dto.CourseParam;
+import com.xboe.module.course.dto.ScoreParam;
 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
 import com.xboe.core.JsonResponse;
@@ -84,6 +86,16 @@ public class ThirdApi {
     @Resource
     private UserDynamicApiRemoteClient userDynamicApiRemoteClient;
 
+    @Value("${coursesuilt.updateOrSaveCourse}")
+    private String updateOrSaveCourse;
+    @Value("${coursesuilt.syncCourseStudent}")
+    private String syncCourseStudent;
+    @Value("${coursesuilt.syncOnLineScore}")
+    private String syncOnLineScore;
+    @Value("${coursesuilt.updateOnLineStatua}")
+    private String updateOnLineStatua;
+
+
     //获取例外人员的id
     public List<String> getUserId() {
         CommonSearchVo searcher = new CommonSearchVo();
@@ -343,4 +355,31 @@ public class ThirdApi {
         return basicInfos;
 
     }
+
+    public void updateOrSaveCourse(CourseParam param, String token){
+        log.info("---------------准备同步在线课到讲师管理完毕 ------- param " + param);
+        String resp = Optional.ofNullable(
+                HttpRequest.post(updateOrSaveCourse).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
+                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
+        log.info("updateOrSaveCourse = " + resp);
+    }
+    public void syncCourseStudent(Long courseId, String token){
+        String resp = Optional.ofNullable(
+                HttpRequest.post(syncCourseStudent).body(JSONUtil.toJsonStr(courseId)).header("token", token).execute()
+                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
+        log.info("syncCourseStudent = " + resp);
+    }
+
+    public void syncOnLineScore(ScoreParam param, String token) {
+        String resp = Optional.ofNullable(
+                HttpRequest.post(syncOnLineScore).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
+                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
+        log.info("syncOnLineScore = " + resp);
+    }
+    public void updateOnLineStatua(CourseParam param, String token){
+        String resp = Optional.ofNullable(
+                HttpRequest.post(updateOnLineStatua).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
+                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
+        log.info("updateOrSaveCourse = " + resp);
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/config/WebConfig.java

@@ -1,6 +1,5 @@
 package com.xboe.config;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -8,9 +7,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.util.List;
@@ -20,6 +21,15 @@ public class WebConfig implements WebMvcConfigurer {
 
     private static final Logger logger = LoggerFactory.getLogger(WebConfig.class);
 
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.favorParameter(true)
+                .defaultContentType(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML)
+                .parameterName("mediaType")
+                .mediaType("json", MediaType.APPLICATION_JSON)
+                .mediaType("xml", MediaType.APPLICATION_XML);
+    }
+
     //结果处理器
     @Bean
     public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter(ObjectMapper objectMapper) {
@@ -30,9 +40,10 @@ public class WebConfig implements WebMvcConfigurer {
     public ObjectMapper objectMapper() {
         ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JavaTimeModule());
-        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY,true);
+        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
         return mapper;
     }
+
     /**
      * 在默认的消息转换器基础上添加或移除某些转换器
      * 保证StringHttpMessageConverter在FastJsonHttpMessageConverter前被调用

servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java

@@ -122,13 +122,20 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
 	            //这里应该是单独的线程去处理
 	        	user.setId(getNodeText(result.get("userId")));//最新接口变化，id改成userId
 	        	String band=getNodeText(result.get("bandCode"));
-	        	if(StringUtils.isNotBlank(band) && band.length()>4) {
+				try {
-	        		String bandNum=band.substring(4);
+					if(StringUtils.isNotBlank(band) && band.length()>4 && band.contains("band")) {
-	        		user.setBandLevel(Integer.valueOf(bandNum));
+						String bandNum=band.substring(4);
-	        	}else {
+						user.setBandLevel(Integer.valueOf(bandNum));
-	        		user.setBandLevel(0);
+					}else if (StringUtils.isNotBlank(band) && band.length()>4 && band.contains("Level")) {
-	        	}
+						String bandNum=band.substring(5);
-	        	user.setAvatar(getNodeText(result.get("avatar")));
+						user.setBandLevel(Integer.valueOf(bandNum));
+					}else {
+						user.setBandLevel(0);
+					}
+				} catch (NumberFormatException e) {
+					user.setBandLevel(0);
+				}
+				user.setAvatar(getNodeText(result.get("avatar")));
 	        	user.setCode(getNodeText(result.get("userNo")));
 	        	
 	        	if(StringUtils.isBlank(user.getCode())) {

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CaseScheduledTasks.java

@@ -1,6 +1,7 @@
 package com.xboe.module.boecase.api;
 
 import com.xboe.module.boecase.service.ICasesService;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -16,6 +17,7 @@ public class CaseScheduledTasks {
      * 每月的第一天的1:00执行
      */
 //    @Scheduled(cron = "0 0 1 1 * ?")
+    @XxlJob("refreshViewsRankOfMajor")
     public void refreshViewsRankOfMajor() {
         casesService.refreshViewsRankOfMajor();
     }
@@ -23,7 +25,8 @@ public class CaseScheduledTasks {
     /**
      * 季初第一天两点执行，cron表达式设置为每个季度的第一个月的第一天的特定时间。每个季度的第一个月是1月、4月、7月和10月：
      */
-    @Scheduled(cron = "0 0 2 1 1,4,7,10 ?")
+//    @Scheduled(cron = "0 0 2 1 1,4,7,10 ?")
+    @XxlJob("refreshLastQuarterStatistics")
     public void refreshLastQuarterStatistics() {
         casesService.refreshLastQuarterStatistics();
     }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java

@@ -140,6 +140,9 @@ public class CasesApi extends ApiBaseController {
             List<Cases> cases = views.getList();
             if (CollUtil.isNotEmpty(cases)) {
                 for (Cases c : cases) {
+                    if ("null".equals(c.getSummary())) {
+                        c.setSummary(null);
+                    }
                     StringBuffer stringBuffer = new StringBuffer();
                     List<CasesMajorType> caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", c.getId()));
                     if (caseId != null && !caseId.isEmpty()) {

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java

@@ -5,7 +5,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import com.xboe.api.ThirdApi;
+import com.xboe.module.course.dto.CourseParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -55,7 +58,10 @@ public class CourseAuditApi  extends ApiBaseController{
 	
 	@Resource
 	private ICourseContentService ccontentService;
-	
+	@Resource
+	private ThirdApi thirdApi;
+
+
 	/**
 	 * 教师需要审核的课程
 	 * @param pager
@@ -315,7 +321,7 @@ public class CourseAuditApi  extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/hrbp-submit-audit")
-	public JsonResponse<Boolean> hrbpAudit(String auditId,String courseId,String title,Boolean pass,String remark){
+	public JsonResponse<Boolean> hrbpAudit(String auditId,String courseId,String title,Boolean pass,String remark, HttpServletRequest request){
 		if(StringUtils.isBlank(auditId)){
 			return badRequest("参数错误");
 		}
@@ -347,6 +353,14 @@ public class CourseAuditApi  extends ApiBaseController{
 		try {
 			CurrentUser cu=getCurrent();
 			service.hrbpSubmitAudit(auditId, courseId,open, pass,cu.getAccountId(),cu.getName(), remark);
+
+			if (pass){
+				//修改在线课开课状态=已开课
+				String token = request.getHeader("Xboe-Access-Token");
+				CourseParam param = new CourseParam();
+				param.setId(courseId);
+				thirdApi.updateOnLineStatua(param,token);
+			}
 			return success(true);
 		} catch (Exception e) {
 			log.error("HRBP审核提交处理错误",e);
@@ -378,7 +392,8 @@ public class CourseAuditApi  extends ApiBaseController{
 	 */
 	@PostMapping("/submit-publish")
 	@AutoLog(module = "课程",action = "默认管理员提交发布",info = "")
-	public JsonResponse<Boolean> submitAndPublish(@RequestBody CourseFullDto dto){
+	public JsonResponse<Boolean> submitAndPublish(@RequestBody CourseFullDto dto, HttpServletRequest request){
+		log.info("---------------提交并直接发布，用于默认管理直接操作 -------");
 		if(dto.getCourse()==null){
 			return badRequest("无课程信息");
 		}
@@ -402,12 +417,22 @@ public class CourseAuditApi  extends ApiBaseController{
 		if(StringUtils.isBlank(dto.getCourse().getOrgId())) {
 			return badRequest("请选择资源归属");
 		}
+		String token = request.getHeader("Xboe-Access-Token");
+
 		CurrentUser cuser=getCurrent();
 		dto.getCourse().setStatus(Course.STATUS_AUDIT_FINISH);//设置为审核通过状态
 		dto.getCourse().setEnabled(true);//设置启用状态问题
 		dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态
 		try {
+
 			courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName());
+			log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);
+			CourseParam param = new CourseParam();
+			param.setId(dto.getCourse().getId());
+			param.setOrgId(dto.getCourse().getOrgId());
+			param.setOrgName(dto.getCourse().getOrgName());
+			thirdApi.updateOrSaveCourse(param,token);
+			log.info("---------------在线课同步到讲师管理完毕 -------");
 			return success(true);
 		} catch (Exception e) {
 			log.error("默认管理员提交直接发布处理失败",e);

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java

@@ -7,6 +7,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.xboe.api.ThirdApi;
+import com.xboe.module.course.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,11 +28,6 @@ import com.xboe.data.dto.UserOrgIds;
 import com.xboe.data.outside.IOutSideDataService;
 import com.xboe.data.service.IDataUserSyncService;
 import com.xboe.module.assistance.service.IEmailService;
-import com.xboe.module.course.dto.CourseExportDto;
-import com.xboe.module.course.dto.CourseFullDto;
-import com.xboe.module.course.dto.CourseQueryDto;
-import com.xboe.module.course.dto.CourseTeacherAndCourse;
-import com.xboe.module.course.dto.CourseTeacherExportDto;
 import com.xboe.module.course.entity.Course;
 import com.xboe.module.course.entity.CourseContent;
 import com.xboe.module.course.entity.CourseCrowd;
@@ -100,7 +97,8 @@ public class CourseManageApi extends ApiBaseController{
 	
 	@Autowired
     IDataUserSyncService userSyncService;
-	
+	@Resource
+	private ThirdApi thirdApi;
 	
 //	@PostMapping("/test")
 //	public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
@@ -271,7 +269,7 @@ public class CourseManageApi extends ApiBaseController{
 	 */
 	@PostMapping("/save")
 	@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
-	public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto){
+	public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto, HttpServletRequest request){
 		if(dto.getCourse()==null){
 			return badRequest("无课程信息");
 		}
@@ -302,7 +300,14 @@ public class CourseManageApi extends ApiBaseController{
 				dto.getCourse().setStatus(Course.STATUS_NONE);
 				courseService.update(dto);
 			}
-			
+			String token = request.getHeader("Xboe-Access-Token");
+			log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);
+			CourseParam param = new CourseParam();
+			param.setId(dto.getCourse().getId());
+			param.setOrgId(dto.getCourse().getOrgId());
+			param.setOrgName(dto.getCourse().getOrgName());
+			thirdApi.updateOrSaveCourse(param,token);
+			log.info("---------------在线课同步到讲师管理完毕 -------");
 			return success(dto);
 		} catch (Exception e) {
 			log.error("整体保存课程信息错误",e);

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseParam.java

@@ -0,0 +1,10 @@
+package com.xboe.module.course.dto;
+
+import lombok.Data;
+
+@Data
+public class CourseParam {
+    private String id;
+    private String orgId;
+    private String orgName;
+}

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/ScoreParam.java

@@ -0,0 +1,9 @@
+package com.xboe.module.course.dto;
+
+import lombok.Data;
+
+@Data
+public class ScoreParam {
+    private Long courseId;
+    private Float score;
+}

servers/boe-server-all/src/main/java/com/xboe/module/filecloud/api/XFileBaseApi.java

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java

@@ -1,7 +1,10 @@
 package com.xboe.module.interaction.api;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import com.xboe.api.ThirdApi;
+import com.xboe.module.course.dto.ScoreParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,18 +28,27 @@ public class CourseGradeApi extends ApiBaseController {
 
     @Resource
     private ICourseGradeService service;
+    @Resource
+    private ThirdApi thirdApi;
+
     /**
      * 评分
      * */
     @PostMapping("/grade")
     @AutoLog(module = "评分",action = "评分")
-    public JsonResponse<Float> grade(String courseId,Float score,String studyId){
+    public JsonResponse<Float> grade(String courseId,Float score,String studyId, HttpServletRequest request){
         CourseGrade courseGrade = new CourseGrade();
         courseGrade.setCourseId(courseId);
         courseGrade.setScores(score);
         courseGrade.setStudyId(studyId);
         try {
 	        Float aFloat = service.save(courseGrade);
+            String token = request.getHeader("Xboe-Access-Token");
+            ScoreParam param = new ScoreParam();
+            param.setCourseId(Long.parseLong(courseId));
+            param.setScore(score);
+            // 同步在线课评分
+//            thirdApi.syncOnLineScore(param,token);
 	        return success(aFloat);
         }catch(Exception e) {
         	log.error("评分保存错误",e);

servers/boe-server-all/src/main/java/com/xboe/module/teacher/entity/Teacher.java

@@ -1,6 +1,8 @@
 package com.xboe.module.teacher.entity;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -153,7 +155,7 @@ public class Teacher extends BaseEntity {
      */
     @Column(name = "courses")
     private String courses;
-    
+
     /**
      * 发薪地id
      */
@@ -206,4 +208,56 @@ public class Teacher extends BaseEntity {
     @Column(name = "expertise")
     private String expertise;
 
+    @Column(name = "user_no",length = 1)
+    private String userNo;
+
+//    @ApiModelProperty(value = "讲师类型 1 内部讲师  2外部讲师")
+    @Column(name = "teacher_type")
+    private Integer teacherType;
+
+//    @ApiModelProperty(value = "默认授课时长(分钟)")
+    @Column(name = "default_teaching_time")
+    private Integer defaultTeachingTime;
+
+//    @ApiModelProperty(value = "认证人")
+    @Column(name = "certify_by")
+    private String certifyBy;
+
+//    @ApiModelProperty(value = "认证时间")
+    @Column(name = "certify_at")
+    private LocalDateTime certifyAt;
+
+    //    @ApiModelProperty(value = "认证资料路径")
+    @Column(name = "certification")
+    private String certification;
+
+    //   @ApiModelProperty(value = "认证资料路径名称")
+    @Column(name = "certification_name")
+    private String certificationName;
+
+    //    @ApiModelProperty(value = "供应商")
+    @Column(name = "supplier")
+    private String supplier;
+
+
+    //   @ApiModelProperty(value = "教师专长名称 逗号分割")
+    @Column(name = "expertise_names")
+    private String expertiseNames;
+
+    //   @ApiModelProperty(value = "标识 0：自动录入/1：手动录入")
+    @Column(name = "create_from")
+    private Integer createFrom;
+
+    //    @ApiModelProperty(value = "组织id")
+    @Column(name = "org_id")
+    private Long orgId;
+
+    //     @ApiModelProperty(value = "组织名称")
+    @Column(name = "org_name")
+    private String orgName;
+
+    //    @ApiModelProperty(value = "旧系统kid字段")
+    @Column(name = "kid")
+    private String kid;
+
 }

servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java

@@ -102,9 +102,12 @@ public class TeacherServiceImpl implements ITeacherService {
     public List<Teacher> findByName(String name) {
     	String hql="Select t.id,t.name,u.userNo from "+Teacher.class.getSimpleName()+" t,"+User.class.getSimpleName()+" u ";
     	hql+=" where t.id=u.id and (t.name like '%"+name+"%' or u.userNo=?1)";
+//        String hql="Select t.id,t.name,t.userNo from "+Teacher.class.getSimpleName()+" t";
+//        hql+=" where t.deleted =0 and t.status =1 and (t.name like '%"+name+"%' or t.userNo like '%"+name+"%' )";
+
     	List<Teacher> teachers=new ArrayList<Teacher>();
     	try {
-			List<Object[]> list =dao.findListFields(hql,name);
+			List<Object[]> list =dao.findListFields(hql);
 			for(Object[] objs :list) {
 				Teacher t=new Teacher();
 				t.setId((String)objs[0]);

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

@@ -0,0 +1,245 @@
+package com.xboe.school.study.api;
+
+import cn.hutool.core.collection.CollUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.xboe.module.course.dto.CourseStudyDto;
+import com.xboe.school.study.dao.PhpOnlineCourseDao;
+import com.xboe.school.study.dto.PhpOnlineDto;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.action.bulk.BulkRequest;
+import org.elasticsearch.action.bulk.BulkResponse;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.update.UpdateRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.SearchHit;
+import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class PhpOnlineStudyRecordScheduledTasks {
+
+    @Resource
+    private PhpOnlineCourseDao phpOnlineCourseDao;
+
+    @Resource
+    RestHighLevelClient restHighLevelClient;
+
+    // todo 定时、分批、数据库名
+    @XxlJob("phpOnlineStudyRecordSyncEsTask")
+    public List<String> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
+
+        log.info("开始同步PHP学习记录到ES");
+        // 增量获取PHP中所有已完成的课程
+        if (syncTimePointOfBegin == null || syncTimePointOfEnd == null) {
+            LocalDateTime now = LocalDateTime.now();
+            LocalDateTime halfAnHourAgo = now.minusMinutes(30);
+            syncTimePointOfBegin = halfAnHourAgo.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond();
+            syncTimePointOfEnd = now.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond();
+
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            log.info("同步时间起点：{}", formatter.format(halfAnHourAgo));
+            log.info("同步时间终点：{}", formatter.format(now));
+        }
+
+        int pageSize = 1000;
+        int totalRecordsCount = phpOnlineCourseDao.selectRecentLearnRecordListOfCount(syncTimePointOfBegin, syncTimePointOfEnd); // 总记录数
+
+        int totalPages = (int) Math.ceil((double) totalRecordsCount / pageSize);
+
+        ArrayList<String> tempResultList = new ArrayList<>();
+
+        for (int pageNumber = 1; pageNumber <= totalPages; pageNumber++) {
+            int offset = (pageNumber - 1) * pageSize;
+            List<PhpOnlineDto> pageData = phpOnlineCourseDao.selectRecentLearnRecordList(syncTimePointOfBegin, syncTimePointOfEnd, offset, pageSize);
+            ArrayList<String> singleResultList = esDataHandle(isOnlyRead, pageData);
+            tempResultList.addAll(singleResultList);
+        }
+
+        return tempResultList;
+    }
+
+
+    private ArrayList<String> esDataHandle(Integer isOnlyRead, List<PhpOnlineDto> recentLearnRecordList) throws IOException {
+        ArrayList<String> tempResultList = new ArrayList<>();
+        // 将数据分批，每批50条
+        int batchSize = 50;
+        int totalSize = recentLearnRecordList.size();
+        List<List<PhpOnlineDto>> batches = new ArrayList<>();
+
+        for (int i = 0; i < totalSize; i += batchSize) {
+            int end = Math.min(i + batchSize, totalSize);
+            batches.add(recentLearnRecordList.subList(i, end));
+        }
+
+        for (List<PhpOnlineDto> batch : batches) {
+            // 构建映射关系
+            Map<String, PhpOnlineDto> map = batch.stream()
+                    .collect(Collectors.toMap(
+                            phpOnlineDto -> phpOnlineDto.getUserIdOfJava() + "-" + phpOnlineDto.getCourseId(),
+                            phpOnlineDto -> phpOnlineDto
+                    ));
+
+            // 获取ES中的数据
+            List<CourseStudyDto> esDataList = getEsData(batch);
+
+
+            // 更新ES数据
+            List<CourseStudyDto> toBeUpdatedEs = esDataList.stream()
+                    .map(esDataItem -> {
+                        String key = esDataItem.getAccountId() + "-" + esDataItem.getCourseId();
+                        PhpOnlineDto phpOnlineDto = map.get(key);
+
+                        // 如果找到相应的 PhpOnlineDto 且进度有变化，则进行更新
+                        if (phpOnlineDto != null && !esDataItem.getProgress().equals(phpOnlineDto.getProgress())) {
+                            esDataItem.setProgress(phpOnlineDto.getProgress());
+                            if (phpOnlineDto.getProgress() == 100) {
+                                esDataItem.setStatus(9); // 完成
+                            } else {
+                                esDataItem.setStatus(2); // 进行中
+                            }
+                            return esDataItem;
+                        }
+                        return null; // 返回 null 表示不需要更新
+                    })
+                    .filter(Objects::nonNull) // 去掉返回为 null 的项
+                    .collect(Collectors.toList());
+
+            tempResultList.addAll(toBeUpdatedEs.stream().map(esDataItem -> esDataItem.getId()).collect(Collectors.toList()));
+
+            if (isOnlyRead != null && isOnlyRead == 1) {
+                continue;
+            }
+
+            // 调用批量更新方法
+//            toBeUpdatedEs(toBeUpdatedEs, indexName);
+        }
+        return tempResultList;
+    }
+
+    private List<CourseStudyDto> getEsData(List<PhpOnlineDto> finishedCourseList) throws IOException {
+        SearchRequest searchRequest = new SearchRequest("new_study_resource");
+        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+
+        for (PhpOnlineDto phpOnlineDto : finishedCourseList) {
+            if (StringUtils.isBlank(phpOnlineDto.getUserIdOfJava()) || StringUtils.isBlank(phpOnlineDto.getCourseId())) {
+                continue;
+            }
+
+            boolQuery.should(QueryBuilders.boolQuery()
+                    .must(QueryBuilders.termQuery("courseId.keyword", phpOnlineDto.getCourseId()))
+                    .must(QueryBuilders.termQuery("accountId.keyword", phpOnlineDto.getUserIdOfJava()))
+                    .mustNot(QueryBuilders.termQuery("status", 9))
+            );
+        }
+
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().query(boolQuery).timeout(new TimeValue(60, TimeUnit.SECONDS));
+        searchRequest.source(sourceBuilder);
+        if (boolQuery.hasClauses()) {
+            sourceBuilder.query(boolQuery);
+        }
+        searchRequest.source(sourceBuilder);
+
+        SearchResponse response = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);
+        SearchHits hits = response.getHits();
+
+        List<CourseStudyDto> courseStudyDtoList = new ArrayList<>();
+        ObjectMapper mapper = new ObjectMapper();
+        for (SearchHit hit : hits) {
+            String sourceAsString = hit.getSourceAsString();
+            try {
+                CourseStudyDto cft = mapper.readValue(sourceAsString, CourseStudyDto.class);
+                courseStudyDtoList.add(cft);
+            } catch (Exception e) {
+                log.error("转化json到对应失败", sourceAsString);
+            }
+        }
+        return courseStudyDtoList;
+    }
+
+    private void toBeUpdatedEs(List<CourseStudyDto> toBeUpdatedEsData, String indexName) {
+        if (CollUtil.isEmpty(toBeUpdatedEsData)) {
+            return;
+        }
+        BulkRequest bulkRequest = new BulkRequest();
+        for (CourseStudyDto courseStudyDto : toBeUpdatedEsData) {
+            Map<String, Object> docMap = new HashMap<>();
+            docMap.put("status", courseStudyDto.getStatus());
+            docMap.put("progress", courseStudyDto.getProgress());
+
+            // 创建更新请求，并传入单一的docMap
+            UpdateRequest updateRequest = new UpdateRequest(indexName, courseStudyDto.getId())
+                    .doc(docMap, XContentType.JSON);
+
+            // 将请求添加到批量请求中
+            bulkRequest.add(updateRequest);
+        }
+
+        try {
+            // 执行批量更新操作
+            BulkResponse bulkResponse = restHighLevelClient.bulk(bulkRequest, RequestOptions.DEFAULT);
+            // 检查是否有失败的操作
+            if (bulkResponse.hasFailures()) {
+                log.error("批量更新失败: {}", bulkResponse.buildFailureMessage());
+            } else {
+                List<String> collect = toBeUpdatedEsData.stream().map(CourseStudyDto::getId).collect(Collectors.toList());
+                log.info("批量更新成功，更新的ES ID列表: {}", collect);
+            }
+        } catch (IOException e) {
+            log.error("执行批量更新时发生错误", e);
+        }
+    }
+
+
+    public List<String> phpOnlineStudyRecordSyncEsOfFull(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
+
+        log.info("开始同步PHP学习记录到ES");
+        // 增量获取PHP中所有已完成的课程
+        if (syncTimePointOfBegin == null || syncTimePointOfEnd == null) {
+            LocalDateTime now = LocalDateTime.now();
+            LocalDateTime halfAnHourAgo = now.minusMinutes(30);
+            syncTimePointOfBegin = halfAnHourAgo.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond();
+            syncTimePointOfEnd = now.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond();
+
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            log.info("同步时间起点：{}", formatter.format(halfAnHourAgo));
+            log.info("同步时间终点：{}", formatter.format(now));
+        }
+
+        int pageSize = 1000;
+        int totalRecordsCount = phpOnlineCourseDao.selectRecentRegRecordListOfCount(syncTimePointOfBegin, syncTimePointOfEnd); // 总记录数
+
+        int totalPages = (int) Math.ceil((double) totalRecordsCount / pageSize);
+
+        ArrayList<String> tempResultList = new ArrayList<>();
+
+        for (int pageNumber = 1; pageNumber <= totalPages; pageNumber++) {
+            int offset = (pageNumber - 1) * pageSize;
+            List<PhpOnlineDto> pageData = phpOnlineCourseDao.selectRecentRegRecordList(syncTimePointOfBegin, syncTimePointOfEnd, offset, pageSize);
+            ArrayList<String> singleResultList = esDataHandle(isOnlyRead, pageData);
+            tempResultList.addAll(singleResultList);
+        }
+
+        return tempResultList;
+    }
+
+
+}

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

@@ -750,18 +750,26 @@ public class StudyCourseApi extends ApiBaseController{
 	 * @param courseId 课程id 用于删除课程报名信息和修改课程学习人数
 	 * */
 	@PostMapping("/delete-signup")
-	public JsonResponse<Boolean> deleteSignUp(String id,String courseId,String studentId){
+	public JsonResponse<Boolean> deleteSignUp(String id,String courseId,String studentId, HttpServletRequest request){
 		if(StringUtils.isBlank(id)){
 			return badRequest("参数异常");
 		}
 		//String aid = this.getCurrent().getAccountId();
 		try {
 			service.deleteSignUp(id,courseId,studentId);
-			return success(true);
 		} catch (Exception e) {
 			log.error("删除报名信息失败",e.getMessage());
 			return error("删除失败",e.getMessage());
 		}
+
+		try {
+			String token = request.getHeader("Xboe-Access-Token");
+			thirdApi.syncCourseStudent(Long.parseLong(courseId),token);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return success(true);
+
 	}
 
 	/**

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

@@ -24,6 +24,8 @@ import com.xboe.school.study.service.IStudyCourseService;
 
 import lombok.extern.slf4j.Slf4j;
 
+import javax.annotation.Resource;
+
 /**
  * ES的课程检索
  * @author seastar
@@ -39,6 +41,10 @@ public class StudyCourseESApi extends ApiBaseController{
 	
 	@Autowired
 	IStudyCourseService service;
+
+	@Resource
+	private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks;
+
 	
 	@RequestMapping(value="/search",method = {RequestMethod.GET,RequestMethod.POST})
 	public JsonResponse<PageList<CourseStudyDto>> search(Pagination page, CourseStudyDto dto){
@@ -161,4 +167,26 @@ public class StudyCourseESApi extends ApiBaseController{
 		
 		return success(true);
 	}
+
+	/**
+	 *
+	 * @param syncTimePointOfBegin
+	 * @param syncTimePointOfEnd
+	 * @param isOnlyRead
+	 * @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);
+	}
+
+
 }

servers/boe-server-all/src/main/java/com/xboe/school/study/dao/PhpOnlineCourseDao.java

@@ -0,0 +1,281 @@
+package com.xboe.school.study.dao;
+
+import cn.hutool.core.collection.CollUtil;
+import com.xboe.core.orm.BaseDao;
+import com.xboe.school.study.dto.PhpOnlineDto;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Repository;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+@Repository
+@Slf4j
+public class PhpOnlineCourseDao extends BaseDao<PhpOnlineDto> {
+
+    @Value("${spring.profiles.active}")
+    private String activeProfile;
+
+    public List<PhpOnlineDto> selectRecentLearnRecordList(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer offset, Integer limit) {
+        String sql =
+                "SELECT\n" +
+                        "  elc.kid AS courseId,\n" +
+                        "  elcr.user_id AS userIdOfPhp,\n" +
+                        "  ROUND((SUM(CASE WHEN elrc.kid IS NOT NULL THEN 1 ELSE 0 END) / COUNT(1)) * 100, 0) AS progress\n" +
+                        "FROM\n" +
+                        "  elearninglms.eln_ln_course elc\n" +
+                        "  INNER JOIN elearninglms.eln_ln_course_reg elcr \n" +
+                        "    ON elc.kid = elcr.course_id\n" +
+                        "  INNER JOIN (\n" +
+                        "    SELECT\n" +
+                        "      user_id,\n" +
+                        "      course_id \n" +
+                        "    FROM\n" +
+                        "      elearninglms.eln_ln_res_complete\n" +
+                        "    WHERE\n" +
+                        "      complete_type = '1'\n" +
+                        "      AND complete_status = '2'\n" +
+                        "      AND updated_at > ?1 AND  updated_at < ?2\n" +
+                        "      AND is_deleted = 0\n" +
+                        "    GROUP BY\n" +
+                        "      user_id,\n" +
+                        "      course_id\n" +
+                        "  ) recentFinishStuent \n" +
+                        "    ON recentFinishStuent.user_id = elcr.user_id \n" +
+                        "    AND recentFinishStuent.course_id = elcr.course_id\n" +
+                        "  INNER JOIN elearninglms.eln_ln_mod_res elms \n" +
+                        "    ON elms.course_id = elcr.course_id\n" +
+                        "  LEFT JOIN elearninglms.eln_ln_res_complete elrc \n" +
+                        "    ON elrc.mod_res_id = elms.kid\n" +
+                        "    AND elrc.user_id = elcr.user_id\n" +
+                        "    AND elrc.complete_type = '1'\n" +
+                        "    AND elrc.complete_status = '2'\n" +
+                        "WHERE\n" +
+                        "  elc.is_deleted = 0\n" +
+                        "  AND elcr.is_deleted = 0\n" +
+                        "  AND elcr.reg_state = '1'\n" +
+                        "  AND elms.publish_status = '1'\n" +
+                        "  AND elms.is_deleted = '0'\n" +
+                        "GROUP BY\n" +
+                        "  elc.kid,\n" +
+                        "  elcr.user_id\n" +
+                        "LIMIT " + offset + "," + limit;
+
+
+        List<Object[]> objectList1 = this.sqlFindList(sql, syncTimePointOfBegin, syncTimePointOfEnd);
+        if (CollUtil.isEmpty(objectList1)) {
+            log.info("没有找到已完成的数据");
+            return null;
+        }
+
+        List<PhpOnlineDto> recentLearnRecordList = new ArrayList<>();
+        for (Object[] objects : objectList1) {
+            String courseId = objects[0].toString();
+            String userIdOfPhp = objects[1].toString();
+            Integer progress = ((BigDecimal) objects[2]).intValue();
+            PhpOnlineDto phpOnlineDto = new PhpOnlineDto();
+            phpOnlineDto.setCourseId(courseId);
+            phpOnlineDto.setUserIdOfPhp(userIdOfPhp);
+            phpOnlineDto.setProgress(progress);
+            recentLearnRecordList.add(phpOnlineDto);
+        }
+
+        // 拼接获取所有新系统用户id，这里不选择与上面的联表查询，有效率问题
+
+        String userBasicDataBase;
+        if (activeProfile.equals("pro")) {
+            userBasicDataBase = "user_basic";
+        } else {
+            userBasicDataBase = "userbasic";
+        }
+
+        List<String> userIds = objectList1.stream().map(objects -> String.valueOf(objects[1])).distinct().collect(Collectors.toList());
+        List<Object[]> objectList2 = this.sqlFindList("select kid,user_id from " + userBasicDataBase + ".user_account where kid in (?1) and deleted=0 and account_status = 0", userIds);
+
+        if (CollUtil.isEmpty(objectList1)) {
+            log.info("新系统用户数据不存在");
+            return null;
+        }
+
+        Map<Object, Object> userIdToKidMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));
+
+        // 设置新系统用户ID
+        recentLearnRecordList = recentLearnRecordList.stream()
+                .map(phpOnlineDto -> {
+                    Object userIdOfJavaObj = userIdToKidMap.get(phpOnlineDto.getUserIdOfPhp());
+                    if (userIdOfJavaObj != null) {
+                        phpOnlineDto.setUserIdOfJava(userIdOfJavaObj.toString());
+                    }
+                    return phpOnlineDto;
+                })
+                .filter(phpOnlineDto -> StringUtils.isNotBlank(phpOnlineDto.getUserIdOfJava()))
+                .collect(Collectors.toList());
+
+        return recentLearnRecordList;
+    }
+
+
+    public int selectRecentLearnRecordListOfCount(Long syncTimePointOfBegin, Long syncTimePointOfEnd) {
+        String sql =
+                "SELECT COUNT(1) \n" +
+                        "FROM (\n" +
+                        "    SELECT elc.kid\n" +
+                        "    FROM elearninglms.eln_ln_course elc\n" +
+                        "    INNER JOIN elearninglms.eln_ln_course_reg elcr\n" +
+                        "        ON elc.kid = elcr.course_id\n" +
+                        "    INNER JOIN (\n" +
+                        "        SELECT user_id, course_id\n" +
+                        "        FROM elearninglms.eln_ln_res_complete\n" +
+                        "        WHERE complete_type = '1'\n" +
+                        "          AND complete_status = '2'\n" +
+                        "          AND updated_at > ?1\n" +
+                        "          AND updated_at < ?2\n" +
+                        "          AND is_deleted = 0\n" +
+                        "        GROUP BY user_id, course_id\n" +
+                        "    ) recentFinishStuent\n" +
+                        "        ON recentFinishStuent.user_id = elcr.user_id\n" +
+                        "        AND recentFinishStuent.course_id = elcr.course_id\n" +
+                        "    INNER JOIN elearninglms.eln_ln_mod_res elms\n" +
+                        "        ON elms.course_id = elcr.course_id\n" +
+                        "    LEFT JOIN elearninglms.eln_ln_res_complete elrc\n" +
+                        "        ON elrc.mod_res_id = elms.kid\n" +
+                        "        AND elrc.user_id = elcr.user_id\n" +
+                        "        AND elrc.complete_type = '1'\n" +
+                        "        AND elrc.complete_status = '2'\n" +
+                        "    WHERE elc.is_deleted = 0\n" +
+                        "      AND elcr.is_deleted = 0\n" +
+                        "      AND elcr.reg_state = '1'\n" +
+                        "      AND elms.publish_status = '1'\n" +
+                        "      AND elms.is_deleted = '0'\n" +
+                        "    GROUP BY elc.kid, elcr.user_id\n" +
+                        ") temp;\n";  // 每页 1000 条记录，OFFSET 计算分页
+
+
+        int count = this.sqlCount(sql, syncTimePointOfBegin, syncTimePointOfEnd);
+        return count;
+    }
+
+
+    public List<PhpOnlineDto> selectRecentRegRecordList(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer offset, Integer limit) {
+        String sql =
+                "SELECT\n" +
+                        "  elc.kid AS courseId,\n" +
+                        "  elcr.user_id AS userIdOfPhp,\n" +
+                        "  ROUND((SUM(CASE WHEN elrc.kid IS NOT NULL THEN 1 ELSE 0 END) / COUNT(1)) * 100, 0) AS progress\n" +
+                        "FROM\n" +
+                        "  elearninglms.eln_ln_course elc\n" +
+                        "  INNER JOIN elearninglms.eln_ln_course_reg elcr ON elc.kid = elcr.course_id AND  elcr.created_at > ?1 AND  elcr.created_at < ?2\n" +
+                        "  INNER JOIN elearninglms.eln_ln_mod_res elms \n" +
+                        "    ON elms.course_id = elcr.course_id\n" +
+                        "  LEFT JOIN elearninglms.eln_ln_res_complete elrc \n" +
+                        "    ON elrc.mod_res_id = elms.kid\n" +
+                        "    AND elrc.user_id = elcr.user_id\n" +
+                        "    AND elrc.complete_type = '1'\n" +
+                        "    AND elrc.complete_status = '2'\n" +
+                        "WHERE\n" +
+                        "  elc.is_deleted = 0\n" +
+                        "  AND elcr.is_deleted = 0\n" +
+                        "  AND elcr.reg_state = '1'\n" +
+                        "  AND elms.publish_status = '1'\n" +
+                        "  AND elms.is_deleted = '0'\n" +
+                        "GROUP BY\n" +
+                        "  elc.kid,\n" +
+                        "  elcr.user_id\n" +
+                        "LIMIT " + offset + "," + limit;
+
+
+        List<Object[]> objectList1 = this.sqlFindList(sql, syncTimePointOfBegin, syncTimePointOfEnd);
+        if (CollUtil.isEmpty(objectList1)) {
+            log.info("没有找到已完成的数据");
+            return null;
+        }
+
+        List<PhpOnlineDto> recentLearnRecordList = new ArrayList<>();
+        for (Object[] objects : objectList1) {
+            String courseId = objects[0].toString();
+            String userIdOfPhp = objects[1].toString();
+            Integer progress = ((BigDecimal) objects[2]).intValue();
+            PhpOnlineDto phpOnlineDto = new PhpOnlineDto();
+            phpOnlineDto.setCourseId(courseId);
+            phpOnlineDto.setUserIdOfPhp(userIdOfPhp);
+            phpOnlineDto.setProgress(progress);
+            recentLearnRecordList.add(phpOnlineDto);
+        }
+
+        // 拼接获取所有新系统用户id，这里不选择与上面的联表查询，有效率问题
+
+        String userBasicDataBase;
+        if (activeProfile.equals("pro")) {
+            userBasicDataBase = "user_basic";
+        } else {
+            userBasicDataBase = "userbasic";
+        }
+
+        List<String> userIds = objectList1.stream().map(objects -> String.valueOf(objects[1])).distinct().collect(Collectors.toList());
+        List<Object[]> objectList2 = this.sqlFindList("select kid,user_id from " + userBasicDataBase + ".user_account where kid in (?1) and deleted=0 and account_status = 0", userIds);
+
+        if (CollUtil.isEmpty(objectList1)) {
+            log.info("新系统用户数据不存在");
+            return null;
+        }
+
+        Map<Object, Object> userIdToKidMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));
+
+        // 设置新系统用户ID
+        recentLearnRecordList = recentLearnRecordList.stream()
+                .map(phpOnlineDto -> {
+                    Object userIdOfJavaObj = userIdToKidMap.get(phpOnlineDto.getUserIdOfPhp());
+                    if (userIdOfJavaObj != null) {
+                        phpOnlineDto.setUserIdOfJava(userIdOfJavaObj.toString());
+                    }
+                    return phpOnlineDto;
+                })
+                .filter(phpOnlineDto -> phpOnlineDto.getUserIdOfJava() != null)
+                .collect(Collectors.toList());
+
+        return recentLearnRecordList;
+    }
+
+    public int selectRecentRegRecordListOfCount(Long syncTimePointOfBegin, Long syncTimePointOfEnd) {
+        String sql =
+                "SELECT COUNT(1)\n" +
+                        "FROM (\n" +
+                        "    SELECT\n" +
+                        "        elc.kid\n" +
+                        "    FROM\n" +
+                        "        elearninglms.eln_ln_course elc\n" +
+                        "    INNER JOIN elearninglms.eln_ln_course_reg elcr \n" +
+                        "        ON elc.kid = elcr.course_id\n" +
+                        "        AND elcr.created_at > ?1\n" +
+                        "        AND elcr.created_at < ?2\n" +
+                        "    INNER JOIN elearninglms.eln_ln_mod_res elms \n" +
+                        "        ON elms.course_id = elcr.course_id\n" +
+                        "    LEFT JOIN elearninglms.eln_ln_res_complete elrc \n" +
+                        "        ON elrc.mod_res_id = elms.kid\n" +
+                        "        AND elrc.user_id = elcr.user_id\n" +
+                        "        AND elrc.complete_type = '1'\n" +
+                        "        AND elrc.complete_status = '2'\n" +
+                        "    WHERE\n" +
+                        "        elc.is_deleted = 0\n" +
+                        "        AND elcr.is_deleted = 0\n" +
+                        "        AND elcr.reg_state = '1'\n" +
+                        "        AND elms.publish_status = '1'\n" +
+                        "        AND elms.is_deleted = '0'\n" +
+                        "    GROUP BY\n" +
+                        "        elc.kid,\n" +
+                        "        elcr.user_id\n" +
+                        ") temp;\n";  // 每页 1000 条记录，OFFSET 计算分页
+
+
+        int count = this.sqlCount(sql, syncTimePointOfBegin, syncTimePointOfEnd);
+        return count;
+    }
+
+
+}

servers/boe-server-all/src/main/java/com/xboe/school/study/dto/PhpOnlineDto.java

@@ -0,0 +1,33 @@
+package com.xboe.school.study.dto;
+
+import lombok.Data;
+
+/**
+ * 批量报名
+ *
+ * @author seastar
+ */
+@Data
+public class PhpOnlineDto {
+
+    /**
+     * 课程id
+     */
+    private String courseId;
+
+    /**
+     * 课程名称
+     */
+    private String userIdOfPhp;
+
+
+    /**
+     * 课程名称
+     */
+    private String userIdOfJava;
+
+    /**
+     * 进度
+     */
+    private Integer progress;
+}

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

@@ -0,0 +1,159 @@
+spring:
+  # application.yml
+  servlet:
+    multipart:
+      max-file-size: 500MB
+      max-request-size: 500MB
+  redis:
+    database: 1
+    host: 192.168.0.101
+    password: boe@123
+    port: 6379
+    lettuce:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 30
+        max-wait: 10000ms
+        shutdown-timeout: 100ms
+  jpa:
+    database: MYSQL
+    properties:
+      hibernate:
+        naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
+        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+        current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+  datasource:
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: boe#1234A
+  web:
+    resources:
+      static-locations: file:E:/Projects/BOE/10/static
+server:
+  port: 9090
+  servlet:
+    multipart:
+      max-file-size: 500MB
+      max-request-size: 500MB
+    session:
+      timeout: 30m
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
+  tomcat:
+    uri-encoding: UTF-8
+    servlet:
+    multipart:
+      maxFileSize: 1024MB
+      maxRequestSize: 1024MB
+  mvc:
+    static-path-pattern: /cdn/**
+
+#logging.level.org.hibernate.SQL=DEBUG
+#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+#logging.config=classpath:log/logback-@profileActive@.xml
+
+# logging:
+#   config: classpath:log/logback-${spring.profiles.active}.xml
+#   level:
+#     org:
+#       hibernate:
+#         SQL: DEBUG
+#         type:
+#           descriptor:
+#             sql:
+#               BasicBinder: TRACE
+
+xcaching:
+  specs:
+    favorites:
+      timeout: 10s
+    praises:
+      timeout: 10s
+    shares:
+      timeout: 10s
+
+xboe:
+  api:
+    cross_filter: true
+  local:
+    dev: true
+  upload:
+    file:
+      temp_path: D:/Projects/BOE/10/static/temp
+      save_path: /home/www/elearning/upload
+      http_path: http://127.0.0.1/upload
+  externalinterface:
+    url:
+      system: http://localhost:9091
+  old:
+    base:
+      url: http://192.168.0.101
+  server:
+    userbasic:
+      url: http://192.168.0.101/userbasic
+  stat:
+    base:
+      url: http://127.0.0.1:9080
+  elasticsearch:
+    server:
+      ip: 192.168.0.101
+      port: 9200
+      user:
+      password:
+  email:
+    url: http://192.168.0.101/api/b1/email/send
+    from: boeu_learning@boe.com.cn
+    user:
+    security:
+
+jasypt:
+  encryptor:
+    algorithm: PBEWithMD5AndDES
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+
+boe:
+  domain: http://127.0.0.1
+
+ok:
+  http:
+    connect-timeout: 30
+    read-timeout: 30
+    write-timeout: 30
+    max-idle-connections: 200
+    keep-alive-duration: 300
+
+
+
+orgTree:
+  orgTreeList: ${boe.domain}/userbasic/org/list
+  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
+
+userBasic:
+  searchUserList: ${boe.domain}/userbasic/user/list
+  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
+  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
+
+audience:
+  usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
+  getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
+
+statApi:
+  userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
+
+infrasApi:
+  dict: ${boe.domain}/infrasApi/dict/list
+
+manageApi:
+  stu:
+    offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
+  editExam: ${boe.domain}/manageApi/admin/project/editExam
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+coursesuilt:
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus

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

@@ -0,0 +1,181 @@
+spring:
+  # application.yml
+  servlet:
+    multipart:
+      max-file-size: 1000MB
+      max-request-size: 1000MB
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.251.129.51:8848
+      config:
+        server-addr: 10.251.129.51:8848
+  redis:
+    database: 1
+    host: 10.251.129.122
+    password: qwert!W588
+    port: 6379
+    lettuce:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 30
+        max-wait: 10000ms
+        shutdown-timeout: 100ms
+  jpa:
+    database: MYSQL
+    properties:
+      hibernate:
+        naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
+        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+        current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+  datasource:
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    username: admin
+    password: boeRds01
+  web:
+    resources:
+      static-locations: file:E:/Projects/BOE/10/static
+server:
+  port: 9090
+  tomcat:
+    uri-encoding: UTF-8
+    servlet:
+    multipart:
+      maxFileSize: 1024MB
+      maxRequestSize: 1024MB
+  mvc:
+    static-path-pattern: /cdn/**
+
+#logging.level.org.hibernate.SQL=DEBUG
+#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+#logging.config=classpath:log/logback-@profileActive@.xml
+
+# logging:
+#   config: classpath:log/logback-${spring.profiles.active}.xml
+#   level:
+#     org:
+#       hibernate:
+#         SQL: DEBUG
+#         type:
+#           descriptor:
+#             sql:
+#               BasicBinder: TRACE
+
+xcaching:
+  specs:
+    favorites:
+      timeout: 10s
+    praises:
+      timeout: 10s
+    shares:
+      timeout: 10s
+
+xboe:
+  api:
+    cross_filter: true
+  local:
+    dev: true
+  upload:
+    file:
+      temp_path: /tmp
+      save_path: /home/www/elearning/upload
+      http_path: http://10.251.132.75/upload
+  externalinterface:
+    url:
+      system: http://localhost:9091
+  old:
+    base:
+      url: http://10.251.132.75
+  server:
+    userbasic:
+      url: http://10.251.132.75/userbasic
+  stat:
+    base:
+      url: http://10.251.132.75:9080
+  elasticsearch:
+    server:
+      ip: 10.251.129.21
+      port: 9200
+      user:
+      password:
+  email:
+    url: http://10.251.132.75/api/b1/email/send
+    from: boeu_learning@boe.com.cn
+    user:
+    security:
+
+jasypt:
+  encryptor:
+    algorithm: PBEWithMD5AndDES
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+
+boe:
+  domain: http://10.251.132.75
+
+ok:
+  http:
+    connect-timeout: 30
+    read-timeout: 30
+    write-timeout: 30
+    max-idle-connections: 200
+    keep-alive-duration: 300
+
+
+
+orgTree:
+  orgTreeList: ${boe.domain}/userbasic/org/list
+  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
+
+userBasic:
+  searchUserList: ${boe.domain}/userbasic/user/list
+  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
+  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
+
+audience:
+  usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
+  getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
+
+statApi:
+  userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
+
+infrasApi:
+  dict: ${boe.domain}/infrasApi/dict/list
+
+manageApi:
+  stu:
+    offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
+  editExam: ${boe.domain}/manageApi/admin/project/editExam
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+coursesuilt:
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+
+xxl:
+  job:
+    admin:
+      addresses: http://10.251.132.75/jobAdmin
+    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
+    executor:
+      appname: java-servers-job-api
+      port: 9995
+      address:
+      ip:
+      logpath: /var/log/xxl-job/system/
+      logretentiondays: 30
+
+aop-log-record:
+  #是否开启日志记录
+  enabled: true
+  #不进行拦截的包或者类
+  excludeClassNames:
+  activemq:
+    broker-url: tcp://10.251.129.51:61616
+    user: admin
+    password: admin
+  elasticsearch:
+    host: 10.251.129.21
+    port: 9200

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

@@ -0,0 +1,100 @@
+spring:
+  servlet:
+    multipart:
+      max-file-size: 1000MB
+      max-request-size: 1000MB
+  web:
+    resources:
+      static-locations: file:E:/Projects/BOE/java/static
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.251.113.100:8848
+      config:
+        server-addr: 10.251.113.100:8848
+  redis:
+    database: 1
+    host: 10.251.88.213
+    password: qwert!W588
+    port: 6379
+  jpa:
+    hibernate:
+      ddl-auto: none
+  datasource:
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    username: admin
+    password: boeRds01
+    type: com.zaxxer.hikari.HikariDataSource
+    hikari:
+      auto-commit: true
+      minimum-idle: 5
+      idle-timeout: 60000
+      connection-timeout: 30000
+      max-lifetime: 1800000
+      maximum-pool-size: 20
+logging:
+  level:
+    org:
+      hibernate:
+        SQL: ERROR
+  config: classpath:log/logback-@profileActive@.xml
+xboe:
+  api:
+    cross_filter: true
+  upload:
+    file:
+      temp_path: /tmp
+      save_path: /home/www/elearning/upload
+      http_path: https://u.boe.com/upload
+  externalinterface:
+    url:
+      system: http://127.0.0.1:9091
+  old:
+    base:
+      url: https://u.boe.com
+  stat:
+    base:
+      url: http://127.0.0.1:9080
+  server:
+    userbasic:
+      url: https://u.boe.com/userbasic
+  elasticsearch:
+    server:
+      ip: 10.251.88.218
+      port: 9200
+      user:
+      password:
+  email:
+    url: https://u.boe.com/api/b1/email/send
+    from: boeu_learning@boe.com.cn
+    user:
+    security:
+  jasypt:
+    encryptor:
+      algorithm: PBEWithMD5AndDES
+      iv-generator-classname: org.jasypt.iv.NoIvGenerator
+xxl:
+  job:
+    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
+    admin:
+      addresses: http://u.boe.com/jobAdmin
+    executor:
+      appname: java-servers-job-api
+      port: 9995
+      address:
+      ip:
+      logpath: /var/log/xxl-job/dw/
+      logretentiondays: 30
+aop-log-record:
+  #是否开启日志记录
+  enabled: true
+  #不进行拦截的包或者类
+  excludeClassNames:
+  activemq:
+    broker-url: tcp://10.251.113.100:61616
+    user: admin
+    password: admin
+  elasticsearch:
+    host: 10.251.88.218
+    port: 9200

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

@@ -0,0 +1,183 @@
+spring:
+  # application.yml
+  servlet:
+    multipart:
+      max-file-size: 1000MB
+      max-request-size: 1000MB
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.251.186.27:8848
+      config:
+        server-addr: 10.251.186.27:8848
+  redis:
+    database: 1
+    host: 10.251.160.38
+    password: qwert!W577
+    port: 6379
+    lettuce:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 30
+        max-wait: 10000ms
+        shutdown-timeout: 100ms
+  jpa:
+    database: MYSQL
+    properties:
+      hibernate:
+        naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
+        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+        current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+  datasource:
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.251.160.40:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    username: admin
+    password: boeRds01
+  web:
+    resources:
+      static-locations: file:E:/Projects/BOE/10/static
+server:
+  port: 9090
+  tomcat:
+    uri-encoding: UTF-8
+    servlet:
+    multipart:
+      maxFileSize: 1024MB
+      maxRequestSize: 1024MB
+  mvc:
+    static-path-pattern: /cdn/**
+
+#logging.level.org.hibernate.SQL=DEBUG
+#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+#logging.config=classpath:log/logback-@profileActive@.xml
+
+# logging:
+#   config: classpath:log/logback-${spring.profiles.active}.xml
+#   level:
+#     org:
+#       hibernate:
+#         SQL: DEBUG
+#         type:
+#           descriptor:
+#             sql:
+#               BasicBinder: TRACE
+
+xcaching:
+  specs:
+    favorites:
+      timeout: 10s
+    praises:
+      timeout: 10s
+    shares:
+      timeout: 10s
+
+xboe:
+  api:
+    cross_filter: true
+  local:
+    dev: true
+  upload:
+    file:
+      temp_path: /tmp
+      save_path: /home/www/elearning/upload
+      http_path: http://10.251.186.27/upload
+  externalinterface:
+    url:
+      system: http://localhost:9091
+  old:
+    base:
+      url: http://10.251.186.27
+  server:
+    userbasic:
+      url: http://10.251.186.27/userbasic
+  stat:
+    base:
+      url: http://10.251.186.27:9080
+  elasticsearch:
+    server:
+      ip: 10.251.129.25
+      port: 9200
+      user: elastic
+      password: Boe@es123
+  email:
+    url: http://10.251.186.27/api/b1/email/send
+    from: boeu_learning@boe.com.cn
+    user:
+    security:
+
+jasypt:
+  encryptor:
+    algorithm: PBEWithMD5AndDES
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+
+boe:
+  domain: http://10.251.186.27
+
+ok:
+  http:
+    connect-timeout: 30
+    read-timeout: 30
+    write-timeout: 30
+    max-idle-connections: 200
+    keep-alive-duration: 300
+
+
+
+orgTree:
+  orgTreeList: ${boe.domain}/userbasic/org/list
+  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
+
+userBasic:
+  searchUserList: ${boe.domain}/userbasic/user/list
+  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
+  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
+
+audience:
+  usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
+  getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
+
+statApi:
+  userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
+
+infrasApi:
+  dict: ${boe.domain}/infrasApi/dict/list
+
+manageApi:
+  stu:
+    offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
+  editExam: ${boe.domain}/manageApi/admin/project/editExam
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+coursesuilt:
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+
+xxl:
+  job:
+    admin:
+      addresses: http://10.251.186.27/jobAdmin
+    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
+    executor:
+      appname: java-servers-job-api
+      port: 9995
+      address:
+      ip:
+      logpath: /var/log/xxl-job/system/
+      logretentiondays: 30
+
+aop-log-record:
+  #是否开启日志记录
+  enabled: true
+  #不进行拦截的包或者类
+  excludeClassNames:
+  activemq:
+    broker-url: tcp://10.251.129.25:61616
+    user: admin
+    password: admin
+  elasticsearch:
+    host: 10.251.129.25
+    port: 9200
+    user: elastic
+    password: Boe@es123

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

@@ -0,0 +1,76 @@
+spring:
+  profiles:
+    active: dev
+  application:
+    name: boe-server-all
+  redis:
+    lettuce:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 30
+        max-wait: 10000ms
+      shutdown-timeout: 100ms
+  jackson:
+    time-zone: GMT+8
+  mvc:
+    static-path-pattern: /cdn/**
+  jpa:
+    database: MYSQL
+    show-sql: false
+    properties:
+      hibernate:
+        naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
+        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+        current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+logging:
+  config: classpath:log/logback-${spring.profiles.active}.xml
+server:
+  port: 9090
+  tomcat:
+    uri-encoding: UTF-8
+  servlet:
+    multipart:
+      max-file-size: 500MB
+      max-request-size: 500MB
+    session:
+      timeout: 30m
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
+
+ok:
+  http:
+    connect-timeout: 30
+    read-timeout: 30
+    write-timeout: 30
+    max-idle-connections: 200
+    keep-alive-duration: 300
+boe:
+  domain: http://127.0.0.1
+orgTree:
+  orgTreeList: ${boe.domain}/userbasic/org/list
+  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
+userBasic:
+  searchUserList: ${boe.domain}/userbasic/user/list
+  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
+  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
+audience:
+  usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
+  getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
+statApi:
+  userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
+infrasApi:
+  dict: ${boe.domain}/infrasApi/dict/list
+manageApi:
+  stu:
+    offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
+  editExam: ${boe.domain}/manageApi/admin/project/editExam
+coursesuilt:
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+  updateOrSaveCourse: ${boe.domain}/manageApi/admin/teacherRecord/updateOrSaveCourse
+  syncCourseStudent: ${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent
+  syncOnLineScore: ${boe.domain}/manageApi/admin/teacherRecord/syncOnLineScore
+  updateOnLineStatua: ${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua

servers/boe-server-all/src/main/resources/bootstrap.yml

@@ -1,24 +0,0 @@
-spring:
-  application:
-    name: boe-server-all
-  profiles:
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.0.101:8848
-      config:
-        server-addr: 192.168.0.101:8848
-        file-extension: yaml
-        namespace: fd5741ee-c2aa-4002-a9b0-43a11436d35c
-        name: boe-server-all
-        group: SERVER_GROUP
-        extension-configs:
-          - data-id: redis0.yaml
-            group: COMMON_GROUP
-            refresh: true
-
-#        shared-configs:
-#          - data-id: redis0.yaml
-#            group: COMMON_GROUP
-#            refresh: true

servers/boe-server-all/src/main/resources/log/logback-pre.xml

@@ -52,4 +52,7 @@
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
     </root>
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
 </configuration>

servers/boe-server-all/src/main/resources/log/logback-pro.xml

@@ -50,6 +50,7 @@
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="INFO">
         <appender-ref ref="info"/>
+        <appender-ref ref="console"/>
        <!-- <appender-ref ref="error"/> --> 
     </root>
 </configuration>

servers/boe-server-all/src/main/resources/log/logback-prod.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+    <property name="log.path" value="/home/logs/${spring.application.name}"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file debug output -->
+    <appender name="info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file error output -->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
+
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+    <root level="INFO">
+        <appender-ref ref="info"/>
+<!--        <appender-ref ref="console"/>-->
+       <!-- <appender-ref ref="error"/> --> 
+    </root>
+</configuration>

servers/boe-server-all/src/main/resources/log/logback-test.xml

@@ -51,5 +51,6 @@
     <root level="INFO">
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
+        <appender-ref ref="console"/>
     </root>
 </configuration>

servers/boe-server-basic/pom.xml

@@ -98,7 +98,7 @@
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
                 <includes>
-                    <include>application-${profileActive}.yml</include>
+                    <include>application-*.yml</include>
                     <include>application.yml</include>
                 </includes>
             </resource>
@@ -136,9 +136,9 @@
     </build>
     <profiles>
         <profile>
-            <id>pro</id>
+            <id>prod</id>
             <properties>
-                <profileActive>pro</profileActive>
+                <profileActive>prod</profileActive>
             </properties>
         </profile>
         <profile>

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

@@ -1,9 +1,7 @@
 # application-pro.yml
 spring:
-  profiles:
-    active: pro
   redis:
-    database: 3
+    database: 1
     host: 10.251.88.213
     password: qwert!W588
     port: 6379

servers/boe-server-basic/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # application.yml
 spring:
   profiles:
-    active: @profileActive@
+    active: dev
   application:
     name: boe-server-basic
   jackson:
@@ -62,4 +62,4 @@ ok:
 
 # 设置logback.xml位置
 logging:
-  config: classpath:log/logback-@profileActive@.xml
+  config: classpath:log/logback-${spring.profiles.active}.xml

servers/boe-server-basic/src/main/resources/log/logback-prod.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+    <property name="log.path" value="/home/logs/${spring.application.name}"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file debug output -->
+    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file error output -->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
+
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+    <root level="WARN">
+        <appender-ref ref="debug"/>
+        <appender-ref ref="error"/>
+    </root>
+</configuration>