Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
4050c2b176
|
|
@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
|
|||
import com.nflg.mobilebroken.common.util.AdminUserUtil;
|
||||
import com.nflg.mobilebroken.common.util.SaTokenAdminUtil;
|
||||
import com.nflg.mobilebroken.common.util.SaTokenAppUtil;
|
||||
import com.nflg.mobilebroken.repository.service.IAdminApiService;
|
||||
import com.nflg.mobilebroken.repository.service.IAdminRoleService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
|
@ -22,6 +23,9 @@ public class StpInterfaceImpl implements StpInterface {
|
|||
@Resource
|
||||
private IAdminRoleService adminRoleService;
|
||||
|
||||
@Resource
|
||||
private IAdminApiService adminApiService;
|
||||
|
||||
@Override
|
||||
public List<String> getPermissionList(Object loginId, String loginType) {
|
||||
if (StrUtil.equals(loginType, SaTokenAdminUtil.getLoginType())){
|
||||
|
|
@ -30,6 +34,7 @@ public class StpInterfaceImpl implements StpInterface {
|
|||
List<String> roleCodes = (List<String>) SaTokenAdminUtil.getExtra("roles");
|
||||
urls = adminRoleService.getUrlsByRoleCodes(roleCodes);
|
||||
AdminUserUtil.setPermissions(urls);
|
||||
urls.addAll(adminApiService.getPublics());
|
||||
}
|
||||
return urls;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||
import com.nflg.mobilebroken.common.pojo.vo.ApiVO;
|
||||
import com.nflg.mobilebroken.repository.entity.AdminApi;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -17,4 +18,6 @@ import java.util.List;
|
|||
public interface IAdminApiService extends IService<AdminApi> {
|
||||
|
||||
List<ApiVO> getAll();
|
||||
|
||||
Collection<String> getPublics();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import com.nflg.mobilebroken.repository.mapper.AdminApiMapper;
|
|||
import com.nflg.mobilebroken.repository.service.IAdminApiService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
|
@ -35,4 +36,9 @@ public class AdminApiServiceImpl extends ServiceImpl<AdminApiMapper, AdminApi> i
|
|||
.setItems(Convert.toList(ApiItemVO.class, e.getValue())))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<String> getPublics() {
|
||||
return lambdaQuery().eq(AdminApi::getIsPublic, true).list().stream().map(AdminApi::getUrl).collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue