Skip to content

C
cas
Commit ef727ce5 by chentianzhong
Options

ca修改

parent cab2c295
Showing with 100 additions and 21 deletions
src/main/java/com/zq/cas/controller/CAVerifyController.java
......@@ -33,6 +33,7 @@ public class CAVerifyController {
}
if (LocalDateTime.now().isAfter(caInfo.getCertStartTime()) && LocalDateTime.now().isBefore(caInfo.getCertEndTime())){
OrgCaInfo newCaInfo = new OrgCaInfo();
newCaInfo.setXm(caInfo.getXm());
newCaInfo.setYouxiang(caInfo.getYouxiang());
return ResultVo.success(newCaInfo);
}
......
src/main/java/com/zq/cas/handler/MyAuthenticationHandler.java
......@@ -59,6 +59,7 @@ public class MyAuthenticationHandler extends AbstractPreAndPostProcessingAuthent
if (!username.contains("@gxfy.com")) {
username += "@gxfy.com";
}
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = servletRequestAttributes.getRequest();
String ipAddr = ServletUtil.getClientIP(request);
......
src/main/resources/static/app/js/ca/mToken.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/resources/static/app/js/myself/login.js
......@@ -17,10 +17,10 @@ function validAndLogin(){
userPwdLogin();
break;
case "2":
certLogin(loginType);
certLogin(2);
break;
case "3":
PwdAndCertLogin(loginType);
PwdAndCertLogin(3);
break;
default:
userPwdLogin();
......
src/main/resources/static/app/js/myself/login_new.js
......@@ -89,14 +89,81 @@ function userPwdLogin(){
//CA证书登录
function certLogin(loginType){
$("#msg").html("暂支持证书登录，待CA研发");
$('#btn_login').removeAttr("disabled");
verifyKeyPinAndLogin(loginType);
}
//密码+证书登录
function PwdAndCertLogin(loginType){
$("#msg").html("暂支持证书登录，待CA研发");
$('#btn_login').removeAttr("disabled");
//获取ukey、再检验用户密码，最后检验ukey密码
let certUser = $("#certUser").val();
if (certUser) {
var hideUserId = $('#hideUserId').val();
var username = $('#username').val();
var password = $('#password').val();
if (!checkUserPwd(username, password)){
$("#msg").html("用户名或密码不能为空");
$('#btn_login').removeAttr("disabled");
return false;
}
if (!username.endsWith("@gxfy.com")){
username = username+"@gxfy.com";
}
if (hideUserId != username){
$("#msg").html("证书用户和输入的账号不一致");
$('#btn_login').removeAttr("disabled");
return false;
}
var formData = {"username":username,"password":password};
$.ajax({
type: 'post',
url: "/cas/user/checkExpirePwd",
dataType: 'json',
data: formData,
shadeClose: false,
success:function(res){
if (res.success){
if (res.code == 8888){
var rdata = res.data;
console.log("rdata------------", rdata);
layer.open({
type: 2,
title:'您的密码是初始密码，需要先修改密码后才能登录门户',
area: ['680px', '520px'],
content: '/cas/updatePasswd?username='+rdata.username+"&useKey="+rdata.useKey,
fixed: false, // 不固定
maxmin: true,
closeBtn: 1,
maxmin:false, //开启最大化最小化按钮 false关闭状态
//btn: ['获取表单值', '取消'],
btnAlign: 'c',
cancel:function(index, layero){
$('#btn_login').removeAttr("disabled");
},
end: function(){
window.parent.location.reload();//关闭open打开的页面时，刷新父页面
}
});
}else {
verifyKeyPinAndLogin(loginType);
}
$('#btn_login').removeAttr("disabled");
}else {
$("#msg").html(res.message);
$('#btn_login').removeAttr("disabled");
}
},
error:function (e){
$("#msg").html("网络异常.请求失败");
$('#btn_login').removeAttr("disabled");
}
})
}else {
$("#msg").html("请先插入UKey");
$('#btn_login').removeAttr("disabled");
}
}
//检查用户名密码非空
......@@ -125,6 +192,9 @@ function loginTypeFunc(){
$("#certPwd-block").hide();
$('#btn_login').removeAttr("disabled");
$("#msg").html("");
btnStopExist();
break;
case "2":
$('#username').val("");
......@@ -132,10 +202,13 @@ function loginTypeFunc(){
$("#username-block").hide();
$("#password-block").hide();
$("#certUser-block").show();
$("#certPwd-block").show();
$("#certPwd-block").hide();
$('#btn_login').removeAttr("disabled");
getCAKeyAuth();
$("#msg").html("");
btnStartExist(2);
break;
case "3":
$('#username').val("");
......@@ -144,8 +217,11 @@ function loginTypeFunc(){
$("#password-block").show();
$("#certUser-block").show();
$("#certPwd-block").hide();
$('#btn_login').removeAttr("disabled");
getCAKeyAuth();
$("#msg").html("");
btnStartExist(3);
break;
default:
//alert("叫你没事别瞎几把点！");
......
src/main/resources/templates/app/casLoginView.html
......@@ -11,8 +11,8 @@
<script type="text/javascript" src="./app/js/jquery/jquery.min.js"></script>
<script type="text/javascript" src="./app/js/jquery/jquery.cookie.js"></script>
<script type="text/javascript" src="./app/js/pintuer.js"></script>
<script type="text/javascript" src="./app/js/ca/mToken.js"></script>
<script type="text/javascript" src="./app/js/myself/cookie.js"></script>
<script type="text/javascript" src="./app/js/myself/ca.js"></script>
<style>
.after_css {
height: 20px;
......@@ -98,7 +98,7 @@
<span class="icon icon-user"></span>
<select class="required input" id="certUser" name="certUser"
style="width:235px;overflow:hidden;"
title="请选择登录用户">
title="请选择证书用户">
</select>
</div>
</div>
......@@ -194,16 +194,14 @@
</div>
</div>
<script src="./app/layui/layui.js"></script>
<script type="text/javascript" src="./app/js/myself/ca.js"></script>
<script type="text/javascript" src="./app/js/myself/messenger.js"></script>
<script type="text/javascript" src="./app/js/myself/SelectGXFYUsers.js"></script>
<!--<script type="text/javascript" src="./app/js/ca/XTXSAB.js"></script>-->
<script type="text/javascript" src="./app/js/myself/login_new.js"></script>
<script type="text/javascript">
// SelectGXFYUsers.init("selectUser", "username", "hideUserId", 3, false);
let enterEnd = false, keyDownCount = 0, leftMouseDownCount = 0, rightMouseDownCount = 0;
bindKeyup();
$(function (){
$("#username-block").show();
......@@ -213,12 +211,15 @@
$("#certPwd-block").hide();
})
$(document).keyup(function(e){
var curKey = e.which;
if(curKey==13){
validAndLogin();
}
})
function bindKeyup(){
$(document).keyup(function(e){
var curKey = e.which;
if(curKey==13){
validAndLogin();
}
})
}
function queryAccount(){
layer.open({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment