Merge branch 'local_20221010' into huacheng_test
| | |
| | | //i小懒 |
| | | WxMaQrcodeService wsCodeService = wxMaConfiguration.getMaService("wx98d62711dfbd8425").getQrcodeService(); |
| | | byte[] bytes = wsCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId, |
| | | "/pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false); |
| | | "pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false); |
| | | String res = String.format("data:image/png;base64,%s", Base64.encode(bytes)); |
| | | |
| | | //花城 |
| | | WxMaQrcodeService uuCodeService = wxMaConfiguration.getMaService("wx118de8a734d269f0").getQrcodeService(); |
| | | byte[] hcBytes = uuCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId, |
| | | "/packageD/pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false); |
| | | "packageD/pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false); |
| | | String hcRes = String.format("data:image/png;base64,%s", Base64.encode(hcBytes)); |
| | | |
| | | Map<String,String> retMap = new HashMap<>(); |
| | |
| | | if (userId == null) { |
| | | return R.fail("请重新登录"); |
| | | } |
| | | String releaseContent = addNeighborCircleAppDTO.getReleaseContent(); |
| | | if (StrUtil.isNotBlank(releaseContent)) { |
| | | String result = checkService.checkMessageBy(releaseContent, this.getLoginUserInfo().getOpenid(), this.getAppId()); |
| | | if (StrUtil.isNotBlank(result)) { |
| | | return R.fail(501, "填写内容存在 " + result + " 违规信息"); |
| | | if (!this.getAppId().equals("wx118de8a734d269f0")){ |
| | | String releaseContent = addNeighborCircleAppDTO.getReleaseContent(); |
| | | if (StrUtil.isNotBlank(releaseContent)) { |
| | | String result = checkService.checkMessageBy(releaseContent, this.getLoginUserInfo().getOpenid(), this.getAppId()); |
| | | if (StrUtil.isNotBlank(result)) { |
| | | return R.fail(501, "填写内容存在 " + result + " 违规信息"); |
| | | } |
| | | } |
| | | } |
| | | String releaseImages = addNeighborCircleAppDTO.getReleaseImages(); |
| | | if (StrUtil.isNotBlank(releaseImages)) { |
| | | if (checkService.checkImageBy(releaseImages, this.getAppId())) { |
| | | return R.fail(501, "上传图片存在违规信息"); |
| | | String releaseImages = addNeighborCircleAppDTO.getReleaseImages(); |
| | | if (StrUtil.isNotBlank(releaseImages)) { |
| | | if (checkService.checkImageBy(releaseImages, this.getAppId())) { |
| | | return R.fail(501, "上传图片存在违规信息"); |
| | | } |
| | | } |
| | | } |
| | | addNeighborCircleAppDTO.setUserId(userId); |