一些改动

com.sharemao.web.xw3/src/main/java/com/sharemao/web/wx/ctrl/AuthCtrl.java

@@ -47,20 +47,13 @@ public class AuthCtrl
 		String accessToken="";
 		String wxCode = para.get("code");
 
-//        String f = para.get("f");
-//        if (!Tools.isEmpty(f)) {
-//            openid=para.get("openid");
-//            if (!Tools.isEmpty(openid)) {
-//                session.setAttribute("openid", openid);
-//            }
-//        }
-
 		if(Tools.isEmpty(openid) && !GzhUtil.isEmpty(wxCode))
 		{
 			Map<String,String> m=GzhUtil.getOpenId(wxCode,Constants.appId,Constants.appSecret);
 			openid=m.get("openId");
 			accessToken=m.get("accessToken");
 			session.setAttribute("openid", openid);
+            session.setAttribute("openidForPay", openid);
 			session.setAttribute("accessToken", accessToken);
 		}
 		log.info("wxCode="+wxCode+",openid="+openid);
@@ -92,13 +85,6 @@ public class AuthCtrl
 				if(Tools.isEmpty(defaultdev)) {
 					return new TextView("/device/getDevInfo.do");
 				} else {
-//                    if ("866162073362932".equals(defaultdev)) {
-//                        String url="http://xcwx.jimi.link/user/index.do?f=1&&sn=" + defaultdev + "&openid=" + openid;
-//                        url = URLEncoder.encode(url);
-//                        log.info("url="+url);
-//                        String path = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb06cf14f96dd7149&redirect_uri=" + url + "&response_type=code&scope=snsapi_base&state=123#wechat_redirect";
-//                        return new TextView(path);
-//                    }
                     return new TextView("/consumer/getPkgsByDevId.do");
 				}
 			}
@@ -112,6 +98,78 @@ public class AuthCtrl
 			return new TextView("/activation.jsp");
 		}
 	}
+    @Path(value="/indexForOld.do")
+    public TextView indexForOld(Context context)
+    {
+        HttpSession session = context.getRequest().getSession();
+        Map<String, String> para = context.getParas();
+        log.info("para=="+para);
+        String cursn=para.get("sn");
+        session.setAttribute("cursn", cursn);//当前设备编号
+
+        String openid=para.get("openid");	// 获取用户微信openid
+        String accessToken="";
+        String wxCode = para.get("code");
+
+        if (Tools.isEmpty(openid)) {
+            para.forEach((k,v)->context.getRequest().setAttribute(k, v));
+            return new TextView("/auth/index.do");
+        }
+
+        session.setAttribute("openid", openid);
+        log.info("old openid="+openid);
+        para.put("openid", openid);
+
+        String openidNew="";
+        if(!GzhUtil.isEmpty(wxCode))
+        {
+            Map<String,String> m=GzhUtil.getOpenId(wxCode,Constants.appId,Constants.appSecret);
+            openidNew=m.get("openId");
+            accessToken=m.get("accessToken");
+            session.setAttribute("openidForPay", openidNew);
+            session.setAttribute("accessToken", accessToken);
+        }
+        log.info("wxCode="+wxCode+",openid="+openidNew);
+
+        GzhUtil.toM3Sign(para);
+        String u=Constants.m3IntAddr + "/user/wxIndex.do";
+        String result = GzhUtil.sendPost(u, para);
+        log.info("url="+u+",result="+result);
+        JSONObject resJson = JSONObject.parseObject(result);
+        int resCode = resJson.getIntValue("code");
+        if(resCode == 0)
+        {
+            JSONObject dataJson = resJson.getJSONObject("data");
+            String phonenum=dataJson.getString("phonenum");
+            if(Tools.isEmpty(phonenum))
+            {
+                context.getRequest().setAttribute("sn", cursn);
+                return new TextView("/activation.jsp");
+            }
+            else
+            {
+                session.setAttribute("appuid", dataJson.getString("appuid"));	// 用户ID
+                session.setAttribute("phonenum", phonenum);	// 用户账户
+                String defaultdev =dataJson.getString("defaultdev");
+                if(Tools.isEmpty(defaultdev))
+                    defaultdev=cursn;
+                session.setAttribute("defaultdev", defaultdev);	// 默认设备
+                if(Tools.isEmpty(defaultdev)) {
+                    return new TextView("/device/getDevInfo.do");
+                } else {
+                    return new TextView("/consumer/getPkgsByDevId.do");
+                }
+            }
+        }
+        else
+        {
+            context.getRequest().setAttribute("sn", cursn);
+            String lt=DateTimeUtil.longtime();
+            lt=lt.substring(0,lt.length()-2);
+            context.getRequest().setAttribute("sign", CodecUtil.str2md5("znz"+cursn+"125226"+lt));
+            return new TextView("/activation.jsp");
+        }
+    }
 	
 	/**
 	 * 用户登陆界面，登陆后将微信号自动绑定到用户账号

com.sharemao.web.xw3/src/main/java/com/sharemao/web/wx/ctrl/PayCtrl.java

@@ -581,7 +581,7 @@ public class PayCtrl
 		
 	    HttpSession session = context.getRequest().getSession();
 	    String appuid = String.valueOf(session.getAttribute("appuid"));
-	    String openid = (String) session.getAttribute("openid");
+	    String openid = (String) session.getAttribute("openidForPay");
 	    if(GzhUtil.isEmpty(appuid)) 
 	    {
 	    	Map<String,String> result = new HashMap<String,String>();