caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

权限改版完成

Browse Source
This commit is contained in:
Chopper 2021-07-27 17:03:31 +08:00
parent a407d3a539
commit 5999b5f217
7 changed files with 61 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
View File

@ -39,6 +39,10 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
@Autowired @Autowired
private WechatAccessTokenUtil wechatAccessTokenUtil; private WechatAccessTokenUtil wechatAccessTokenUtil;
/**
* 设置行业
*/
private final String setIndustry = "https://api.weixin.qq.com/cgi-bin/template/api_set_industry?access_token=";
/** /**
* get 获取所有的模版 * get 获取所有的模版
*/ */
@ -54,9 +58,18 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
try { try {
this.baseMapper.deleteAll(); this.baseMapper.deleteAll();
//获取token
String accessToken = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.H5); String accessToken = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.H5);
//设置行业
Map<String, Object> setIndustryParams = new HashMap<>();
setIndustryParams.put("industry_id1", 1);//互联网/电子商务
setIndustryParams.put("industry_id2", 5);//通信与运营商
String context = HttpUtils.doPostWithJson(setIndustry + accessToken, setIndustryParams);
//获取已有模版，删除 //获取已有模版，删除
String context = HttpUtil.get(allMsgTpl + accessToken); context = HttpUtil.get(allMsgTpl + accessToken);
JSONObject jsonObject = new JSONObject(context); JSONObject jsonObject = new JSONObject(context);
WechatMessageUtil.wechatHandler(jsonObject); WechatMessageUtil.wechatHandler(jsonObject);
List<String> oldList = new ArrayList<>(); List<String> oldList = new ArrayList<>();
@ -77,7 +90,7 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
List<WechatMessageData> tmpList = initData(); List<WechatMessageData> tmpList = initData();
tmpList.forEach(tplData -> { tmpList.forEach(tplData -> {
WechatMessage wechatMessage = new WechatMessage(); WechatMessage wechatMessage = new WechatMessage();
Map params = new HashMap<>(1); Map<String, Object> params = new HashMap<>(1);
params.put("template_id_short", tplData.getMsgId()); params.put("template_id_short", tplData.getMsgId());
String content = HttpUtils.doPostWithJson(addTpl + accessToken, params); String content = HttpUtils.doPostWithJson(addTpl + accessToken, params);
JSONObject tplContent = new JSONObject(content); JSONObject tplContent = new JSONObject(content);

2
framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java
View File

@ -68,7 +68,7 @@ public class WechatAccessTokenUtil {
} }
//获取token //获取token
String content = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential" + String content = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential" +
"&appid=" + item.getAppId() + "&secret=" + item.getAppSecret()); "&appid=wx6cfbe6e0ace12ce8&secret=6dfbe0c72380dce5d49d65b3c91059b1");
JSONObject object = new JSONObject(content); JSONObject object = new JSONObject(content);
log.info("token获取【" + clientTypeEnum.name() + "】返回" + object.toString()); log.info("token获取【" + clientTypeEnum.name() + "】返回" + object.toString());

12
framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
View File

@ -93,7 +93,7 @@ public class WechatMessageUtil {
return; return;
} }
log.info("微信消息发送消息：", order.getMemberId() + "-" + sn); log.info("微信消息发送消息：{}", order.getMemberId() + "-" + sn);
//获取token //获取token
String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.H5); String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.H5);
@ -137,7 +137,7 @@ public class WechatMessageUtil {
wechatMPMessageQueryWrapper.eq(WechatMPMessage::getOrderStatus, order.getOrderStatus()); wechatMPMessageQueryWrapper.eq(WechatMPMessage::getOrderStatus, order.getOrderStatus());
WechatMPMessage wechatMPMessage = wechatMPMessageService.getOne(wechatMPMessageQueryWrapper); WechatMPMessage wechatMPMessage = wechatMPMessageService.getOne(wechatMPMessageQueryWrapper);
if (wechatMPMessage == null) { if (wechatMPMessage == null) {
log.error("未配置微信消息订阅"); log.info("未配置微信消息订阅");
return; return;
} }
@ -150,7 +150,7 @@ public class WechatMessageUtil {
return; return;
} }
log.info("微信消息订阅消息发送：", order.getMemberId() + "-" + sn); log.info("微信消息订阅消息发送：{}", order.getMemberId() + "-" + sn);
//获取token //获取token
String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP); String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
@ -270,7 +270,7 @@ public class WechatMessageUtil {
/** /**
* 如果返回信息有错误 * 如果返回信息有错误
* *
* @param jsonObject * @param jsonObject 返回消息
*/ */
public static void wechatHandler(JSONObject jsonObject) { public static void wechatHandler(JSONObject jsonObject) {
if (jsonObject.containsKey("errmsg")) { if (jsonObject.containsKey("errmsg")) {
@ -283,9 +283,9 @@ public class WechatMessageUtil {
} }
/** /**
* 如果返回信息有错误....................................................................................................................................................................................333333333333333333 * 如果返回信息有错误
* *
* @param string * @param string 返回消息
*/ */
public static String wechatHandler(String string) { public static String wechatHandler(String string) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();

18
framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java
View File

@ -26,36 +26,30 @@ public class Menu extends BaseEntity {
private static final long serialVersionUID = 7050744476203495207L; private static final long serialVersionUID = 7050744476203495207L;
@ApiModelProperty(value = "菜单/权限名称") @ApiModelProperty(value = "菜单名称")
private String name; private String name;
@ApiModelProperty(value = "层级") @ApiModelProperty(value = "菜单层级")
private Integer level; private Integer level;
@ApiModelProperty(value = "菜单标题") @ApiModelProperty(value = "菜单标题")
private String title; private String title;
@ApiModelProperty(value = "赋权API地址,正则表达式") @ApiModelProperty(value = "路径")
private String path; private String path;
@ApiModelProperty(value = "前端路由") @ApiModelProperty(value = "前端目录文件")
private String frontRoute; private String frontRoute;
@ApiModelProperty(value = "图标")
private String icon;
@ApiModelProperty(value = "父id") @ApiModelProperty(value = "父id")
private String parentId = "0"; private String parentId = "0";
@ApiModelProperty(value = "说明备注")
private String description;
@ApiModelProperty(value = "排序值") @ApiModelProperty(value = "排序值")
@Column(precision = 10, scale = 2) @Column(precision = 10, scale = 2)
private BigDecimal sortOrder; private BigDecimal sortOrder;
@ApiModelProperty(value = "文件地址") @ApiModelProperty(value = "权限URL，*号模糊匹配，逗号分割")
private String frontComponent; private String permission;
} }

6
framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java
View File

@ -19,4 +19,10 @@ public class UserMenuVO extends Menu {
*/ */
private Boolean isSupper; private Boolean isSupper;
public Boolean getSupper() {
if (this.isSupper == null) {
return false;
}
return isSupper;
}
} }

19
framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java
View File

@ -77,28 +77,27 @@ public class ManagerTokenGenerate extends AbstractTokenGenerate {
//循环权限菜单 //循环权限菜单
userMenuVOList.forEach(menu -> { userMenuVOList.forEach(menu -> {
//循环菜单，赋予用户权限 //循环菜单，赋予用户权限
if (menu.getPath() != null) { if (menu.getPermission() != null) {
//获取路径集合 //获取路径集合
String[] paths = menu.getPath().split("\\|"); String[] permissionUrl = menu.getPermission().split(",");
//for循环路径集合 //for循环路径集合
for (String path : paths) { for (String url : permissionUrl) {
//如果是超级权限 则计入超级权限 //如果是超级权限 则计入超级权限
if (menu.getIsSupper() != null && menu.getIsSupper()) { if (menu.getSupper()) {
//如果已有超级权限，则这里就不做权限的累加 //如果已有超级权限，则这里就不做权限的累加
if (!superPermissions.contains(path)) { if (!superPermissions.contains(url)) {
superPermissions.add(path); superPermissions.add(url);
} }
} }
//否则计入浏览权限 //否则计入浏览权限
else { else {
//如果已有超级权限，或者已有普通查看权限，则这里就不做权限的累加 //没有权限，则累加。
if (!superPermissions.contains(path) && !queryPermissions.contains(path)) { if (!queryPermissions.contains(url)) {
queryPermissions.add(path); queryPermissions.add(url);
} }
} }
} }
} }
//去除无效的权限 //去除无效的权限
superPermissions.forEach(queryPermissions::remove); superPermissions.forEach(queryPermissions::remove);
}); });

28
manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java
View File

@ -75,24 +75,32 @@ public class ManagerAuthenticationFilter extends BasicAuthenticationFilter {
private void customAuthentication(HttpServletRequest request, HttpServletResponse response, UsernamePasswordAuthenticationToken authentication) throws NoPermissionException { private void customAuthentication(HttpServletRequest request, HttpServletResponse response, UsernamePasswordAuthenticationToken authentication) throws NoPermissionException {
AuthUser authUser = (AuthUser) authentication.getDetails(); AuthUser authUser = (AuthUser) authentication.getDetails();
String requestUrl = request.getRequestURI(); String requestUrl = request.getRequestURI();
Map<String, List<String>> permission = (Map<String, List<String>>) cache.get(CachePrefix.PERMISSION_LIST.getPrefix(UserEnums.MANAGER) + authUser.getId());
//如果不是超级管理员， 不做鉴权
//如果不是超级管理员， 则鉴权
if (!authUser.getIsSuper()) { if (!authUser.getIsSuper()) {
//获取数据权限 Map<String, List<String>> permission = (Map<String, List<String>>) cache.get(CachePrefix.PERMISSION_LIST.getPrefix(UserEnums.MANAGER) + authUser.getId());
System.out.println(requestUrl);
System.out.println(PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), requestUrl));
System.out.println(PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY.name()).toArray(new String[0]), requestUrl));
//获取数据(GET 请求)权限
if (request.getMethod().equals(RequestMethod.GET.name())) { if (request.getMethod().equals(RequestMethod.GET.name())) {
//如果用户的超级权限和查阅权限都不包含当前请求的api //如果用户的超级权限和查阅权限都不包含当前请求的api
if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), requestUrl) && if (PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), requestUrl)
!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY.name()).toArray(new String[0]), requestUrl)) { || PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY.name()).toArray(new String[0]), requestUrl)) {
} else {
ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限")); ResponseUtil.output(response, ResponseUtil.resultMap(false, 400, "权限不足"));
throw new NoPermissionException("权限不足"); throw new NoPermissionException("权限不足");
} }
} }
//非get请求（数据操作） 判定 //非get请求（数据操作） 判定鉴权
else { else {
if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), request.getRequestURI())) { if (PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), request.getRequestURI())) {
ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限")); } else {
ResponseUtil.output(response, ResponseUtil.resultMap(false, 400, "权限不足"));
throw new NoPermissionException("权限不足"); throw new NoPermissionException("权限不足");
} }
} }