diff --git a/console/authentication/ticket_pair.js b/console/authentication/ticket_pair.js deleted file mode 100644 index cb71007..0000000 --- a/console/authentication/ticket_pair.js +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Created by strawmanbobi - * 2016-12-24 (Xmax eve) - */ - -require('../mini_poem/configuration/constants'); -let Cache = require('../mini_poem/cache/redis.js'); -let logger = require('../mini_poem/logging/logger4js').helper; -let Enums = require('../constants/enums'); -let ErrorCode = require('../constants/error_code'); - -let enums = new Enums(); -let errorCode = new ErrorCode(); - -let TicketPair = function(_cacheHost, _cachePort, _cacheAdmin, _cachePassword) { - this.cache = new Cache(_cacheHost, _cachePort, _cacheAdmin, _cachePassword); -}; - -TicketPair.prototype.setTicketPair = function(id, ticket, ttl, callback) { - this.cache.set(id, ticket, ttl, function(setTicketPairErr, data) { - let error = errorCode.SUCCESS; - if(setTicketPairErr !== errorCode.SUCCESS.code) { - error = errorCode.FAILED; - } - callback(error, data); - }); -}; - - -TicketPair.prototype.getTicketPair = function(id, callback) { - let error = errorCode.SUCCESS; - this.cache.get(id, false, function(getTicketPairErr, result) { - if(errorCode.SUCCESS.code !== getTicketPairErr) { - error = errorCode.FAILED; - } - callback(error, result); - }); -}; - -TicketPair.prototype.deleteTicketPair = function(id, callback) { - let error = errorCode.SUCCESS; - this.cache.delete(id, function(deleteTicketPairErr) { - if(deleteTicketPairErr !== errorCode.SUCCESS.code) { - error = errorCode.FAILED; - } - callback(error); - }); -}; - -module.exports = TicketPair; \ No newline at end of file diff --git a/console/mini_poem/cache/redis.js b/console/mini_poem/cache/redis.js index 8f00b2f..eded494 100644 --- a/console/mini_poem/cache/redis.js +++ b/console/mini_poem/cache/redis.js @@ -29,7 +29,7 @@ var Cache = function(_host, _port, _user, _password) { Cache.prototype = Object.create(BaseCache.prototype); Cache.prototype.set = function(key, value, ttl, callback) { - this.redisClient.set(key, value, function(err) { + this.redisClient.set(key, value, 'EX', ttl, function(err) { if(err) { logger.error("Redis set value failed with key " + key); callback(errorCode.FAILED); diff --git a/server/.idea/modules.xml b/server/.idea/modules.xml deleted file mode 100644 index 6ed89c3..0000000 --- a/server/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/server/src/main/java/net/irext/server/service/cache/impl/DecodeSessionRepositoryImpl.java b/server/src/main/java/net/irext/server/service/cache/impl/DecodeSessionRepositoryImpl.java index 942b5ca..aeccb7a 100644 --- a/server/src/main/java/net/irext/server/service/cache/impl/DecodeSessionRepositoryImpl.java +++ b/server/src/main/java/net/irext/server/service/cache/impl/DecodeSessionRepositoryImpl.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Repository; import javax.annotation.PostConstruct; import java.util.Map; +import java.util.concurrent.TimeUnit; /** * Filename: IDecodeSessionRepositoryImpl.java @@ -38,6 +39,7 @@ public class DecodeSessionRepositoryImpl implements IDecodeSessionRepository { public void add(final String decodeSessionId, Integer binaryId) { hashOperations.put(KEY, decodeSessionId, binaryId); + redisTemplate.expire(decodeSessionId, 7 , TimeUnit.DAYS); } public void delete(String decodeSessionId) { diff --git a/server/src/main/java/net/irext/server/service/cache/impl/IRBinaryRepositoryImpl.java b/server/src/main/java/net/irext/server/service/cache/impl/IRBinaryRepositoryImpl.java index f83de69..bc587b0 100644 --- a/server/src/main/java/net/irext/server/service/cache/impl/IRBinaryRepositoryImpl.java +++ b/server/src/main/java/net/irext/server/service/cache/impl/IRBinaryRepositoryImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Repository; import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.util.Map; +import java.util.concurrent.TimeUnit; /** * Filename: IIRBinaryRepositoryImpl.java @@ -41,6 +42,7 @@ public class IRBinaryRepositoryImpl implements IIRBinaryRepository { public void add(Integer id, RemoteIndex remoteIndex) { hashOperations.put(KEY, id, remoteIndex); + redisTemplate.expire(Integer.toString(id), 7 , TimeUnit.DAYS); } public void delete(final Integer id) { diff --git a/server/src/main/java/net/irext/server/service/cache/impl/UserAppRepositoryImpl.java b/server/src/main/java/net/irext/server/service/cache/impl/UserAppRepositoryImpl.java index b94efbe..e0bb2e4 100644 --- a/server/src/main/java/net/irext/server/service/cache/impl/UserAppRepositoryImpl.java +++ b/server/src/main/java/net/irext/server/service/cache/impl/UserAppRepositoryImpl.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Repository; import javax.annotation.PostConstruct; import javax.annotation.Resource; +import java.util.concurrent.TimeUnit; /** * Filename: UserAppRepositoryImpl.java @@ -39,6 +40,7 @@ public class UserAppRepositoryImpl implements IUserAppRepository { public void add(Integer id, String token) { hashOperations.put(KEY, token, id); + redisTemplate.expire(token, 7 , TimeUnit.DAYS); } public void delete(final String token) {