Merge branch 'dev-0814' into 'release'

Dev 0814

review coder:陈哲浩

See merge request !41

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

@@ -174,7 +174,14 @@ public class AccountController extends AccountBaseController {
 
         //登录成功，清除旧token，生成新token
         String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
-        String newToken = this.generateToken(account, deviceType);
+//        String newToken = this.generateToken(account, deviceType);
+        String newToken = "";
+        if(deviceType.equals("1")){
+            newToken = this.generateToken(account, "4"); //pc端注册，目前无法生成新token
+        }else {
+            newToken = this.generateToken(account, deviceType);
+        }
+
         intactUtil.sendIntact(batchNo,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"req:"+ JSON.toJSONString(req));
         return PicaResponse.toResponse(newToken);
     }
@@ -207,7 +214,12 @@ public class AccountController extends AccountBaseController {
         accountService.createAccount(account,null);
 
         //生成token并返回
-        String newToken = this.generateToken(account, deviceType);
+        String newToken = "";
+        if(deviceType.equals("1")){
+            newToken = this.generateToken(account, "4"); //pc端注册，目前无法生成新token
+        }else {
+            newToken = this.generateToken(account, deviceType);
+        }
 
         LoginResult result = new LoginResult();
         result.setToken(newToken);