Merge branch 'master_activity' into base-modify

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

@@ -79,8 +79,7 @@ public class AccessTokenService {
 	 * @return String accessToken
 	 */
 	public  String getAccessTokenStr() {
-//		return getAccessToken().getAccessToken();
-		return null;
+          return getAccessToken().getAccessToken();
 	}
 
 	
@@ -102,7 +101,7 @@ public class AccessTokenService {
 		obj.put(wy_appid, result);
 		Boolean suc=summbitRedisTemplate.opsForValue().setIfAbsent(wy_appid,  obj.toJSONString());
 		if (suc) {
-//			summbitRedisTemplate.expire(wy_appid, result.getExpiresIn(), TimeUnit.MINUTES);
+		  summbitRedisTemplate.expire(wy_appid, result.getExpiresIn(), TimeUnit.MINUTES);
 		}
 	}
 }
\ No newline at end of file

xx-summit/xx-summit-server/src/main/resources/mapper/ActivityMapper.xml

@@ -25,6 +25,7 @@
         </if>
         <if test="type ==2">
           and  is_publish=1
+          and is_show=1
         </if>
         order  by  rank asc , start_time desc
     </select>