自动登出功能实现

src/main/java/a8k/app/config/WebConfig.java

@@ -0,0 +1,20 @@
+package a8k.app.config;
+
+import a8k.app.interceptor.RefreshAccessInterceptor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    private final RefreshAccessInterceptor refreshInterceptor;
+
+    public WebConfig(RefreshAccessInterceptor refreshInterceptor) {
+        this.refreshInterceptor = refreshInterceptor;
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(refreshInterceptor).addPathPatterns("/api/**");
+    }
+}

src/main/java/a8k/app/controler/api/v1/app/setting/DeviceSettingControler.java

@@ -1,5 +1,6 @@
 package a8k.app.controler.api.v1.app.setting;
 
+import a8k.app.service.data.AppUserMgrService;
 import a8k.app.type.exception.AppException;
 import a8k.app.type.ui.ApiRet;
 import a8k.app.dao.type.db.DeviceSetting;

src/main/java/a8k/app/interceptor/RefreshAccessInterceptor.java

@@ -0,0 +1,27 @@
+package a8k.app.interceptor;
+
+import a8k.app.service.data.AppUserMgrService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+/**
+ * Interceptor that refreshes the last-access timestamp on each HTTP request.
+ */
+@Component
+public class RefreshAccessInterceptor implements HandlerInterceptor {
+
+    private final AppUserMgrService userMgr;
+
+    public RefreshAccessInterceptor(AppUserMgrService userMgr) {
+        this.userMgr = userMgr;
+    }
+
+    @Override
+    public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, @NotNull Object handler) {
+        userMgr.recordAccess();
+        return true;
+    }
+}

src/main/java/a8k/app/service/data/AppUserMgrService.java

@@ -1,30 +1,70 @@
 package a8k.app.service.data;
 
 import a8k.app.dao.AppUsrDao;
+import a8k.app.dao.DeviceSettingDao;
 import a8k.app.dao.type.db.AppUser;
+import a8k.app.dao.type.db.DeviceSetting;
 import a8k.app.hardware.type.A8kEcode;
 import a8k.app.type.exception.AppException;
+import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.List;
 
 
 @Component
+@EnableScheduling //Enable scheduled tasks
 public class AppUserMgrService {
     static Logger logger = org.slf4j.LoggerFactory.getLogger(AppUserMgrService.class);
 
+    /**
+     * current user
+     */
     @Resource
     AppUsrDao appUsrDao;
+    @Resource
+    DeviceSettingDao deviceSettingDao;
 
     AppUser loginUsr = null;
 
+    /**
+     * timestamp of last access
+     */
+    private volatile Instant lastAccess;
+
+    /**
+     * auto logout time out duration
+     */
+    private volatile Duration autoLogoutTimeout;
+
+    /**
+     * flag to enable auto logout
+     */
+    private volatile boolean autoLogout;
 
     // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
     // EXT FUNC
     // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+    /**
+     * load timeout and switch
+     */
+    @PostConstruct
+    public void init() {
+        DeviceSetting deviceSetting = deviceSettingDao.get();
+        int minutes = deviceSetting.getAutoLogoutTimeout();
+        this.autoLogoutTimeout = Duration.ofMinutes(minutes);
+        boolean autoLogout = deviceSetting.getAutoLogout();
+        this.autoLogout = autoLogout;
+        logger.debug("initialized autoLogout={}, timeout={} minutes", autoLogout, minutes);
+    }
+
 
     public AppUser login(int id, String password) throws AppException {
         var usr = appUsrDao.getUsrById(id);
@@ -45,6 +85,26 @@ public class AppUserMgrService {
     }
 
 
+    /**
+     * refresh lastAccess on each intercepted request
+     */
+    public synchronized void recordAccess() {
+        if (loginUsr != null) {
+            this.lastAccess = Instant.now();
+        }
+    }
+
+    public synchronized void updateAutoLogout(boolean autoLogout) {
+        this.autoLogout = autoLogout;
+        logger.debug("updated cache autoLogout:{}", autoLogout);
+    }
+
+    public synchronized void updateAutoLogoutTimeout(int autoLogoutTimeout) {
+        this.autoLogoutTimeout = Duration.ofMinutes(autoLogoutTimeout);
+        logger.debug("updated cache autoLogoutTimeout {} minutes", autoLogoutTimeout);
+    }
+
+
     synchronized public AppUser getLoginUsr() {
         return (loginUsr);
     }
@@ -76,13 +136,13 @@ public class AppUserMgrService {
         return usr;
     }
 
-	public AppUser modifyUsrPwd(Integer id, String oldpasswd,String password) throws AppException {
+    public AppUser modifyUsrPwd(Integer id, String oldpasswd, String password) throws AppException {
         var user = appUsrDao.getUsrById(id);
         if (user == null) {
             throw new AppException(A8kEcode.USR_NOT_EXIT);
         }
 
-		if(!user.password.equals(oldpasswd)){
+        if (!user.password.equals(oldpasswd)) {
             throw new AppException(A8kEcode.USR_OLD_PASSWORD_ERROR);
         }
 
@@ -119,5 +179,15 @@ public class AppUserMgrService {
 
     }
 
+    @Scheduled(fixedDelay = 60_000)
+    public void autoLogoutTask() {
+        if (!autoLogout || loginUsr == null) {
+            return;
+        }
+        if (Duration.between(lastAccess, Instant.now()).compareTo(autoLogoutTimeout) >= 0) {
+            logger.info("auto logout user {} after {} minutes inactivity", loginUsr.account, autoLogoutTimeout.toMinutes());
+            unlogin();
+        }
+    }
 
 }

src/main/java/a8k/app/service/setting/AppSettingsMgrService.java

@@ -1,5 +1,6 @@
 package a8k.app.service.setting;
 
+import a8k.app.service.data.AppUserMgrService;
 import a8k.app.type.exception.AppException;
 import a8k.app.dao.DeviceSettingDao;
 import a8k.app.dao.LISSettingDao;
@@ -16,6 +17,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class AppSettingsMgrService {
 	Logger logger = org.slf4j.LoggerFactory.getLogger(AppSettingsMgrService.class);
+	@Resource
+	AppUserMgrService appUserMgrService;
 
 	@Resource
 	DeviceSettingDao deviceSettingDao;
@@ -61,12 +64,14 @@ public class AppSettingsMgrService {
 		DeviceSetting setting = deviceSettingDao.get();
 		setting.autoLogoutTimeout = val;
 		deviceSettingDao.update(setting);
+		appUserMgrService.updateAutoLogoutTimeout(val);
 	}
 
 	public void setAutoLogout(Boolean val) {
 		DeviceSetting setting = deviceSettingDao.get();
 		setting.autoLogout = val;
 		deviceSettingDao.update(setting);
+		appUserMgrService.updateAutoLogout(val);
 	}