Merge branch 'xiaozhequ'

# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/resources/application.properties
This commit is contained in:
xiaozhequ
2023-10-18 11:43:21 +08:00
9 changed files with 108 additions and 15 deletions

View File

@@ -1,5 +1,4 @@
spring.profiles.active= @profileActive@
spring.profiles.active=@profileActive@
spring.application.name=boe-server-all
server.port=9090
server.servlet.session.timeout=30m
@@ -66,4 +65,6 @@ audience.usersByAudienceList=${boe.domain}/userbasic/audience/memberList
#获取用户学习课程数据
statApi.userdynamicList=${boe.domain}/statApi/xboe/m/stat/userdynamic/list
#用户中心根据组织id查询用户信息接口递归子组织
audience.getOrgUsers=${boe.domain}/userbasic/user/getOrgUsers
audience.getOrgUsers=${boe.domain}/userbasic/user/getOrgUsers
#获取工号
infrasApi.dict=${boe.domain}/infrasApi/dict/getCourseException