瀏覽代碼

更新!

TRX 1 年之前
父節點
當前提交
4587081bb6

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/gateDoor/GateDoorController.java

@@ -4,6 +4,7 @@ package com.zhongshu.card.server.core.controller.gateDoor;
 import com.github.microservice.models.gateDoor.OnLineParam;
 import com.github.microservice.models.gateDoor.gateDoor.GateDoorIotParam;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.zhongshu.card.server.core.service.gateDoor.GateDoorService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
@@ -15,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @RestController
-@RequestMapping("/openAPI/gateDoor/v1")
+@RequestMapping("/" + OpenApiMark.fullCardOpenAPI + "/gateDoor/v1")
 @Tag(name = "门闸")
 @Hidden
 public class GateDoorController {

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/AccessRecordController.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.controller.openAPI;
 
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.zhongshu.opengateway.client.model.param.AccessRecordSearchParam;
 import com.zhongshu.opengateway.client.model.ret.ResultContent;
 import com.zhongshu.opengateway.client.service.AccessRecordService;
@@ -11,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/openApi/accessRecord")
+@RequestMapping("/"+ OpenApiMark.fullCardOpenAPI +"/accessRecord")
 @Tag(name = "OpenApi--访问日志")
 public class AccessRecordController {
 

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/DevicePermissOpenApiController.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.controller.openAPI;
 
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.zhongshu.card.client.openApi.model.DeviceInfoOpenApiModel;
 import com.zhongshu.card.client.openApi.model.DevicePermissOpenApiModel;
 import com.zhongshu.card.client.openApi.params.*;
@@ -22,7 +23,7 @@ import java.util.List;
  * @date 2024/6/5
  */
 @RestController
-@RequestMapping("/openAPI/v1/devicePermiss")
+@RequestMapping("/"+ OpenApiMark.fullCardOpenAPI +"/v1/devicePermiss")
 @Tag(name = "openAPI-设备权限管理")
 public class DevicePermissOpenApiController {
 

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/ExpenseFlowOpenApiController.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.controller.openAPI;
 
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.zhongshu.card.client.openApi.model.ExpenseFlowOpenApiModel;
 import com.zhongshu.card.client.openApi.params.ExpenseFlowOpenApiSearch;
 import com.zhongshu.card.client.openApi.params.PaymentNoParam;
@@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2024/6/5
  */
 @RestController
-@RequestMapping("/openAPI/v1/orderManager")
+@RequestMapping("/"+ OpenApiMark.fullCardOpenAPI +"/v1/orderManager")
 @Tag(name = "openAPI-订单管理")
 public class ExpenseFlowOpenApiController {
 

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/OpenApiConfigManagerController.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.server.core.controller.openAPI;
 import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.zhongshu.card.server.core.service.openAPI.OpenApiConfigManagerService;
 import com.zhongshu.card.server.core.service.openAPI.OpenAppManagerService;
 import com.zhongshu.opengateway.client.model.OpenApiConfigModel;
@@ -26,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@RequestMapping("/openApi/apiConfig")
+@RequestMapping("/"+ OpenApiMark.fullCardOpenAPI +"/apiConfig")
 @Tag(name = "OpenApi--接口管理")
 public class OpenApiConfigManagerController {
 

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/OpenAppManagerController.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.server.core.controller.openAPI;
 import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.zhongshu.card.client.model.openApi.AppParam;
 import com.zhongshu.card.server.core.service.openAPI.OpenAppManagerService;
 import com.zhongshu.opengateway.client.model.param.SignParam;
@@ -19,7 +20,7 @@ import org.springframework.data.web.PageableDefault;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/openApi/app")
+@RequestMapping("/"+ OpenApiMark.fullCardOpenAPI +"/app")
 @Tag(name = "OpenApi--应用管理")
 public class OpenAppManagerController {
 

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/OrganizationUserOpenApiController.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.controller.openAPI;
 
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.openApi.model.OrganizationUserOpenApiModel;
 import com.zhongshu.card.client.openApi.params.OrganizationUserOpenApiSearch;
@@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2024/6/5
  */
 @RestController
-@RequestMapping("/openAPI/v1/projectUserManager")
+@RequestMapping("/"+ OpenApiMark.fullCardOpenAPI +"/v1/projectUserManager")
 @Tag(name = "openAPI-项目用户")
 public class OrganizationUserOpenApiController {
 

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/PayOpenApiController.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.server.core.controller.openAPI;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
 import com.github.microservice.pay.client.model.ledger.transaction.TransactionLogAggregateRetModel;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.client.model.pay.*;
 import com.zhongshu.card.client.openApi.RefundQueryParam;
@@ -25,7 +26,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/openAPI/v1/pay")
+@RequestMapping("/"+ OpenApiMark.fullCardOpenAPI +"/v1/pay")
 @Tag(name = "openAPI-支付管理")
 public class PayOpenApiController {
 

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/ProjectOpenAPIController.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.server.core.controller.openAPI;
 import com.github.microservice.models.device.DevicePerQuery;
 import com.github.microservice.models.device.UserPerQuery;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissIotService;
 import com.zhongshu.card.server.core.service.devices.DeviceUseRecordService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -20,7 +21,7 @@ import javax.validation.Valid;
  * @date 2024/6/5
  */
 @RestController
-@RequestMapping("/openAPI/v1/projectManager")
+@RequestMapping("/"+ OpenApiMark.fullCardOpenAPI +"/v1/projectManager")
 @Tag(name = "openAPI-项目管理")
 public class ProjectOpenAPIController {
 

+ 8 - 9
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/TransactionLogOpenApiController.java

@@ -1,12 +1,11 @@
 package com.zhongshu.card.server.core.controller.openAPI;
 
-import com.github.microservice.auth.security.annotations.ResourceAuth;
-import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
 import com.github.microservice.pay.client.model.ledger.transaction.TransactionLogPeriodAggregateRetModel;
 import com.github.microservice.pay.client.model.ledger.transaction.TransactionLogRealTimeAggregateRetModel;
 import com.github.microservice.pay.client.model.ledger.transaction.TransactionLogSettleAggregateRetModel;
 import com.github.microservice.pay.client.ret.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.zhongshu.card.client.model.pay.PeriodDetailQueryModel;
 import com.zhongshu.card.client.model.pay.PeriodQueryModel;
 import com.zhongshu.card.client.model.pay.SettleDetailQueryModel;
@@ -23,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/openAPI/v1/transactionLog")
+@RequestMapping("/" + OpenApiMark.fullCardOpenAPI + "/v1/transactionLog")
 @Tag(name = "openAPI-账单")
 public class TransactionLogOpenApiController {
 
@@ -33,42 +32,42 @@ public class TransactionLogOpenApiController {
     @Operation(summary = "查询收入账单", description = "查询收入账单-年月日汇总")
     @RequestMapping(value = "queryCreditBill", method = RequestMethod.POST)
     public ResultContent<Page<TransactionLogPeriodAggregateRetModel>> queryCreditBill(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-                                                                                      @Parameter(required = true) PeriodQueryModel param){
+            @Parameter(required = true) PeriodQueryModel param) {
         return orgOverviewService.queryCreditBill(pageable, param);
     }
 
     @Operation(summary = "查询收入账单详情", description = "查询收入账单详情")
     @RequestMapping(value = "queryCreditBillDetail", method = RequestMethod.POST)
     public ResultContent<Page<TransactionLogModel>> queryCreditBillDetail(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-                                                                          @Parameter(required = true) PeriodDetailQueryModel periodDetailQueryModel){
+            @Parameter(required = true) PeriodDetailQueryModel periodDetailQueryModel) {
         return orgOverviewService.queryCreditBillDetail(pageable, periodDetailQueryModel);
     }
 
     @Operation(summary = "查询结算账单", description = "查询结算账单")
     @RequestMapping(value = "querySettleBill", method = RequestMethod.POST)
     public ResultContent<Page<TransactionLogSettleAggregateRetModel>> querySettleBill(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-                                                                                      @Parameter(required = false) PeriodQueryModel param){
+            @Parameter(required = false) PeriodQueryModel param) {
         return orgOverviewService.querySettleBill(pageable, param);
     }
 
     @Operation(summary = "查询结算账单详情", description = "查询结算账单详情")
     @RequestMapping(value = "querySettleBillDetail", method = RequestMethod.POST)
     public ResultContent<Page<TransactionLogModel>> querySettleBillDetail(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-                                                                          @Parameter(required = false) SettleDetailQueryModel settleDetailQueryModel){
+            @Parameter(required = false) SettleDetailQueryModel settleDetailQueryModel) {
         return orgOverviewService.querySettleBillDetail(pageable, settleDetailQueryModel);
     }
 
     @Operation(summary = "查询提现账单", description = "查询提现账单")
     @RequestMapping(value = "queryWithdrawBill", method = RequestMethod.POST)
     public ResultContent<Page<TransactionLogRealTimeAggregateRetModel>> queryWithdrawBill(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-                                                                                          @Parameter(required = false) PeriodQueryModel param){
+            @Parameter(required = false) PeriodQueryModel param) {
         return orgOverviewService.queryWithdrawBill(pageable, param);
     }
 
     @Operation(summary = "查询提现账单详情", description = "查询提现账单详情")
     @RequestMapping(value = "queryWithdrawBillDetail", method = RequestMethod.POST)
     public ResultContent<Page<TransactionLogModel>> queryWithdrawBillDetail(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-                                                                            @Parameter(required = false) SettleDetailQueryModel settleDetailQueryModel){
+            @Parameter(required = false) SettleDetailQueryModel settleDetailQueryModel) {
         return orgOverviewService.queryWithdrawBillDetail(pageable, settleDetailQueryModel);
     }
 }

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/HxzController.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.server.core.controller.payment;
 
 import com.github.microservice.models.hxz.*;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.zhongshu.card.server.core.service.hxz.HxzService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController
-@RequestMapping("/openAPI/hxz/v1")
+@RequestMapping("/" + OpenApiMark.fullCardOpenAPI + "/hxz/v1")
 @Tag(name = "云版消费机接口-HXZ")
 public class HxzController {
 

+ 4 - 4
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/OpenAPIRegisterService.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.server.core.service.openAPI;
 import com.github.microservice.models.openAPI.OpenApiInfo;
 import com.github.microservice.models.openAPI.RefreshApiParam;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
 import com.github.microservice.utils.OpenAPIScan;
 import com.zhongshu.opengateway.client.type.ApiType;
 import lombok.extern.slf4j.Slf4j;
@@ -31,14 +32,13 @@ public class OpenAPIRegisterService {
 
     public ResultContent initRegisterPAIS() {
         String str = restTemplate.getForObject("http://" + serviceId + "/v3/api-docs", String.class);
-        String sign = "openAPI";
-        List<OpenApiInfo> openAPIS = OpenAPIScan.scanAPI(str, "一卡通", sign);
+        List<OpenApiInfo> openAPIS = OpenAPIScan.scanAPI(str, "一卡通", OpenApiMark.fullCardOpenAPI);
         RefreshApiParam param = new RefreshApiParam();
         param.setServerName(serviceId.toLowerCase());
-        param.setPredicateArgs(String.format("/%s/**", sign));
+        param.setPredicateArgs(String.format("/%s/**", OpenApiMark.fullCardOpenAPI));
         param.setOpenApiInfo(openAPIS);
         param.setApiType(ApiType.FullCard.name());
-        param.setApiDocs(OpenAPIScan.filterOpenApi(str, sign));
+        param.setApiDocs(OpenAPIScan.filterOpenApi(str, OpenApiMark.fullCardOpenAPI));
         ResultContent content = restTemplate.postForObject("http://openapiserver/manager/gateway/api/refresh", param, ResultContent.class);
         if (content == null) {
             content = ResultContent.buildSuccess();