Merge branch 'wei_master' into '105'

update

See merge request !49

src/main/java/com/server/utils/ParamStrMap.java

+package com.server.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by dell on 2018/2/28.
+ */
+public class ParamStrMap {
+    private Map<String, String> data = new HashMap();
+
+    private ParamStrMap() {
+    }
+
+    public static ParamStrMap create() {
+        return new ParamStrMap();
+    }
+
+    public static ParamStrMap create(String key, String value) {
+        return create().put(key, value);
+    }
+
+    public ParamStrMap put(String key, String value) {
+        this.data.put(key, value);
+        return this;
+    }
+
+    public Map<String, String> getData() {
+        return this.data;
+    }
+}

src/main/java/com/server/web/controller/BaseController.java

 package com.server.web.controller;
 package com.server.web.controller;
 
 
+import com.server.utils.ParamStrMap;
+import com.server.utils.weixin.HttpURLUtil;
 import com.server.utils.weixin.WeixinBaseUtil;
 import com.server.utils.weixin.WeixinBaseUtil;
 import com.server.utils.weixin.bean.AccessTokenBean;
 import com.server.utils.weixin.bean.AccessTokenBean;
 import com.server.web.common.mapper.TKzyUserMapper;
 import com.server.web.common.mapper.TKzyUserMapper;
@@ -32,6 +34,8 @@ public class BaseController {
     Logger logger = LoggerFactory.getLogger(getClass());
     Logger logger = LoggerFactory.getLogger(getClass());
 
 
     public final static String WX_USER_SESSION_KEY = "weixin_user_session_key";
     public final static String WX_USER_SESSION_KEY = "weixin_user_session_key";
+    //获取微信accesstockenurl
+    public static final String AccessTokenURL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
 
 
     /**
     /**
      * 获取appaccessToken
      * 获取appaccessToken
@@ -50,10 +54,15 @@ public class BaseController {
             }
             }
             if(redisAccessToken){
             if(redisAccessToken){
 
 
-                String url = WeixinBaseUtil.ACCESS_TOKEN_URL + "&appid=" + appId + "&secret=" + appSecret;
-                RestTemplate restTemplate = new RestTemplate();
-                json = restTemplate.getForObject(url, String.class);
-                redisTemplate.opsForValue().set("wx_accessToken_"+appId,json,60*60, TimeUnit.SECONDS);
+//                String url = WeixinBaseUtil.ACCESS_TOKEN_URL + "&appid=" + appId + "&secret=" + appSecret;
+//                RestTemplate restTemplate = new RestTemplate();
+//                json = restTemplate.getForObject(url, String.class);
+//                redisTemplate.opsForValue().set("wx_accessToken_"+appId,json,60*60, TimeUnit.SECONDS);
+
+                final Map queryParas = ParamStrMap.create("appid", appId).put("secret", appSecret).getData();
+                json = HttpURLUtil.get(AccessTokenURL, queryParas);
+                redisTemplate.opsForValue().set("wx_accessToken_"+appId,json,60*5, TimeUnit.SECONDS);
+
             }
             }
             AccessTokenBean accessTokenBean = new AccessTokenBean(json);
             AccessTokenBean accessTokenBean = new AccessTokenBean(json);
             return accessTokenBean.getAccessToken();
             return accessTokenBean.getAccessToken();