DriverZYTravel/guns-admin/pom.xml
@@ -140,9 +140,8 @@ <artifactId>jjwt</artifactId> </dependency> <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId> <version>2.9.0</version> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId> </dependency> <dependency> DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/config/RedisConfig.java
File was deleted DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
@@ -1,23 +1,12 @@ package com.stylefeng.guns.modular.system.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.stylefeng.guns.core.util.ToolUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.Pipeline; import java.io.IOException; import java.util.*; import java.util.concurrent.TimeUnit; /** @@ -27,9 +16,8 @@ public class RedisUtil { @Autowired private JedisPool jedisPool; private RedisTemplate redisTemplate; private Timer timer; /** @@ -39,9 +27,7 @@ */ public void setStrValue(String key, String value){ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){ Jedis resource = jedisPool.getResource(); String set = resource.set(key, value); closeJedis(resource); redisTemplate.opsForValue().set(key, value); } } @@ -54,9 +40,7 @@ */ public void setStrValue(String key, String value, int time){ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){ Jedis resource = jedisPool.getResource(); String setex = resource.setex(key, time, value); closeJedis(resource); redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); } } @@ -68,46 +52,13 @@ */ public String getValue(String key){ if(ToolUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); String data = resource.get(key); closeJedis(resource); String data = (String) redisTemplate.opsForValue().get(key); return data; } return null; } /** * 批量获取 * @param kes * @return */ public List<Object> getValues(List<String> kes){ if(null != kes){ Jedis resource = jedisPool.getResource(); Pipeline pipelined = resource.pipelined(); for(String key : kes){ pipelined.get(key); } List<Object> list = pipelined.syncAndReturnAll(); closeJedis(resource); pipelined.clear(); try { pipelined.close(); } catch (IOException e) { e.printStackTrace(); } List<Object> data = new ArrayList<>(); for(Object o : list){ if(null != o){ data.add(o); } } return data; } return null; } /** @@ -116,66 +67,14 @@ */ public void remove(String key){ if(ToolUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); Long del = resource.del(key); closeJedis(resource); redisTemplate.delete(key); } } /** * 向集合key添加数据 * @param key * @param members */ public void addSetValue(String key, String...members){ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(members)){ Jedis resource = jedisPool.getResource(); Long sadd = resource.sadd(key, members); resource.close(); } } /** * 返回Set集合数据 * @param key * @return */ public Set<String> getSetAllValue(String key){ Set<String> smembers = new HashSet<>(); if(ToolUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); smembers = resource.smembers(key); resource.close(); } return smembers; } /** * 删除Set集合中的值 * @param key * @param members */ public void delSetValue(String key, String...members){ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(members)){ Jedis resource = jedisPool.getResource(); Long sadd = resource.srem(key, members); resource.close(); } } /** * 删除资源 * @param jedis */ public void closeJedis(Jedis jedis){ if(null != jedis){ jedis.close(); } } /** @@ -188,23 +87,7 @@ public boolean lock(String key, String value, int time){ if(!StringUtils.isEmpty(key)){ key += "_lock"; Jedis resource = jedisPool.getResource(); String set = resource.set(key, value, "nx", "ex", time); if("OK".equals(set)){ String finalKey = key; timer = new Timer(); timer.schedule(new TimerTask() { @Override public void run() { System.err.println("定时任务启动"); Jedis resource = jedisPool.getResource(); resource.setex(finalKey, time, value); resource.close(); } }, 1000, 500); } resource.close(); return "OK".equals(set) ? true : false; return redisTemplate.opsForValue().setIfAbsent(key, value); } return false; } @@ -234,11 +117,7 @@ public boolean unlock(String key){ if(!StringUtils.isEmpty(key)){ key += "_lock"; Jedis resource = jedisPool.getResource(); timer.cancel();//取消定时任务 Long del = resource.del(key); resource.close(); return del != 0 ? true : false; return redisTemplate.delete(key); } return false; } DriverZYTravel/guns-admin/src/main/resources/application.yml
@@ -27,6 +27,12 @@ multipart: max-request-size: 100MB max-file-size: 100MB redis: database: 0 host: 127.0.0.1 port: 16379 password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5 mybatis-plus: typeAliasesPackage: com.stylefeng.guns.modular DriverZYTravel/guns-admin/src/main/resources/redis.properties
File was deleted MessagePushTravel/pom.xml
@@ -26,11 +26,9 @@ <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> </dependency> <!-- jedis --> <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId> <version>2.9.0</version> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId> </dependency> <dependency> MessagePushTravel/src/main/java/com/sinata/push/config/RedisConfig.java
File was deleted MessagePushTravel/src/main/java/com/sinata/push/controller/RedisController.java
@@ -33,19 +33,6 @@ } /** * 批量获取 * @param keys * @return */ @ResponseBody @PostMapping("/getValues") public String getValues(String keys){ String[] split = keys.split(","); List<String> list = Arrays.asList(split); List<Object> values = redisUtil.getValues(list); return JSON.toJSONString(ResultUtil.success(values)); } /** @@ -82,85 +69,4 @@ } /** * 添加数据到list集合 * @param key * @param s * @return */ @ResponseBody @PostMapping("/addValueList") public String addValueList(String key, String value){ redisUtil.addValueList(key, value); return JSON.toJSONString(ResultUtil.success()); } /** * 集合中获取数据 * @param key * @return */ @ResponseBody @PostMapping("/getValueList") public String getValueList(String key){ String valueList = redisUtil.getValueList(key); return JSON.toJSONString(ResultUtil.success(valueList)); } /** * 删除集合数据 * @param key * @param count * @param value * @return */ @ResponseBody @PostMapping("/delValueList") public String delValueList(String key, long count, String value){ redisUtil.delValueList(key, count, value); return JSON.toJSONString(ResultUtil.success()); } /** * 获取list集合数量 * @param key * @return */ @ResponseBody @PostMapping("/getListCount") public String getListCount(String key){ Long length = redisUtil.getListCount(key); return JSON.toJSONString(ResultUtil.success(length)); } /** * 获取list集合数据 * @param key * @param start * @param end * @return */ @ResponseBody @PostMapping("/getList") public String getList(String key, Long start, Long end){ List<String> list = redisUtil.getList(key, start, end); return JSON.toJSONString(ResultUtil.success(list)); } /** * 获取list集合所有数据 * @param key * @return */ @ResponseBody @PostMapping("/getAllList") public String getAllList(String key){ List<String> list = redisUtil.getAllList(key); return JSON.toJSONString(ResultUtil.success(list)); } } MessagePushTravel/src/main/java/com/sinata/push/util/RedisUtil.java
@@ -1,14 +1,15 @@ package com.sinata.push.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.Pipeline; import org.springframework.util.StringUtils; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; /** @@ -18,7 +19,8 @@ public class RedisUtil { @Autowired private JedisPool jedisPool; private RedisTemplate redisTemplate; /** @@ -27,10 +29,8 @@ * @param value */ public void setStrValue(String key, String value){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); String set = resource.set(key, value); resource.close(); if(!StringUtils.isEmpty(key) && !StringUtils.isEmpty(value)){ redisTemplate.opsForValue().set(key, value); } } @@ -42,10 +42,8 @@ * @param time 秒 */ public void setStrValue(String key, String value, int time){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); String setex = resource.setex(key, time, value); resource.close(); if(!StringUtils.isEmpty(key) && !StringUtils.isEmpty(value)){ redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); } } @@ -56,81 +54,12 @@ * @return */ public String getValue(String key){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); String data = resource.get(key); resource.close(); if(!StringUtils.isEmpty(key)){ String data = (String) redisTemplate.opsForValue().get(key); return data; } return null; } /** * 批量获取 * @param kes * @return */ public List<Object> getValues(List<String> kes){ if(null != kes){ Jedis resource = jedisPool.getResource(); Pipeline pipelined = resource.pipelined(); for(String key : kes){ pipelined.get(key); } List<Object> list = pipelined.syncAndReturnAll(); resource.close(); pipelined.clear(); try { pipelined.close(); } catch (IOException e) { e.printStackTrace(); } List<Object> data = new ArrayList<>(); for(Object o : list){ if(null != o){ data.add(o); } } return data; } return null; } /** * 从右侧获取数据 * @param key * @return */ public String getValueList(String key){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); String s = resource.lpop(key); resource.close(); return s; } return null; } /** * 从左侧添加数据到list中 * @param key * @param s */ public void addValueList(String key, String s){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); resource.rpush(key, s); resource.close(); } } @@ -140,76 +69,67 @@ * @param key */ public void remove(String key){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); Long del = resource.del(key); resource.close(); if(!StringUtils.isEmpty(key)){ redisTemplate.delete(key); } } /** * 删除list集合数据 * redis加锁 * @param key * @param count * @param value * @param time * @return */ public void delValueList(String key, long count, String value){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); Long lrem = resource.lrem(key, count, value); resource.close(); public boolean lock(String key, String value, int time){ if(!StringUtils.isEmpty(key)){ key += "_lock"; return redisTemplate.opsForValue().setIfAbsent(key, value); } return false; } /** * 获取redis锁 * @param time * @return */ public boolean lock(int time){ String uuid = UUID.randomUUID().toString(); return lock("redis", uuid, time); } public boolean lock(String key, int time){ String uuid = UUID.randomUUID().toString(); return lock(key, uuid, time); } /** * 获取list集合数量 * redis释放锁 * @param key * @return */ public Long getListCount(String key){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); Long length = resource.llen(key); resource.close(); return length; public boolean unlock(String key){ if(!StringUtils.isEmpty(key)){ key += "_lock"; return redisTemplate.delete(key); } return 0L; return false; } /** * 获取集合内容 * @param key * @param start * @param end * 删除锁 * @return */ public List<String> getList(String key, long start, long end){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); List<String> lrange = resource.lrange(key, start, end); resource.close(); return lrange; } return new ArrayList<>(); } /** * 获取list所有数据 * @param key * @return */ public List<String> getAllList(String key){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); Long llen = resource.llen(key); List<String> lrange = resource.lrange(key, 0, llen - 1); resource.close(); return lrange; } return new ArrayList<>(); public boolean unlock(){ return unlock("redis"); } } MessagePushTravel/src/main/resources/application.yml
@@ -7,6 +7,12 @@ multipart: max-request-size: 100MB max-file-size: 100MB redis: database: 0 host: 127.0.0.1 port: 16379 password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5 eureka: client: MessagePushTravel/src/main/resources/redis.properties
File was deleted UserZYTravel/guns-admin/pom.xml
@@ -148,9 +148,8 @@ </dependency> <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId> <version>2.9.0</version> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId> </dependency> <dependency> UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/config/RedisConfig.java
File was deleted UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -61,6 +61,8 @@ if(d < (distance * 1000)){ list.add(driver); } }else{ System.err.println(driver.getName() + "-----------------没有上传经纬度----------------"); } } return list; UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
@@ -1,23 +1,12 @@ package com.stylefeng.guns.modular.system.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.stylefeng.guns.core.util.ToolUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.Pipeline; import java.io.IOException; import java.util.*; import java.util.concurrent.TimeUnit; /** @@ -27,9 +16,8 @@ public class RedisUtil { @Autowired private JedisPool jedisPool; private RedisTemplate redisTemplate; private Timer timer; /** @@ -39,9 +27,7 @@ */ public void setStrValue(String key, String value){ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){ Jedis resource = jedisPool.getResource(); String set = resource.set(key, value); closeJedis(resource); redisTemplate.opsForValue().set(key, value); } } @@ -54,9 +40,7 @@ */ public void setStrValue(String key, String value, int time){ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){ Jedis resource = jedisPool.getResource(); String setex = resource.setex(key, time, value); closeJedis(resource); redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); } } @@ -68,46 +52,15 @@ */ public String getValue(String key){ if(ToolUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); String data = resource.get(key); closeJedis(resource); return data; System.err.println("查询缓存：" + key); Object o = redisTemplate.opsForValue().get(key); System.err.println(o); return (String) o; } return null; } /** * 批量获取 * @param kes * @return */ public List<Object> getValues(List<String> kes){ if(null != kes){ Jedis resource = jedisPool.getResource(); Pipeline pipelined = resource.pipelined(); for(String key : kes){ pipelined.get(key); } List<Object> list = pipelined.syncAndReturnAll(); closeJedis(resource); pipelined.clear(); try { pipelined.close(); } catch (IOException e) { e.printStackTrace(); } List<Object> data = new ArrayList<>(); for(Object o : list){ if(null != o){ data.add(o); } } return data; } return null; } /** @@ -116,66 +69,14 @@ */ public void remove(String key){ if(ToolUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); Long del = resource.del(key); closeJedis(resource); redisTemplate.delete(key); } } /** * 向集合key添加数据 * @param key * @param members */ public void addSetValue(String key, String...members){ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(members)){ Jedis resource = jedisPool.getResource(); Long sadd = resource.sadd(key, members); resource.close(); } } /** * 返回Set集合数据 * @param key * @return */ public Set<String> getSetAllValue(String key){ Set<String> smembers = new HashSet<>(); if(ToolUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); smembers = resource.smembers(key); resource.close(); } return smembers; } /** * 删除Set集合中的值 * @param key * @param members */ public void delSetValue(String key, String...members){ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(members)){ Jedis resource = jedisPool.getResource(); Long sadd = resource.srem(key, members); resource.close(); } } /** * 删除资源 * @param jedis */ public void closeJedis(Jedis jedis){ if(null != jedis){ jedis.close(); } } /** @@ -188,23 +89,7 @@ public boolean lock(String key, String value, int time){ if(!StringUtils.isEmpty(key)){ key += "_lock"; Jedis resource = jedisPool.getResource(); String set = resource.set(key, value, "nx", "ex", time); if("OK".equals(set)){ String finalKey = key; timer = new Timer(); timer.schedule(new TimerTask() { @Override public void run() { System.err.println("定时任务启动"); Jedis resource = jedisPool.getResource(); resource.setex(finalKey, time, value); resource.close(); } }, 1000, 500); } resource.close(); return "OK".equals(set) ? true : false; return redisTemplate.opsForValue().setIfAbsent(key, value); } return false; } @@ -234,11 +119,7 @@ public boolean unlock(String key){ if(!StringUtils.isEmpty(key)){ key += "_lock"; Jedis resource = jedisPool.getResource(); timer.cancel();//取消定时任务 Long del = resource.del(key); resource.close(); return del != 0 ? true : false; return redisTemplate.delete(key); } return false; } UserZYTravel/guns-admin/src/main/resources/application.yml
@@ -27,6 +27,11 @@ multipart: max-request-size: 100MB max-file-size: 100MB redis: database: 0 host: 127.0.0.1 port: 16379 password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5 mybatis-plus: typeAliasesPackage: com.stylefeng.guns.modular UserZYTravel/guns-admin/src/main/resources/redis.properties
File was deleted ZuulZYTravel/pom.xml
@@ -37,11 +37,9 @@ <artifactId>swagger-spring-boot-starter</artifactId> <version>1.7.0.RELEASE</version> </dependency> <!-- jedis --> <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId> <version>2.9.0</version> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId> </dependency> <dependency> ZuulZYTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java
File was deleted ZuulZYTravel/src/main/java/com/sinata/zuul/controller/RedisController.java
@@ -33,20 +33,6 @@ } /** * 批量获取 * @param keys * @return */ @ResponseBody @PostMapping("/getValues") public String getValues(String keys){ String[] split = keys.split(","); List<String> list = Arrays.asList(split); List<Object> values = redisUtil.getValues(list); return JSON.toJSONString(ResultUtil.success(values)); } /** * 存值 ZuulZYTravel/src/main/java/com/sinata/zuul/util/RedisUtil.java
@@ -1,15 +1,11 @@ package com.sinata.zuul.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.Pipeline; import redis.clients.jedis.Response; import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.springframework.util.StringUtils; import java.util.UUID; import java.util.concurrent.TimeUnit; /** @@ -19,7 +15,8 @@ public class RedisUtil { @Autowired private JedisPool jedisPool; private RedisTemplate redisTemplate; /** @@ -28,10 +25,8 @@ * @param value */ public void setStrValue(String key, String value){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); String set = resource.set(key, value); resource.close(); if(!StringUtils.isEmpty(key) && !StringUtils.isEmpty(value)){ redisTemplate.opsForValue().set(key, value); } } @@ -43,10 +38,8 @@ * @param time 秒 */ public void setStrValue(String key, String value, int time){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); String setex = resource.setex(key, time, value); resource.close(); if(!StringUtils.isEmpty(key) && !StringUtils.isEmpty(value)){ redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); } } @@ -57,47 +50,14 @@ * @return */ public String getValue(String key){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); String data = resource.get(key); resource.close(); if(!StringUtils.isEmpty(key)){ String data = (String) redisTemplate.opsForValue().get(key); return data; } return null; } /** * 批量获取 * @param kes * @return */ public List<Object> getValues(List<String> kes){ if(null != kes){ Jedis resource = jedisPool.getResource(); Pipeline pipelined = resource.pipelined(); for(String key : kes){ pipelined.get(key); } List<Object> list = pipelined.syncAndReturnAll(); resource.close(); pipelined.clear(); try { pipelined.close(); } catch (IOException e) { e.printStackTrace(); } List<Object> data = new ArrayList<>(); for(Object o : list){ if(null != o){ data.add(o); } } return data; } return null; } /** @@ -105,10 +65,67 @@ * @param key */ public void remove(String key){ if(StringUtil.isNotEmpty(key)){ Jedis resource = jedisPool.getResource(); Long del = resource.del(key); resource.close(); if(!StringUtils.isEmpty(key)){ redisTemplate.delete(key); } } /** * redis加锁 * @param key * @param value * @param time * @return */ public boolean lock(String key, String value, int time){ if(!StringUtils.isEmpty(key)){ key += "_lock"; return redisTemplate.opsForValue().setIfAbsent(key, value); } return false; } /** * 获取redis锁 * @param time * @return */ public boolean lock(int time){ String uuid = UUID.randomUUID().toString(); return lock("redis", uuid, time); } public boolean lock(String key, int time){ String uuid = UUID.randomUUID().toString(); return lock(key, uuid, time); } /** * redis释放锁 * @param key * @return */ public boolean unlock(String key){ if(!StringUtils.isEmpty(key)){ key += "_lock"; return redisTemplate.delete(key); } return false; } /** * 删除锁 * @return */ public boolean unlock(){ return unlock("redis"); } } ZuulZYTravel/src/main/resources/application.yml
@@ -3,6 +3,11 @@ spring: application: name: zuul-gateway #服务名称 redis: database: 0 host: 127.0.0.1 port: 16379 password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5 eureka: client: ZuulZYTravel/src/main/resources/redis.properties
File was deleted
