campsite bug 修复

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -16,6 +16,7 @@ import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.EmojiFilter;
 import com.github.wxiaoqi.security.common.util.EntityUtils;
+import com.github.wxiaoqi.security.common.util.IpUtil;
 import com.github.wxiaoqi.security.common.util.VerificationUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
@@ -33,7 +34,12 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -305,9 +311,12 @@ public class AppPermissionService {
                 data.put("userId", userid);
                 data.put("imUserId", userVo.getImUserid());
                 //更新登录时间 和 ip
-                AppUserLogin userLoign= new AppUserLogin();
-                EntityUtils.setCreateInfo(userLoign);
-                appUserLoginBiz.updateLoginInfo(userid,userLoign.getCrtHost());
+//                AppUserLogin userLoign= new AppUserLogin();
+//                EntityUtils.setCreateInfo(userLoign);
+                ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+                HttpServletRequest request = requestAttributes.getRequest();
+                String clientIp = IpUtil.getClientIp(request);
+                appUserLoginBiz.updateLoginInfo(userid,clientIp);
             }
 
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/SysRegionBiz.java

@@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;