|
@@ -13,6 +13,7 @@ import com.sooka.sponest.mobile.remoteapi.RemoteSystemBaseService;
|
|
|
import com.sooka.sponest.mobile.remoteapi.domain.LoginBody;
|
|
|
import com.sooka.sponest.mobile.system.login.domain.AppLoginBO;
|
|
|
import com.sooka.sponest.mobile.system.login.domain.AppLoginVO;
|
|
|
+import com.sooka.sponest.mobile.system.login.domain.AppUpPwd;
|
|
|
import com.sooka.sponest.mobile.system.login.domain.SysMenuApp;
|
|
|
import com.sooka.sponest.mobile.system.login.service.AppLoginService;
|
|
|
import org.slf4j.Logger;
|
|
@@ -58,6 +59,8 @@ public class AppLoginServiceImpl implements AppLoginService {
|
|
|
if(StringUtils.isNotEmpty(appLoginVO.getDeviceid())){
|
|
|
remoteSystemBaseService.updateUserJg(appLoginVO.getUsername(),appLoginVO.getDeviceid());
|
|
|
}
|
|
|
+ //
|
|
|
+ Boolean flag = Boolean.parseBoolean(remoteSystemBaseService.forceUpdatePwd(appLoginVO.getUsername()).get("data").toString());
|
|
|
LoginBody loginBody = new LoginBody();
|
|
|
loginBody.setUsername(appLoginVO.getUsername());
|
|
|
loginBody.setPassword(appLoginVO.getPassword());
|
|
@@ -69,6 +72,7 @@ public class AppLoginServiceImpl implements AppLoginService {
|
|
|
AppLoginBO bo = JSON.parseObject(json, AppLoginBO.class);
|
|
|
ArrayList deptList = (ArrayList)((LinkedHashMap) remoteSystemBaseService.deptselector(bo.getUserinfo().getUsername()).get("data")).get("depts");
|
|
|
bo.setDeptList(deptList);
|
|
|
+ bo.setUpdatePwd(flag);
|
|
|
return AjaxResult.success(bo);
|
|
|
}else{
|
|
|
return AjaxResult.error(map.getCode(),map.getMsg());
|
|
@@ -77,8 +81,6 @@ public class AppLoginServiceImpl implements AppLoginService {
|
|
|
log.error(e.getMessage());
|
|
|
return AjaxResult.error(R.FAIL,"登录失败");
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -114,4 +116,9 @@ public class AppLoginServiceImpl implements AppLoginService {
|
|
|
public AjaxResult getAppChildrenMenuOrButtonByParentId(SysMenuApp sysMenuApp) {
|
|
|
return remoteSystemBaseService.getAppChildrenMenuOrButtonByParentId(sysMenuApp.getParentId(),sysMenuApp.getMenuType());
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public AjaxResult updatePwd(AppUpPwd appUpPwd){
|
|
|
+ return remoteSystemBaseService.updatPwd(appUpPwd);
|
|
|
+ }
|
|
|
}
|