From ca5cb4629a67aee38f4f07bbec9eb85435530ee3 Mon Sep 17 00:00:00 2001 From: username <1532322479@qq.com> Date: Sun, 30 Jun 2024 13:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bs/df/controller/DfBizClueController.java | 3 ++ .../bs/df/controller/DfOrderController.java | 2 +- .../df/controller/DfUserBrokerController.java | 6 ++- .../controller/system/SysLoginController.java | 4 +- .../controller/system/SysUserController.java | 2 +- .../main/java/com/bs/web/utils/SignUtil.java | 5 +-- .../java/com/bs/web/utils/WeiXinUtil.java | 14 ++++--- bs-ui/src/views/article/article/index.vue | 15 +++++-- bs-ui/src/views/biz/clue/index.vue | 40 +++++++++---------- bs-ui/src/views/moment/moment/index.vue | 9 ++++- bs-ui/src/views/poster/poster/index.vue | 14 ++++++- bs-ui/src/views/product/info/index.vue | 14 ++++++- 12 files changed, 86 insertions(+), 42 deletions(-) diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java b/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java index 09c8f1e..99c91a3 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java @@ -135,6 +135,9 @@ public class DfBizClueController extends BaseController { } else if ("2".equals(dfBizClue.getClassify())) { queryWrapper.in(DfBizClue::getDataType, "1"); } + if (Validator.isNotEmpty(dfBizClue.getBusinessLinks())) { + queryWrapper.eq(DfBizClue::getBusinessLinks, dfBizClue.getBusinessLinks()); + } List list = dfBizClueService.list(queryWrapper); List uniqueList = list.stream() .collect(Collectors.toMap( diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java b/bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java index 67d5dda..ce4c6e7 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java @@ -182,7 +182,7 @@ public class DfOrderController extends BaseController { dfOrder.setCreateTimeVo(date); SecurityUtils.getTenantId(); dfOrder.setTenantId(SecurityUtils.getTenantId()); - dfOrder.setCreateBy(SecurityUtils.getUserId()); +// dfOrder.setCreateBy(SecurityUtils.getUserId()); dfOrder.setCreateDept(SecurityUtils.getDeptId()); return toAjax(dfOrderMapper.insertOrder(dfOrder)); } diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfUserBrokerController.java b/bs-admin/src/main/java/com/bs/df/controller/DfUserBrokerController.java index ae6d406..3005c6f 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfUserBrokerController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfUserBrokerController.java @@ -1,8 +1,12 @@ package com.bs.df.controller; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; +import com.bs.common.annotation.Anonymous; +import com.bs.common.core.domain.model.LoginBody; +import com.bs.web.utils.WeiXinUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -39,7 +43,6 @@ import javax.annotation.Resource; public class DfUserBrokerController extends BaseController { @Resource private IDfUserBrokerService dfUserBrokerService; - /** * 分页查询客户经纪列表 */ @@ -118,6 +121,7 @@ public class DfUserBrokerController extends BaseController { return toAjax(dfUserBrokerService.removeBatchByIds(ids)); } + /** * 条件设置 */ diff --git a/bs-admin/src/main/java/com/bs/web/controller/system/SysLoginController.java b/bs-admin/src/main/java/com/bs/web/controller/system/SysLoginController.java index e406eee..64bce95 100644 --- a/bs-admin/src/main/java/com/bs/web/controller/system/SysLoginController.java +++ b/bs-admin/src/main/java/com/bs/web/controller/system/SysLoginController.java @@ -382,10 +382,10 @@ public class SysLoginController */ @PostMapping("/getConfig") @Anonymous - public Map getConfig(LoginBody loginBody) + public AjaxResult getConfig(@RequestBody LoginBody loginBody) { Map config = weiXinUtil.getConfig(loginBody.getUrl()); - return config; + return AjaxResult.success(config); } } diff --git a/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java b/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java index 17e5660..e3cdfda 100644 --- a/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java +++ b/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java @@ -237,7 +237,7 @@ public class SysUserController extends BaseController { @Anonymous public AjaxResult getUser(@PathVariable(value = "userId", required = false) Long userId) { SysUser sysUser = userService.selectUserById(userId); - List attachVo = cmAttachService.list(new LambdaQueryWrapper().eq(CmAttach::getFileId, userId)); + List attachVo = cmAttachService.list(new LambdaQueryWrapper().eq(CmAttach::getFileId, "userId" + userId)); sysUser.setFiles(attachVo); return success(sysUser); } diff --git a/bs-admin/src/main/java/com/bs/web/utils/SignUtil.java b/bs-admin/src/main/java/com/bs/web/utils/SignUtil.java index 92e7900..9872be7 100644 --- a/bs-admin/src/main/java/com/bs/web/utils/SignUtil.java +++ b/bs-admin/src/main/java/com/bs/web/utils/SignUtil.java @@ -45,19 +45,19 @@ public class SignUtil { String timestamp = create_timestamp(); String string1; String signature = ""; - //注意这里参数名必须全部小写，且必须有序 string1 = "jsapi_ticket=" + jsapi_ticket + "&noncestr=" + nonce_str + "×tamp=" + timestamp + "&url=" + url; - + System.out.println(string1); try { MessageDigest crypt = MessageDigest.getInstance("SHA-1"); crypt.reset(); crypt.update(string1.getBytes("UTF-8")); signature = byteToHex(crypt.digest()); + System.out.println("signature" + signature); } catch (NoSuchAlgorithmException e) { @@ -67,7 +67,6 @@ public class SignUtil { { e.printStackTrace(); } - ret.put("nonceStr", nonce_str); ret.put("timestamp", timestamp); ret.put("signature", signature); diff --git a/bs-admin/src/main/java/com/bs/web/utils/WeiXinUtil.java b/bs-admin/src/main/java/com/bs/web/utils/WeiXinUtil.java index 88e7e8c..b6a9eb0 100644 --- a/bs-admin/src/main/java/com/bs/web/utils/WeiXinUtil.java +++ b/bs-admin/src/main/java/com/bs/web/utils/WeiXinUtil.java @@ -42,17 +42,17 @@ public class WeiXinUtil { private static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 微信小程序appid //@Value("${wxConfig.appid}") - private static String appid="wx9e514cd1390086a8" ; + private static String appid="wx750df5fec24d61c1" ; // 微信小程序appsecret //@Value("${wxConfig.appsecret}") - private static String appsecret="e1e7395c8162f9d97487dae670faee5f"; + private static String appsecret="fda079d4713bc3bdd5810ebb54dc7507"; // 微信公众号appid //@Value("${wxConfig.gzhappid}") - private static String gzhappid="wx328dafbfac1bb1b6"; + private static String gzhappid="wxe8539d3b62c9a06c"; // 微信公众号appsecret //@Value("${wxConfig.gzhappsecret}") - private static String gzhappsecret="Dfjf3333"; + private static String gzhappsecret="84f607283501d0177ca7595f709c20ca"; // 微信开放号appid private static String openAppid = ""; @@ -224,6 +224,7 @@ public class WeiXinUtil { try { String titcket = getTitcket(); sign = SignUtil.sign(titcket, url); + sign.put("titcket", titcket); } catch (Exception e) { e.printStackTrace(); } @@ -543,7 +544,9 @@ public class WeiXinUtil { // 获取Access_token public synchronized String getAccess_token(String appid, String appsecret) { + System.out.println("appid:" + appid + ".appsecret:" + appsecret); String access_token = getSysConfig("access_token"); + System.out.println(access_token); if (StringUtils.isNotEmpty(access_token)){ JSONObject jo = JSONObject.parseObject(access_token); jo.getString("expirettime"); @@ -1024,7 +1027,8 @@ public class WeiXinUtil { public String getTitcket() throws Exception { - String accessToken = getAccess_token(appid, appsecret); + String accessToken = getAccess_token(gzhappid, gzhappsecret); + System.out.println(accessToken); String url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + accessToken + "&type=jsapi"; String returnValue = httpGet(url,null); diff --git a/bs-ui/src/views/article/article/index.vue b/bs-ui/src/views/article/article/index.vue index 8b8a4dc..0a91238 100644 --- a/bs-ui/src/views/article/article/index.vue +++ b/bs-ui/src/views/article/article/index.vue @@ -103,6 +103,7 @@ plain size="mini" @click="shelves" + :disabled="multiple" v-hasPermi="['article:article:shelves']" >上架 @@ -113,6 +114,7 @@ plain size="mini" @click="offShelves" + :disabled="multiple" v-hasPermi="['article:article:offShelves']" >下架 @@ -268,7 +270,7 @@