From ef454c40898805f1e0f0532c85ffbddcf40797fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 4 Jun 2024 10:32:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=A6=96=E6=AC=A1=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anmo/pom.xml                                                  | 2 +-
 .../sqx/modules/material/controller/MaterialController.java   | 1 -
 .../main/java/com/sqx/modules/utils/VerifyIdCardUtils.java    | 3 +--
 anmo/src/main/resources/application-prod.yml                  | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/anmo/pom.xml b/anmo/pom.xml
index 0b7ad9e..c943b68 100644
--- a/anmo/pom.xml
+++ b/anmo/pom.xml
@@ -40,7 +40,7 @@
 		<gson.version>2.8.5</gson.version>
 		<fastjson.version>1.2.83</fastjson.version>
 		<hutool.version>5.8.16</hutool.version>
-		<lombok.version>1.18.4</lombok.version>
+		<lombok.version>1.18.22</lombok.version>
 
 		<!--wagon plugin 配置-->
 		<!--<service-path>/work/sz</service-path>
diff --git a/anmo/src/main/java/com/sqx/modules/material/controller/MaterialController.java b/anmo/src/main/java/com/sqx/modules/material/controller/MaterialController.java
index 8bf32db..48b0be9 100644
--- a/anmo/src/main/java/com/sqx/modules/material/controller/MaterialController.java
+++ b/anmo/src/main/java/com/sqx/modules/material/controller/MaterialController.java
@@ -10,7 +10,6 @@ import com.sqx.modules.material.entity.MaterialMassage;
 import com.sqx.modules.material.service.MaterialArtificerService;
 import com.sqx.modules.material.service.MaterialMassageService;
 import com.sqx.modules.material.service.MaterialService;
-import com.sun.org.apache.regexp.internal.RE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/anmo/src/main/java/com/sqx/modules/utils/VerifyIdCardUtils.java b/anmo/src/main/java/com/sqx/modules/utils/VerifyIdCardUtils.java
index 9954a7e..ee5108b 100644
--- a/anmo/src/main/java/com/sqx/modules/utils/VerifyIdCardUtils.java
+++ b/anmo/src/main/java/com/sqx/modules/utils/VerifyIdCardUtils.java
@@ -6,7 +6,6 @@ import com.sqx.modules.common.service.CommonInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import sun.misc.BASE64Encoder;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
@@ -155,7 +154,7 @@ public class VerifyIdCardUtils {
         Key sKey = new SecretKeySpec(secretKey.getBytes("UTF-8"), mac.getAlgorithm());
         mac.init(sKey);
         byte[] hash = mac.doFinal(signStr.getBytes("UTF-8"));
-        String sig = new BASE64Encoder().encode(hash);
+        String sig = Base64.getEncoder().encodeToString(hash);
 
         String auth = "hmac id=\"" + secretId + "\", algorithm=\"hmac-sha1\", headers=\"x-date x-source\", signature=\"" + sig + "\"";
         return auth;
diff --git a/anmo/src/main/resources/application-prod.yml b/anmo/src/main/resources/application-prod.yml
index e03c459..15c1a4a 100644
--- a/anmo/src/main/resources/application-prod.yml
+++ b/anmo/src/main/resources/application-prod.yml
@@ -3,9 +3,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://127.0.0.1:3306/anmoceshi?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
+            url: jdbc:mysql://123.60.46.33:3306/anmo?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
             username: root
-            password: 123456
+            password: root
             initial-size: 10
             max-active: 100
             min-idle: 10