Merge remote-tracking branch 'power_fs3/master'

# Conflicts:
#	power-admin/src/main/webapp/static/js/login.js
master
linjj 1 year ago
commit 721319e8cc

@ -1,7 +1,10 @@
/** /**
* Created by ljx on 2019/4/25. * Created by ljx on 2019/4/25.
*/ */
$(function () { $(function(){
//cookie数据保存格式是key=value;key=value;形式loginInfo为保存在cookie中的key值具体看controller代码 //cookie数据保存格式是key=value;key=value;形式loginInfo为保存在cookie中的key值具体看controller代码
/*if(str != ""){ /*if(str != ""){
var userName = str.split("#")[0]; var userName = str.split("#")[0];
@ -12,7 +15,7 @@ $(function () {
//并且选中复选框 //并且选中复选框
$("#rememberMe").attr("checked", true); $("#rememberMe").attr("checked", true);
}*/ }*/
//获取cookie //获取cookie
/*function getCookie(cname) { /*function getCookie(cname) {
var name = cname + "="; var name = cname + "=";
@ -25,38 +28,38 @@ $(function () {
return ""; return "";
}*/ }*/
$("#forgetPwd").on("click", function () { $("#forgetPwd").on("click",function(){
alert("请联系管理员进行修改密码!"); alert("请联系管理员进行修改密码!");
}); });
}); });
function login() { function login(){
var userName = $("#userName").val(); var userName = $("#userName").val();
var userPwd = $("#userPwd").val(); var userPwd = $("#userPwd").val();
userPwd = hex_hmac_md5(userPwd, userPwd); userPwd = hex_hmac_md5(userPwd,userPwd);
var rememberMeChecked = $("input[type='checkbox']").is(':checked'); var rememberMeChecked = $("input[type='checkbox']").is(':checked');
var rememberMe = ''; var rememberMe = '';
if (rememberMeChecked) { if(rememberMeChecked){
rememberMe = 'yes'; rememberMe = 'yes';
} }
if (userName == '') { if(userName == ''){
toastr.warning("用户名不能为空!"); toastr.warning("用户名不能为空!");
} else { }else{
if (userPwd == '') { if(userPwd == ''){
toastr.warning("密码不能为空!"); toastr.warning("密码不能为空!");
} else { }else{
$.ajax({ $.ajax({
type: "POST", type : "POST",
url: path + "/login", url : path+"/login",
data: {userName: userName, userPwd: userPwd, rememberMe: rememberMe}, data: {userName:userName, userPwd:userPwd,rememberMe:rememberMe},
dataType: 'json', dataType:'json',
success: function (data) { success : function(data) {
if (data.code == 100) { if(data.code == 100){
window.location.href = data.extend.url; window.location.href = data.extend.url;
} else { }else{
alert(data.msg) $("#msg").text(data.msg);
} }
} }
}) })
@ -65,62 +68,58 @@ function login() {
} }
var interval = ""; var interval ="";
var qrCodeIdentity = ""; var qrCodeIdentity ="";
function handoffLogin(){
//获取扫码登录二维码
function handoffLogin() {
$.ajax({ $.ajax({
type: "POST", type : "POST",
data: {loginTypeBitValue: 16, type: 3, projectUid: "cloudkey-fstth", ApplicationId: "fstth-wzh"}, data:{loginTypeBitValue:16,type:3,projectUid:"cloudkey-fstth",ApplicationId:"fstth-wzh"},
url: path + '/font/getQRcode', url : path+'/font/getQRcode',
success: function (data) { success : function(data) {
qrCodeIdentity = data.qrCodeIdentity; qrCodeIdentity = data.qrCodeIdentity;
$("#QRcordImg").prop("src", "data:image/jpeg;base64," + data.qrCodeBase64); $("#QRcordImg").prop("src","data:image/jpeg;base64,"+data.qrCodeBase64);
//轮询监听用户扫码 interval = setInterval(scanCodeLogin, 1000,qrCodeIdentity);
interval = setInterval(scanCodeLogin, 1000, qrCodeIdentity);
} }
}) })
$("#switchHandoff").css("display", "none"); $("#switchHandoff").css("display","none");
$("#switchHandoff2").css("display", "block"); $("#switchHandoff2").css("display","block");
} }
function scanCodeLogin() { function scanCodeLogin() {
$.ajax({ $.ajax({
type: "POST", type:"POST",
data: {qrCodeIdentity: qrCodeIdentity}, data:{qrCodeIdentity:qrCodeIdentity},
url: path + '/font/getScanCode', url : path+'/font/getScanCode',
success: function (body) { success : function (body) {
if (body.verifyStatus == 0) { if (body.verifyStatus ==0) {
//扫码认证成功后撤销监听
clearInterval(interval); clearInterval(interval);
$.ajax({ $.ajax({
type: "POST", type:"POST",
data: {userToken: body.userToken}, data:{userToken:body.userToken},
url: path + '/font/getUserInfo', url : path+'/font/getUserInfo',
success: function (tlte) { success : function (tlte) {
if (tlte.msgType == 1) { if (tlte.msgType==1){
$.ajax({ $.ajax({
type: "POST", type:"POST",
data: {userName: tlte.uid}, data:{userName:tlte.uid },
url: path + '/font/qRCodeLogin', url : path+'/font/qRCodeLogin',
success: function (tltel) { success:function (tltel) {
if (tltel.code == 100) { if(tltel.code == 100){
window.location.href = tltel.extend.url; window.location.href = tltel.extend.url;
} else { }else{
$("#msg").text(tltel.msg); $("#msg").text(tltel.msg);
}
} }
} })
}) }else {
} else { alert("登录失败请重新登录")
alert("登录失败请重新登录") }
} }
} })
})
} }
} }
}) })
@ -128,24 +127,27 @@ function scanCodeLogin() {
} }
function handoffLogin2() {
$("#switchHandoff").css("display", "block");
$("#switchHandoff2").css("display", "none");
function handoffLogin2(){
$("#switchHandoff").css("display","block");
$("#switchHandoff2").css("display","none");
clearInterval(interval); clearInterval(interval);
} }
$('body').keydown(function () { $('body').keydown(function () {
if (event.keyCode == '13') { if(event.keyCode == '13'){
login(); login();
} }
}) })
/** /**
* 判断是iframe框架跳出iframe框架使用top链接 * 判断是iframe框架跳出iframe框架使用top链接
*/ */
if (top.location != location) { if (top.location != location){
top.location.href = location.href; top.location.href = location.href;
} }

Loading…
Cancel
Save