From 79853da7f5575d143410f0b3fd84c717388dea50 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 18:42:44 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java | 4 ++--
ruoyi-auth/src/main/java/com/ruoyi/auth/service/QywxInnerService.java | 19 ++++++++++++++-----
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java
index 048fafd..075f428 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java
@@ -71,8 +71,8 @@
@GetMapping("/h5/getAgentConfig")
@ApiOperation("通过code获取访问用户登录")
- public R<AgentConfigVo> getAgentConfig(@ApiParam(value = "url", required = true) String url) throws IOException {
- AgentConfigVo agentConfigVo = qywxInnerService.getAgentConfig(url);
+ public R<AgentConfigVo> getAgentConfig(@ApiParam(value = "url", required = true) String url, @ApiParam(value = "type", required = false) String type) throws IOException {
+ AgentConfigVo agentConfigVo = qywxInnerService.getAgentConfig(url, type);
return R.ok(agentConfigVo);
}
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/QywxInnerService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/QywxInnerService.java
index b425ba0..d41b903 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/QywxInnerService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/QywxInnerService.java
@@ -127,14 +127,14 @@
- public AgentConfigVo getAgentConfig(String url) {
+ public AgentConfigVo getAgentConfig(String url, String type) {
AgentConfigVo agentConfigVo = new AgentConfigVo();
agentConfigVo.setAgentid(qywxInnerConfig.getAgentId());
agentConfigVo.setCorpid(qywxInnerConfig.getCorpId());
//临时票据
- String ticket = getJsApiTicket();
+ String ticket = getJsApiTicket(type);
if (StringUtils.isEmpty(ticket)) {
throw new ServiceException("获取票据异常");
}
@@ -178,13 +178,22 @@
* @paran type
* @return
*/
- public String getJsApiTicket() {
+ public String getJsApiTicket(String type) {
String accessToken = getAccessToken();
- String ticket = redisTemplate.opsForValue().get(Constants.QY_WX_TICKET_KEY);
+ String ticketKey = Constants.QY_WX_TICKET_KEY;
+
+ String jsapiTicketUrl = qywxInnerConfig.getJsapiTicketUrl();
+ if(!StringUtils.isEmpty(type)){
+ ticketKey = ticketKey + type;
+ jsapiTicketUrl = qywxInnerConfig.getJsapiTicketAgentUrl();
+ }
+
+ String ticket = redisTemplate.opsForValue().get(ticketKey);
if(!StringUtils.isEmpty(ticket)){
return ticket;
}
- String url = String.format(qywxInnerConfig.getJsapiTicketAgentUrl(), accessToken);
+
+ String url = String.format(jsapiTicketUrl, accessToken);
JSONObject response = RestUtils.get(url);
if(response.containsKey(Constants.QY_WX_ERR_CODE) && response.getInteger(Constants.QY_WX_ERR_CODE) != 0){
--
Gitblit v1.7.1