From 4596b69e682f0c7898a3f8e94741eb3ee15ca412 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 14 Jun 2023 16:04:30 +0800 Subject: [PATCH] isv update --- .../com/cool/store/http/ISVHttpRequest.java | 26 +++++++++---------- .../main/resources/application-ab.properties | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java index 85bf23a41..e9e08ca4d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java @@ -43,7 +43,7 @@ public class ISVHttpRequest { private HttpRestTemplateService httpRestTemplateService; public UserIdInfoDTO getUserIdByCode(String paramStr){ - String url = isvDomain + "/isv/user/getUserIdByCode?" + paramStr; + String url = isvDomain + "/user/getUserIdByCode?" + paramStr; ResponseEntity responseEntity = null; try { responseEntity = RestTemplateUtil.loadGet(url, ResultDTO.class); @@ -58,7 +58,7 @@ public class ISVHttpRequest { } public EnterpriseUserDTO getUserDetailByUserId(String userId){ - String url = isvDomain + "/isv/user/getUserDetail"; + String url = isvDomain + "/user/getUserDetail"; HashMap requestMap = new HashMap(); requestMap.put("userId", userId); ResultDTO responseEntity = null; @@ -75,7 +75,7 @@ public class ISVHttpRequest { } public List getAdminUserList(){ - String url = isvDomain + "/isv/corp/getAdminUserList"; + String url = isvDomain + "/corp/getAdminUserList"; HashMap requestMap = new HashMap(); ResultDTO responseEntity = null; try { @@ -91,7 +91,7 @@ public class ISVHttpRequest { } public AuthInfoDTO getAuthInfo(){ - String url = isvDomain + "/isv/corp/getAuthInfo"; + String url = isvDomain + "/corp/getAuthInfo"; HashMap requestMap = new HashMap(); ResultDTO responseEntity = null; try { @@ -107,7 +107,7 @@ public class ISVHttpRequest { } public List getDepartments(String parentId){ - String url = isvDomain + "/isv/corp/getDepartments"; + String url = isvDomain + "/corp/getDepartments"; HashMap requestMap = new HashMap(); requestMap.put("parentId", parentId); ResultDTO responseEntity = null; @@ -124,7 +124,7 @@ public class ISVHttpRequest { } public AuthScopeDTO getAuthScope(){ - String url = isvDomain + "/isv/corp/getAuthScope"; + String url = isvDomain + "/corp/getAuthScope"; HashMap requestMap = new HashMap(); ResultDTO responseEntity = null; try { @@ -140,7 +140,7 @@ public class ISVHttpRequest { } public List getDepartmentUsers(String deptId){ - String url = isvDomain + "/isv/corp/getDepartmentUsers"; + String url = isvDomain + "/corp/getDepartmentUsers"; HashMap requestMap = new HashMap(); requestMap.put("deptId", deptId); ResultDTO responseEntity = null; @@ -157,7 +157,7 @@ public class ISVHttpRequest { } public List getUserDetailByUserIds(List userIdList) { - String url = isvDomain + "/isv/corp/getDepartmentUsers"; + String url = isvDomain + "/corp/getDepartmentUsers"; HashMap requestMap = new HashMap(); requestMap.put("userIds", userIdList); ResultDTO responseEntity = null; @@ -174,7 +174,7 @@ public class ISVHttpRequest { } public List getSubDepartments(String parentId, Boolean fetchChild) { - String url = isvDomain + "/isv/corp/getSubDepartments"; + String url = isvDomain + "/corp/getSubDepartments"; HashMap requestMap = new HashMap(); requestMap.put("parentId", parentId); requestMap.put("fetchChild", fetchChild); @@ -199,7 +199,7 @@ public class ISVHttpRequest { * @return */ public List getFreeBusyList(String userId, long startTime, long endTime) throws ApiException{ - String url = isvDomain + "/isv/user/getFreeBusyList"; + String url = isvDomain + "/user/getFreeBusyList"; HashMap requestMap = new HashMap(); requestMap.put("userId", userId); requestMap.put("startTime", startTime); @@ -225,7 +225,7 @@ public class ISVHttpRequest { * @throws ApiException */ public UserCalendarsEventDTO createUserCalendarEvent(CreateCalendarEventDTO param) throws ApiException{ - String url = isvDomain + "/isv/user/createUserCalendarEvent"; + String url = isvDomain + "/user/createUserCalendarEvent"; ResultDTO responseEntity = null; try { responseEntity = httpRestTemplateService.postForObject(url, param, ResultDTO.class); @@ -247,7 +247,7 @@ public class ISVHttpRequest { * @throws ApiException */ public UserCalendarsEventDTO updateUserCalendarEvent(UpdateCalendarEventDTO param) throws ApiException{ - String url = isvDomain + "/isv/user/updateUserCalendarEvent"; + String url = isvDomain + "/user/updateUserCalendarEvent"; ResultDTO responseEntity = null; try { responseEntity = httpRestTemplateService.postForObject(url, param, ResultDTO.class); @@ -269,7 +269,7 @@ public class ISVHttpRequest { * @throws ApiException */ public UserCalendarsEventDTO deleteUserCalendarEvent(DeleteCalendarEventDTO param) throws ApiException { - String url = isvDomain + "/isv/user/deleteUserCalendarEvent"; + String url = isvDomain + "/user/deleteUserCalendarEvent"; ResultDTO responseEntity = null; try { responseEntity = httpRestTemplateService.postForObject(url, param, ResultDTO.class); diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index e49344f19..708563403 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://abstore-isv.coolstore.cn +isv.domain = https://abstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=zK2oVEz4G1ts23d2