改造:平台用户的登录及注册,关键词:isAdmin
This commit is contained in:
@@ -143,20 +143,18 @@ public class CmsWebsiteController extends BaseController {
|
|||||||
@ApiOperation("网站基本信息")
|
@ApiOperation("网站基本信息")
|
||||||
@GetMapping("/getSiteInfo")
|
@GetMapping("/getSiteInfo")
|
||||||
public ApiResult<CmsWebsite> getSiteInfo(HttpServletRequest request) {
|
public ApiResult<CmsWebsite> getSiteInfo(HttpServletRequest request) {
|
||||||
final Integer tenantId = getTenantId();
|
String key = "RootSiteInfo";
|
||||||
String key = "RootSiteInfo:" + tenantId;
|
|
||||||
final String siteInfo = redisUtil.get(key);
|
final String siteInfo = redisUtil.get(key);
|
||||||
String access_token = JwtUtil.getAccessToken(request);
|
String access_token = JwtUtil.getAccessToken(request);
|
||||||
System.out.println("access_token = " + access_token);
|
|
||||||
// 从缓存读取信息
|
// 从缓存读取信息
|
||||||
if(StrUtil.isNotBlank(siteInfo)){
|
if(StrUtil.isNotBlank(siteInfo)){
|
||||||
// return success(JSONObject.parseObject(siteInfo,CmsWebsite.class));
|
return success(JSONObject.parseObject(siteInfo,CmsWebsite.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 判断是否存在
|
// 判断是否存在
|
||||||
if (cmsWebsiteService.count() == 0) {
|
// if (cmsWebsiteService.count() == 0) {
|
||||||
return fail("站点不存在",null);
|
// return fail("站点不存在",null);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// 获取站点信息
|
// 获取站点信息
|
||||||
final CmsWebsite website = cmsWebsiteService.getOne(new LambdaQueryWrapper<CmsWebsite>().eq(CmsWebsite::getDeleted, 0).last("limit 1"));
|
final CmsWebsite website = cmsWebsiteService.getOne(new LambdaQueryWrapper<CmsWebsite>().eq(CmsWebsite::getDeleted, 0).last("limit 1"));
|
||||||
|
|||||||
@@ -74,9 +74,10 @@ public class MybatisPlusConfig {
|
|||||||
"sys_components",
|
"sys_components",
|
||||||
"sys_website_field",
|
"sys_website_field",
|
||||||
"sys_white_domain",
|
"sys_white_domain",
|
||||||
// "cms_website",
|
"cms_website",
|
||||||
"cms_domain",
|
"cms_domain",
|
||||||
"cms_website_field"
|
"cms_website_field",
|
||||||
|
"cms_navigation"
|
||||||
).contains(tableName);
|
).contains(tableName);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -581,7 +581,7 @@ public class MainController extends BaseController {
|
|||||||
// 签发token
|
// 签发token
|
||||||
String access_token = JwtUtil.buildToken(new JwtSubject(phone, adminByPhone.getTenantId()),
|
String access_token = JwtUtil.buildToken(new JwtSubject(phone, adminByPhone.getTenantId()),
|
||||||
tokenExpireTime, configProperties.getTokenKey());
|
tokenExpireTime, configProperties.getTokenKey());
|
||||||
return success("登录成功", new LoginResult(access_token, adminByPhone));
|
return success("注册成功", new LoginResult(access_token, adminByPhone));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user