From 4c6dcf757cc7962a8dbaefd83588cc576ee44594 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 七月 2025 11:29:40 +0800
Subject: [PATCH] 迁移redis服务
---
se-system/src/main/java/com/terra/system/service/all/SysService.java | 1
se-system/src/main/java/com/terra/system/service/sys/ReportService.java | 4
se-system/src/main/java/com/terra/system/service/sys/DepService.java | 4
se-common/src/main/java/com/terra/common/interceptor/CrosFilter.java | 2
se-common/src/main/java/com/terra/common/entity/lf/TokenPo.java | 48 ++++++++
se-system/src/main/java/com/terra/system/service/sys/BlacklistService.java | 4
se-common/src/main/java/com/terra/common/aspect/LogAspect.java | 10
se-system/pom.xml | 6 -
se-system/src/main/java/com/terra/system/service/all/ScheduleService.java | 2
se-common/src/main/java/com/terra/common/service/TokenHelper.java | 78 +++++++++++++
se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java | 3
se-system/src/main/java/com/terra/system/service/data/DirService.java | 4
se-common/src/main/java/com/terra/common/interceptor/AuthInterceptor.java | 38 +++---
se-common/src/main/java/com/terra/common/entity/all/RedisCacheKey.java | 2
se-common/src/main/java/com/terra/common/entity/lf/UserPo.java | 62 ++++++++++
se-common/src/main/java/com/terra/common/mapper/OperatePoMapper.java | 25 ++++
se-common/src/main/java/com/terra/common/service/RedisService.java | 16 +-
/dev/null | 16 --
se-system/src/main/java/com/terra/system/service/all/PermsService.java | 2
se-common/src/main/java/com/terra/common/config/RedisConfig.java | 2
se-common/pom.xml | 12 ++
se-system/src/main/java/com/terra/system/service/sys/TokenService.java | 4
se-system/src/main/java/com/terra/system/service/sys/UserService.java | 1
se-system/src/main/java/com/terra/system/service/sys/LayerService.java | 4
24 files changed, 275 insertions(+), 75 deletions(-)
diff --git a/se-common/pom.xml b/se-common/pom.xml
index 6f3eb91..68f6064 100644
--- a/se-common/pom.xml
+++ b/se-common/pom.xml
@@ -57,6 +57,18 @@
<artifactId>lombok</artifactId>
</dependency>
+ <!--redis-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-redis</artifactId>
+ </dependency>
+
+ <!--SpringBoot鐑儴缃�-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/se-common/src/main/java/com/terra/common/aspect/LogAspect.java b/se-common/src/main/java/com/terra/common/aspect/LogAspect.java
index 831dae2..7a60693 100644
--- a/se-common/src/main/java/com/terra/common/aspect/LogAspect.java
+++ b/se-common/src/main/java/com/terra/common/aspect/LogAspect.java
@@ -2,9 +2,9 @@
import com.terra.common.annotation.SysLog;
import com.terra.common.entity.lf.OperatePo;
-import com.terra.common.helper.TokenHelper;
+import com.terra.common.service.TokenHelper;
import com.terra.common.helper.WebHelper;
-import com.terra.common.mapper.CommonMapper;
+import com.terra.common.mapper.OperatePoMapper;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -27,7 +27,7 @@
@Component
public class LogAspect {
@Resource
- CommonMapper commonMapper;
+ OperatePoMapper operatePoMapper;
private final static String SELECT = "select";
@@ -85,7 +85,7 @@
po.setUrl(req.getServletPath());
po.setIp(WebHelper.getIpAddress(req));
po.setExec(time);
- po.setUserid(TokenHelper.getCurrentUserId());
+ po.setUserid(TokenHelper.getCurrentUserId(req));
// 璁剧疆妯″潡
Tag tag = clazz.getAnnotation(Tag.class);
@@ -105,7 +105,7 @@
po.setBak(sysLog.value());
}
- commonMapper.insert(po);
+ operatePoMapper.insert(po);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
diff --git a/se-system/src/main/java/com/terra/system/config/RedisConfig.java b/se-common/src/main/java/com/terra/common/config/RedisConfig.java
similarity index 98%
rename from se-system/src/main/java/com/terra/system/config/RedisConfig.java
rename to se-common/src/main/java/com/terra/common/config/RedisConfig.java
index 1d83ca9..b913026 100644
--- a/se-system/src/main/java/com/terra/system/config/RedisConfig.java
+++ b/se-common/src/main/java/com/terra/common/config/RedisConfig.java
@@ -1,4 +1,4 @@
-package com.terra.system.config;
+package com.terra.common.config;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
diff --git a/se-system/src/main/java/com/terra/system/entity/all/RedisCacheKey.java b/se-common/src/main/java/com/terra/common/entity/all/RedisCacheKey.java
similarity index 97%
rename from se-system/src/main/java/com/terra/system/entity/all/RedisCacheKey.java
rename to se-common/src/main/java/com/terra/common/entity/all/RedisCacheKey.java
index 4b0d3fd..9756e62 100644
--- a/se-system/src/main/java/com/terra/system/entity/all/RedisCacheKey.java
+++ b/se-common/src/main/java/com/terra/common/entity/all/RedisCacheKey.java
@@ -1,4 +1,4 @@
-package com.terra.system.entity.all;
+package com.terra.common.entity.all;
/**
* Redis缂撳瓨閿�
diff --git a/se-common/src/main/java/com/terra/common/entity/lf/TokenPo.java b/se-common/src/main/java/com/terra/common/entity/lf/TokenPo.java
new file mode 100644
index 0000000..ba46536
--- /dev/null
+++ b/se-common/src/main/java/com/terra/common/entity/lf/TokenPo.java
@@ -0,0 +1,48 @@
+package com.terra.common.entity.lf;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.sql.Timestamp;
+
+/**
+ * 浠ょ墝
+ * @author WWW
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("lf.sys_token")
+@EqualsAndHashCode(callSuper = false)
+public class TokenPo {
+ private Integer id;
+
+ private String uname;
+
+ private String token;
+
+ private Integer duration;
+
+ private Timestamp expire;
+
+ private Integer type;
+
+ private String ip;
+
+ private Integer createUser;
+
+ private Timestamp createTime;
+
+ private Integer updateUser;
+
+ private Timestamp updateTime;
+
+ private String createName;
+
+ private String updateName;
+
+ private Integer autoLogOut;
+}
diff --git a/se-common/src/main/java/com/terra/common/entity/lf/UserPo.java b/se-common/src/main/java/com/terra/common/entity/lf/UserPo.java
new file mode 100644
index 0000000..b202963
--- /dev/null
+++ b/se-common/src/main/java/com/terra/common/entity/lf/UserPo.java
@@ -0,0 +1,62 @@
+package com.terra.common.entity.lf;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.sql.Timestamp;
+
+/**
+ * 鐢ㄦ埛
+ * @author WWW
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("lf.sys_user")
+@EqualsAndHashCode(callSuper = false)
+public class UserPo {
+ private Integer id;
+
+ private Integer depid;
+
+ private String uid;
+
+ private String uname;
+
+ private String pwd;
+
+ private String salt;
+
+ private Integer sex;
+
+ private String natives;
+
+ private String contact;
+
+ private String job;
+
+ private String email;
+
+ private String addr;
+
+ private String edu;
+
+ private String idcard;
+
+ private Integer status;
+
+ private Integer createUser;
+
+ private Timestamp createTime;
+
+ private Integer updateUser;
+
+ private Timestamp updateTime;
+
+ private String bak;
+
+ private String depcode;
+}
diff --git a/se-common/src/main/java/com/terra/common/helper/TokenHelper.java b/se-common/src/main/java/com/terra/common/helper/TokenHelper.java
deleted file mode 100644
index 8efe7ee..0000000
--- a/se-common/src/main/java/com/terra/common/helper/TokenHelper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.terra.common.helper;
-
-/**
- * 浠ょ墝甯姪绫�
- * @author WWW
- */
-public class TokenHelper {
- public static Integer getCurrentUserId() {
- return null;
- }
-
- public static String getCurrentUserName() {
- return null;
- }
-}
diff --git a/se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java b/se-common/src/main/java/com/terra/common/interceptor/AuthInterceptor.java
similarity index 83%
rename from se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java
rename to se-common/src/main/java/com/terra/common/interceptor/AuthInterceptor.java
index 49d2e73..fd6b66d 100644
--- a/se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java
+++ b/se-common/src/main/java/com/terra/common/interceptor/AuthInterceptor.java
@@ -1,14 +1,12 @@
-package com.terra.system.interceptor;
+package com.terra.common.interceptor;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.common.entity.all.StaticData;
-import com.terra.system.entity.sys.TokenEntity;
-import com.terra.system.entity.sys.UserEntity;
+import com.terra.common.entity.lf.UserPo;
import com.terra.common.helper.StringHelper;
import com.terra.common.helper.WebHelper;
-import com.terra.system.service.all.SysService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.annotation.Configuration;
@@ -25,8 +23,6 @@
*/
@Configuration
public class AuthInterceptor implements HandlerInterceptor {
- private final SysService sysService;
-
private static final Log log = LogFactory.getLog(AuthInterceptor.class);
private static final String NO_TOKEN = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.TOKEN_ERROR, "鎵句笉鍒颁护鐗�"));
@@ -43,9 +39,9 @@
private static final String ILLEGAL_TOKEN = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.UNAUTHORIZED, "浠ょ墝鏉ユ簮闈炴硶"));
- public AuthInterceptor(SysService sysService) {
- this.sysService = sysService;
- }
+ //public AuthInterceptor(SysService sysService) {
+ // this.sysService = sysService;
+ //}
/**
* Controller鎵ц涔嬪墠鎵ц锛屽鏋滆繑鍥炲�兼槸true鍒欎唬琛ㄦ斁琛岋紝杩斿洖false鍒欐嫤鎴�
@@ -66,7 +62,7 @@
}
// 3.鑾峰彇鐢ㄦ埛浠ょ墝
- UserEntity ue = sysService.tokenService.getUserByToken(token);
+ UserPo ue = new UserPo(); //sysService.tokenService.getUserByToken(token);
if (ue == null) {
return WebHelper.writeStr2Page(response, NO_LOGIN);
}
@@ -95,9 +91,9 @@
}
// 8.妫�鏌ョ敤鎴稩D鏄惁绂佺敤
- if (sysService.tokenService.isUidDisable(ue)) {
- return WebHelper.writeStr2Page(response, USER_LOCK);
- }
+ //if (sysService.tokenService.isUidDisable(ue)) {
+ // return WebHelper.writeStr2Page(response, USER_LOCK);
+ //}
// 9.鏉冮檺鏍￠獙
if (!checkPerms(ue, request)) {
@@ -129,8 +125,8 @@
/**
* 妫�鏌ユ潈闄�
*/
- private boolean checkPerms(UserEntity ue, HttpServletRequest request) {
- List<String> list = sysService.permsService.selectPerms(ue.getUid());
+ private boolean checkPerms(UserPo ue, HttpServletRequest request) {
+ List<String> list = null; //sysService.permsService.selectPerms(ue.getUid());
if (list == null || list.size() == 0) {
return false;
}
@@ -149,7 +145,7 @@
* 妫�鏌ラ粦鍚嶅崟
*/
private boolean checkBlackList(String ip, HttpServletRequest request) {
- List<String> blackList = sysService.blacklistService.selectIpList(1);
+ List<String> blackList = null; // sysService.blacklistService.selectIpList(1);
if (blackList == null || blackList.isEmpty()) {
return true;
}
@@ -164,7 +160,7 @@
* 妫�鏌ョ櫧鍚嶅崟
*/
private boolean checkWhiteList(String ip, HttpServletRequest request) {
- List<String> whiteList = sysService.blacklistService.selectIpList(2);
+ List<String> whiteList = null; // sysService.blacklistService.selectIpList(2);
if (whiteList == null || whiteList.isEmpty()) {
return false;
}
@@ -176,8 +172,10 @@
* 妫�鏌P涓�鑷存�э細鍥哄畾浠ょ墝涓嶆鏌�
*/
private boolean checkIpSource(String ip, String token) {
- TokenEntity te = sysService.tokenService.getEntityByToken(token);
+ //TokenEntity te = sysService.tokenService.getEntityByToken(token);
- return StaticData.I1 == te.getType() || te.getIp().equals(ip);
+ //return StaticData.I1 == te.getType() || te.getIp().equals(ip);
+
+ return true;
}
}
diff --git a/se-system/src/main/java/com/terra/system/interceptor/CrosFilter.java b/se-common/src/main/java/com/terra/common/interceptor/CrosFilter.java
similarity index 96%
rename from se-system/src/main/java/com/terra/system/interceptor/CrosFilter.java
rename to se-common/src/main/java/com/terra/common/interceptor/CrosFilter.java
index 47004a0..9fb72e1 100644
--- a/se-system/src/main/java/com/terra/system/interceptor/CrosFilter.java
+++ b/se-common/src/main/java/com/terra/common/interceptor/CrosFilter.java
@@ -1,4 +1,4 @@
-package com.terra.system.interceptor;
+package com.terra.common.interceptor;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
diff --git a/se-common/src/main/java/com/terra/common/mapper/CommonMapper.java b/se-common/src/main/java/com/terra/common/mapper/CommonMapper.java
deleted file mode 100644
index c74f2cd..0000000
--- a/se-common/src/main/java/com/terra/common/mapper/CommonMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.terra.common.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.terra.common.entity.lf.OperatePo;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.Map;
-
-@Mapper
-@Repository
-public interface CommonMapper extends BaseMapper<OperatePo> {
- @Insert("INSERT INTO lf.sys_operate(url, ip, exec, clazz, type, userid, bak, modular1, modular2) VALUES (#{url}, #{ip}, #{exec}, #{clazz}, #{type}, #{userid}, #{bak}, #{modular1}, #{modular2})")
- int insertOperate(Map<String, Object> map);
-}
diff --git a/se-common/src/main/java/com/terra/common/mapper/OperatePoMapper.java b/se-common/src/main/java/com/terra/common/mapper/OperatePoMapper.java
new file mode 100644
index 0000000..f3c1b6c
--- /dev/null
+++ b/se-common/src/main/java/com/terra/common/mapper/OperatePoMapper.java
@@ -0,0 +1,25 @@
+package com.terra.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.terra.common.entity.lf.OperatePo;
+import com.terra.common.entity.lf.TokenPo;
+import com.terra.common.entity.lf.UserPo;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface OperatePoMapper extends BaseMapper<OperatePo> {
+ @Insert("INSERT INTO lf.sys_operate(url, ip, exec, clazz, type, userid, bak, modular1, modular2) VALUES (#{url}, #{ip}, #{exec}, #{clazz}, #{type}, #{userid}, #{bak}, #{modular1}, #{modular2})")
+ int insertOperate(Map<String, Object> map);
+
+ @Select("select * from lf.sys_user where id = (select create_user from lf.sys_token where token=#{token} and expire > now() limit 1)")
+ public UserPo selectByToken(String token);
+
+ @Select("select a.* from lf.sys_token a where token = #{token} and expire > now() limit 1")
+ public TokenPo selectOneByToken(String token);
+}
diff --git a/se-system/src/main/java/com/terra/system/service/all/RedisService.java b/se-common/src/main/java/com/terra/common/service/RedisService.java
similarity index 89%
rename from se-system/src/main/java/com/terra/system/service/all/RedisService.java
rename to se-common/src/main/java/com/terra/common/service/RedisService.java
index 5f0fd82..e0f288c 100644
--- a/se-system/src/main/java/com/terra/system/service/all/RedisService.java
+++ b/se-common/src/main/java/com/terra/common/service/RedisService.java
@@ -1,4 +1,4 @@
-package com.terra.system.service.all;
+package com.terra.common.service;
import com.terra.common.entity.all.SettingData;
import org.springframework.data.redis.core.RedisTemplate;
@@ -13,15 +13,13 @@
* Redis鏈嶅姟绫�
* @author WWW
*/
-@Service("redisService")
+@Service
public class RedisService {
@Resource
private RedisTemplate<String, Object> redisTemplate;
/**
* 鑾峰彇Redis妯℃澘
- *
- * @return
*/
public RedisTemplate<String, Object> getRedisTemplate() {
return redisTemplate;
@@ -53,7 +51,6 @@
* 鏍规嵁key鑾峰彇value
*
* @param key 閿�
- * @return
*/
public Object get(String key) {
return redisTemplate.opsForValue().get(key);
@@ -63,7 +60,6 @@
* 鏄惁瀛樺湪key
*
* @param key 閿�
- * @return
*/
public boolean hasKey(String key) {
return redisTemplate.hasKey(key);
@@ -87,7 +83,7 @@
*/
public void clearKeys(String subKeyString) {
Set<String> keys = redisTemplate.keys(subKeyString + "*");
- if (null != keys && keys.size() > 0) {
+ if (!keys.isEmpty()) {
redisTemplate.delete(keys);
}
}
@@ -97,7 +93,7 @@
*/
public void clearAll() {
Set<String> keys = redisTemplate.keys("*");
- if (null != keys && keys.size() > 0) {
+ if (!keys.isEmpty()) {
redisTemplate.delete(keys);
}
}
@@ -118,7 +114,7 @@
* 鏍规嵁Key淇濆瓨鏁版嵁
*/
public <T> void saveListByKey(String key, List<T> list) {
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
put(key, list, SettingData.CACHE_EXPIRE, TimeUnit.MINUTES);
}
}
@@ -127,7 +123,7 @@
* 鏍规嵁Key淇濆瓨鏁版嵁
*/
public <T> void saveListByKey(String key, List<T> list, Integer minutes) {
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
put(key, list, minutes, TimeUnit.MINUTES);
}
}
diff --git a/se-common/src/main/java/com/terra/common/service/TokenHelper.java b/se-common/src/main/java/com/terra/common/service/TokenHelper.java
new file mode 100644
index 0000000..24aa174
--- /dev/null
+++ b/se-common/src/main/java/com/terra/common/service/TokenHelper.java
@@ -0,0 +1,78 @@
+package com.terra.common.service;
+
+import com.terra.common.entity.all.RedisCacheKey;
+import com.terra.common.entity.lf.TokenPo;
+import com.terra.common.entity.lf.UserPo;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
+import com.terra.common.mapper.OperatePoMapper;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 浠ょ墝甯姪绫�
+ * @author WWW
+ */
+@Component
+public class TokenHelper {
+ @Resource
+ RedisService redisService;
+
+ @Resource
+ OperatePoMapper mapper;
+
+ public static Integer getCurrentUserId(HttpServletRequest req) {
+ String token = WebHelper.getToken(req);
+
+ return null;
+ }
+
+ public UserPo getUserByToken(String token) {
+ if (StringHelper.isNull(token)) {
+ return null;
+ }
+
+ // redis
+ String userKey = RedisCacheKey.signUserKey(token);
+ Object obj = redisService.get(userKey);
+ if (obj instanceof UserPo) {
+ return (UserPo) obj;
+ }
+
+ // db
+ UserPo po = mapper.selectByToken(token);
+ if (null != po) {
+ getEntityByToken(token);
+ }
+
+ return po;
+ }
+
+ public TokenPo getEntityByToken(String token) {
+ String tokenKey = RedisCacheKey.signTokenKey(token);
+
+ // redis
+ Object obj = redisService.get(tokenKey);
+ if (obj instanceof TokenPo) {
+ return (TokenPo) obj;
+ }
+
+ // db
+ TokenPo te = mapper.selectOneByToken(token);
+ if (null != te) {
+ long min = StringHelper.getMinuteDifference(te.getExpire());
+ if (min > 0) {
+ redisService.put(tokenKey, te, min, TimeUnit.MINUTES);
+ }
+ }
+
+ return te;
+ }
+
+ public static String getCurrentUserName() {
+ return null;
+ }
+}
diff --git a/se-system/pom.xml b/se-system/pom.xml
index 3ef1c3d..4ab0a7a 100644
--- a/se-system/pom.xml
+++ b/se-system/pom.xml
@@ -50,12 +50,6 @@
<!--<version>2.2.2.RELEASE</version>-->
</dependency>
- <!--redis-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
- </dependency>
-
<!--postgresql-->
<dependency>
<groupId>org.postgresql</groupId>
diff --git a/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java b/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java
index 34ad010..ff046ac 100644
--- a/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java
@@ -2,8 +2,9 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.terra.system.entity.all.RedisCacheKey;
+import com.terra.common.entity.all.RedisCacheKey;
import com.terra.common.entity.all.StaticData;
+import com.terra.common.service.RedisService;
import com.terra.system.entity.ctrl.IdNameEntity;
import com.terra.system.entity.ctrl.KeyValueEntity;
import com.terra.system.entity.ctrl.TabEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/all/PermsService.java b/se-system/src/main/java/com/terra/system/service/all/PermsService.java
index c36870d..94b700b 100644
--- a/se-system/src/main/java/com/terra/system/service/all/PermsService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/PermsService.java
@@ -1,7 +1,9 @@
package com.terra.system.service.all;
+import com.terra.common.entity.all.RedisCacheKey;
import com.terra.common.entity.all.SettingData;
import com.terra.common.entity.all.StaticData;
+import com.terra.common.service.RedisService;
import com.terra.system.entity.all.*;
import com.terra.system.entity.sys.MenuEntity;
import com.terra.system.entity.sys.ResEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/all/ScheduleService.java b/se-system/src/main/java/com/terra/system/service/all/ScheduleService.java
index 5ad53f1..96604a1 100644
--- a/se-system/src/main/java/com/terra/system/service/all/ScheduleService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/ScheduleService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.all;
import com.alibaba.fastjson.JSONObject;
-import com.terra.system.entity.all.RedisCacheKey;
+import com.terra.common.entity.all.RedisCacheKey;
import com.terra.system.entity.sys.LoginEntity;
import com.terra.system.entity.sys.OperateEntity;
import com.terra.system.entity.sys.ResEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/all/SysService.java b/se-system/src/main/java/com/terra/system/service/all/SysService.java
index 0b0ab87..838d032 100644
--- a/se-system/src/main/java/com/terra/system/service/all/SysService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/SysService.java
@@ -1,5 +1,6 @@
package com.terra.system.service.all;
+import com.terra.common.service.RedisService;
import com.terra.system.service.sys.BlacklistService;
import com.terra.system.service.sys.TokenService;
import javax.annotation.Resource;
diff --git a/se-system/src/main/java/com/terra/system/service/data/DirService.java b/se-system/src/main/java/com/terra/system/service/data/DirService.java
index cbc4685..4f7f3d7 100644
--- a/se-system/src/main/java/com/terra/system/service/data/DirService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/DirService.java
@@ -1,12 +1,12 @@
package com.terra.system.service.data;
-import com.terra.system.entity.all.RedisCacheKey;
+import com.terra.common.entity.all.RedisCacheKey;
import com.terra.system.entity.data.DirEntity;
import com.terra.system.helper.PathHelper;
import com.terra.common.helper.StringHelper;
import com.terra.system.helper.Zip4jHelper;
import com.terra.system.mapper.data.DirMapper;
-import com.terra.system.service.all.RedisService;
+import com.terra.common.service.RedisService;
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.model.ZipParameters;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/BlacklistService.java b/se-system/src/main/java/com/terra/system/service/sys/BlacklistService.java
index 7577b40..ac9bea8 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/BlacklistService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/BlacklistService.java
@@ -1,11 +1,11 @@
package com.terra.system.service.sys;
-import com.terra.system.entity.all.RedisCacheKey;
+import com.terra.common.entity.all.RedisCacheKey;
import com.terra.common.entity.all.SettingData;
import com.terra.system.entity.sys.BlacklistEntity;
import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.BlacklistMapper;
-import com.terra.system.service.all.RedisService;
+import com.terra.common.service.RedisService;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/DepService.java b/se-system/src/main/java/com/terra/system/service/sys/DepService.java
index 73606eb..02f3058 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/DepService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/DepService.java
@@ -1,10 +1,10 @@
package com.terra.system.service.sys;
-import com.terra.system.entity.all.RedisCacheKey;
+import com.terra.common.entity.all.RedisCacheKey;
import com.terra.system.entity.ctrl.IdNameEntity;
import com.terra.system.entity.sys.DepEntity;
import com.terra.system.mapper.sys.DepMapper;
-import com.terra.system.service.all.RedisService;
+import com.terra.common.service.RedisService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/LayerService.java b/se-system/src/main/java/com/terra/system/service/sys/LayerService.java
index e927cad..6ffc40b 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/LayerService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/LayerService.java
@@ -1,11 +1,11 @@
package com.terra.system.service.sys;
-import com.terra.system.entity.all.RedisCacheKey;
+import com.terra.common.entity.all.RedisCacheKey;
import com.terra.common.entity.all.SettingData;
import com.terra.system.entity.sys.LayerEntity;
import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.LayerMapper;
-import com.terra.system.service.all.RedisService;
+import com.terra.common.service.RedisService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/ReportService.java b/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
index b7ddc37..93fb021 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
@@ -3,7 +3,7 @@
import com.terra.common.helper.FileHelper;
import com.terra.common.helper.StringHelper;
import com.terra.common.helper.WebHelper;
-import com.terra.system.entity.all.RedisCacheKey;
+import com.terra.common.entity.all.RedisCacheKey;
import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.CoordinateEntity;
import com.terra.system.entity.ctrl.CountEntity;
@@ -13,7 +13,7 @@
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.*;
import com.terra.system.mapper.sys.ReportMapper;
-import com.terra.system.service.all.RedisService;
+import com.terra.common.service.RedisService;
import com.terra.system.service.data.DirService;
import com.terra.system.service.data.DownloadService;
import org.apache.commons.logging.Log;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/TokenService.java b/se-system/src/main/java/com/terra/system/service/sys/TokenService.java
index daeae24..f8cf7d0 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/TokenService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/TokenService.java
@@ -1,6 +1,6 @@
package com.terra.system.service.sys;
-import com.terra.system.entity.all.RedisCacheKey;
+import com.terra.common.entity.all.RedisCacheKey;
import com.terra.common.entity.all.SettingData;
import com.terra.system.entity.sys.LoginEntity;
import com.terra.system.entity.sys.TokenEntity;
@@ -9,7 +9,7 @@
import com.terra.common.helper.WebHelper;
import com.terra.system.mapper.sys.TokenMapper;
import com.terra.system.mapper.sys.UserMapper;
-import com.terra.system.service.all.RedisService;
+import com.terra.common.service.RedisService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/UserService.java b/se-system/src/main/java/com/terra/system/service/sys/UserService.java
index 3d41c09..b53c700 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/UserService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/UserService.java
@@ -6,7 +6,6 @@
import com.terra.system.helper.RsaHelper;
import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.UserMapper;
-import com.terra.system.service.all.RedisService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.annotation.Resource;
--
Gitblit v1.9.3