Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop

2021-07-27 17:17:19 +08:00
parent 4ac7c038f2 b8634e9d59
commit cd1b67ba84
8 changed files with 475 additions and 43 deletions
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
@@ -39,6 +39,10 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
    @Autowired
    private WechatAccessTokenUtil wechatAccessTokenUtil;

+    /**
+     * 设置行业
+     */
+    private final String setIndustry = "https://api.weixin.qq.com/cgi-bin/template/api_set_industry?access_token=";
    /**
     * get 获取所有的模版
     */
@@ -54,9 +58,18 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
        try {
            this.baseMapper.deleteAll();

+            //获取token
            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);
            WechatMessageUtil.wechatHandler(jsonObject);
            List<String> oldList = new ArrayList<>();
@@ -77,7 +90,7 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
            List<WechatMessageData> tmpList = initData();
            tmpList.forEach(tplData -> {
                WechatMessage wechatMessage = new WechatMessage();
-                Map params = new HashMap<>(1);
+                Map<String, Object> params = new HashMap<>(1);
                params.put("template_id_short", tplData.getMsgId());
                String content = HttpUtils.doPostWithJson(addTpl + accessToken, params);
                JSONObject tplContent = new JSONObject(content);
--- a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java
+++ b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java
@@ -68,7 +68,7 @@ public class WechatAccessTokenUtil {
            }
            //获取token
            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);
            log.info("token获取【" + clientTypeEnum.name() + "】返回" + object.toString());
--- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
+++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
@@ -93,7 +93,7 @@ public class WechatMessageUtil {
            return;
        }

-        log.info("微信消息发送消息：", order.getMemberId() + "-" + sn);
+        log.info("微信消息发送消息：{}", order.getMemberId() + "-" + sn);
        //获取token
        String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.H5);

@@ -137,7 +137,7 @@ public class WechatMessageUtil {
        wechatMPMessageQueryWrapper.eq(WechatMPMessage::getOrderStatus, order.getOrderStatus());
        WechatMPMessage wechatMPMessage = wechatMPMessageService.getOne(wechatMPMessageQueryWrapper);
        if (wechatMPMessage == null) {
-            log.error("未配置微信消息订阅");
+            log.info("未配置微信消息订阅");
            return;
        }

@@ -150,7 +150,7 @@ public class WechatMessageUtil {
            return;
        }

-        log.info("微信消息订阅消息发送：", order.getMemberId() + "-" + sn);
+        log.info("微信消息订阅消息发送：{}", order.getMemberId() + "-" + sn);
        //获取token
        String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);

@@ -270,7 +270,7 @@ public class WechatMessageUtil {
    /**
     * 如果返回信息有错误
     *
-     * @param jsonObject
+     * @param jsonObject 返回消息
     */
    public static void wechatHandler(JSONObject jsonObject) {
        if (jsonObject.containsKey("errmsg")) {
@@ -283,9 +283,9 @@ public class WechatMessageUtil {
    }

    /**
-     * 如果返回信息有错误....................................................................................................................................................................................333333333333333333
+     * 如果返回信息有错误
     *
-     * @param string
+     * @param string 返回消息
     */
    public static String wechatHandler(String string) {
        JSONObject jsonObject = new JSONObject();
--- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java
@@ -26,36 +26,30 @@ public class Menu extends BaseEntity {

    private static final long serialVersionUID = 7050744476203495207L;

-    @ApiModelProperty(value = "菜单/权限名称")
+    @ApiModelProperty(value = "菜单名称")
    private String name;

-    @ApiModelProperty(value = "层级")
+    @ApiModelProperty(value = "菜单层级")
    private Integer level;

    @ApiModelProperty(value = "菜单标题")
    private String title;

-    @ApiModelProperty(value = "赋权API地址,正则表达式")
+    @ApiModelProperty(value = "路径")
    private String path;

-    @ApiModelProperty(value = "前端路由")
+    @ApiModelProperty(value = "前端目录文件")
    private String frontRoute;

-    @ApiModelProperty(value = "图标")
-    private String icon;
-
    @ApiModelProperty(value = "父id")
    private String parentId = "0";

-    @ApiModelProperty(value = "说明备注")
-    private String description;
-
    @ApiModelProperty(value = "排序值")
    @Column(precision = 10, scale = 2)
    private BigDecimal sortOrder;

-    @ApiModelProperty(value = "文件地址")
-    private String frontComponent;
+    @ApiModelProperty(value = "权限URL，*号模糊匹配，逗号分割")
+    private String permission;


 }
--- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java
@@ -19,4 +19,10 @@ public class UserMenuVO extends Menu {
     */
    private Boolean isSupper;

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