|
|
|
@ -4,7 +4,6 @@ import au.com.royalpay.payment.manage.appclient.beans.RetailLoginInfo;
|
|
|
|
|
import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
|
|
|
|
|
import au.com.royalpay.payment.manage.appclient.core.RetailAppService;
|
|
|
|
|
import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService;
|
|
|
|
|
import au.com.royalpay.payment.manage.device.core.DeviceManager;
|
|
|
|
|
import au.com.royalpay.payment.manage.merchants.core.ClientManager;
|
|
|
|
|
import au.com.royalpay.payment.manage.signin.beans.LoginInfo;
|
|
|
|
|
import au.com.royalpay.payment.manage.signin.core.SignInStatusManager;
|
|
|
|
@ -62,8 +61,6 @@ public class RetailValidationController implements ApplicationEventPublisherAwar
|
|
|
|
|
private ApplicationEventPublisher publisher;
|
|
|
|
|
@Resource
|
|
|
|
|
private ManageAppService manageAppService;
|
|
|
|
|
@Resource
|
|
|
|
|
private DeviceManager deviceManager;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
|
|
|
|
@ -98,7 +95,6 @@ public class RetailValidationController implements ApplicationEventPublisherAwar
|
|
|
|
|
client = JSON.parseObject(client.toJSONString());
|
|
|
|
|
if (loginInfo.getDevId() != null) {
|
|
|
|
|
deviceSupport.validDeviceWithClient(client, loginInfo.getDevId());
|
|
|
|
|
deviceManager.offlineNotCurrentUserByDevIdAndAccountId(loginInfo.getDevId(),client.getString("account_id"));
|
|
|
|
|
}
|
|
|
|
|
client.put("sign_key", signKey);
|
|
|
|
|
return client;
|
|
|
|
@ -223,10 +219,6 @@ public class RetailValidationController implements ApplicationEventPublisherAwar
|
|
|
|
|
result.put("account",account);
|
|
|
|
|
result.put("status","success");
|
|
|
|
|
result.put("bind_status", true);
|
|
|
|
|
if (params.getString("devId") != null) {
|
|
|
|
|
deviceSupport.validDeviceWithClient(account, params.getString("devId"));
|
|
|
|
|
deviceManager.offlineNotCurrentUserByDevIdAndAccountId(params.getString("devId"),account.getString("account_id"));
|
|
|
|
|
}
|
|
|
|
|
this.publisher.publishEvent(new ClientLoginEvent(this, account.getIntValue("client_id"), account.getString("account_id"), RequestEnvironment.getClientIp(), "MOBILE"));
|
|
|
|
|
}else{
|
|
|
|
|
result.put("status","success");
|
|
|
|
@ -280,10 +272,6 @@ public class RetailValidationController implements ApplicationEventPublisherAwar
|
|
|
|
|
deviceSupport.validDeviceWithClient(account, params.getString("app_openid"));
|
|
|
|
|
return account;
|
|
|
|
|
}
|
|
|
|
|
if (params.getString("devId") != null) {
|
|
|
|
|
deviceSupport.validDeviceWithClient(account, params.getString("devId"));
|
|
|
|
|
deviceManager.offlineNotCurrentUserByDevIdAndAccountId(params.getString("devId"),account.getString("account_id"));
|
|
|
|
|
}
|
|
|
|
|
this.publisher.publishEvent(new ClientLoginEvent(this, account.getJSONObject("account").getIntValue("client_id"), account.getJSONObject("account").getString("account_id"), RequestEnvironment.getClientIp(), "wechat"));
|
|
|
|
|
return account;
|
|
|
|
|
}
|
|
|
|
|