账号微服务

server/src/main/java/com/pica/cloud/account/account/server/controller/AccountController.java

@@ -54,10 +54,10 @@ public class AccountController extends AccountBaseController {
         //判断账号是否已经存在
         Account account = accountService.getByMobilePhone(mobilePhone);
         long senderId = account == null ? 0L : account.getId();
-        //发送短信
-        super.sendMobileMessage(mobilePhone, message, senderId);
         //验证码保存到redis，失效时间10分钟
         redisClient.set(this.getAuthCodeKey(mobilePhone, flag), authCode, 600);
+        //发送短信
+        super.sendMobileMessage(mobilePhone, message, senderId);
         return PicaResponse.toResponse(authCode);
     }
 
@@ -75,17 +75,7 @@ public class AccountController extends AccountBaseController {
 
         //已经绑定过云鹊医账号，登录成功，返回token
         String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
-        String newToken;
-        switch (deviceType) {  //设备信息，pc没有微信登录
-            case "2":  //android
-            case "3":  //ios
-                //TODO  更新设备信息
-                newToken = StringUtils.EMPTY;
-                break;
-            default:  //H5
-                newToken = this.generateH5Token(account.getId());
-        }
-
+        String newToken = this.generateToken(account.getId(), deviceType);
         return PicaResponse.toResponse(newToken);
     }
 
@@ -120,21 +110,7 @@ public class AccountController extends AccountBaseController {
 
         //登录成功，清除旧token，生成新token
         String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
-        String newToken;
-        switch (deviceType) {  //设备信息
-            case "1":  //pc
-                //TODO
-                newToken = StringUtils.EMPTY;
-                break;
-            case "2":  //android
-            case "3":  //ios
-                //TODO  更新设备信息
-                newToken = StringUtils.EMPTY;
-                break;
-            default:  //H5
-                newToken = this.generateH5Token(account.getId());
-        }
-
+        String newToken = this.generateToken(account.getId(), deviceType);
         return PicaResponse.toResponse(newToken);
     }
 
@@ -148,7 +124,7 @@ public class AccountController extends AccountBaseController {
         account.setMobilePhone(req.getMobilePhone());
         switch (deviceType) {  //注册来源
             case "1":
-                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_3);  //saas
+                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_3);  //pc
                 break;
             case "2":
                 account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_1);  //android
@@ -240,4 +216,23 @@ public class AccountController extends AccountBaseController {
         return newToken;
     }
 
+    //清除旧token，生成新token
+    private String generateToken(Long doctorId, String deviceType) {
+        String newToken;
+        switch (deviceType) {  //设备信息
+            case "1":  //pc
+                //TODO
+                newToken = StringUtils.EMPTY;
+                break;
+            case "2":  //android
+            case "3":  //ios
+                //TODO  更新设备信息
+                newToken = StringUtils.EMPTY;
+                break;
+            default:  //H5
+                newToken = this.generateH5Token(doctorId);
+        }
+        return newToken;
+    }
+
 }