Commit 622760e3 authored by ag's avatar ag

fix : 更换一个包名

parent 47797ce3
...@@ -5,13 +5,15 @@ ...@@ -5,13 +5,15 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>cn.quantgroup</groupId> <groupId>cn.quantgroup</groupId>
<artifactId>baitiao-commons</artifactId> <artifactId>commons</artifactId>
<version>0.0.2</version> <version>0.0.2</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<guava.version>23.0</guava.version>
<apollo.client.version>0.9.2</apollo.client.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>
...@@ -27,12 +29,21 @@ ...@@ -27,12 +29,21 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
<version>1.5.6.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>23.0</version> <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>${apollo.client.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.16</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
package cn.quantgroup.tech.constant;
@Deprecated
public enum ServiceUrls {
}
package cn.quantgroup.xyqb.util; package cn.quantgroup.tech.util;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -30,10 +31,9 @@ import java.util.concurrent.locks.ReentrantLock; ...@@ -30,10 +31,9 @@ import java.util.concurrent.locks.ReentrantLock;
* @date 2017/5/18 * @date 2017/5/18
*/ */
@Component @Component
@Slf4j
public class IDGenerator { public class IDGenerator {
private static final Logger LOGGER = LoggerFactory.getLogger(IDGenerator.class);
private static final String REDIS_WORK_ID_KEY = "GLOBAL:WORK:ID:"; private static final String REDIS_WORK_ID_KEY = "GLOBAL:WORK:ID:";
private static final String ID_FORMAT = "yyyyMMddHHmmss"; private static final String ID_FORMAT = "yyyyMMddHHmmss";
...@@ -130,7 +130,7 @@ public class IDGenerator { ...@@ -130,7 +130,7 @@ public class IDGenerator {
AtomicInteger historyCounter = (AtomicInteger) cache.get(timeSecond); AtomicInteger historyCounter = (AtomicInteger) cache.get(timeSecond);
counter = historyCounter.incrementAndGet(); counter = historyCounter.incrementAndGet();
} catch (ExecutionException e) { } catch (ExecutionException e) {
LOGGER.error("取出缓存时出错"); log.error("取出缓存时出错");
} }
} }
...@@ -140,7 +140,7 @@ public class IDGenerator { ...@@ -140,7 +140,7 @@ public class IDGenerator {
Thread.sleep(500); Thread.sleep(500);
return getId(prefix); return getId(prefix);
} catch (InterruptedException e) { } catch (InterruptedException e) {
LOGGER.error("发号器休眠时发生错误:{}", e); log.error("发号器休眠时发生错误:{}", e);
} }
} }
......
package cn.quantgroup.xyqb.util; package cn.quantgroup.tech.util;
import org.slf4j.Logger; import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
/** /**
*
* @author zhiguo.liu * @author zhiguo.liu
* @date 2017/7/28 * @date 2017/7/28
*/ */
@Slf4j
public class RedisUtils { public class RedisUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(RedisUtils.class);
/** /**
* 通过 setnx + expire 命令,原子性给某个 key 上锁并设置过期时间 * 通过 setnx + expire 命令,原子性给某个 key 上锁并设置过期时间
* 上锁成功返回 true ,上锁失败返回 false. * 上锁成功返回 true ,上锁失败返回 false.
...@@ -30,7 +28,7 @@ public class RedisUtils { ...@@ -30,7 +28,7 @@ public class RedisUtils {
Jedis jedis = (Jedis) connection.getNativeConnection(); Jedis jedis = (Jedis) connection.getNativeConnection();
return jedis.set(key, "1", "nx", "ex", expire) != null; return jedis.set(key, "1", "nx", "ex", expire) != null;
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("上锁出错:{}", e); log.error("上锁出错:{}", e);
} finally { } finally {
if (connection != null) { if (connection != null) {
connection.close(); connection.close();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment