Compare commits

...

3 Commits

Author SHA1 Message Date
670788339
3d9b26982c 在线课-外部讲师报错 2025-03-18 11:49:53 +08:00
emcchui
a65fa797cc dev 2025-03-16 13:29:06 +08:00
emcchui
feba3237ab dev 2025-03-16 13:27:05 +08:00
3 changed files with 106 additions and 154 deletions

View File

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

View File

@@ -1,159 +1,102 @@
boe:
domain: http://192.168.0.253
spring: spring:
# application.yml
servlet: servlet:
multipart: 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: web:
resources: 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: xboe:
api: api:
cross_filter: true cross_filter: true
local:
dev: true
upload: upload:
file: file:
temp_path: D:/Projects/BOE/10/static/temp temp_path: /tmp
save_path: /home/www/elearning/upload save_path: /home/www/elearning/upload
http_path: http://127.0.0.1/upload http_path: http://192.168.0.253/upload
externalinterface: externalinterface:
url: url:
system: http://localhost:9091 system: http://127.0.0.1:9091
old: old:
base: base:
url: http://192.168.0.101 url: http://192.168.0.253
server:
userbasic:
url: http://192.168.0.101/userbasic
stat: stat:
base: base:
url: http://127.0.0.1:9080 url: http://127.0.0.1:9080
server:
userbasic:
url: http://192.168.0.253/userbasic
elasticsearch: elasticsearch:
server: server:
ip: 192.168.0.101 ip: 192.168.0.253
port: 9200 port: 9200
user: user:
password: password:
email: 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 from: boeu_learning@boe.com.cn
user: user:
security: security:
jasypt:
jasypt:
encryptor: encryptor:
algorithm: PBEWithMD5AndDES algorithm: PBEWithMD5AndDES
iv-generator-classname: org.jasypt.iv.NoIvGenerator iv-generator-classname: org.jasypt.iv.NoIvGenerator
xxl:
boe: job:
domain: http://127.0.0.1 accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
admin:
ok: addresses: http://192.168.0.253/jobAdmin
http: executor:
connect-timeout: 30 appname: java-servers-job-api
read-timeout: 30 port: 9995
write-timeout: 30 address:
max-idle-connections: 200 ip:
keep-alive-duration: 300 logpath: /var/log/xxl-job/dw/
logretentiondays: 30
aop-log-record:
#是否开启日志记录
orgTree: enabled: true
orgTreeList: ${boe.domain}/userbasic/org/list #不进行拦截的包或者类
orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs excludeClassNames:
activemq:
userBasic: broker-url: tcp://192.168.0.253:61616
searchUserList: ${boe.domain}/userbasic/user/list user: admin
getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo password: admin
getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo elasticsearch:
host: 192.168.0.253
audience: port: 9200
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

View File

@@ -1,13 +1,13 @@
# application-dev.yml # application-pro.yml
spring: spring:
redis: redis:
database: 2 database: 1
port: 6379 host: 192.168.0.253
host: 192.168.0.101
password: boe@123 password: boe@123
port: 6379
jpa: jpa:
hibernate: hibernate:
ddl-auto: none ddl-auto: update
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
@@ -16,14 +16,15 @@ spring:
driverClassName: com.mysql.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
db1: db1:
driverClassName: com.mysql.jdbc.Driver 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 username: root
password: boe#1234A password: boe#1234A
db2: db2:
driverClassName: com.mysql.jdbc.Driver 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 username: root
password: boe#1234A password: boe#1234A
web: web:
resources: resources:
static-locations: file:E:/Projects/BOE/java/static static-locations: file:E:/Projects/BOE/java/static
@@ -32,23 +33,27 @@ logging:
level: level:
org: org:
hibernate: hibernate:
SQL: DEBUG SQL: ERROR
type: # type:
descriptor: # descriptor:
sql: # sql:
BasicBinder: TRACE # BasicBinder: TRACE
config: classpath:log/logback-dev.xml config: classpath:log/logback-dev.xml
xboe: xboe:
api:
cross_filter: true
upload: upload:
file: 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: inner:
data: data:
sync: sync:
baseurl: http://localhost:9090 baseurl: http://127.0.0.1:9090
jasypt: jasypt:
encryptor: encryptor: