Merge remote-tracking branch 'origin/beta' into beta

beta-enc
kk 2 years ago
commit a45c7f6429
  1. 19
      jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java
  2. 4
      jianshui-ui/src/views/freedom/login.vue

@ -96,12 +96,13 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
return AjaxResult.success("未查询到该流水号相关信息,请确认后输入"); return AjaxResult.success("未查询到该流水号相关信息,请确认后输入");
} }
if ("F000".equals(invoiceAllLoginResult.getCode())) { if ("F000".equals(invoiceAllLoginResult.getCode())) {
String[] splitResult = invoiceAllLoginResult.getMsg().split(":"); // String[] splitResult = invoiceAllLoginResult.getMsg().split(":");
if (StringUtils.isNotBlank(splitResult[1])){ // if (StringUtils.isNotBlank(splitResult[1])){
return AjaxResult.error(splitResult[1]); // return AjaxResult.error(splitResult[1]);
}else { // }else {
return AjaxResult.error(splitResult[0]); // return AjaxResult.error(splitResult[0]);
} // }
return AjaxResult.error(invoiceAllLoginResult.getMsg());
} else if ("S000".equals(invoiceAllLoginResult.getCode())) { } else if ("S000".equals(invoiceAllLoginResult.getCode())) {
return AjaxResult.success("10012"); return AjaxResult.success("10012");
} else if ("SMS".equals(invoiceAllLoginResult.getCode())){ } else if ("SMS".equals(invoiceAllLoginResult.getCode())){
@ -219,9 +220,9 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
// 回调地址 // 回调地址
inoviceAllQdLoginDTO.setLoginType("1"); inoviceAllQdLoginDTO.setLoginType("1");
inoviceAllQdLoginDTO.setCallback("http://dev.goldentaxcloud.com:8081/api/invoice_all/v1/autonomousAuthorization"); inoviceAllQdLoginDTO.setCallback("http://dev.goldentaxcloud.com:8081/api/invoice_all/v1/autonomousAuthorization");
log.info("全电登录接口,请求上游,地址:{},参数:{}", "http://221.222.184.98:8880/login/getLogin2", JSONUtil.toJsonStr(inoviceAllQdLoginDTO)); log.info("全电登录接口,请求上游,地址:{},参数:{}", "http://zzsq.jcsk100.com/login/getLogin2", JSONUtil.toJsonStr(inoviceAllQdLoginDTO));
Thread requestThread = new Thread(() -> { Thread requestThread = new Thread(() -> {
HttpUtils.sendJsonPost("http://221.222.184.98:8880/login/getLogin2", inoviceAllQdLoginDTO); HttpUtils.sendJsonPost("http://zzsq.jcsk100.com/login/getLogin2", inoviceAllQdLoginDTO);
}); });
requestThread.start(); requestThread.start();
// 用户信息封装 // 用户信息封装
@ -239,7 +240,7 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
invoiceAllApiLog.setCreateTime(new Date()); invoiceAllApiLog.setCreateTime(new Date());
invoiceAllApiLog.setCompany(companyservice.getSellertax()); invoiceAllApiLog.setCompany(companyservice.getSellertax());
invoiceAllApiLog.setIdentityId(companyservice.getIdentity()); invoiceAllApiLog.setIdentityId(companyservice.getIdentity());
invoiceAllApiLog.setUrl("http://221.222.184.98:8880/login/getLogin2"); invoiceAllApiLog.setUrl("http://zzsq.jcsk100.com/login/getLogin2");
invoiceAllApiLog.setSendMsg(JSONUtil.toJsonStr(inoviceAllQdLoginDTO)); invoiceAllApiLog.setSendMsg(JSONUtil.toJsonStr(inoviceAllQdLoginDTO));
invoiceAllApiLog.setRequestId(qqlsh); invoiceAllApiLog.setRequestId(qqlsh);
allApiLogMapper.insert(invoiceAllApiLog); allApiLogMapper.insert(invoiceAllApiLog);

@ -260,8 +260,8 @@ export default {
clearInterval(timer) clearInterval(timer)
} }
}).catch(()=>{ }).catch(()=>{
this.ruleForm.showone = false; this.ruleForm.showone = true;
this.ruleForm.showtwo = true; this.ruleForm.showtwo = false;
this.ruleForm.showthree = false; this.ruleForm.showthree = false;
this.loading = false; this.loading = false;
this.loadingone = false; this.loadingone = false;

Loading…
Cancel
Save