|
@@ -56,8 +56,9 @@ public class Auth2Controller extends ControllerSupport {
|
|
@WithoutStackTrace(true)
|
|
@WithoutStackTrace(true)
|
|
@ApiOperation(value = "登录1", notes = "登录")
|
|
@ApiOperation(value = "登录1", notes = "登录")
|
|
@PostMapping("/login")
|
|
@PostMapping("/login")
|
|
- public Map<String, Object> login1(@RequestParam String loginName, @RequestParam String password,
|
|
|
|
|
|
+ public Map<String, Object> login1(@RequestParam String loginName,
|
|
@RequestParam(required = false) Long rootOrgId) {
|
|
@RequestParam(required = false) Long rootOrgId) {
|
|
|
|
+ String password = getRequiredStringParam("password");
|
|
return login(loginName, password, rootOrgId);
|
|
return login(loginName, password, rootOrgId);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -74,8 +75,9 @@ public class Auth2Controller extends ControllerSupport {
|
|
@WithoutStackTrace(true)
|
|
@WithoutStackTrace(true)
|
|
@ApiOperation(value = "登录2", notes = "登录")
|
|
@ApiOperation(value = "登录2", notes = "登录")
|
|
@PostMapping("/login/{rootOrgId}")
|
|
@PostMapping("/login/{rootOrgId}")
|
|
- public Map<String, Object> login2(@PathVariable long rootOrgId, @RequestParam String loginName,
|
|
|
|
- @RequestParam String password) {
|
|
|
|
|
|
+ public Map<String, Object> login2(@PathVariable long rootOrgId,
|
|
|
|
+ @RequestParam String loginName) {
|
|
|
|
+ String password = getRequiredStringParam("password");
|
|
return login(loginName, password, rootOrgId);
|
|
return login(loginName, password, rootOrgId);
|
|
}
|
|
}
|
|
|
|
|