FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_3

Browse Source 
# Conflicts:
#	adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
This commit is contained in:
zhaokaiyao@91isoft.com
2021-10-20 14:53:46 +08:00
parent bef55f395a 900bcb9c14
commit 4ebe597ed4
10 changed files with 46 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java
+4 -4
View File
@@ -30,7 +30,7 @@ public class SyncUserService {
*/
public List<String> syncFotonUser()throws Exception{
String appuser = "app_slrs";
String appkey = "wj5iDTqyguQCxnsoo5VU21BoRSZqevhI";
String appkey = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe";
AuthUtils util = new AuthUtils(appuser, appkey, null);
List<String> json=new ArrayList<>();
@@ -45,7 +45,7 @@ public class SyncUserService {
params.put("basedn", "ou=People,o=foton.com.cn,o=isp");
System.out.println("RequestBody:" + params.toString());
// 用户测试
String rs = util.getResponseFromServer("http://172.24.224.42:82/rest/users/getUserList", params);
String rs = util.getResponseFromServer("http://idmsync.foton.com.cn/rest/users/getUserList", params);
json.add(rs);
@@ -76,7 +76,7 @@ public class SyncUserService {
public List<String> syncFotonOrg()throws Exception{
String appuser = "app_slrs";
String appkey = "wj5iDTqyguQCxnsoo5VU21BoRSZqevhI";
String appkey = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe";
AuthUtils util = new AuthUtils(appuser, appkey, null);
byte[] cookie = null;
@@ -90,7 +90,7 @@ public class SyncUserService {
params.put("filter", "(orgNumber=*)");
params.put("basedn", "ou=Organizations,o=foton.com.cn,o=isp");
// 组织测试
String rs = util.getResponseFromServer("http://172.24.224.42:82/rest/orgs/getOrgList", params);
String rs = util.getResponseFromServer("http://idmsync.foton.com.cn/rest/orgs/getOrgList", params);
json.add(rs);