数据跨域
This commit is contained in:
parent
e950fa859d
commit
fa0109a910
File diff suppressed because one or more lines are too long
|
|
@ -92,26 +92,32 @@ public class TokenController {
|
||||||
|
|
||||||
@PostMapping("login")
|
@PostMapping("login")
|
||||||
public Result<?> login(@RequestBody LoginBody form) {
|
public Result<?> login(@RequestBody LoginBody form) {
|
||||||
// String logType=form.getLoginType();
|
if(System.getProperty("os.name").toLowerCase().contains("windows")){
|
||||||
// Map<String,String> map;
|
LoginUser userInfo2 = sysLoginService.login(form.getUsername(),form.getPassword(), form.getLoginType(), null);
|
||||||
// if("1".equals(logType)){
|
// 获取登录token
|
||||||
// map=IscLoginController.getUserTicket(url,form.getTicket(),"xn",form.getAccessToken(),sc_web_index);
|
// userInfo2.setIscUserId(iscUserId);
|
||||||
// }else if("2".equals(logType)){
|
return Result.ok(tokenService.createToken(userInfo2), "登录成功");
|
||||||
// map=IscLoginController.getUserTicket(url,form.getTicket(),"xn",form.getAccessToken(),sc_web_index);
|
}else{
|
||||||
// }else{
|
String logType=form.getLoginType();
|
||||||
// map=IscLoginController.getUserTicket(url,form.getTicket(),"xn",form.getAccessToken(),ht_index);
|
Map<String,String> map;
|
||||||
// }
|
if("1".equals(logType)){
|
||||||
// String username=map.get("username");
|
map=IscLoginController.getUserTicket(url,form.getTicket(),"xn",form.getAccessToken(),sc_web_index);
|
||||||
// System.err.println("username="+username);
|
}else if("2".equals(logType)){
|
||||||
// String password=map.get("password");
|
map=IscLoginController.getUserTicket(url,form.getTicket(),"xn",form.getAccessToken(),sc_web_index);
|
||||||
// System.err.println("password="+password);
|
}else{
|
||||||
// String iscUserId=map.get("iscUserId");
|
map=IscLoginController.getUserTicket(url,form.getTicket(),"xn",form.getAccessToken(),ht_index);
|
||||||
// System.err.println("iscUserId="+iscUserId);
|
}
|
||||||
LoginUser userInfo2 = sysLoginService.login(form.getUsername(),form.getPassword(), form.getLoginType(), null);
|
String username=map.get("username");
|
||||||
// 获取登录token
|
System.err.println("username="+username);
|
||||||
// userInfo2.setIscUserId(iscUserId);
|
String password=map.get("password");
|
||||||
return Result.ok(tokenService.createToken(userInfo2), "登录成功");
|
System.err.println("password="+password);
|
||||||
|
String iscUserId=map.get("iscUserId");
|
||||||
|
System.err.println("iscUserId="+iscUserId);
|
||||||
|
LoginUser userInfo2 = sysLoginService.login(form.getUsername(),form.getPassword(), form.getLoginType(), null);
|
||||||
|
// 获取登录token
|
||||||
|
// userInfo2.setIscUserId(iscUserId);
|
||||||
|
return Result.ok(tokenService.createToken(userInfo2), "登录成功");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Object> getIscLogin(String username, String password) {
|
private Map<String, Object> getIscLogin(String username, String password) {
|
||||||
|
|
|
||||||
|
|
@ -49,11 +49,12 @@ public class MyFilter implements Filter {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
response.setHeader("Access-Control-Allow-Origin", "*");
|
|
||||||
// 当前只支持POST 跟GET
|
|
||||||
response.setHeader("Access-Control-Allow-Methods",
|
response.setHeader("Access-Control-Allow-Methods",
|
||||||
"POST, GET");
|
"POST, GET");
|
||||||
response.setHeader("Access-Control-Max-Age", "3600");
|
response.setHeader("Access-Control-Max-Age", "3600");
|
||||||
|
//response.setHeader("Access-Control-Allow-Origin", "**");
|
||||||
|
// 当前只支持POST 跟GET
|
||||||
|
|
||||||
response.setHeader("Access-Control-Allow-Headers",
|
response.setHeader("Access-Control-Allow-Headers",
|
||||||
"Content-Type, x-requested-with, X-Custom-Header, Authorization");
|
"Content-Type, x-requested-with, X-Custom-Header, Authorization");
|
||||||
// 对OPTIONS请求进行拦截处理
|
// 对OPTIONS请求进行拦截处理
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue