Merge branch 'dev-8.9.0' into 'develop'

Dev 8.9.0

See merge request !22

pom.xml

@@ -166,6 +166,10 @@
             <artifactId>ops-java-common</artifactId>
             <version>0.0.1-Release</version>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -173,7 +177,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-vault-config-databases</artifactId>
-            <version>3.0.4</version>
+            <version>3.0.5</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -183,16 +187,12 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-vault-config</artifactId>
-            <version>2.1.5.RELEASE</version>
+            <version>3.0.5</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-vault-config</artifactId>
-            <version>2.1.5.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
+            <groupId>org.springframework.vault</groupId>
+            <artifactId>spring-vault-core</artifactId>
+            <version>2.3.2</version>
         </dependency>
         <!--        运维类依赖-->
 

src/main/java/com/afanticar/afantiopenapi/config/TokenInterceptor.java

@@ -4,8 +4,9 @@ import cn.hutool.core.util.StrUtil;
 import com.afanticar.afantiopenapi.controller.BaseController;
 import com.afanticar.afantiopenapi.utils.JWTUtils;
 import com.alibaba.fastjson.JSONObject;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
@@ -18,17 +19,19 @@ import java.util.Set;
  * @contact chenyan@afanticar.com
  * @since 2023/4/26/026
  */
-@Component
 @Slf4j
+@Setter
+@Component
+@ConfigurationProperties(prefix = "ignored")
 public class TokenInterceptor implements HandlerInterceptor {
 
-    @Value("#{'${ignored.uri}'.split(',')}")
-    private Set<String> ignoredUris;
+    private Set<String> uris;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String requestUri = request.getRequestURI();
-        if (ignoredUris.contains(requestUri)) {
+        log.info("请求uri" + requestUri);
+        if (uris.contains(requestUri)) {
             return true;
         }
         String token = request.getHeader("authorization");

src/main/java/com/afanticar/afantiopenapi/controller/CommonDataController.java

@@ -59,7 +59,7 @@ public class CommonDataController extends BaseController {
     @GetMapping("/activity")
     public BaseResponse<BasePageVO<ActivityInfoVO>> getActionData(HttpServletRequest request, @Max(value = 500,message = "单页数据page_size过大") @RequestParam(name = "page_size", defaultValue = "100", required = false) Integer pageSize,
                                                                   @RequestParam(name = "current_page", defaultValue = "1", required = false) Integer pageNum) {
-        BaseResponse check = baseService.baseLimit(request, dateType, limit, limitPeriod);
+        BaseResponse check = baseService.baseLimit(dateType, limit, limitPeriod);
         if (check != null) {
             return check;
         }
@@ -70,7 +70,7 @@ public class CommonDataController extends BaseController {
     @ApiOperation(value = "获取token", notes = "token数据", produces = "application/json")
     @PostMapping("/token")
     public BaseResponse<TokenVO> getToken(@RequestBody @Valid TokenDTO dto) {
-        BaseResponse check = baseService.baseLimit(null, dateType, limit, limitPeriod);
+        BaseResponse check = baseService.baseLimit(dateType, limit, limitPeriod);
         if (check != null) {
             return check;
         }

src/main/java/com/afanticar/afantiopenapi/controller/FawOpenController.java

@@ -67,6 +67,7 @@ public class FawOpenController extends BaseController {
                                                                            @RequestParam(name = "publish_date_start") @DateTimeFormat(pattern = "yyyy-MM-dd") Date publishDateStart,
                                                                            @RequestParam(name = "publish_date_end") @DateTimeFormat(pattern = "yyyy-MM-dd") Date publishDateEnd,
                                                                            @RequestParam(name = "type") String type) {
+        log.info("AAAAAAAAA:" + limit);
         BaseResponse check = baseService.baseValidator(request,client, dataType,  limit, limitPeriod);
         if (check != null) {
             return check;

src/main/java/com/afanticar/afantiopenapi/service/BaseService.java

@@ -38,11 +38,8 @@ public class BaseService {
         return null;
     }
 
-    public BaseResponse baseLimit(HttpServletRequest request, String dataType, Integer limit, Integer limitPeriod) {
+    public BaseResponse baseLimit(String dataType, Integer limit, Integer limitPeriod) {
         String header = "token";
-        if (request != null) {
-            header = (String) request.getAttribute(BaseController.header);
-        }
         String fawKey = String.format("%s:%s:limit", dataType, header);
         RRateLimiter rateLimiter = redissonClient.getRateLimiter(fawKey);
         rateLimiter.trySetRate(RateType.OVERALL, limit,limitPeriod, RateIntervalUnit.SECONDS);

src/main/resources/bootstrap.yml

@@ -34,16 +34,23 @@ spring:
         access-key-property: spring.rocket-mq.accessKey
         secret-key-property: spring.rocket-mq.secretKey
       # adb链接
-      generic:
-        enabled: true
+      kv:
+        enabled: false
         backend: ${spring.profiles.active}
         default-context: etladb
-      database:
+      databases:
+        master:
           enabled: true
           backend: ${spring.profiles.active}db
           role: app-role
           username-property: spring.datasource.dynamic.datasource.master.username
           password-property: spring.datasource.dynamic.datasource.master.password
+        tmp:
+          enabled: true
+          backend: ${spring.profiles.active}db
+          role: external-role
+          username-property: spring.datasource.dynamic.datasource.tmp.username
+          password-property: spring.datasource.dynamic.datasource.tmp.password
 
 #
 #