From 8ba9295eef9d53f633aeb83e7cf5234da7713ac0 Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期二, 28 二月 2023 08:55:28 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0
---
src/main/java/com/whyc/task/AccountLockStrategyTask.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/task/AccountLockStrategyTask.java b/src/main/java/com/whyc/task/AccountLockStrategyTask.java
index 24b3f6a..968b2ac 100644
--- a/src/main/java/com/whyc/task/AccountLockStrategyTask.java
+++ b/src/main/java/com/whyc/task/AccountLockStrategyTask.java
@@ -1,10 +1,12 @@
package com.whyc.task;
+import com.github.pagehelper.PageInfo;
import com.whyc.pojo.PageParam;
import com.whyc.service.PageParamService;
import com.whyc.service.UserService;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -21,6 +23,7 @@
@Component
public class AccountLockStrategyTask extends TimerTask {
+ @Autowired
private ServletContext servletContext;
@Resource
@@ -35,14 +38,14 @@
userService.updateExpiredAccount();
//鏌ヨ璐﹀彿瑙ｉ攣绛栫暐
- PageParam accountUnLock = (PageParam) ((List)pageParamService.findByCategoryId(9).getData()).get(1);
+ PageParam accountUnLock = (PageParam) ((PageInfo)pageParamService.findByCategoryId(9).getData()).getList().get(1);
if(accountUnLock.getStatus()==2){ //鑷姩瑙ｉ攣绛栫暐
//鏌ヨ璐﹀彿閿佸畾鏃堕棿,瓒呰繃20鍒嗛挓瑙ｉ攣
userService.unLock();
}
//鐧诲綍澶辫触鏃堕棿瓒呰繃24灏忔椂璁板綍,鍐呭瓨涓璦pplication绉婚櫎
- servletContext = ActionUtil.getApplication();
+ //servletContext = ActionUtil.getApplication();
Enumeration<String> attributeNames = servletContext.getAttributeNames();
//24灏忔椂鍓嶇殑鏃堕棿鎴�
long oneDayBefore = System.currentTimeMillis()-24*60*60*1000;
--
Gitblit v1.9.1