hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-11 03:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy0525-llf' into dev0525

Browse Source 
# 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:
zhaolongfei
2024-05-25 19:09:23 +08:00
parent bdfb400ad6 73c2e8b54a
commit 0c98dbef06
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
View File

@@ -61,7 +61,7 @@ public class ThirdApi {
private String getStudyStatus; private String getStudyStatus;
//获取例外人员的id //获取例外人员的id
public List<String> getUserId(){ public List<String> getUserId(){
String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=136&type=1").execute() //prod 316 String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=316&type=1").execute() //prod 316
.body()).orElseThrow(() -> new RuntimeException("token校验失败")); .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
log.info("正在获取例外人员工号 responseBody = " + responseBody); log.info("正在获取例外人员工号 responseBody = " + responseBody);
try { try {
@@ -192,7 +192,6 @@ public class ThirdApi {
} }
public List<StudyCourse>getStudyCourseList(String studyId,String courseId, String token){ public List<StudyCourse>getStudyCourseList(String studyId,String courseId, String token){
System.out.println("------------------getStudyCourseList-----------------------------");
StudyCourseVo studyCourseVo = new StudyCourseVo(); StudyCourseVo studyCourseVo = new StudyCourseVo();
studyCourseVo.setStudyId(studyId); studyCourseVo.setStudyId(studyId);
studyCourseVo.setCourseId(courseId); studyCourseVo.setCourseId(courseId);

2
servers/boe-server-all/src/main/resources/application.properties
View File

@@ -57,7 +57,7 @@ logging.config=classpath:log/logback-@profileActive@.xml
#boe.domain=https://pretest.zcwytd.com #boe.domain=https://pretest.zcwytd.com
boe.domain=https://u.boe.com boe.domain=https://u.boe.com
#boe.domain=http://127.0.0.1:30001 #boe.domain=http://localhost:30001
orgTree.orgTreeList=${boe.domain}/userbasic/org/list orgTree.orgTreeList=${boe.domain}/userbasic/org/list
# ????id???????????? # ????id????????????
orgTree.orgChildTreeList=${boe.domain}/userbasic/org/childOrgs orgTree.orgChildTreeList=${boe.domain}/userbasic/org/childOrgs