From 75942ecc2e438012c5ea876715966ace593565a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 15:17:41 +0800
Subject: [PATCH] 部分代码
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 21 ++++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java | 18 ++--
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/HuaWeiSMSUtil.java | 186 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 214 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
index 6143bf9..88d793b 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
@@ -13,20 +13,20 @@
@Data
@Component
public class DatasourceModel {
- private String url = "jdbc:mysql://127.0.0.1:10633/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
- private String username = "root";
- private String password = "Haitunyingyu@2025!";
- private String driverClassName = "com.mysql.cj.jdbc.Driver";
- private Integer maxActive =20;
- private Long maxWait = 60000L;
- private Integer minIdle =5;
- private Integer initialSize =2;
// private String url = "jdbc:mysql://127.0.0.1:10633/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
// private String username = "root";
-// private String password = "HaiTunEnglish2024!";
+// private String password = "Haitunyingyu@2025!";
// private String driverClassName = "com.mysql.cj.jdbc.Driver";
// private Integer maxActive =20;
// private Long maxWait = 60000L;
// private Integer minIdle =5;
// private Integer initialSize =2;
+ private String url = "jdbc:mysql://127.0.0.1:3306/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
+ private String username = "root";
+ private String password = "root";
+ private String driverClassName = "com.mysql.cj.jdbc.Driver";
+ private Integer maxActive =20;
+ private Long maxWait = 60000L;
+ private Integer minIdle =5;
+ private Integer initialSize =2;
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index e6ae4b4..26c0859 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -21,6 +21,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import kotlin.random.Random;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -561,6 +562,21 @@
tStudy.setQuarter(dto.getQuarter());
studyService.saveOrUpdate(tStudy);
}
+ // 每次添加周目后需要根据季度来重新排序周目
+ if (dto.getType() == 1){
+ List<TStudy> list1 = studyService.lambdaQuery()
+ .eq(TStudy::getType, 1)
+ .orderByAsc(TStudy::getQuarter)
+ .orderByAsc(TStudy::getWeek)
+ .list();
+ int i = 1;
+ for (TStudy tStudy : list1) {
+ tStudy.setWeek(i);
+ i++;
+ }
+ studyService.updateBatchById(list1);
+ }
+
return R.ok();
}
@@ -633,7 +649,8 @@
res.setWeeks(type);
List<TStudy> list8 = studyService.list(new QueryWrapper<TStudy>()
.eq("type", dto.getType())
- .eq("week", dto.getWeek()));
+ .eq("week", dto.getWeek())
+ .orderByAsc("quarter"));
if (!list8.isEmpty()) {
res.setQuarter(list8.get(0).getQuarter());
res.setTitle(list8.get(0).getTitle());
@@ -1567,7 +1584,7 @@
private List<String> getData(TGame game, List<String> newSubjectId, int num) {
List<String> subjectData = new ArrayList<>();
- Random random = new Random();
+ java.util.Random random = new java.util.Random();
// 获取列表大小
int dataSize = newSubjectId.size();
// 生成随机索引并获取数据
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/HuaWeiSMSUtil.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/HuaWeiSMSUtil.java
new file mode 100644
index 0000000..855ee86
--- /dev/null
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/HuaWeiSMSUtil.java
@@ -0,0 +1,186 @@
+package com.ruoyi.study.utils;
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.util.EntityUtils;
+
+import java.nio.charset.Charset;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+// 如果JDK版本是1.8,可使用原生Base64类
+
+public class HuaWeiSMSUtil {
+
+ // 无需修改,用于格式化鉴权头域,给"X-WSSE"参数赋值
+ private static final String WSSE_HEADER_FORMAT = "UsernameToken Username=\"%s\",PasswordDigest=\"%s\",Nonce=\"%s\",Created=\"%s\"";
+ // 无需修改,用于格式化鉴权头域,给"Authorization"参数赋值
+ private static final String AUTH_HEADER_VALUE = "WSSE realm=\"SDP\",profile=\"UsernameToken\",type=\"Appkey\"";
+
+ public static void main(String[] args) throws Exception {
+
+ sendSms("[\"" + 123456 + "\"]", "18398968484", "8824060605338",
+ "e5ddbbbac6e0460f87ae893566f71c0d");
+
+// sendSms("[\"17623778642\",\"蓉A-7823\"]","17623778642","8819122535459","6c848255000c4619833ab690e393f906");
+// sendSms("[\"17623778642\",\"蓉A-7823\",\"2019/12/27\",\"14:00\"]","17623778642","8819122535459","bb13d00d11e043659001a89c72d54cab");
+ }
+
+ /**
+ * 调用短信
+ *
+ * @param code 入参
+ * @param phone 接收短信手机号
+ * @param sender 国内短信签名通道号或国际/港澳台短信通道号
+ * @param templateId 模板ID
+ * @throws Exception
+ */
+ public static void sendSms(String code, String phone, String sender, String templateId)
+ throws Exception {
+ // TODO 必填,请参考"开发准备"获取如下数据,替换为实际值
+ String url = "https://smsapi.cn-north-4.myhuaweicloud.com:443/sms/batchSendSms/v1"; // APP接入地址+接口访问URI
+ String appKey = "WlLCBjQ3hg9esHFLk1mUM8eqqK36"; // APP_Key
+ String appSecret = "TRK3BaNAxs3eW1rQdG46oh7yvw6Q"; // APP_Secret
+
+ // 条件必填,国内短信关注,当templateId指定的模板类型为通用模板时生效且必填,必须是已审核通过的,与模板类型一致的签名名称
+ // 国际/港澳台短信不用关注该参数
+ String signature = null; // 签名名称
+
+ // 必填,全局号码格式(包含国家码),示例:+8615123456789,多个号码之间用英文逗号分隔
+ String receiver = "+86" + phone; // 短信接收人号码
+
+ // 选填,短信状态报告接收地址,推荐使用域名,为空或者不填表示不接收状态报告
+ String statusCallBack = "";
+
+ /**
+ * 选填,使用无变量模板时请赋空值 String templateParas = "";
+ * 单变量模板示例:模板内容为"您的验证码是${NUM_6}"时,templateParas可填写为"[\"369751\"]"
+ * 双变量模板示例:模板内容为"您有${NUM_2}件快递请到${TXT_20}领取"时,templateParas可填写为"[\"3\",\"人民公园正门\"]"
+ * ${DATE}${TIME}变量不允许取值为空,${TXT_20}变量可以使用英文空格或点号替代空值,${NUM_6}变量可以使用0替代空值
+ * 查看更多模板和变量规范:产品介绍>模板和变量规范
+ */
+ String templateParas = code; // 模板变量
+
+ // 请求Body,不携带签名名称时,signature请填null
+ String body = buildRequestBody(sender, receiver, templateId, templateParas, statusCallBack,
+ signature);
+ if (null == body || body.isEmpty()) {
+ System.out.println("body is null.");
+ return;
+ }
+
+ // 请求Headers中的X-WSSE参数值
+ String wsseHeader = buildWsseHeader(appKey, appSecret);
+ if (null == wsseHeader || wsseHeader.isEmpty()) {
+ System.out.println("wsse header is null.");
+ return;
+ }
+
+ // 如果JDK版本低于1.8,可使用如下代码
+ // 为防止因HTTPS证书认证失败造成API调用失败,需要先忽略证书信任问题
+ // CloseableHttpClient client = HttpClients.custom()
+ // .setSSLContext(new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+ // @Override
+ // public boolean isTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+ // return true;
+ // }
+ // }).build()).setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE).build();
+
+ // 如果JDK版本是1.8,可使用如下代码
+ // 为防止因HTTPS证书认证失败造成API调用失败,需要先忽略证书信任问题
+ CloseableHttpClient client = HttpClients.custom()
+ .setSSLContext(new SSLContextBuilder().loadTrustMaterial(null,
+ (x509CertChain, authType) -> true).build())
+ .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE)
+ .build();
+
+ HttpResponse response = client.execute(RequestBuilder.create("POST")// 请求方法POST
+ .setUri(url)
+ .addHeader(HttpHeaders.CONTENT_TYPE, "application/x-www-form-urlencoded")
+ .addHeader(HttpHeaders.AUTHORIZATION, AUTH_HEADER_VALUE)
+ .addHeader("X-WSSE", wsseHeader)
+ .setEntity(new StringEntity(body)).build());
+
+ System.out.println(response.toString()); // 打印响应头域信息
+ System.out.println(EntityUtils.toString(response.getEntity())); // 打印响应消息实体
+ }
+
+ /**
+ * 构造请求Body体
+ *
+ * @param sender
+ * @param receiver
+ * @param templateId
+ * @param templateParas
+ * @param statusCallbackUrl
+ * @param signature | 签名名称,使用国内短信通用模板时填写
+ * @return
+ */
+ static String buildRequestBody(String sender, String receiver, String templateId,
+ String templateParas,
+ String statusCallbackUrl, String signature) {
+ if (null == sender || null == receiver || null == templateId || sender.isEmpty()
+ || receiver.isEmpty()
+ || templateId.isEmpty()) {
+ System.out.println("buildRequestBody(): sender, receiver or templateId is null.");
+ return null;
+ }
+ List<NameValuePair> keyValues = new ArrayList<NameValuePair>();
+
+ keyValues.add(new BasicNameValuePair("from", sender));
+ keyValues.add(new BasicNameValuePair("to", receiver));
+ keyValues.add(new BasicNameValuePair("templateId", templateId));
+ if (null != templateParas && !templateParas.isEmpty()) {
+ keyValues.add(new BasicNameValuePair("templateParas", templateParas));
+ }
+ if (null != statusCallbackUrl && !statusCallbackUrl.isEmpty()) {
+ keyValues.add(new BasicNameValuePair("statusCallback", statusCallbackUrl));
+ }
+ if (null != signature && !signature.isEmpty()) {
+ keyValues.add(new BasicNameValuePair("signature", signature));
+ }
+
+ return URLEncodedUtils.format(keyValues, Charset.forName("UTF-8"));
+ }
+
+ /**
+ * 构造X-WSSE参数值
+ *
+ * @param appKey
+ * @param appSecret
+ * @return
+ */
+ static String buildWsseHeader(String appKey, String appSecret) {
+ if (null == appKey || null == appSecret || appKey.isEmpty() || appSecret.isEmpty()) {
+ System.out.println("buildWsseHeader(): appKey or appSecret is null.");
+ return null;
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ String time = sdf.format(new Date()); // Created
+ String nonce = UUID.randomUUID().toString().replace("-", ""); // Nonce
+
+ byte[] passwordDigest = DigestUtils.sha256(nonce + time + appSecret);
+ String hexDigest = Hex.encodeHexString(passwordDigest);
+
+ // 如果JDK版本是1.8,请加载原生Base64类,并使用如下代码
+ String passwordDigestBase64Str = Base64.getEncoder()
+ .encodeToString(hexDigest.getBytes()); // PasswordDigest
+ // 如果JDK版本低于1.8,请加载三方库提供Base64类,并使用如下代码
+ // String passwordDigestBase64Str = Base64.encodeBase64String(hexDigest.getBytes(Charset.forName("utf-8"))); //PasswordDigest
+ // 若passwordDigestBase64Str中包含换行符,请执行如下代码进行修正
+ // passwordDigestBase64Str = passwordDigestBase64Str.replaceAll("[\\s*\t\n\r]", "");
+
+ return String.format(WSSE_HEADER_FORMAT, appKey, passwordDigestBase64Str, nonce, time);
+ }
+}
--
Gitblit v1.7.1