Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8

@@ -100,7 +100,7 @@ public class ControllerCacheAop implements ApplicationContextAware{
 
 
     private Object dealPageCache(String cacheKey, Cachable cacheExpire, Class<?> returnType, String methodName, ProceedingJoinPoint joinPoint) throws Throwable {
     private Object dealPageCache(String cacheKey, Cachable cacheExpire, Class<?> returnType, String methodName, ProceedingJoinPoint joinPoint) throws Throwable {
         //从一级缓存中获取数据
         //从一级缓存中获取数据
-        String pageKey = getPageCacheKey(cacheExpire.pageArgs());
+        String pageKey = getPageCacheKey(cacheExpire.pageArgs(), joinPoint.getArgs());
         try {
         try {
             Object level1_obj = this.cacheClient.hashGet(cacheKey, pageKey, returnType);
             Object level1_obj = this.cacheClient.hashGet(cacheKey, pageKey, returnType);
             if (level1_obj != null) {
             if (level1_obj != null) {
@@ -254,8 +254,14 @@ public class ControllerCacheAop implements ApplicationContextAware{
         return cacheKeyPrefix + ":" + args_sign;
         return cacheKeyPrefix + ":" + args_sign;
     }
     }
 
 
-    private String getPageCacheKey(int[] pageParams) {
-        return "PAGE:" + StringUtils.join(pageParams, ":");
+    private String getPageCacheKey(int[] pageParams, Object[] args) {
+        StringBuilder sb = new StringBuilder();
+        for (int index : pageParams) {
+            if (index < args.length) {
+                sb.append(":").append(args[index]);
+            }
+        }
+        return "PAGE" + sb.toString();
     }
     }