Commit 1f6fc59c authored by 赵然's avatar 赵然

zr

parent a7039a75
......@@ -12,11 +12,11 @@ import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
@Controller
public class CreatUrlModule {
final Base64.Decoder decoder = Base64.getDecoder();
final Base64.Encoder encoder = Base64.getEncoder();
private static String httpArea;
/**
* 功能:生成免登链接操作
* @return
......@@ -24,6 +24,8 @@ public class CreatUrlModule {
@RequestMapping(value = "/urlLink", method= RequestMethod.POST)
@ResponseBody
public Map urlLink(HttpServletRequest request) throws Exception {
String evn = request.getParameter("evn");
String appkey = request.getParameter("appkey");
if(appkey.equals(null) || appkey.equals("") || appkey.isEmpty()){
appkey = "jlg88lyxz7siqtmr";
......@@ -84,7 +86,13 @@ public class CreatUrlModule {
if(vip!=null&&vip!=""&&vip != "null") {
params.put("vip", vip);
}
String url=tool.buildUrlWithSign("https://activity.m.duibatest.com.cn/autoLogin/autologin?",params);
if(evn.equals("1")){
httpArea = "https://activity.m.duibatest.com.cn/autoLogin/autologin?";
}else{
httpArea = "https://activity.m.duiba.com.cn/autoLogin/autologin?";
}
String url=tool.buildUrlWithSign(httpArea,params);
System.out.println(url);
Map<String, String> map = new HashMap<>();
......
......@@ -69,6 +69,7 @@ $(document).ready(function(){
$("#result").val("获取执行结果,请等待~");
e.preventDefault();
var evn = $("#evn").val();
var appkey = $("#appkey").val();
var appsecret = $("#appsecret").val();
var userId = $("#userId").val();
......@@ -82,7 +83,7 @@ $(document).ready(function(){
var qq = $("#qq").val();
var vip = $("#vip").val();
$.post("urlLink", {"appkey":appkey,"appsecret":appsecret,"userId":userId,"credits":credits,"dcustom":dcustom,"transfer":transfer,"redirect":redirect,"phone":phone,"alipay":alipay,"realName":realName,"qq":qq,"vip":vip},function(data, status){
$.post("urlLink", {"evn":evn,"appkey":appkey,"appsecret":appsecret,"userId":userId,"credits":credits,"dcustom":dcustom,"transfer":transfer,"redirect":redirect,"phone":phone,"alipay":alipay,"realName":realName,"qq":qq,"vip":vip},function(data, status){
$("#result").val(data.message);
});
});
......@@ -249,9 +250,15 @@ $(document).ready(function(){
<select onchange="selectOnchang(this)" name="action" id="level">
<option value="1">普通设置</option>
<option value="2">高级设置</option>
</select>
</select>
</div>
<div class="mws-form-row">
<label>选择环境</label>
<select name="evn" id="evn">
<option value="1">测试环境</option>
<option value="2">线上环境</option>
</select>
</div>
<div class="mws-form-row">
<label>AppKey</label>
<div class="mws-form-item small">
......@@ -269,7 +276,7 @@ $(document).ready(function(){
<div class="mws-form-row">
<label>用户id</label>
<div class="mws-form-item small">
<input type="number" class="mws-textinput" name="user_id" placeholder="partner_user_id" id="userId"/>
<input type="number" class="mws-textinput" name="user_id" placeholder="partner_user_id,不填默认未登录用户" id="userId"/>
</div>
</div>
......
......@@ -299,7 +299,7 @@
<li><a href="http://172.16.80.141:8088/" target='_BLANK'>签到模拟集合</a></li>
</ul>
</li>
<li>
<li class="active">
<a href="#" class="mws-i-24 i-dribbble-4">活动助手</a>
<ul>
<li><a href="package.html">开发者测试包</a></li>
......@@ -309,7 +309,7 @@
<li><a href="red.html">猜红包系列</a></li>
</ul>
</li>
<li class="active">
<li>
<a href="#" class="mws-i-24 i-table-1" >自动化统计</a>
<ul>
<li><a href="AutoTable.html">运行记录</a></li>
......
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