Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mhotel/src/com/happy/Model/weixin/WeiXinUtil.java

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

@@ -2,20 +2,10 @@ package com.happy.Model.weixin;
 
 public class WeiXinUtil {
 
-    // 诚欣公众号
+    // 创海公众号
     public static String appid_c = "wx2fc3f45732fae5d3";
-    public static String ip = "171.34.223.11";
     public static String screct_c = "7eee4a49a4470a77f9222995e8511547";
-    public static String key = "v2";
-    // 诚欣测试号
-    /*public static String appid_c = "wx5fcbd4d313aa4c15";
-    public static String screct_c = "a72db0c99cde741eb391af69067aacfa";*/
 
-    // 学校公众号
-    public static String appid = "9FFFACD6D09F15D2";
-    public static String screct = "2F0F57080E311542B8411A2A33C44329";
-    public static String APIid = "chuanghaikejichuanghaikeji123456";
-    public static String account = "1648595577";
     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";

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

@@ -286,7 +286,7 @@ public class appAction extends ActionSupport implements ServletRequestAware {
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
-        if (login.getLevel().equals("2")){
+        if (login.getLevel().equals("1")){
             resultJson.put("message", "管理员无权限绑定");
             resultJson.put("code", 205);
             resultJson.put("data","");
@@ -294,6 +294,7 @@ public class appAction extends ActionSupport implements ServletRequestAware {
             return null;
         }
         CodeEntity codeEntity = appService.getCodeInfo(code);
+        System.out.println(codeEntity.getOpenid());
         AdminManager admin = appService.queryMaByNameAndOpenid(admin_name,codeEntity.getOpenid());
         if (admin!=null){
             resultJson.put("message",  "该账户已绑定，请勿重复绑定");