second commit by ailanyin

ailanyin-common/src/main/java/com/ailanyin/common/utils/DateUtil.java

@@ -331,9 +331,13 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
         return getDayEndTime(cal.getTime());
     }
 
-
+    public static int test() {
+        Calendar instance = Calendar.getInstance();
+        instance.set(Calendar.DAY_OF_MONTH,4);
+        return instance.get(Calendar.WEEK_OF_MONTH);
+    }
     public static void main(String[] args) {
-        System.out.println(getBeginDayOfMonth());
+        System.out.println(test());
     }
 }
 

ailanyin-common/src/main/java/com/ailanyin/common/utils/FileUtil.java

@@ -24,6 +24,8 @@ public class FileUtil {
 
     private static final String AGENT_MSIE = "MSIE";
 
+    private static final String FILE_URL = "URL";
+
     private static final String AGENT_FIREFOX = "Firefox";
 
     private static final String AGENT_CHROME = "Chrome";
@@ -243,6 +245,12 @@ public class FileUtil {
     }
 
     public static String getUrl(HttpServletRequest request) {
+
+        // 解决nginx反向代理后代理前缀丢失的问题
+        if (EmptyUtil.isNotEmpty(request.getHeader(FILE_URL))) {
+            return request.getHeader(FILE_URL);
+        }
+
         StringBuffer url = request.getRequestURL();
         String contextPath = request.getServletContext().getContextPath();
         return url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString();