|
@@ -33,13 +33,13 @@ public class UserAuthService {
|
|
|
@Autowired
|
|
|
private PropertyService propertyService;
|
|
|
|
|
|
- public Result login(String account, String password, String rootOrgId) throws Exception {
|
|
|
+ public Result login(String account, String password, Long rootOrgId) throws Exception {
|
|
|
final String requestUrl = propertyService.getUserAuthUrl() + "/api/ecs_core/auth/login";
|
|
|
//封装请求参数
|
|
|
Map<String, String> params = new HashMap<>();
|
|
|
params.put("accountValue", account);
|
|
|
params.put("password", password);
|
|
|
- params.put("rootOrgId", rootOrgId);
|
|
|
+ params.put("rootOrgId", String.valueOf(rootOrgId));
|
|
|
params.put("accountType", DEFAULT_ACCOUNT_TYPE);
|
|
|
params.put("domain", "");
|
|
|
String json = new JsonMapper().toJson(params);
|
|
@@ -63,11 +63,11 @@ public class UserAuthService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public Result updatePassword(String key, String token, String userId, String password) throws Exception {
|
|
|
+ public Result updatePassword(String key, String token, Long userId, String password) throws Exception {
|
|
|
final String requestUrl = propertyService.getUserAuthUrl() + "/api/ecs_core/user/password";
|
|
|
//封装请求参数
|
|
|
RequestBody formBody = new FormBody.Builder()
|
|
|
- .add("userId", userId)
|
|
|
+ .add("userId", String.valueOf(userId))
|
|
|
.add("password", password)
|
|
|
.build();
|
|
|
Request request = new Request.Builder()
|