czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

银盛大改，增加D1通道

Browse Source
This commit is contained in:
liuyingfang
2023-06-21 09:34:28 +08:00
parent 0f6cc8d945
commit 7eaf21c7e8
18 changed files with 354 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/LoginController.java
View File

@@ -103,20 +103,20 @@ public class LoginController {
userInfo.setLoginName(username);
userInfo = uiService.getOne(new QueryWrapper<>(userInfo));
String ipAddr = IpUtils.getIpAddr(request);
DescribeIpv4LocationResponse clientLocation = ipLocationService.getLocation(ipAddr);
String location = clientLocation.getCountry()
+ "," + clientLocation.getProvince()
+ "," + clientLocation.getCity()
+ "," + clientLocation.getCounty();
// String ipAddr = IpUtils.getIpAddr(request);
// DescribeIpv4LocationResponse clientLocation = ipLocationService.getLocation(ipAddr);
// String location = clientLocation.getCountry()
// + "," + clientLocation.getProvince()
// + "," + clientLocation.getCity()
// + "," + clientLocation.getCounty();
if (userInfo == null) {
wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, false);
//wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, false);
result.put("message", "用户名或者密码错误");
return result;
}
if (!userInfo.getPassword().equals(MD5.create().digestHex(password, StandardCharsets.UTF_8))) {
wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, false);
//wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, false);
result.put("message", "用户名或者密码错误");
return result;
}
@@ -126,7 +126,7 @@ public class LoginController {
result.put("token", JwtUtils.getToken(userInfo));
result.put("userId", userInfo.getId());
wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, true);
//wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, true);
return result;
}

3
pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java
View File

@@ -462,11 +462,12 @@ public class MerchantStoreController extends BaseNoModelController {
}
Map<String, Object> result = new HashMap<>(2);
Integer channel =0;
try {
JSONObject params = new JSONObject();
params.put("userId", ua.getUserId() + "");
//ysAuditServiceV2.merchantAudit(ua.getUserId() + "", false);
ysAuditServiceV3.merchantAuditV3(String.valueOf(ua.getUserId()), false); // userAppService.merchantAudit(params, "4");
ysAuditServiceV3.merchantAuditV3(String.valueOf(ua.getUserId()), false,channel); // userAppService.merchantAudit(params, "4");
result.put("code", "1");
result.put("msg", "发起进件成功, 稍后查看进件状态");
return result;