Merge branch 'master' into develop
This commit is contained in:
commit
22e7aa77cd
|
|
@ -354,6 +354,8 @@ public class LoginServiceImpl implements ILoginService {
|
||||||
* @return LoginTokenVo
|
* @return LoginTokenVo
|
||||||
*/
|
*/
|
||||||
private LoginTokenVo makeLoginToken(Integer userId, String mobile) {
|
private LoginTokenVo makeLoginToken(Integer userId, String mobile) {
|
||||||
|
mobile = StringUtils.isNull(mobile) ? "" : mobile;
|
||||||
|
|
||||||
String token = ToolsUtils.makeToken();
|
String token = ToolsUtils.makeToken();
|
||||||
int tokenValidTime = Integer.parseInt(YmlUtils.get("like.token-valid-time"));
|
int tokenValidTime = Integer.parseInt(YmlUtils.get("like.token-valid-time"));
|
||||||
RedisUtils.set(FrontConfig.frontendTokenKey+token, userId, tokenValidTime);
|
RedisUtils.set(FrontConfig.frontendTokenKey+token, userId, tokenValidTime);
|
||||||
|
|
|
||||||
|
|
@ -562,8 +562,6 @@ INSERT INTO `la_system_config` VALUES (41, 'mp_channel', 'primaryId', '', 166062
|
||||||
INSERT INTO `la_system_config` VALUES (42, 'mp_channel', 'appId', '', 1660620367, 1662551403);
|
INSERT INTO `la_system_config` VALUES (42, 'mp_channel', 'appId', '', 1660620367, 1662551403);
|
||||||
INSERT INTO `la_system_config` VALUES (43, 'mp_channel', 'appSecret', '', 1660620367, 1662551403);
|
INSERT INTO `la_system_config` VALUES (43, 'mp_channel', 'appSecret', '', 1660620367, 1662551403);
|
||||||
INSERT INTO `la_system_config` VALUES (44, 'mp_channel', 'qrCode', '', 1660620367, 1662551403);
|
INSERT INTO `la_system_config` VALUES (44, 'mp_channel', 'qrCode', '', 1660620367, 1662551403);
|
||||||
INSERT INTO `la_system_config` VALUES (50, 'wx_channel', 'appId', '', 1660620367, 1660620367);
|
|
||||||
INSERT INTO `la_system_config` VALUES (51, 'wx_channel', 'appSecret', '', 1660620367, 1660620367);
|
|
||||||
INSERT INTO `la_system_config` VALUES (55, 'oa_channel', 'name', '', 1660620367, 1662551337);
|
INSERT INTO `la_system_config` VALUES (55, 'oa_channel', 'name', '', 1660620367, 1662551337);
|
||||||
INSERT INTO `la_system_config` VALUES (56, 'oa_channel', 'primaryId', ' ', 1660620367, 1662551337);
|
INSERT INTO `la_system_config` VALUES (56, 'oa_channel', 'primaryId', ' ', 1660620367, 1662551337);
|
||||||
INSERT INTO `la_system_config` VALUES (57, 'oa_channel', 'qrCode', '', 1662551337, 1662551337);
|
INSERT INTO `la_system_config` VALUES (57, 'oa_channel', 'qrCode', '', 1662551337, 1662551337);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue