Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

@@ -88,7 +88,7 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
         }
         try {
             //授权菜单，先删除在新增
-            taUserAuthMenuMapper.deleteUserAuthMenu(roleId);
+            taRoleMenuMapper.deleteCurrentMenu(roleId);
             for (SysMenu sysMenu: sysMenuList) {
                 TaRoleMenu taRoleMenu = new TaRoleMenu();
                 taRoleMenu.setRoleId(roleId);

src/main/java/com/huiju/estateagents/controller/TaMiniappController.java

@@ -1,10 +1,12 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.service.ITaMiniappService;
 import org.slf4j.Logger;
@@ -141,4 +143,25 @@ public class TaMiniappController extends BaseController {
         }
         return responseBean;
     }
+
+    @PostMapping(value = "center/check/taMiniapp")
+    public ResponseBean createQRCode(@RequestBody String paramStr) {
+        if (StringUtils.isEmpty(paramStr)) {
+            return ResponseBean.error("生成二维码参数为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            return ResponseBean.error("非法生成二维码参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String appid = params.getString("appid");
+        String secret = params.getString("secret");
+        String path = params.getString("path");
+
+        if (StringUtils.isEmpty(appid) || StringUtils.isEmpty(secret) || StringUtils.isEmpty(path)) {
+
+        }
+        return null;
+    }
 }

src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java

@@ -49,7 +49,7 @@ public class SysButtonInMenu implements Serializable {
     private String code;
     
     private String remark;
-
+    
     @TableField(exist = false)
     private List<Integer> roles;
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -136,11 +136,11 @@ public class AccessInterceptor implements HandlerInterceptor {
             return false;
         }
         
-        //按钮权限校验
+//        按钮权限校验
         boolean state = checkButtonRole(request);
         if (!state){
             ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
-        
+
             response.addHeader("Content-type", "application/json");
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;

src/main/java/com/huiju/estateagents/mapper/TaRoleMenuMapper.java

@@ -15,4 +15,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaRoleMenuMapper extends BaseMapper<TaRoleMenu> {
 
+    /**
+     * 先删除再添加
+     * @param roleId
+     */
+    void deleteCurrentMenu(Integer roleId);
 }

src/main/java/com/huiju/estateagents/service/IMiniAppService.java

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.service;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappQrcode;
@@ -29,6 +31,8 @@ public interface IMiniAppService {
 
     ResponseBean getQrCode(String paramsStr, String appid);
 
+    String createQrCode(WxMaService service, String path) throws Exception;
+
     TaMiniappQrcode getQrCodeBySerialNo(Integer id);
 
     List<TaMiniapp> getAllAvaliableMiniapps();

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -175,6 +175,13 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
     }
 
+    @Override
+    public String createQrCode(WxMaService service, String path) throws Exception {
+        File qrFile = service.getQrcodeService().createWxaCode(path);
+        String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
+        return qrcode;
+    }
+
     @Override
     public TaMiniappQrcode getQrCodeBySerialNo(Integer id) {
         return taMiniappQrcodeMapper.selectById(id);

src/main/resources/mapper/TaRoleMenuMapper.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaRoleMenuMapper">
-
+    <delete  id="deleteCurrentMenu">
+    delete from ta_role_menu where ta_role_menu.role_id = #{roleId}
+    </delete >
 </mapper>