From b3e0f695edb683ea13876a51e2f907e8c4936b9c Mon Sep 17 00:00:00 2001 From: yanyan Date: Sun, 7 Apr 2024 10:47:59 +0800 Subject: [PATCH] =?UTF-8?q?properties=E6=96=87=E4=BB=B6=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zdxt/knowledge/domain/JwtProperties.java | 42 +++++++++++++++++++ .../knowledge/domain/WechatProperties.java | 32 +++++++------- .../com/zdxt/knowledge/jwt/JwtProperties.java | 20 --------- .../jwt/JwtTokenUserInterceptor.java | 8 ++-- .../service/impl/SceneManageServiceImpl.java | 9 ++-- .../service/impl/WechatServiceImpl.java | 13 +++--- 6 files changed, 69 insertions(+), 55 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/JwtProperties.java delete mode 100644 lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/jwt/JwtProperties.java diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/JwtProperties.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/JwtProperties.java new file mode 100644 index 00000000..3427f57b --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/JwtProperties.java @@ -0,0 +1,42 @@ +package com.zdxt.knowledge.domain; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "wechat.jwt") +public class JwtProperties { + /** + * 用户端微信用户生成jwt令牌相关配置 + */ + private static String userSecretKey; + private static long userTtl; + private static String userTokenName; + + public static String getUserSecretKey() { + return userSecretKey; + } + + public void setUserSecretKey(String userSecretKey) { + JwtProperties.userSecretKey = userSecretKey; + } + + public static long getUserTtl() { + return userTtl; + } + + public void setUserTtl(long userTtl) { + JwtProperties.userTtl = userTtl; + } + + public static String getUserTokenName() { + return userTokenName; + } + + public void setUserTokenName(String userTokenName) { + JwtProperties.userTokenName = userTokenName; + } + +} + + diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatProperties.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatProperties.java index 18c44a2f..e078fb0d 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatProperties.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatProperties.java @@ -7,43 +7,43 @@ import org.springframework.stereotype.Component; @ConfigurationProperties(prefix = "wechat.config") public class WechatProperties { - private String appId; + private static String appId; - private String secret; + private static String secret; - private String grantType; + private static String grantType; - private String requestUrl; + private static String requestUrl; - public String getAppId() { + public static String getAppId() { return appId; } - public void setAppId(String appId) { - this.appId = appId; + public void setAppId(String appId) { + WechatProperties.appId = appId; } - public String getSecret() { + public static String getSecret() { return secret; } - public void setSecret(String secret) { - this.secret = secret; + public void setSecret(String secret) { + WechatProperties.secret = secret; } - public String getGrantType() { + public static String getGrantType() { return grantType; } - public void setGrantType(String grantType) { - this.grantType = grantType; + public void setGrantType(String grantType) { + WechatProperties.grantType = grantType; } - public String getRequestUrl() { + public static String getRequestUrl() { return requestUrl; } - public void setRequestUrl(String requestUrl) { - this.requestUrl = requestUrl; + public void setRequestUrl(String requestUrl) { + WechatProperties.requestUrl = requestUrl; } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/jwt/JwtProperties.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/jwt/JwtProperties.java deleted file mode 100644 index 8080a52a..00000000 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/jwt/JwtProperties.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zdxt.knowledge.jwt; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Component -@ConfigurationProperties(prefix = "wechat.jwt") -@Data -public class JwtProperties { - /** - * 用户端微信用户生成jwt令牌相关配置 - */ - private String userSecretKey; - private long userTtl; - private String userTokenName; - -} - - diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/jwt/JwtTokenUserInterceptor.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/jwt/JwtTokenUserInterceptor.java index 192dee68..2278c351 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/jwt/JwtTokenUserInterceptor.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/jwt/JwtTokenUserInterceptor.java @@ -1,6 +1,7 @@ package com.zdxt.knowledge.jwt; import com.zdxt.knowledge.annotation.Applet; +import com.zdxt.knowledge.domain.JwtProperties; import com.zdxt.knowledge.domain.WechatUser; import com.zdxt.knowledge.mapper.WechatLoginMapper; import io.jsonwebtoken.Claims; @@ -21,9 +22,6 @@ import java.util.Objects; @Slf4j public class JwtTokenUserInterceptor implements HandlerInterceptor { - @Autowired - private JwtProperties jwtProperties; - @Autowired private WechatLoginMapper wechatLoginMapper; @@ -52,12 +50,12 @@ public class JwtTokenUserInterceptor implements HandlerInterceptor { } //1、从请求头中获取令牌 - String token = request.getHeader(jwtProperties.getUserTokenName()); + String token = request.getHeader(JwtProperties.getUserTokenName()); //2、校验令牌 try { log.info("jwt校验:{}", token); - Claims claims = JwtUtil.parseJWT(jwtProperties.getUserSecretKey(), token); + Claims claims = JwtUtil.parseJWT(JwtProperties.getUserSecretKey(), token); String userId = claims.get(JwtClaimsConstant.USER_ID).toString(); log.info("当前用户id：", userId); WechatUser wechatUser = wechatLoginMapper.selectUserById(userId); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java index 5718a719..5bc733f5 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java @@ -70,9 +70,6 @@ public class SceneManageServiceImpl implements ISceneManageService { @Autowired private ZdxtFileCommonApi zdxtFileCommonApi; - @Autowired - private WechatProperties wechatProperties; - /** * 查询【请填写功能名称】 * @@ -112,7 +109,7 @@ public class SceneManageServiceImpl implements ISceneManageService { @Override public ZDResponse getQRCode() throws Exception { - String appId = wechatProperties.getAppId(); + String appId = WechatProperties.getAppId(); ZdxtFileBean zdxtFileBean = new ZdxtFileBean(); zdxtFileBean.setBusinessId(appId); List zdxtFileBeans = zdxtFileCommonApi.selectZdxtFileList(zdxtFileBean); @@ -204,8 +201,8 @@ public class SceneManageServiceImpl implements ISceneManageService { } public String getAccessToken() { - String appid = wechatProperties.getAppId(); - String secret = wechatProperties.getSecret(); + String appid = WechatProperties.getAppId(); + String secret = WechatProperties.getSecret(); String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret; String result = HttpUtil.get(url); JSONObject jsonObject = JSONUtil.parseObj(result); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java index ba83d466..35a68a43 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java @@ -8,7 +8,7 @@ import com.zdxt.common.util.Convert; import com.zdxt.common.util.StringUtils; import com.zdxt.knowledge.domain.*; import com.zdxt.knowledge.jwt.JwtClaimsConstant; -import com.zdxt.knowledge.jwt.JwtProperties; +import com.zdxt.knowledge.domain.JwtProperties; import com.zdxt.knowledge.jwt.JwtUtil; import com.zdxt.knowledge.mapper.SceneMedalMapper; import com.zdxt.knowledge.mapper.WechatLoginMapper; @@ -44,9 +44,6 @@ public class WechatServiceImpl implements WechatService { @Autowired private SceneMedalMapper sceneMedalMapper; - @Autowired - private WechatProperties wechatProperties; - @Autowired private JwtProperties jwtProperties; @@ -144,16 +141,16 @@ public class WechatServiceImpl implements WechatService { Map requestUrlParam = new HashMap<>(); // 小程序appId - requestUrlParam.put("appid", wechatProperties.getAppId()); + requestUrlParam.put("appid", WechatProperties.getAppId()); // 小程序secret - requestUrlParam.put("secret", wechatProperties.getSecret()); + requestUrlParam.put("secret", WechatProperties.getSecret()); // 小程序端返回的code requestUrlParam.put("js_code", code); // 默认参数 - requestUrlParam.put("grant_type", wechatProperties.getGrantType()); + requestUrlParam.put("grant_type", WechatProperties.getGrantType()); // 发送post请求读取调用微信接口获取openid用户唯一标识 - String result = HttpClientUtils.doPost(wechatProperties.getRequestUrl(), requestUrlParam); + String result = HttpClientUtils.doPost(WechatProperties.getRequestUrl(), requestUrlParam); return JSON.parseObject(result); }