|
@@ -144,7 +144,7 @@ public class LoginController {
|
|
|
accessToken.setFarmId(data.getFarmIds());
|
|
|
accessToken.setType(data.getType());
|
|
|
accessToken.setId(data.getId());
|
|
|
- String token = TokenSign.sign(accountName, data.getId(), data.getFarmIds(), data.getWorkLocationId(), data.getType());
|
|
|
+ String token = TokenSign.sign(data.getUserName(), data.getId(), data.getFarmIds(), data.getWorkLocationId(), data.getType());
|
|
|
accessToken.setToken(token);
|
|
|
Integer lastFarmId = data.getLastFarmId();
|
|
|
if (ObjectUtil.isEmpty(lastFarmId)) {
|
|
@@ -254,7 +254,7 @@ public class LoginController {
|
|
|
accessToken.setFarmId(data.getFarmIds());
|
|
|
accessToken.setType(data.getType());
|
|
|
accessToken.setId(data.getId());
|
|
|
- String token = TokenSign.sign(data.getAccount(), data.getId(), data.getFarmIds(), data.getWorkLocationId(), 7);
|
|
|
+ String token = TokenSign.sign(data.getUserName(), data.getId(), data.getFarmIds(), data.getWorkLocationId(), 7);
|
|
|
accessToken.setToken(token);
|
|
|
Integer lastFarmId = data.getLastFarmId();
|
|
|
if (ObjectUtil.isEmpty(lastFarmId)) {
|
|
@@ -316,7 +316,7 @@ public class LoginController {
|
|
|
accessToken.setFarmId(sysAccountMultilevel.getFarmIds());
|
|
|
accessToken.setType(sysAccountMultilevel.getType());
|
|
|
accessToken.setId(sysAccountMultilevel.getId());
|
|
|
- String token = TokenSign.sign(sysAccountMultilevel.getAccount(), sysAccountMultilevel.getId(), sysAccountMultilevel.getFarmIds(), sysAccountMultilevel.getWorkLocationId(), sysAccountMultilevel.getType());
|
|
|
+ String token = TokenSign.sign(sysAccountMultilevel.getUserName(), sysAccountMultilevel.getId(), sysAccountMultilevel.getFarmIds(), sysAccountMultilevel.getWorkLocationId(), sysAccountMultilevel.getType());
|
|
|
accessToken.setToken(token);
|
|
|
Integer lastFarmId = sysAccountMultilevel.getLastFarmId();
|
|
|
if (ObjectUtil.isEmpty(lastFarmId)) {
|