更新

src/main/java/com/zswl/dataservice/controller/openApi/SystemTimeController.java

@@ -2,6 +2,7 @@ package com.zswl.dataservice.controller.openApi;
 
 import com.github.microservice.models.hxz.ServerTimeModel;
 import com.github.microservice.models.hxz.ServerTimeResult;
+import com.zswl.dataservice.model.openApi.SystemTimeModel;
 import com.zswl.dataservice.model.openApi.SystemTimeParam;
 import com.zswl.dataservice.service.openApi.SystemTimeService;
 import com.zswl.dataservice.utils.result.ResultContent;
@@ -24,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("/v1/openApi/systemTime")
-@Tag(name = "openApi-系统时间")
+@Tag(name = "openAPI-系统时间")
 public class SystemTimeController {
 
     @Autowired
@@ -32,7 +33,7 @@ public class SystemTimeController {
 
     @Operation(summary = "获取服务器时间接口")
     @PostMapping(value = "serverTime", consumes = MediaType.APPLICATION_JSON_VALUE)
-    public ResultContent serverTime(@RequestBody SystemTimeParam param) {
+    public ResultContent<SystemTimeModel> serverTime(@RequestBody SystemTimeParam param) {
         return systemTimeService.serverTime(param);
     }
 

src/main/java/com/zswl/dataservice/model/openApi/SuperOpenApiModel.java

@@ -0,0 +1,18 @@
+package com.zswl.dataservice.model.openApi;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/9/11
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SuperOpenApiModel {
+    @Schema(description = "消息ID, 原路返回")
+    private String msgId;
+}

src/main/java/com/zswl/dataservice/model/openApi/SuperOpenApiParam.java

@@ -24,4 +24,6 @@ public class SuperOpenApiParam {
     @NotEmpty(message = "appId不能为空")
     private String appId;
 
+    @Schema(description = "消息ID, 原路返回")
+    private String msgId;
 }

src/main/java/com/zswl/dataservice/model/openApi/SystemTimeModel.java

@@ -0,0 +1,20 @@
+package com.zswl.dataservice.model.openApi;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/9/11
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SystemTimeModel extends SuperOpenApiModel {
+
+    @Schema(description = "系统时间 yyyy-MM-dd HH:mm:ss")
+    private String serverTime;
+
+}

src/main/java/com/zswl/dataservice/model/openApi/SystemTimeParam.java

@@ -13,8 +13,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class SystemTimeParam extends SuperOpenApiParam {
-
-    @Schema(description = "消息ID, 原路返回")
-    private String msgId;
-
+    @Schema(description = "hideId", hidden = true)
+    private String hideId;
 }

src/main/java/com/zswl/dataservice/service/openApi/OpenApiSignInfoService.java

@@ -11,6 +11,7 @@ import com.zswl.dataservice.service.base.SuperService;
 import com.zswl.dataservice.service.user.OperationLogsService;
 import com.zswl.dataservice.type.AppState;
 import com.zswl.dataservice.utils.AppInfoUtil;
+import com.zswl.dataservice.utils.CommonUtil;
 import com.zswl.dataservice.utils.SecurityUtil;
 import com.zswl.dataservice.utils.bean.BeanUtils;
 import com.zswl.dataservice.utils.mqtt.type.CommonState;
@@ -80,7 +81,7 @@ public class OpenApiSignInfoService extends SuperService {
             initEntity(openApiSignInfo);
 
             String appId = AppInfoUtil.generateRandomString();
-            String appKey = SecurityUtil.passWord(appId);
+            String appKey = CommonUtil.UUID();
             openApiSignInfo.setAppId(appId);
             openApiSignInfo.setAppKey(appKey);
             operationLogsService.addLogs(String.format("添加了openAPI认证数据：%s", appId), LogsLevel.Low);

src/main/java/com/zswl/dataservice/service/openApi/SystemTimeService.java

@@ -1,6 +1,8 @@
 package com.zswl.dataservice.service.openApi;
 
+import com.zswl.dataservice.model.openApi.SystemTimeModel;
 import com.zswl.dataservice.model.openApi.SystemTimeParam;
+import com.zswl.dataservice.utils.DateUtils;
 import com.zswl.dataservice.utils.result.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -20,9 +22,11 @@ public class SystemTimeService {
      *
      * @return
      */
-    public ResultContent serverTime(SystemTimeParam param) {
-
-        return ResultContent.buildSuccess(System.currentTimeMillis());
+    public ResultContent<SystemTimeModel> serverTime(SystemTimeParam param) {
+        SystemTimeModel model = new SystemTimeModel();
+        model.setMsgId(param.getMsgId());
+        model.setServerTime(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
+        return ResultContent.buildSuccess(model);
     }
 
 }

src/main/java/com/zswl/dataservice/utils/SecurityUtil.java

@@ -1,7 +1,10 @@
 package com.zswl.dataservice.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.math.BigInteger;
 import java.security.MessageDigest;
+import java.util.Base64;
 
 /**
  * @author TRX
@@ -42,4 +45,28 @@ public class SecurityUtil {
         }
         return encryptedPassword;
     }
+
+    public static String base64Encode(String str) {
+        if (StringUtils.isNotEmpty(str)) {
+            try {
+                byte[] encoded = Base64.getEncoder().encode(str.getBytes("utf-8"));
+                return new String(encoded);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return str;
+    }
+
+    public static String base64Decode(String str) {
+        if (StringUtils.isNotEmpty(str)) {
+            try {
+                byte[] decoded = Base64.getDecoder().decode(str.getBytes("utf-8"));
+                return new String(decoded);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return str;
+    }
 }