Merge remote-tracking branch 'origin/release-20250328-master-20251219' into release-20250328-master-20251219

# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java

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

@@ -13,11 +13,11 @@ import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xboe.api.ThirdApi;
-import com.xboe.module.course.dto.CourseParam;
-import com.xboe.module.course.service.*;
 import com.xboe.module.course.dto.*;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.utils.HttpUtils;
+import com.xboe.module.course.dto.CourseParam;
+import com.xboe.module.course.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.CloseableHttpResponse;

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

@@ -83,11 +83,11 @@ public class CourseFullTextApi  extends ApiBaseController{
 	@Autowired
 	StringRedisTemplate redisTemplate;
 
+
+
 	@Value("${kjb.aicoreUrl}")
 	private String aicoreUrl;
 
-
-
 	/**
 	 * 课程的初始化
 	 * @return

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

@@ -94,6 +94,7 @@ public class CourseManageApi extends ApiBaseController{
     IDataUserSyncService userSyncService;
 	@Resource
 	private ThirdApi thirdApi;
+
 	@Resource
 	CourseAuditApi courseAuditApi;
 

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java

@@ -33,7 +33,6 @@ import com.xboe.module.course.dao.*;
 import com.xboe.module.course.dto.*;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.dao.*;
-import com.xboe.module.course.dto.CourseTagRelationDto;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.service.ICourseTagService;
 import com.xboe.module.course.utils.HttpUtils;
@@ -466,13 +465,6 @@ public class CourseServiceImpl implements ICourseService {
                     PageList<Course> rs = new PageList<>();
                     rs.setCount(collect.size());
                     rs.setList(paginate);
-                    //log.info("78888888888888888888 "+paginate.isEmpty());
-                    if (paginate != null && !paginate.isEmpty()) {
-                        log.info("-----KJB------ getCourse");
-                        for (Course course : paginate) {
-                            this.getCourseFromKJB(course);
-                        }
-                    }
                     return rs;
                 }
             }
@@ -482,7 +474,6 @@ public class CourseServiceImpl implements ICourseService {
         rs.setCount(listByFilters2.size());
         rs.setPageSize(pageSize);
         rs.setList(paginate);
-
         if (paginate != null && !paginate.isEmpty()) {
             log.info("-----KJB------ getCourse");
             for (Course course : paginate) {

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

@@ -17,13 +17,13 @@ import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
 import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
 import com.xboe.constants.CacheName;
-import com.xboe.module.course.entity.*;
-import com.xboe.module.course.service.ICourseTagService;
 import com.xboe.module.course.api.CourseFullTextApi;
 import com.xboe.module.course.dto.AiVideoResourceRsp;
 import com.xboe.module.course.dto.BoeaiSubtitleRsp;
 import com.xboe.module.course.dto.CourseFullText;
 import com.xboe.module.course.utils.HttpUtils;
+import com.xboe.module.course.entity.*;
+import com.xboe.module.course.service.ICourseTagService;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.usergroup.service.IUserGroupService;
 import com.xboe.school.study.dao.StudyCourseDao;
@@ -191,14 +191,14 @@ public class StudyCourseApi extends ApiBaseController{
 			String tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.joining(","));
 			course1.setTags(tags);
 		}
-
+		rs.put("course",course1);
 		//获取课程AI详情
 		log.info("---- KJB 获取课程详情 ---");
 		CourseFullText courseFullText = new CourseFullText();
 		courseFullText.setId(cid);
-		courseFullTextApi.getCourseFromKJB(courseFullText,course1);
-		rs.put("course",course1);
-		//rs.put("course",course);
+		courseFullTextApi.getCourseFromKJB(courseFullText,course);
+
+		rs.put("course",course);
 
 		List<CourseCrowd> courseCrowdList = courseService.findCrowdByCourseId(cid);
 		if(crowd!=null && crowd) {

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

@@ -9,20 +9,20 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 10.232.28.76:8848,10.232.28.83:8848,10.232.28.77:8848
+        server-addr: 10.251.113.100:8848
       config:
-        server-addr: 10.232.28.76:8848,10.232.28.83:8848,10.232.28.77:8848
+        server-addr: 10.251.113.100:8848
   redis:
     database: 1
-    host: 10.232.27.44
-    password: j2ZsxUyl
+    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.232.27.47:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    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
@@ -34,7 +34,7 @@ spring:
       max-lifetime: 1800000
       maximum-pool-size: 20
   activemq:
-    broker-url: tcp://10.232.28.73:61616
+    broker-url: tcp://10.251.113.100:61616
     user: admin
     password: admin
   jms:
@@ -67,7 +67,7 @@ xboe:
       url: https://u.boe.com/userbasic
   elasticsearch:
     server:
-      ip: 10.232.27.40
+      ip: 10.251.88.218
       port: 9200
       user:
       password:
@@ -338,16 +338,13 @@ aop-log-record:
   #不进行拦截的包或者类
   excludeClassNames:
   activemq:
-    broker-url: tcp://10.232.28.73:61616
+    broker-url: tcp://10.251.113.100:61616
     user: admin
     password: admin
   elasticsearch:
-    host: 10.232.27.40
+    host: 10.251.88.218
     port: 9200
 
 kjb:
-  aicoreUrl: http://10.232.28.95:8080
-  videoUrlPrefix: https://u.boe.com/upload
-
-boe:
-  domain: https://u.boe.com
+  aicoreUrl: http://10.232.28.95:8088
+  videoUrlPrefix: https://u.boe.com/upload

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

@@ -1,7 +1,7 @@
 <?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="/data/logs/${spring.application.name}"/>
+    <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}}"/>

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

@@ -2,8 +2,8 @@
 spring:
   redis:
     database: 1
-    host: 10.232.27.44
-    password: j2ZsxUyl
+    host: 10.251.88.213
+    password: qwert!W588
     port: 6379
   jpa:
     hibernate:
@@ -16,12 +16,12 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     db1:
       driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://10.232.27.47:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://10.251.88.216:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: admin
       password: boeRds01
     db2:
       driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://10.232.27.47:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: admin
       password: boeRds01
 

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

@@ -1,7 +1,7 @@
 <?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="/data/logs/${spring.application.name}"/>
+    <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}}"/>