diff --git a/pom.xml b/pom.xml
index 2543d1e4..4d35ab8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,13 +224,6 @@
system
${pom.basedir}/src/main/resources/lib/aspose-words-22.10-jdk16.jar
-
- com.bcloud.msg.http
- bcloud.msg.http
- http
- system
- ${pom.basedir}/src/main/resources/lib/http.jar
-
net.sourceforge.lame
lame
@@ -448,7 +441,7 @@
spring-boot-maven-plugin
true
- true
+
diff --git a/src/main/java/com/baidu/ueditor/upload/Base64Uploader.java b/src/main/java/com/baidu/ueditor/upload/Base64Uploader.java
index 92788326..2f81076a 100644
--- a/src/main/java/com/baidu/ueditor/upload/Base64Uploader.java
+++ b/src/main/java/com/baidu/ueditor/upload/Base64Uploader.java
@@ -42,7 +42,7 @@ public final class Base64Uploader {
}
private static byte[] decode(String content) {
- return Base64.decodeBase64(content.getBytes());
+ return Base64.decodeBase64(content);
}
private static boolean validSize(byte[] data, long length) {
diff --git a/src/main/java/com/peanut/common/service/HlsDecryptService.java b/src/main/java/com/peanut/common/service/HlsDecryptService.java
index 98ec2caf..0fcb0642 100644
--- a/src/main/java/com/peanut/common/service/HlsDecryptService.java
+++ b/src/main/java/com/peanut/common/service/HlsDecryptService.java
@@ -111,7 +111,7 @@ public class HlsDecryptService {
*/
private byte[] decrypt(String ciphertext) {
DecryptKMSDataKeyResponseBody decryptKMSDataKeyResponseBody = SpdbUtil.enKMS(ciphertext);
- return Base64.decodeBase64(decryptKMSDataKeyResponseBody.getPlaintext().getBytes());
+ return Base64.decodeBase64(decryptKMSDataKeyResponseBody.getPlaintext());
// DecryptKMSDataKeyRequest request = new DecryptKMSDataKeyRequest();
// request.setCipherText(ciphertext);
// request.setProtocol(ProtocolType.HTTPS);
diff --git a/src/main/java/com/peanut/common/utils/SmsUtil.java b/src/main/java/com/peanut/common/utils/SmsUtil.java
index 5191784e..44b6e3cb 100644
--- a/src/main/java/com/peanut/common/utils/SmsUtil.java
+++ b/src/main/java/com/peanut/common/utils/SmsUtil.java
@@ -1,7 +1,6 @@
package com.peanut.common.utils;
import com.alibaba.fastjson.JSONObject;
-import com.bcloud.msg.http.HttpSender;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -9,6 +8,7 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+import java.net.URLEncoder;
@Component
public class SmsUtil {
@@ -31,22 +31,25 @@ public class SmsUtil {
private String abroadContent;
public R sendSmsCode(String phone, String code) {
- String mobiles = phone;//手机号码,多个号码使用","分割
- boolean needstatus = true;//是否需要状态报告,需要true,不需要false
- String product = "";//产品ID
- String extno = "";//扩展码
- String respType = "json";//返回json格式响应
- boolean encrypt = true;// 密码使用时间戳加密
try {
- String returnString = HttpSender.send(url, account, pswd, mobiles, content.replace("XXXXXX",code), needstatus, product, extno, respType, encrypt);
- //{"result":108,"ts":"20250416115415"}
- //{"result":0,"msgid":"2150416115442493200","ts":"20250416115442"}
- JSONObject object = JSONObject.parseObject(returnString);
- if ("0".equals(object.get("result").toString())){
+ CloseableHttpClient client = HttpClients.createDefault();
+ HttpPost httpPost = new HttpPost(url);
+ StringEntity entity = new StringEntity("" +
+ "account="+account+
+ "&pswd="+pswd+
+ "&mobile="+phone+
+ "&msg="+ URLEncoder.encode(content.replace("XXXXXX",code), "UTF-8")+
+ "&needstatus=false");
+ httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded");
+ httpPost.setEntity(entity);
+ String returnString = EntityUtils.toString(client.execute(httpPost).getEntity());
+ //20250416115415,0
+ String[] res = returnString.split(",");
+ if ("0".equals(res[1])){
return R.ok();
- }else if ("104".equals(object.get("result").toString())){
+ }else if ("104".equals(res[1])){
return R.error("短信平台系统忙,请稍后重试。");
- }else if ("107".equals(object.get("result").toString())){
+ }else if ("107".equals(res[1])){
return R.error("错误的手机号码。");
}else {
return R.error("系统错误,请联系管理员");
diff --git a/src/main/java/com/peanut/modules/sys/controller/VodAliController.java b/src/main/java/com/peanut/modules/sys/controller/VodAliController.java
index c464149a..bb1ce3f3 100644
--- a/src/main/java/com/peanut/modules/sys/controller/VodAliController.java
+++ b/src/main/java/com/peanut/modules/sys/controller/VodAliController.java
@@ -31,13 +31,13 @@ public class VodAliController {
throw new RuntimeException(e);
}
if (!validRe) {
- return Base64.decodeBase64("Illegal access".getBytes());
+ return Base64.decodeBase64("Illegal access");
}
if (null == cipherText) {
- return Base64.decodeBase64("Illegal access !".getBytes());
+ return Base64.decodeBase64("Illegal access !");
}
DecryptKMSDataKeyResponseBody decryptKMSDataKeyResponseBody = SpdbUtil.enKMS(cipherText);
- return Base64.decodeBase64(decryptKMSDataKeyResponseBody.getPlaintext().getBytes());
+ return Base64.decodeBase64(decryptKMSDataKeyResponseBody.getPlaintext());
}
diff --git a/src/main/resources/lib/http.jar b/src/main/resources/lib/http.jar
deleted file mode 100644
index f5a20c0e..00000000
Binary files a/src/main/resources/lib/http.jar and /dev/null differ