upd

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

@@ -1,8 +1,5 @@
 package com.sharemao.web.wx.ctrl;
 
-import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.http.HttpSession;
@@ -91,13 +88,7 @@ public class AuthCtrl
 				String defaultdev =dataJson.getString("defaultdev");
 				if(Tools.isEmpty(defaultdev)) {
                     defaultdev = cursn;
-                } /*else if(!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
-                    String url="http://dy.yunjia99.cn/user/index.do";
-                    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);
-                }*/
+                }
 				session.setAttribute("defaultdev", defaultdev);	// 默认设备
 				/*if(Tools.isEmpty(defaultdev)) {
 					return new TextView("/device/getDevInfo.do");
@@ -189,27 +180,6 @@ public class AuthCtrl
             return new TextView("/activation.jsp");
         }
     }
-
-    /*private int getDevtype(String cursn){
-        Map<String, String> para = new HashMap<>();
-        para.put("devid", cursn);
-        String devTypeResult = GzhUtil.sendPost(Constants.m3IntAddr + "/device/getDevType.do", para);
-        try {
-            if(!Tools.isEmpty(devTypeResult))
-            {
-                JSONObject devTypeJson = JSONObject.parseObject(devTypeResult);
-                int resCode2 = devTypeJson.getIntValue("code");
-                if(resCode2 == 0){
-                    JSONObject devTypeDataJson = devTypeJson.getJSONObject("data");
-                    JSONObject devtypeJo = devTypeDataJson.getJSONObject("devtype");
-                    return devtypeJo.getIntValue("id");
-                }
-            }
-        } catch (Exception e) {
-            log.info(Tools.getExceptionMessage( e));
-        }
-        return 0;
-    }*/
 	
 	/**
 	 * 用户登陆界面，登陆后将微信号自动绑定到用户账号