Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/UserApiController.java

@@ -301,7 +301,11 @@ public class UserApiController {
 
         try {
             if (StrUtil.isBlank(openId)) {
-                    throw new Exception("微信标识不存在");
+                throw new Exception("微信标识不存在");
+            }
+
+            if (StrUtil.isBlank(phone)) {
+                throw new Exception("手机号不能为空");
             }
 
             PersonInfo personInfo = null;

web/src/main/java/com/jpsoft/employment/modules/wechat/controller/WxController.java

@@ -229,11 +229,11 @@ public class WxController {
     public MessageResult findUserPhoneNumber(@PathVariable String code) {
         try {
 
-            String accessToken = (String)valueOperations.get("accessToken1");
+            String accessToken = (String)valueOperations.get("accessToken");
             if(StringUtils.isEmpty(accessToken)){
                 AccessToken token = WeixinUtil.getAccessToken(wxPropertiesApplet.getAppId(), wxPropertiesApplet.getAppSecret());
                 accessToken = token.getToken();
-                valueOperations.set("accessToken1",token.getToken(),2, TimeUnit.HOURS);
+                valueOperations.set("accessToken",token.getToken(),2, TimeUnit.HOURS);
             }
             String phone = WeixinUtil.getUserPhoneNumber(accessToken,code);