diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java
index 412992f..4235139 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java
@@ -14,13 +14,8 @@ import org.springframework.core.io.ClassPathResource;
 
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 
 @Slf4j
 public class TimeServiceConstant {
@@ -28,7 +23,7 @@ public class TimeServiceConstant {
     public static TSAClient client;
 
     @Value("${spring.redis.sentinel.master}")
-    private String redis="eshop-redis";
+    private String redis;
 
     public  TimeServiceConstant(){
         try{
@@ -52,7 +47,7 @@ public class TimeServiceConstant {
      * @return 时间戳加密原文
      */
     public String signTimeStamp(String data){
-        if(redis.equals("eshop-redis-sim")){
+        if(redis!=null&&redis.equals("eshop-redis-sim")){
             return "";
         }
         try{
@@ -79,7 +74,7 @@ public class TimeServiceConstant {
     public TtsAgent.TtsParseResult verifyTimeStamp2(String timestamp){
         String systemtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(systemtime,"","");
-        if(redis.equals("eshop-redis-sim")){
+        if(redis!=null&&redis.equals("eshop-redis-sim")){
             return ttsParseResult;
         }
         try{
@@ -116,7 +111,7 @@ public class TimeServiceConstant {
     public TtsAgent.TtsParseResult getServiceTimeObj(String data){
         String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(time,"","");
-        if(redis.equals("eshop-redis-sim")){
+        if(redis!=null&&redis.equals("eshop-redis-sim")){
             return ttsParseResult;
         }
         try{
@@ -135,8 +130,9 @@ public class TimeServiceConstant {
      * @return 时间
      */
     public String getServiceTime(String data){
+        log.info("-------------------redis-"+redis);
         String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-        if(redis.equals("eshop-redis-sim")){
+        if(redis!=null&&redis.equals("eshop-redis-sim")){
             return time;
         }
         try{
@@ -157,7 +153,7 @@ public class TimeServiceConstant {
      * @return date时间
      */
     public Date getServiceDate(String data){
-        if(redis.equals("eshop-redis-sim")){
+        if(redis!=null&&redis.equals("eshop-redis-sim")){
             return new Date();
         }
         try{
@@ -178,7 +174,7 @@ public class TimeServiceConstant {
      */
     public SystemTime getServiceSystemTime(String data){
         Date date = new Date();
-        if(redis.equals("eshop-redis-sim")){
+        if(redis!=null&&redis.equals("eshop-redis-sim")){
             return new SystemTime()
                     .setYear(date.getYear()+1900)
                     .setMonth(date.getMonth()+1)