Merge remote-tracking branch 'origin/master'

mhotel/src/com/happy/Model/weixin/WeiXinUtil.java

@@ -5,17 +5,13 @@ public class WeiXinUtil {
     // 创海公众号
     public static String appid_c = "wx2fc3f45732fae5d3";
     public static String screct_c = "7eee4a49a4470a77f9222995e8511547";
+    public static String APIid = "chuanghaikeji1612322883333333333";  // 商户密钥
+    public static String key = "chuanghaikeji1612322883333333333"; // 商户密钥
+    public static String account = "1612322883";  // 商户号
 
+    public static String ip = "172.16.20.88";
     public static String ip_h = "https://chtech.ncjti.edu.cn/hotelReservation/zhotel";
     //public static String ip_q = "https://chtech.ncjti.edu.cn/hotelReservation/dist";
     public static String ip_q = "http://192.168.161.227:8000/hotelReservation/dist";
 
-    public static String ip = "171.34.223.11";
-    public static String key = "v2";
-    public static String appid = "9FFFACD6D09F15D2";
-    public static String screct = "2F0F57080E311542B8411A2A33C44329";
-    public static String APIid = "chuanghaikejichuanghaikeji123456";
-    public static String account = "1648595577";
-
-
 }

mhotel/src/com/happy/action/AppMePageAction.java

@@ -347,7 +347,7 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
             {
                 users = new Users();
                 // 确定默认用户名，默认用户头像
-                String userName = "微信用户" + Func.parseStr(WxUtil.mchOrderNo());
+                String userName = Func.parseStr(WxUtil.createDefaultUserName());
                 users.setUser_name(userName);
                 users.setHeadPhoto("http://172.16.20.88:80/mhotel/download/orderS.png");
                 users.setOpenid(OPEN_ID);

mhotel/src/com/happy/common/wx/WxUtil.java

@@ -364,6 +364,16 @@ public class WxUtil {
 	}
 
 	/**
+	 * 生成默认用户名
+	 * @return String
+	 */
+	public static String createDefaultUserName(){
+		SimpleDateFormat sdf = new SimpleDateFormat("ddHHmmss");
+		String date = sdf.format(new Date());
+		return "微信用户" + date;
+	}
+
+	/**
 	 * 返回信息给微信
 	 * @param response
 	 * @param content 内容

mhotel/src/com/happy/filter/CrosFilter.java

@@ -0,0 +1,29 @@
+package com.happy.filter;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class CrosFilter implements Filter{
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest req, ServletResponse res, FilterChain filterChain) throws IOException, ServletException {
+        //相应之前设置响应的头部，授权跨域访问
+        HttpServletResponse response = (HttpServletResponse) res;
+        response.setHeader("Pragma", "no-cache");
+        response.setHeader("Cache-Control", "no-cache");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setDateHeader("Expires", 0);
+        //放行
+        filterChain.doFilter(req,res);
+    }
+    @Override
+    public void destroy() {
+
+    }
+}