liupeng 5 년 전
부모
커밋
f323f4cf63

+ 7 - 0
code/sapparent/sapservice/src/main/java/org/fouram/core/base/service/BaseService.java

@@ -43,4 +43,11 @@ public abstract class BaseService {
 		headers.add("Authorization", authorizationStr);
 		return headers;
 	}
+	
+	public static void main(String[] args) {
+		StringBuilder stringBuilder = new StringBuilder();
+		String sapApiUser = ConfConfig.getConfigString("sapApi.user");
+		String authorizationStr = stringBuilder.append("Basic ").append(Base64Util.encodeString(sapApiUser)).toString();
+		System.out.println(authorizationStr);
+	}
 }

+ 2 - 2
code/sapparent/sapservice/src/main/java/org/fouram/service/SapReportService.java

@@ -424,8 +424,8 @@ public class SapReportService extends BaseService {
 				String endDate = JsonNodeUtil.getValue(userNode, "endDate");// 结束日期
 				String school = JsonNodeUtil.getValue(userNode, "school");// 院校
 				String major = JsonNodeUtil.getValue(userNode, "major");// 专业
-				String degree = JsonNodeUtil.getValue(userNode, "degree");// 学历
-				String qualification = JsonNodeUtil.getValue(userNode, "custom1");// 学位
+				String degree = JsonNodeUtil.getValue(userNode, "degreeNav", "externalCode");// 学历
+				String qualification = JsonNodeUtil.getValue(userNode, "custom1Nav", "externalCode");// 学位
 				SapEducation entity = SapEducation.builder().userId(userId).startDate(startDate).endDate(endDate)
 						.school(school).major(major).degree(degree).qualification(qualification).build();
 				save("SapReportMapper.saveSapEducation", entity);