Merge branch 'ah-sbd-h5'
This commit is contained in:
commit
fe51edfd94
|
|
@ -230,11 +230,11 @@ public class CustInfoServiceImpl extends ServiceImpl<CustInfoMapper, CustInfo> i
|
||||||
return ajaxResult;
|
return ajaxResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
// public static void main(String[] args) {
|
||||||
BCryptPasswordEncoder bCrypt = new BCryptPasswordEncoder();
|
// BCryptPasswordEncoder bCrypt = new BCryptPasswordEncoder();
|
||||||
boolean flag = bCrypt.matches("Bonus$2026", "$2a$10$vrcmG0TyvgH5tS9g8ptaVOK2K3pYWVAa13SWEK7pQBGRtNAPlGV7O");
|
// boolean flag = bCrypt.matches("Bonus$2026", "$2a$10$vrcmG0TyvgH5tS9g8ptaVOK2K3pYWVAa13SWEK7pQBGRtNAPlGV7O");
|
||||||
System.out.println(flag);
|
// System.out.println(flag);
|
||||||
}
|
// }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult custForgetPassword(CustForgetPasswordDTO content) {
|
public AjaxResult custForgetPassword(CustForgetPasswordDTO content) {
|
||||||
|
|
@ -310,8 +310,8 @@ public class CustInfoServiceImpl extends ServiceImpl<CustInfoMapper, CustInfo> i
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getOrderQRCode(Integer sourceType, String paramValue) {
|
public String getOrderQRCode(Integer sourceType, String paramValue) {
|
||||||
String stime = String.valueOf(System.currentTimeMillis() / 1000L);
|
String stime = String.valueOf(System.currentTimeMillis());
|
||||||
return "xnzn{\"s\":" + sourceType + ",\"y\":" + LeCodeUseSceneEnum.PAY.key() + ",\"p\":\"" + paramValue + "\",\"t\":" + stime + "}";
|
return "xnzn{\"s\":" + sourceType + ",\"y\":" + LeCodeUseSceneEnum.PAY.key() + ",\"p\":\"" + paramValue + "\",\"t\":" + "\"" + stime + "\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void assembleErrInfo(List<CustErrorToLead> custErrorToLeadList, CustAccExcelModel temp, String msg) {
|
public static void assembleErrInfo(List<CustErrorToLead> custErrorToLeadList, CustAccExcelModel temp, String msg) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue