fix: 资源学习情况倒序改正序

# Conflicts:
#	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/entity/Course.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
#	servers/boe-server-all/src/main/resources/application-prod.yml
#	servers/boe-server-all/src/main/resources/application-test.yml

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

@@ -22,9 +22,9 @@ import com.xboe.module.course.vo.CoursePageVo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.parameters.P;
+//import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -104,12 +104,6 @@ public class CourseManageApi extends ApiBaseController{
     IDataUserSyncService userSyncService;
 	@Resource
 	private ThirdApi thirdApi;
-	@Resource
-	CourseAuditApi courseAuditApi;
-
-	@Resource
-	CourseFullTextApi courseFullTextApi;
-
 
 	@Value("${boe.pcPageUrl}")
 	private String pcPageUrl;
@@ -123,6 +117,12 @@ public class CourseManageApi extends ApiBaseController{
 	@Value("${boe.pcLoginUrl}")
 	private String pcLoginUrl;
 
+	@Resource
+	CourseAuditApi courseAuditApi;
+
+	@Resource
+	CourseFullTextApi courseFullTextApi;
+
 //	@PostMapping("/test")
 //	public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
 //		//dto.setOrgAid("7003708665807110150");
@@ -196,6 +196,7 @@ public class CourseManageApi extends ApiBaseController{
 	public void manageExport(CoursePageQueryDTO coursePageQueryDTO, HttpServletResponse response) {
 		coursePageService.exportCourseList(coursePageQueryDTO, response);
 	}
+
 	/**
 	 * 管理列表的查询
 	 * @param pager

servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java

@@ -448,13 +448,6 @@ public class Course extends BaseEntity {
     @Transient
     private Boolean isTip;
 
-    @Transient
-    private String auditUser;
-
-    @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime auditTime;
-
     /**
      * 课程时长（秒）
      */
@@ -475,6 +468,13 @@ public class Course extends BaseEntity {
     @Column(name = "create_from")
     private String createFrom;
 
+    @Transient
+    private String auditUser;
+
+    @Transient
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditTime;
+
     public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime){
         super.setId(id);
         this.name=name;

servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java

@@ -102,9 +102,6 @@ public class CourseContent extends BaseEntity {
     @Transient
     private Integer status;
 
-    @Transient
-    List<BoeaiSubtitleRsp> boeaiSubtitleRspList;
-
     /**
      * 展示名称（章名+节名，如果没有章节，则为课程名+节名）
      * 25.12.15新增
@@ -112,6 +109,9 @@ public class CourseContent extends BaseEntity {
     @Transient
     private String displayName;
 
+    @Transient
+    List<BoeaiSubtitleRsp> boeaiSubtitleRspList;
+
     public CourseContent() {
     	
     }

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

@@ -577,13 +577,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);
+		courseFullTextApi.getCourseFromKJB(courseFullText,course);
 		rs.put("course",course1);
+		//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,11 +338,11 @@ 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
 
 boe:
@@ -359,7 +359,4 @@ mysql:
 
 kjb:
   aicoreUrl: http://10.232.28.95:8080
-  videoUrlPrefix: https://u.boe.com/upload
-
-boe:
-  domain: https://u.boe.com
+  videoUrlPrefix: https://u.boe.com/upload

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

@@ -168,6 +168,7 @@ boe:
 kjb:
   aicoreUrl: http://10.251.186.27:8088
   videoUrlPrefix: https://u-pre.boe.com/upload
+
 ok:
   http:
     connect-timeout: 30

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}}"/>