Merge branch 'master_activity' into base-modify

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/service/JsTicketService.java

@@ -94,8 +94,8 @@ public class JsTicketService {
 					ehcache.put(element);*/
 					log.info("----jsTicket===="+jsTicket);
 				  JSONObject obj = new JSONObject();
+				  obj.put(key, jsTicket);
 				  summbitRedisTemplate.delete(key);
-				  log.info("----obj===="+obj.toJSONString());
 				  Boolean suc=summbitRedisTemplate.opsForValue().setIfAbsent(key,  obj.toJSONString());
 				  if (suc) {
 					  summbitRedisTemplate.expire(wy_appid, jsTicket.getExpiresIn(), TimeUnit.MINUTES);
@@ -119,4 +119,5 @@ public class JsTicketService {
 	}
 
 
+
 }
\ No newline at end of file