账号微服务

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

@@ -138,18 +138,8 @@ public class AccountController extends AccountBaseController {
         accountService.createAccount(account);  //创建账号
 
         //生成token并返回
-        try {
-            if (account.getRegisterSource().intValue() == 7) {  //H5注册生成token
-                return PicaResponse.toResponse(this.generateH5Token(account.getId()));
-            } else {  //pc,android,ios注册生成token
-                //TODO 生成token； app注册更新设备信息
-                //super.saveToken(null, null);
-                return PicaResponse.toResponse(StringUtils.EMPTY);
-            }
-        } catch (Exception ex) {
-            logger.error("生成token异常：{}", ex.getMessage());
-            return PicaResponse.toResponse(StringUtils.EMPTY);
-        }
+        String newToken = this.generateToken(account.getId(), deviceType);
+        return PicaResponse.toResponse(newToken);
     }
 
     @ApiOperation("登录或注册")
@@ -200,19 +190,23 @@ public class AccountController extends AccountBaseController {
 
     //生成H5 token
     private String generateH5Token(Long doctorId) {
-        //先清除旧token
-        String tokenValue = "token-doctor-" + doctorId.toString();
-        String oldToken = redisClient.get(tokenValue + "-h5");
-        if (StringUtils.isNotBlank(oldToken)) {
-            redisClient.del(oldToken);
+        String newToken = StringUtils.EMPTY;
+        try {
+            //先清除旧token
+            String tokenValue = "token-doctor-" + doctorId.toString();
+            String oldToken = redisClient.get(tokenValue + "-h5");
+            if (StringUtils.isNotBlank(oldToken)) {
+                redisClient.del(oldToken);
+            }
+            //生成新token
+            int expiredSeconds = 30*24*60*60;  //H5 token有效期30天
+            newToken = UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            String tokenKey = "token-" + newToken;
+            redisClient.set(tokenKey, tokenValue, expiredSeconds);
+            redisClient.set(tokenValue + "-h5", tokenKey, expiredSeconds);
+        } catch (Exception ex) {
+            logger.error("生成H5 token异常：{}" + ex.getMessage(), ex);
         }
-
-        //生成新token
-        int expiredSeconds = 30*24*60*60;  //H5 token有效期30天
-        String newToken = UUID.randomUUID().toString().replace("-", "").toUpperCase();
-        String tokenKey = "token-" + newToken;
-        redisClient.set(tokenKey, tokenValue, expiredSeconds);
-        redisClient.set(tokenValue + "-h5", tokenKey, expiredSeconds);
         return newToken;
     }