Merge branch 'master' of http://8.138.247.150:3000/baibx/xc into dy

com.sharemao.web.appserver/src/main/java/com/sharemao/app/service/impl/AppUserServiceImpl.java

@@ -1338,8 +1338,9 @@ public class AppUserServiceImpl extends AppBaseService implements AppUserService
 				}
 			}
 
-            String defSql = "UPDATE appuser SET phonenum = '"+phone+"' WHERE id = '"+id+"'";
-            baseDao.excuSql(defSql);
+            String sql = "UPDATE appuser SET phonenum = '"+phone+"' WHERE id = '"+id+"' and defaultdev='"+devid+"'";
+            logger.info(sql);
+            baseDao.excuSql(sql);
 
 			record.put("msg", "OK");
 			ProjectConstants.smsCodeMap.remove(phone);

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

@@ -2,6 +2,7 @@ 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;
@@ -42,6 +43,15 @@ public class AuthCtrl
 		log.info("para=="+para);
 		String cursn=para.get("sn");
 		session.setAttribute("cursn", cursn);//当前设备编号
+
+        /*if(!Tools.isEmpty(cursn)&&getDevtype(cursn)==16)
+		{
+            String url="http://dy.yunjia99.cn/user/index.do?&sn="+cursn;
+            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);
+		}*/
 		
 		String openid = (String) session.getAttribute("openid");	// 获取用户微信openid
 		String accessToken="";
@@ -79,8 +89,15 @@ public class AuthCtrl
 				session.setAttribute("appuid", dataJson.getString("appuid"));	// 用户ID
 				session.setAttribute("phonenum", phonenum);	// 用户账户
 				String defaultdev =dataJson.getString("defaultdev");
-				if(Tools.isEmpty(defaultdev))
-					defaultdev=cursn;
+				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");
@@ -172,6 +189,27 @@ 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;
+    }*/
 	
 	/**
 	 * 用户登陆界面，登陆后将微信号自动绑定到用户账号