bug fix.

shentar · Jul 23, 2016 · 0e317e5 · 0e317e5
1 parent b738443
commit 0e317e5
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 16 deletions.
diff --git a/photoweb/src/com/service/filter/WebFilter.java b/photoweb/src/com/service/filter/WebFilter.java
@@ -59,13 +59,12 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chains
             }
             SystemProperties.add(SystemConstant.IS_MOBILE_KEY,
                     new Boolean(HeadUtils.checkMobile(useragent)));
+            logger.info("user agent is: " + useragent);
 
             MDC.put(SystemConstant.REMOTE_ADDR,
                     newreq.getRemoteAddr() + ":" + newreq.getRemotePort());
 
             MDC.put(SystemConstant.HTTP_URI, newreq.getRequestURI());
-
-
 
             chains.doFilter(newreq, newres);
 
@@ -77,7 +76,7 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chains
             MDC.put(SystemConstant.IS_MOBILE_KEY, "" + HeadUtils.isMobile());
             AccessLogger.accessLog();
 
-            SystemProperties.init();
+            SystemProperties.clear();
             MDC.clear();
         }
     }

diff --git a/photoweb/src/com/utils/sys/SystemProperties.java b/photoweb/src/com/utils/sys/SystemProperties.java
@@ -4,24 +4,26 @@
 
 public final class SystemProperties
 {
-    private static ThreadLocal<HashMap<String, Object>> contentLocal;
+    private ThreadLocal<HashMap<String, Object>> contentLocal;
 
+    private static SystemProperties instance = new SystemProperties();
+
     static
     {
-        init();
+        instance.init();
     }
 
     public static void add(String key, Object value)
     {
-        contentLocal.get().put(key, value);
+        instance.contentLocal.get().put(key, value);
     }
 
     public static Object get(String key)
     {
-        return contentLocal.get().get(key);
+        return instance.contentLocal.get().get(key);
     }
 
-    public static void init()
+    private void init()
     {
         contentLocal = new ThreadLocal<HashMap<String, Object>>()
         {
@@ -31,6 +33,11 @@ public HashMap<String, Object> initialValue()
             }
         };
     }
+
+    public static void clear()
+    {
+        instance.contentLocal.get().clear();
+    }
 
     private SystemProperties()
     {

diff --git a/photoweb/src/com/utils/web/GenerateHTML.java b/photoweb/src/com/utils/web/GenerateHTML.java
@@ -375,12 +375,16 @@ public static String generateDayPage(String day, String prevDay, String nextDay,
 
         StringBuffer sb = new StringBuffer();
         sb.append(getHtmlHead());
+
         String yearNavigate = genYearNavigate();
         sb.append(yearNavigate);
-        sb.append("<table style=\"text-align: center;\" width=\"100%\" "
-                + "height=\"100%\" border=\"0\" bordercolor=\"#000000\">");
+
         String dayNavigate = genDayNavigate(day, prevDay, nextDay);
+
         sb.append(dayNavigate);
+
+        sb.append("<table style=\"text-align: center;\" width=\"100%\" "
+                + "height=\"100%\" border=\"0\" bordercolor=\"#000000\">");
         int i = 0;
         int start = 0;
         int end = 0;
@@ -411,9 +415,12 @@ public static String generateDayPage(String day, String prevDay, String nextDay,
         {
             sb.append("</tr>");
         }
-        sb.append(dayNavigate);
         sb.append("</table>");
+
+        sb.append(dayNavigate);
+
         sb.append(yearNavigate);
+
         sb.append(getHtmlFoot());
 
         return sb.toString();
@@ -422,6 +429,9 @@ public static String generateDayPage(String day, String prevDay, String nextDay,
     private static String genDayNavigate(String day, String prevDay, String nextDay)
     {
         StringBuffer dayNavigate = new StringBuffer();
+        dayNavigate.append("<table style=\"text-align: center;\" width=\"100%\" "
+                + "height=\"100%\" border=\"0\" bordercolor=\"#000000\">");
+
         dayNavigate.append("<tr><td width=\"20%\">");
         dayNavigate.append("<a href=\"/month/" + day.substring(0, 6) + "\">返回" + day.substring(0, 4)
                 + "年" + day.substring(4, 6) + "月</a></td>");
@@ -433,21 +443,22 @@ private static String genDayNavigate(String day, String prevDay, String nextDay)
                     + "<input value=\"上一天\" type=\"button\"/></a>");
         }
         dayNavigate.append("</td>");
-        
+
         dayNavigate.append("<td  width=\"20%\" style=\"text-align:center\">" + day + "</td>");
-        
+
         dayNavigate.append("<td  width=\"20%\" style=\"text-align:center\">");
         if (StringUtils.isNotBlank(nextDay))
         {
             dayNavigate.append("<a href=\"/day/" + nextDay + "\">"
                     + "<input value=\"下一天\" type=\"button\"/></a>");
         }
         dayNavigate.append("</td>");
-        
+
         dayNavigate.append("<td width=\"20%\"></td>");
-        
+
         dayNavigate.append("</tr>");
-
+
+        dayNavigate.append("</table>");
         return dayNavigate.toString();
     }