Merge branch 'master-20250227-lyc' into test

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

@@ -327,7 +327,9 @@ public class CoursePortalApi extends ApiBaseController{
 					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
 					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
 					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
+					if(user!=null){
+						teacherCourseDto.setUserNo(user.getUserNo());
+					}
 					teacherCourseDtos.add(teacherCourseDto);
 				}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 					List<String> list=new ArrayList<>();
@@ -345,7 +347,9 @@ public class CoursePortalApi extends ApiBaseController{
 					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
 					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
 					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
+					if(user!=null){
+						teacherCourseDto.setUserNo(user.getUserNo());
+					}
 					teacherCourseDtos.add(teacherCourseDto);
 				}
 			}

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

@@ -480,7 +480,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "rt.course_id\n" +
                 "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
+                "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -503,7 +503,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "pt.course_id\n" +
                 "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
+                "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -560,8 +560,8 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "\tc.id \n" +
                 "FROM\n" +
-                "\tboe_new.student s\n" +
+                "\tboe.student s\n" +
-                "\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" +
+                "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" +
                 "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" +
                 "WHERE\n" +
                 "\ts.type = 14 \n" +

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

@@ -367,6 +367,8 @@ public class StudyCourseApi extends ApiBaseController{
 			studyService.saveStudyInfo(sci,token);
 			//学习记录成功后处理
 			studyService.appendStudyDuration(sci.getStudyId(),sci.getStudyItemId(),sci.getContentId(),sci.getDuration());
+
+			log.info("在线课学习记录 sci.getStudyId() = "+ sci.getStudyId() + " , sci.getCourseId() = " + sci.getCourseId() );
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
 			log.info("在线课学习记录"+allUserList);
 			//System.out.println("在线课学习记录"+allUserList);

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

@@ -1,159 +1,102 @@
+boe:
+  domain: http://192.168.0.253
 spring:
-  # application.yml
   servlet:
     multipart:
-      max-file-size: 500MB
+      max-file-size: 1000MB
-      max-request-size: 500MB
+      max-request-size: 1000MB
-  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
+      static-locations: file:E:/Projects/BOE/java/static
-server:
+  cloud:
-  port: 9090
+    nacos:
-  servlet:
+      discovery:
-    multipart:
+        server-addr: 192.168.0.253:8848
-      max-file-size: 500MB
+      config:
-      max-request-size: 500MB
+        server-addr: 192.168.0.253:8848
-    session:
+  redis:
-      timeout: 30m
+    database: 1
-    encoding:
+    host: 192.168.0.253
-      charset: UTF-8
+    password: boe@123
-      enabled: true
+    port: 6379
-      force: true
+  jpa:
-  tomcat:
+    hibernate:
-    uri-encoding: UTF-8
+      ddl-auto: none
-    servlet:
+  datasource:
-    multipart:
+    driverClassName: com.mysql.jdbc.Driver
-      maxFileSize: 1024MB
+    url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
-      maxRequestSize: 1024MB
+    username: root
-  mvc:
+    password: boe#1234A
-    static-path-pattern: /cdn/**
+    type: com.zaxxer.hikari.HikariDataSource
-
+    hikari:
-#logging.level.org.hibernate.SQL=DEBUG
+      auto-commit: true
-#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+      minimum-idle: 5
-#logging.config=classpath:log/logback-@profileActive@.xml
+      idle-timeout: 60000
-
+      connection-timeout: 30000
-# logging:
+      max-lifetime: 1800000
-#   config: classpath:log/logback-${spring.profiles.active}.xml
+      maximum-pool-size: 20
-#   level:
+logging:
-#     org:
+  level:
-#       hibernate:
+    org:
-#         SQL: DEBUG
+      hibernate:
-#         type:
+        SQL: ERROR
-#           descriptor:
+  config: classpath:log/logback-@profileActive@.xml
-#             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
+      temp_path: /tmp
       save_path: /home/www/elearning/upload
-      http_path: http://127.0.0.1/upload
+      http_path: http://192.168.0.253/upload
   externalinterface:
     url:
-      system: http://localhost:9091
+      system: http://127.0.0.1:9091
   old:
     base:
-      url: http://192.168.0.101
+      url: http://192.168.0.253
-  server:
-    userbasic:
-      url: http://192.168.0.101/userbasic
   stat:
     base:
       url: http://127.0.0.1:9080
+  server:
+    userbasic:
+      url: http://192.168.0.253/userbasic
   elasticsearch:
     server:
-      ip: 192.168.0.101
+      ip: 192.168.0.253
       port: 9200
       user:
       password:
   email:
-    url: http://192.168.0.101/api/b1/email/send
+    url: http://192.168.0.253/api/b1/email/send
     from: boeu_learning@boe.com.cn
     user:
     security:
-
+  jasypt:
-jasypt:
+    encryptor:
-  encryptor:
+      algorithm: PBEWithMD5AndDES
-    algorithm: PBEWithMD5AndDES
+      iv-generator-classname: org.jasypt.iv.NoIvGenerator
-    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+xxl:
-
+  job:
-boe:
+    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
-  domain: http://127.0.0.1
+    admin:
-
+      addresses: http://192.168.0.253/jobAdmin
-ok:
+    executor:
-  http:
+      appname: java-servers-job-api
-    connect-timeout: 30
+      port: 9995
-    read-timeout: 30
+      address:
-    write-timeout: 30
+      ip:
-    max-idle-connections: 200
+      logpath: /var/log/xxl-job/dw/
-    keep-alive-duration: 300
+      logretentiondays: 30
-
+aop-log-record:
-
+  #是否开启日志记录
-
+  enabled: true
-orgTree:
+  #不进行拦截的包或者类
-  orgTreeList: ${boe.domain}/userbasic/org/list
+  excludeClassNames:
-  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
+  activemq:
-
+    broker-url: tcp://192.168.0.253:61616
-userBasic:
+    user: admin
-  searchUserList: ${boe.domain}/userbasic/user/list
+    password: admin
-  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
+  elasticsearch:
-  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
+    host: 192.168.0.253
-
+    port: 9200
-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-basic/src/main/resources/application-dev.yml

@@ -1,13 +1,13 @@
-# application-dev.yml
+# application-pro.yml
 spring:
   redis:
-    database: 2
+    database: 1
-    port: 6379
+    host: 192.168.0.253
-    host: 192.168.0.101
     password: boe@123
+    port: 6379
   jpa:
     hibernate:
-      ddl-auto: none
+      ddl-auto: update
     open-in-view: false
     properties:
       hibernate:
@@ -16,39 +16,44 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     db1:
       driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: root
       password: boe#1234A
     db2:
       driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: root
       password: boe#1234A
-    web:
+
-      resources:
+  web:
-        static-locations: file:E:/Projects/BOE/java/static
+    resources:
+      static-locations: file:E:/Projects/BOE/java/static
 
 logging:
   level:
     org:
       hibernate:
-        SQL: DEBUG
+        SQL: ERROR
-        type:
+        # type:
-          descriptor:
+        #   descriptor:
-            sql:
+        #     sql:
-              BasicBinder: TRACE
+        #       BasicBinder: TRACE
   config: classpath:log/logback-dev.xml
 
+
+
 xboe:
+  api:
+    cross_filter: true
   upload:
     file:
-      temp_path: E:/Projects/BOE/java/static/temp
+      temp_path: /tmp
-      save_path: E:/Projects/BOE/java/static/upload
+      save_path: /home/www/elearning/upload
-      http_path: http://localhost:9090/upload
+      http_path: http://192.168.0.253/upload
   inner:
     data:
       sync:
-        baseurl: http://localhost:9090
+        baseurl: http://127.0.0.1:9090
 
 jasypt:
   encryptor: