wangxiaoming преди 5 години
родител
ревизия
b5dd782650

+ 0 - 8
wechat-wechat-web/src/main/java/com/iamberry/wechat/filters/WechatFilter.java

@@ -63,14 +63,6 @@ public class WechatFilter implements Filter {
 	 * @Time   2016年11月24日
 	 */
 	public void forword(HttpServletRequest req, HttpServletResponse resp, FilterChain chain) throws Exception {
-// 如果是扫描机器后面的二维码,那么转发到下层处理
-//		String ua = req.getHeader("user-agent").toLowerCase();
-//		if(ua.indexOf("micromessenger") < 0 && req.getRequestURL().indexOf("wechat/qrcode") > 0 ){
-//			chain.doFilter(req, resp);
-//			return;
-//		}
-		
-		// 如果不是扫描二维码,那么获取后转发微信服务器,完成授权。
 		String query = req.getQueryString();
 		String urlstr = new String(req.getRequestURI().toString().replace(req.getContextPath(), ""));
 		if (query != null) {

+ 66 - 0
wechat-wechat-web/src/main/java/com/iamberry/wechat/handles/home/HomeHandler.java

@@ -0,0 +1,66 @@
+package com.iamberry.wechat.handles.home;
+
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.WechatUtils;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.face.member.MemberService;
+import com.iamberry.wechat.tools.WeixinUtil;
+import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+@Controller
+@RequestMapping("/wechat")
+public class HomeHandler {
+    private Logger logger = LoggerFactory.getLogger(HomeHandler.class);
+
+    @Autowired
+    private MemberService memberService;
+
+    /**
+     * 刷新用户信息
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getUserInfo", method = RequestMethod.POST)
+    public ResultMsg getUserInfo(HttpServletRequest request) throws Exception {
+        Member m = memberService.getMemberByUserOpenId(WechatUtils.getUserBySession(request).getUserOpenid());
+        try{
+            JSONObject jsonObject = WeixinUtil.getUserInfo(m.getUserOpenid());
+            assert jsonObject != null;
+            assert jsonObject.has("nickname");
+            String nickname = jsonObject.getString("nickname");
+            String headimgurl = jsonObject.getString("headimgurl");
+            try {
+                nickname = URLEncoder.encode(jsonObject.getString("nickname"), "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                nickname = "";
+            }
+
+            Member mem = new Member();
+            mem.setUserHead(headimgurl);
+            mem.setUserNickname(nickname);
+            mem.setUserOpenid(m.getUserOpenid());
+            if(m.getUserStatus() == 2){
+                memberService.nowUpdateUserByOpenId(mem);
+            }else{
+                if(nickname != null && !"".equals(nickname)){
+                    mem.setUserStatus(2);
+                }
+                memberService.nowUpdateUserByOpenId(mem);
+            }
+//				logger.info("获取个人信息成功;openid:"+m.getUserOpenid());
+        }catch (Exception e){
+            logger.error("获取个人信息失败:{}", e);
+        }
+        return ResultMsg.getSuccess();
+    }
+}

+ 8 - 14
wechat-wechat-web/src/main/resources/platform.properties

@@ -1,14 +1,11 @@
-ROOT_PATH=wechat
+ROOT_PATH=wechat_rg
 # wechat auth back url
-WECHAT_BACK_URL=http://test.iamberry.com/tooth/wechatBack
+WECHAT_BACK_URL=http://w.iamberry.com/wechat_rg/wechatBack
 # redirect url
 redirectUrl=redirectUrl
 # index redirect url
 redirectUrl_index=redirect:/wechat/index
 
-#rst_base_url
-rst_base_url=http://test.iamberry.com/rst/mcahine/getMachineInfo?barCode=
-
 # date_format
 DATE_FORMAT=yyyy-MM-dd
 # time_format
@@ -18,19 +15,16 @@ DATE_TIME_FORMAT=yyyy-MM-dd HH:mm:ss
 # date_time_format1
 DATE_TIME_FORMAT1=yyyy/MM/dd HH:mm:ss
 
-# pubNo -- soodo
-pubNo=gh_cdd0a86d3b19
-# appId-soodo
-appId=wxdb090f0af89e0be3
-# appSecret-soodo
-appSecret=518114a120274f625530750c1803921b
+# pubNo -- watero
+pubNo=gh_2674097b2442
+# appId-watero
+appId=wx27c9f825761a861b
+# appSecret-watero
+appSecret=97b2f2991e4ff0f2567fbc625f858377
 
 # token
 token=weixin
 
-# partnerkey
-partnerkey=8a90e3ab0e2db7772f5f64e7ed2f4b98
-
 # wechat-machine-id		test
 productId=29439
 # wechat-machine-id		watero

+ 1 - 0
wechat-wechat-web/src/main/webapp/WEB-INF/web.xml

@@ -9,6 +9,7 @@
 		<cookie-config>
 			<name>IAMBERRY_WECHAT</name>
 			<http-only>true</http-only>
+			<max-age>1800</max-age>
 		</cookie-config>
 	</session-config>