更新！11

SecretKeyClient/pom.xml

@@ -44,12 +44,6 @@
 			<version>5.8.20</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.github.wechatpay-apiv3</groupId>
-			<artifactId>wechatpay-java</artifactId>
-			<version>0.2.12</version>
-		</dependency>
-
 		<dependency>
 			<groupId>com.github.microservice.auth</groupId>
 			<artifactId>AuthClient</artifactId>

SecretKeyClient/src/main/java/com/zhongshu/secretKey/client/service/SecretKeyVerifyService.java

@@ -1,6 +1,7 @@
 package com.zhongshu.secretKey.client.service;
 
 import com.github.microservice.net.ResultContent;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient("secretkeyserver/manager/secretKeyVerify")
 public interface SecretKeyVerifyService {
 
+    @Operation(summary = "验证签名", description = "验证签名")
     @RequestMapping(value = "verifyAk", method = RequestMethod.GET, consumes = {MediaType.ALL_VALUE})
     ResultContent verifyAk(
             @RequestParam(value = "ak", required = true) String ak,

SecretKeyClient/src/main/java/com/zhongshu/secretKey/client/service/TestInfoFeignService.java

@@ -1,20 +1,20 @@
-package com.zhongshu.secretKey.client.service;
-
-import com.github.microservice.auth.client.content.ResultContent;
-import com.zhongshu.opengateway.client.model.param.AddApiParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-@FeignClient("secretkeyserver/manager/test")
-public interface TestInfoFeignService {
-
-    /**
-     *
-     */
-    @RequestMapping(value = "saveInfo", method = RequestMethod.POST, consumes = {MediaType.ALL_VALUE})
-    ResultContent saveInfo(@RequestBody AddApiParam param);
-
-}
+//package com.zhongshu.secretKey.client.service;
+//
+//import com.github.microservice.auth.client.content.ResultContent;
+//import com.zhongshu.opengateway.client.model.param.AddApiParam;
+//import org.springframework.cloud.openfeign.FeignClient;
+//import org.springframework.http.MediaType;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//
+//@FeignClient("secretkeyserver/manager/test")
+//public interface TestInfoFeignService {
+//
+//    /**
+//     *
+//     */
+//    @RequestMapping(value = "saveInfo", method = RequestMethod.POST, consumes = {MediaType.ALL_VALUE})
+//    ResultContent saveInfo(@RequestBody AddApiParam param);
+//
+//}

SecretKeyServer/src/main/java/com/zhongshu/secretKey/server/core/service/secret/SecretKeyService.java

@@ -3,7 +3,6 @@ package com.zhongshu.secretKey.server.core.service.secret;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
-import com.zhongshu.card.client.model.org.projectDict.ProjectDictModel;
 import com.zhongshu.secretKey.client.model.secret.SecretKeyModel;
 import com.zhongshu.secretKey.client.model.secret.SecretKeyParam;
 import com.zhongshu.secretKey.client.model.secret.SecretKeySearch;
@@ -45,7 +44,7 @@ public class SecretKeyService extends SuperService {
         entity.setAk(CommonUtil.generateRandomString(16));
         entity.setSk(CommonUtil.generateRandomString(32));
         secretKeyDao.save(entity);
-        return ResultContent.buildSuccess();
+        return ResultContent.buildSuccess(toModel(entity));
     }
 
     /**
@@ -100,8 +99,8 @@ public class SecretKeyService extends SuperService {
         return ResultContent.buildSuccess();
     }
 
-    private ProjectDictModel toModel(SecretKey entity) {
-        ProjectDictModel model = new ProjectDictModel();
+    private SecretKeyModel toModel(SecretKey entity) {
+        SecretKeyModel model = new SecretKeyModel();
         if (ObjectUtils.isNotEmpty(entity)) {
             BeanUtils.copyProperties(entity, model);
         }

SecretKeyServer/src/main/java/com/zhongshu/secretKey/server/core/service/secret/SecretKeyVerifyServiceImpl.java

@@ -38,7 +38,7 @@ public class SecretKeyVerifyServiceImpl implements SecretKeyVerifyService {
                 String input = String.format("%s%s%s", ak, time, sk);
                 String _sign = SecurityUtil.getMD5Str(input).toLowerCase();
                 if (!_sign.equals(sign)) {
-                    return ResultContent.buildFail("签名验证错误");
+                    return ResultContent.buildFail("签名验证失败");
                 }
             }
         }

SecretKeyServer/src/main/java/com/zhongshu/secretKey/server/core/utils/CommonUtil.java

@@ -1,7 +1,7 @@
 package com.zhongshu.secretKey.server.core.utils;
 
 import com.github.microservice.core.util.net.IPUtil;
-import com.github.microservice.models.type.LogServiceType;
+import com.github.microservice.types.deviceUse.LogServiceType;
 import com.google.common.collect.Lists;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.j2se.MatrixToImageWriter;

SecretKeyServer/src/main/resources/application-dev.yml

@@ -9,7 +9,7 @@ spring:
         prefer-ip-address: false
   data:
     mongodb:
-      uri: mongodb://root:8756mongo2024@172.24.50.53:27017,172.24.50.53:27018,172.24.50.53:27019/payment?authSource=admin
+      uri: mongodb://root:8756mongo2024@172.24.50.53:27017,172.24.50.53:27018,172.24.50.53:27019/secretCenter?authSource=admin
       auto-index-creation: true
     redis:
       host: 172.24.50.53