log

src/main/java/cn/quantgroup/xyqb/controller/external/user/WebChatController.java → src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java

@@ -6,8 +6,8 @@ import cn.quantgroup.xyqb.model.webchat.AccessTokenResponse;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,20 +20,21 @@ import java.util.Arrays;
 /**
  * Created by 11 on 2017/1/17.
  */
+@Slf4j
 @RestController
-@RequestMapping("/webchat")
-public class WebChatController {
+@RequestMapping("/wechat")
+public class WeChatController {
 
+    // todo: 配置文件
     public static final String TOKEN = "5YihkluEo5QuWAWpFwzvA";
 
-    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(WebChatController.class);
-
     @Autowired
     private IHttpService httpService;
     @Autowired
     private IUserService userService;
-    public String access_token_url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxcdf6077af8127559&secret=16eaec16084d0d9c52d4114f359cc72c&code=%s&grant_type=authorization_code";
-    public String access_userinfo_url = "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN";
+    //todo: 配置文件相关
+    private String access_token_url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxcdf6077af8127559&secret=16eaec16084d0d9c52d4114f359cc72c&code=%s&grant_type=authorization_code";
+    private String access_userinfo_url = "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN";
 
 
     /**
@@ -72,11 +73,6 @@ public class WebChatController {
         return null;
     }
 
-    public static void main(String[] args) {
-        String test = " ";
-        System.out.println(StringUtils.isEmpty(test));
-        System.out.println(StringUtils.isBlank(test));
-    }
 
     /**
      * 验签：步骤
@@ -87,14 +83,14 @@ public class WebChatController {
      * @param request
      * @return
      */
-    public boolean checkSignature(HttpServletRequest request) {
+    private boolean checkSignature(HttpServletRequest request) {
         String signature = request.getParameter("signature");
         String timestamp = request.getParameter("timestamp");
         String nonce = request.getParameter("nonce");
         String token = TOKEN;
         String[] arrs = new String[]{token, timestamp, nonce};
         Arrays.sort(arrs);
-        String joinStr = splitArray(arrs);
+        String joinStr = joinArray(arrs);
         joinStr = sha1(joinStr);
         return joinStr.equals(signature);
     }
@@ -122,7 +118,7 @@ public class WebChatController {
             return hexString.toString();
 
         } catch (NoSuchAlgorithmException e) {
-            LOGGER.error("未找到sha1算法." + e.getMessage());
+            log.error("未找到sha1算法." + e.getMessage());
         }
         return "";
     }
@@ -132,7 +128,7 @@ public class WebChatController {
      * @param arr
      * @return
      */
-    private String splitArray(String[] arr) {
+    private String joinArray(String[] arr) {
         StringBuilder builder = new StringBuilder();
         for(String str : arr){
             builder.append(str);
@@ -164,7 +160,7 @@ public class WebChatController {
         try {
             accessTokenResponse = JSON.parseObject(response, AccessTokenResponse.class);
         } catch (Exception e){
-            LOGGER.error("获取access_token出错{}:", e);
+            log.error("获取access_token出错{}:", e);
             return JsonResult.buildErrorStateResult("获取access_token出错", null);
         }
         //从AccessTokenResponse中获取access_token, openid