Преглед на файлове

app用户登录密码超时验证

Wang-Xiao-Ran преди 1 година
родител
ревизия
ae234764be

+ 8 - 0
src/main/java/com/sooka/sponest/mobile/remoteapi/RemoteSystemBaseService.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.mobile.remoteapi;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -13,6 +14,7 @@ import com.sooka.sponest.mobile.base.domain.SysAttendance;
 import com.sooka.sponest.mobile.event.domain.SysUserSystem;
 import com.sooka.sponest.mobile.log.LogFeignCall;
 import com.sooka.sponest.mobile.remoteapi.factory.RemoteSystemBaseServiceFallbackFactory;
+import com.sooka.sponest.mobile.system.login.domain.AppUpPwd;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -250,4 +252,10 @@ public interface RemoteSystemBaseService {
     @PostMapping("/dept/getDeptsByDeptType")
     @LogFeignCall
     AjaxResult getDeptsByDeptType(@RequestBody SysDept sysDept);
+
+    @GetMapping("/user/forceUpdatePwd/{username}")
+    AjaxResult forceUpdatePwd(@PathVariable("username")String username);
+
+    @PutMapping("/user/profile/updateAppPwd")
+    AjaxResult updatPwd(@RequestBody AppUpPwd appUpPwd);
 }

+ 13 - 0
src/main/java/com/sooka/sponest/mobile/remoteapi/factory/RemoteSystemBaseServiceFallbackFactory.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.mobile.remoteapi.factory;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -11,12 +12,14 @@ import com.ruoyi.system.api.model.LoginUser;
 import com.sooka.sponest.mobile.base.domain.SysAttendance;
 import com.sooka.sponest.mobile.event.domain.SysUserSystem;
 import com.sooka.sponest.mobile.remoteapi.RemoteSystemBaseService;
+import com.sooka.sponest.mobile.system.login.domain.AppUpPwd;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -191,6 +194,16 @@ public class RemoteSystemBaseServiceFallbackFactory implements FallbackFactory<R
             public AjaxResult getDeptsByDeptType(SysDept sysDept) {
                 return null;
             }
+
+            @Override
+            public AjaxResult forceUpdatePwd(String username) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult updatPwd(AppUpPwd appUpPwd) {
+                return null;
+            }
         };
     }
 

+ 7 - 0
src/main/java/com/sooka/sponest/mobile/system/login/controller/AppLoginController.java

@@ -1,8 +1,10 @@
 package com.sooka.sponest.mobile.system.login.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.redis.service.RedisService;
 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 io.swagger.annotations.ApiOperation;
@@ -90,4 +92,9 @@ public class AppLoginController {
         return ajaxResult;
     }
 
+    @PostMapping("/updatePwd")
+    public AjaxResult updatePwd(@RequestBody AppUpPwd appUpPwd){
+        return appLoginService.updatePwd(appUpPwd);
+    }
+
 }

+ 1 - 0
src/main/java/com/sooka/sponest/mobile/system/login/domain/AppLoginBO.java

@@ -16,6 +16,7 @@ public class AppLoginBO {
     private String accessToken;
     private Userinfo userinfo;
     private ArrayList deptList;
+    private Boolean updatePwd;
 
     @Getter
     @Setter

+ 10 - 0
src/main/java/com/sooka/sponest/mobile/system/login/domain/AppUpPwd.java

@@ -0,0 +1,10 @@
+package com.sooka.sponest.mobile.system.login.domain;
+
+import lombok.Data;
+
+@Data
+public class AppUpPwd {
+    private String un;
+    private String op;
+    private String np;
+}

+ 4 - 0
src/main/java/com/sooka/sponest/mobile/system/login/service/AppLoginService.java

@@ -1,7 +1,9 @@
 package com.sooka.sponest.mobile.system.login.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 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 javax.servlet.http.HttpServletRequest;
@@ -21,4 +23,6 @@ public interface AppLoginService {
     public AjaxResult selectRoleMenuVisuTreest();
 
     AjaxResult getAppChildrenMenuOrButtonByParentId(SysMenuApp sysMenuApp);
+
+    AjaxResult updatePwd(AppUpPwd appUpPwd);
 }

+ 9 - 2
src/main/java/com/sooka/sponest/mobile/system/login/service/impl/AppLoginServiceImpl.java

@@ -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);
+    }
 }