|
|
@@ -1157,13 +1157,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
String loginType = hpUser1.getLoginType() + "," + AppLoginsEnum.APP.getType();
|
|
|
hpUser1.setLoginType(loginType);
|
|
|
}
|
|
|
- if (StringUtils.isBlank(hpUser1.getUserToken())) {
|
|
|
- //用户token作为请求的标准
|
|
|
- long t1 = System.currentTimeMillis();
|
|
|
- String timestamp = String.valueOf(t1);
|
|
|
- String user_token = Md5Encrypt.md5(hpUser1.getId() + timestamp);
|
|
|
- hpUser1.setUserToken(user_token);
|
|
|
- }
|
|
|
+
|
|
|
+ //用户token作为请求的标准
|
|
|
+ long t1 = System.currentTimeMillis();
|
|
|
+ String timestamp = String.valueOf(t1);
|
|
|
+ String user_token = Md5Encrypt.md5(hpUser1.getId() + timestamp);
|
|
|
+ hpUser1.setUserToken(user_token);
|
|
|
+
|
|
|
this.save(hpUser1);
|
|
|
} else {
|
|
|
hpUser.setRegisterType(AppLoginsEnum.AppRegisterEnum.R_APP.getRegistType());
|
|
|
@@ -1773,13 +1773,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
String loginType = hpUser.getLoginType() + "," + AppLoginsEnum.WX_AUTH.getType();
|
|
|
hpUser.setLoginType(loginType);
|
|
|
}
|
|
|
- if (StringUtils.isBlank(hpUser.getUserToken())) {
|
|
|
- //用户token作为请求的标准
|
|
|
- long t1 = System.currentTimeMillis();
|
|
|
- String timestamp = String.valueOf(t1);
|
|
|
- String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
|
|
|
- hpUser.setUserToken(user_token);
|
|
|
- }
|
|
|
+
|
|
|
+ //用户token作为请求的标准
|
|
|
+ long t1 = System.currentTimeMillis();
|
|
|
+ String timestamp = String.valueOf(t1);
|
|
|
+ String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
|
|
|
+ hpUser.setUserToken(user_token);
|
|
|
+
|
|
|
if (StringUtils.isBlank(hpUser.getUserType())) {
|
|
|
hpUser.setUserType("0");
|
|
|
}
|
|
|
@@ -1942,13 +1942,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
String loginType = hpUser.getLoginType() + "," + AppLoginsEnum.WX_AUTH.getType();
|
|
|
hpUser.setLoginType(loginType);
|
|
|
}
|
|
|
- if (StringUtils.isBlank(hpUser.getUserToken())) {
|
|
|
- //用户token作为请求的标准
|
|
|
- long t1 = System.currentTimeMillis();
|
|
|
- String timestamp = String.valueOf(t1);
|
|
|
- String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
|
|
|
- hpUser.setUserToken(user_token);
|
|
|
- }
|
|
|
+
|
|
|
+ //用户token作为请求的标准
|
|
|
+ long t1 = System.currentTimeMillis();
|
|
|
+ String timestamp = String.valueOf(t1);
|
|
|
+ String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
|
|
|
+ hpUser.setUserToken(user_token);
|
|
|
+
|
|
|
if (StringUtils.isBlank(hpUser.getUserType())) {
|
|
|
hpUser.setUserType("0");
|
|
|
}
|
|
|
@@ -1992,13 +1992,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
String loginType = hpUser.getLoginType() + "," + AppLoginsEnum.WX_AUTH.getType();
|
|
|
hpUser.setLoginType(loginType);
|
|
|
}
|
|
|
- if (StringUtils.isBlank(hpUser.getUserToken())) {
|
|
|
- //用户token作为请求的标准
|
|
|
- long t1 = System.currentTimeMillis();
|
|
|
- String timestamp = String.valueOf(t1);
|
|
|
- String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
|
|
|
- hpUser.setUserToken(user_token);
|
|
|
- }
|
|
|
+
|
|
|
+ //用户token作为请求的标准
|
|
|
+ long t1 = System.currentTimeMillis();
|
|
|
+ String timestamp = String.valueOf(t1);
|
|
|
+ String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
|
|
|
+ hpUser.setUserToken(user_token);
|
|
|
+
|
|
|
if (StringUtils.isBlank(hpUser.getUserType())) {
|
|
|
hpUser.setUserType("0");
|
|
|
}
|
|
|
@@ -2309,13 +2309,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
String loginType = hpUser1.getLoginType() + "," + AppLoginsEnum.MINA.getType();
|
|
|
hpUser1.setLoginType(loginType);
|
|
|
}
|
|
|
- if (StringUtils.isBlank(hpUser1.getUserToken())) {
|
|
|
- //用户token作为请求的标准
|
|
|
- long t1 = System.currentTimeMillis();
|
|
|
- String timestamp = String.valueOf(t1);
|
|
|
- String user_token = Md5Encrypt.md5(hpUser1.getId() + timestamp);
|
|
|
- hpUser1.setUserToken(user_token);
|
|
|
- }
|
|
|
+
|
|
|
+ //用户token作为请求的标准
|
|
|
+ long t1 = System.currentTimeMillis();
|
|
|
+ String timestamp = String.valueOf(t1);
|
|
|
+ String user_token = Md5Encrypt.md5(hpUser1.getId() + timestamp);
|
|
|
+ hpUser1.setUserToken(user_token);
|
|
|
+
|
|
|
if (StringUtils.isBlank(hpUser1.getUserType())) {
|
|
|
hpUser1.setUserType("0");
|
|
|
}
|
|
|
@@ -2463,13 +2463,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
String loginType = hpUser.getLoginType() + "," + AppLoginsEnum.MINA.getType();
|
|
|
hpUser.setLoginType(loginType);
|
|
|
}
|
|
|
- if (StringUtils.isBlank(hpUser.getUserToken())) {
|
|
|
- //用户token作为请求的标准
|
|
|
- long t1 = System.currentTimeMillis();
|
|
|
- String timestamp = String.valueOf(t1);
|
|
|
- String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
|
|
|
- hpUser.setUserToken(user_token);
|
|
|
- }
|
|
|
+
|
|
|
+ //用户token作为请求的标准
|
|
|
+ long t1 = System.currentTimeMillis();
|
|
|
+ String timestamp = String.valueOf(t1);
|
|
|
+ String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
|
|
|
+ hpUser.setUserToken(user_token);
|
|
|
+
|
|
|
if (StringUtils.isBlank(hpUser.getUserType())) {
|
|
|
hpUser.setUserType("0");
|
|
|
}
|
|
|
@@ -2513,13 +2513,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
String loginType = hpUser.getLoginType() + "," + AppLoginsEnum.MINA.getType();
|
|
|
hpUser.setLoginType(loginType);
|
|
|
}
|
|
|
- if (StringUtils.isBlank(hpUser.getUserToken())) {
|
|
|
- //用户token作为请求的标准
|
|
|
- long t1 = System.currentTimeMillis();
|
|
|
- String timestamp = String.valueOf(t1);
|
|
|
- String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
|
|
|
- hpUser.setUserToken(user_token);
|
|
|
- }
|
|
|
+
|
|
|
+ //用户token作为请求的标准
|
|
|
+ long t1 = System.currentTimeMillis();
|
|
|
+ String timestamp = String.valueOf(t1);
|
|
|
+ String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
|
|
|
+ hpUser.setUserToken(user_token);
|
|
|
+
|
|
|
if (StringUtils.isBlank(hpUser.getUserType())) {
|
|
|
hpUser.setUserType("0");
|
|
|
}
|