msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'changePWD' into develop

Browse Source
master
wangning 7 years ago
parent 262ce70a7d 5168d717f8
commit 45b3149865
2 changed files with 171 additions and 0 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -1251,6 +1251,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
if(config.containsKey(rateKey)){
if(org.containsKey(rateValueKey)){
if(config.getBigDecimal(rateKey).compareTo(org.getBigDecimal(rateValueKey)) < 0){
throw new ForbiddenException("费率参数小于旗下商户最低"+channel+"费率，请重新输入");
};
}

170
src/main/resources/templates/change_password.html
Unescape View File

@ -0,0 +1,170 @@
<!DOCTYPE html>
<html>
<head>
<title>RoyalPay - Change Passowrd</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no">
<link rel="stylesheet" type="text/css" href="/static/lib/bootstrap/css/bootstrap.min.css">
<script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="/static/lib/bootstrap/js/bootstrap.min.js"></script>
<link rel="stylesheet" type="text/css" href="/static/css/index_register.css">
<link rel="stylesheet" href="/static/css/qrpay.css?t=201608301951" type="text/css">
<script type="text/javascript" src="/static/lib/websocket/sockjs.min.js"></script>
<script type="text/javascript" src="/static/lib/websocket/stomp.min.js"></script>
<!-- Theme style -->
<link rel="stylesheet" href="/static/lib/dist/css/AdminLTE.min.css">
<link rel="stylesheet" href="/static/css/main.css">
<script type="text/javascript" data-th-inline="javascript">
window.verifyCode = /*[[*{verifyCode}]]*/null;
$(document).ready(function () {
$('input').keypress(function (evt) {
if (evt.keyCode == 13) {
$('#login-btn').click();
}
});
$('#login-btn').click(function () {
var loginid = $('#loginid-input').val();
if (loginid == null || loginid.length == 0) {
alert('请填写账号');
return;
}
var pwd = $('#pwd-input').val();
if (pwd == null || pwd.length == 0) {
alert('请填写密码');
return;
}
// var verifyCode = window.verifyCode;
if ( window.verifyCode == null || window.verifyCode.length == 0) {
alert('Page has expired');
return;
}
$.ajax({
url: '/global/userstatus/partner_changepassword',
method: 'post',
data: JSON.stringify({login_id: loginid, newPassword: pwd, verifyCode: window.verifyCode}),
contentType: 'application/json',
dataType: 'text',
success: function () {
alert("Reset Password Successful!");
location.href = 'https://mpay.royalpay.com.au/index.html';
},
error: function (jqXHR) {
alert(JSON.parse(jqXHR.responseText).message);
}
})
});
})
</script>
</head>
<body>
<div class="qrpay-background"></div>
<div id="main">
<div id="page-index" class="content-page">
<nav id="header" class="navbar navbar-dark navbar-full">
<div class="container">
<div class="navbar-header">
<button class="navbar-toggle collapsed" type="button" data-toggle="collapse"
data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="https://www.royalpay.com.au/">
<img src="/static/css/img/logo_w.png" alt="" class="navbar--logo">
</a>
<span class="navbar-brand"
style="margin-left: 10px;padding-left: 10px;border-left: 1px solid #fff;">
<img src="/static/css/img/wechatpay.png" class="navbar--logo"
style="transform: translateY(50%);height: 60%;">
</span>
</div>
<ul class="nav navbar-nav navbar-right navbar-collapse collapse">
<li id="nav-index" class="nav-item">
<a href="https://www.royalpay.com.au/" class="nav-link">Home</a>
</li>
<li class="nav-item dropdown">
<a role="button" class="nav-link dropdown-toggle" data-toggle="dropdown">GATEWAY API</a>
<ul class="dropdown-menu">
<li><a href="https://mpay.royalpay.com.au/docs/en/" target="_blank">En</a></li>
<li><a href="https://mpay.royalpay.com.au/docs/cn/" target="_blank">中文</a></li>
</ul>
</li>
<li class="nav-item">
<a href="https://www.royalpay.com.au/industry.html" class="nav-link">Industry</a>
</li>
<li class="nav-item">
<a href="https://www.royalpay.com.au/marketing.html" class="nav-link">Marketing</a>
</li>
<li class="nav-item">
<a role="button" class="nav-link dropdown-toggle" data-toggle="dropdown">About Us</a>
<ul class="dropdown-menu">
<li><a href="https://www.royalpay.com.au/about.html" target="_blank">About Us</a></li>
<li><a href="https://www.royalpay.com.au/c_news.html">News</a></li>
<li><a href="https://www.royalpay.com.au/c_career.html">Career</a></li>
</ul>
</li>
<li class="nav-item">
<a href="https://www.royalpay.com.au/download.html" class="nav-link">Downloads</a>
</li>
</ul>
</div>
</nav>
<section class="container content">
<div>
<div class="login-box divloginbox">
<!-- /.login-logo -->
<div class="login-box-body login-box-bg">
<p style="text-align: center;"><img src="/static/images/dh_logo.png" style="width: 70%"></p>
<p style="text-align: center;font-size:20px;">Set a new password</p>
<div class="form-group has-feedback">
<input type="text" id="loginid-input" class="form-control" placeholder="Login ID">
<span class="glyphicon glyphicon-user form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input type="password" id="pwd-input" class="form-control" placeholder="New Password">
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<!--<span style="padding-left: 70%;font-size: smaller" id="forgetPassword">Forgot Password</span>-->
<!--<br/>-->
<div class="row">
<!-- /.col -->
<div class="col-xs-12 margin-bottom">
<button type="button" id="login-btn" class="btn btn-success btn-block btn-flat">Sumbit
</button>
</div>
<!-- /.col -->
</div>
</div>
<!-- /.login-box-body -->
</div>
</div>
</section>
<section id="footer" class="section section-six fp-auto-height footer">
<div class="copyright">
<div class="container">
<div class="row">
<div class="col-xs-12 text-center">
© 2016 Tunnel Show Pty. Ltd. | Representative of AFSL licensee 448066
</div>
</div>
</div>
</div>
</section>
</div>
</div>
</body>
</html>
Write Preview
Loading…
Cancel
Save