From c45c2087783863d127f38aa8fc8a3dcc0acd744f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 16 七月 2025 10:55:21 +0800
Subject: [PATCH] 配置修改
---
/dev/null | 79 -------------------
ruoyi-admin/src/main/resources/application-test.yml | 38 ---------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 44 +++++-----
ruoyi-admin/src/main/resources/application-prod.yml | 35 --------
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 5 -
5 files changed, 25 insertions(+), 176 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index de52f90..cff09cb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -15,17 +15,17 @@
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.web.controller.tool.MsgUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Set;
-import java.util.concurrent.TimeUnit;
/**
* 登录验证
@@ -50,8 +50,6 @@
private TokenService tokenService;
@Autowired
private ISysRoleService roleService;
- @Autowired
- private MsgUtils msgUtils;
/**
* 账号密码登录
@@ -116,23 +114,23 @@
* @param phone 手机号
* @return 结果
*/
- @ApiOperation(value = "获取验证码",notes = "获取验证码")
- @GetMapping("/getCode")
- public AjaxResult getCode(@RequestParam String phone)
- {
- // 发送验证码并存储到redis
- if (StringUtils.hasLength(phone)) {
- String code = String.valueOf((int) (Math.random() * 1000000));
- redisCache.setCacheObject(phone, code,5*60,TimeUnit.SECONDS);
- try {
- msgUtils.sendMsg(phone, code);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- return AjaxResult.success("发送短信验证码成功！5分钟内有效");
- }
- return AjaxResult.error(500, "发送短信验证码失败，请确认手机号码!");
- }
+// @ApiOperation(value = "获取验证码",notes = "获取验证码")
+// @GetMapping("/getCode")
+// public AjaxResult getCode(@RequestParam String phone)
+// {
+// // 发送验证码并存储到redis
+// if (StringUtils.hasLength(phone)) {
+// String code = String.valueOf((int) (Math.random() * 1000000));
+// redisCache.setCacheObject(phone, code,5*60,TimeUnit.SECONDS);
+// try {
+// msgUtils.sendMsg(phone, code);
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// return AjaxResult.success("发送短信验证码成功！5分钟内有效");
+// }
+// return AjaxResult.error(500, "发送短信验证码失败，请确认手机号码!");
+// }
/**
* 获取用户信息
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/MsgUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/MsgUtils.java
deleted file mode 100644
index 119a5ea..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/MsgUtils.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.ruoyi.web.controller.tool;
-
-import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
-import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
-import com.aliyun.tea.TeaException;
-import com.aliyun.teaopenapi.models.Config;
-import com.aliyun.teautil.models.RuntimeOptions;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class MsgUtils {
-
- @Value("${code.config.accessKeyId}")
- private String accessKeyId;
- @Value("${code.config.accessKeySecret}")
- private String accessKeySecret;
- @Value("${code.config.signName}")
- private String signName;
- @Value("${code.config.templateCode}")
- private String templateCode;
- @Value("${code.config.signNameTest}")
- private String signNameTest;
- @Value("${code.config.templateCodeTest}")
- private String templateCodeTest;
-
- /**
- * 使用AK&SK初始化账号Client
- * @param accessKeyId
- * @param accessKeySecret
- * @return Client
- * @throws Exception
- */
- public static com.aliyun.dysmsapi20170525.Client createClient(String accessKeyId, String accessKeySecret) throws Exception {
- Config config = new Config()
- // 您的 AccessKey ID
- .setAccessKeyId(accessKeyId)
- // 您的 AccessKey Secret
- .setAccessKeySecret(accessKeySecret);
- // 访问的域名
- config.endpoint = "dysmsapi.aliyuncs.com";
- return new com.aliyun.dysmsapi20170525.Client(config);
- }
-
- public void sendMsg(String phone,String code) throws Exception {
- com.aliyun.dysmsapi20170525.Client client = MsgUtils.createClient(accessKeyId,accessKeySecret);
- SendSmsRequest sendSmsRequest = new SendSmsRequest()
- .setSignName(signName)
- .setTemplateCode(templateCode)
- .setPhoneNumbers(phone)
- .setTemplateParam("{\"code\":\""+code+"\"}");
- RuntimeOptions runtime = new RuntimeOptions();
- try {
- // 复制代码运行请自行打印 API 的返回值
- SendSmsResponse sendSmsResponse = client.sendSmsWithOptions(sendSmsRequest, runtime);
- log.info("短信发送成功:{},{}",sendSmsResponse.getBody().getMessage(),sendSmsResponse.getStatusCode());
- } catch (TeaException error) {
- // 如有需要，请打印 error
- com.aliyun.teautil.Common.assertAsString(error.message);
- log.info("短信发送失败:{}",error.message);
- } catch (Exception _error) {
- TeaException error = new TeaException(_error.getMessage(), _error);
- // 如有需要，请打印 error
- com.aliyun.teautil.Common.assertAsString(error.message);
- log.info("短信发送失败:{}",error.message);
- }
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/FileUploaderConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/FileUploaderConfig.java
deleted file mode 100644
index d87ab0d..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/FileUploaderConfig.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.ruoyi.web.core.config;
-
-import com.qcloud.cos.COSClient;
-import com.qcloud.cos.ClientConfig;
-import com.qcloud.cos.auth.BasicCOSCredentials;
-import com.qcloud.cos.auth.COSCredentials;
-import com.qcloud.cos.http.HttpProtocol;
-import com.qcloud.cos.region.Region;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@Data
-public class FileUploaderConfig {
-
- /**
- * COS的SecretId
- */
- @Value("${cos.client.accessKey}")
- private String secretId;
- /**
- * COS的SecretKey
- */
- @Value("${cos.client.secretKey}")
- private String secretKey;
- /**
- * 文件上传后访问路径的根路径，后面要最佳文件名字与类型
- */
- @Value("${cos.client.rootSrc}")
- private String rootSrc;
- /**
- * 上传的存储桶的地域
- */
- @Value("${cos.client.bucketAddr}")
- private String bucketAddr;
- /**
- * 存储桶的名字，是自己在存储空间自己创建的，我创建的名字是：qq-test-1303******
- */
- @Value("${cos.client.bucket}")
- private String bucketName;
- /**
- * 文件存放位置
- */
- @Value("${cos.client.location}")
- private String location;
-
- @Value("${file.url.prefix}")
- private String fileUrlPrefix;
-
-
- @Bean
- public COSClient cosClient() {
- // 1 初始化用户身份信息（secretId, secretKey）。
- COSCredentials cred = new BasicCOSCredentials(secretId, secretKey);
- // 2.1 设置存储桶的地域（上文获得）
- Region region = new Region(bucketAddr);
- ClientConfig clientConfig = new ClientConfig(region);
- // 2.2 使用https协议传输
- clientConfig.setHttpProtocol(HttpProtocol.https);
- // 生成 cos 客户端
- return new COSClient(cred, clientConfig);
- }
-
-
-}
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 02bf461..2709b4c 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -202,36 +202,5 @@
prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path}
wx:
conf:
- appId: wxe91f1af7638aa5dd
- secretId: a787e1a462715604e0c9528b6d8960d1
-#OSS及短信配置
-code:
- config:
- templateCodeTest: "SMS_154950909"
- signNameTest: "阿里云短信测试"
- accessKeyId: LTAI5tAdba8HtT1C6UqtSxBt
- accessKeySecret: 0SRb6XGkciQDPWn2rYqbJtq2qRMDY8
- signName: "四川金达通信工程"
- templateCode: "SMS_293985284"
-cos:
- client:
- accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
- secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
- bucket: xzgttest-1305134071
- bucketAddr: ap-chengdu
- rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
- location: /xizang
-sms:
- enable: true
- appId: 1400957506
- secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
- secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
- sign: 畅云出行
-com:
- taxi591:
- bank:
- cer-path: /usr/local/bank/TrustPay.cer
- base-url: http://hello.enjoy.abchina.com
- enable: true
- keystore-password: gggs6666
- pfx-path: /usr/local/bank/103882597000441.pfx
\ No newline at end of file
+ appId:
+ secretId:
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 19f275a..e5ba565 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -191,41 +191,7 @@
qrLocation: /file/qrCode/
accessPath: /file/
allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar
- url:
-# prefix: http://localhost:${server.port}${server.servlet.context-path}
- prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path}
wx:
conf:
- appId: wxe91f1af7638aa5dd
- secretId: a787e1a462715604e0c9528b6d8960d1
-#OSS及短信配置
-code:
- config:
- templateCodeTest: "SMS_154950909"
- signNameTest: "阿里云短信测试"
- accessKeyId: LTAI5tAdba8HtT1C6UqtSxBt
- accessKeySecret: 0SRb6XGkciQDPWn2rYqbJtq2qRMDY8
- signName: "四川金达通信工程"
- templateCode: "SMS_293985284"
-cos:
- client:
- accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
- secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
- bucket: xzgttest-1305134071
- bucketAddr: ap-chengdu
- rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
- location: /xizang
-sms:
- enable: true
- appId: 1400957506
- secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
- secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
- sign: 畅云出行
-com:
- taxi591:
- bank:
- cer-path: D:\workspaces\工作文件\畅云\农业银行\正式\TrustPay.cer
- base-url: http://hello.enjoy.abchina.com
- enable: true
- keystore-password: gggs6666
- pfx-path: D:\workspaces\工作文件\畅云\农业银行\正式\103882597000441.pfx
\ No newline at end of file
+ appId:
+ secretId:
\ No newline at end of file
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index e3367b9..35e8dec 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,17 +1,12 @@
package com.ruoyi.web.controller.system;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.SmsUtil;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.web.controller.tool.MsgUtils;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/SmsProperties.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/SmsProperties.java
deleted file mode 100644
index 7a45914..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/SmsProperties.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.common.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "sms")
-public class SmsProperties {
-
- public static final String ENABLE_KEY = "sms.enable";
-
- private Boolean enable;
-
- private String appId;
-
- private String secretid;
-
- private String secretkey;
- /**
- * 短信签名
- */
- private String sign;
-
- /**
- * 账单提醒 ，同一个用户离上次发送短信的最小间隔
- * 单位分钟
- */
- private Integer billSmsDelayPeriod = 60;
- /**
- * 账单提醒 ，同一个用户离上次发送邮件的最小间隔
- * 单位分钟
- */
- private Integer billMailDelayPeriod = 60;
-
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtil.java
deleted file mode 100644
index c558969..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtil.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.ruoyi.common.utils;
-
-import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.config.SmsProperties;
-import com.ruoyi.common.exception.ServiceException;
-import com.tencentcloudapi.common.Credential;
-import com.tencentcloudapi.common.exception.TencentCloudSDKException;
-import com.tencentcloudapi.common.profile.ClientProfile;
-import com.tencentcloudapi.common.profile.HttpProfile;
-import com.tencentcloudapi.sms.v20190711.SmsClient;
-import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest;
-import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.List;
-
-@Component
-@Slf4j
-public class SmsUtil {
-
- @Resource
- SmsProperties smsProperties;
- static SmsClient smsClient;
-
-
- public SmsProperties getPro() {
- return smsProperties;
- }
-
- @PostConstruct
- public void createSmsClient() {
- // 实例化一个认证对象，入参需要传入腾讯云账户 SecretId，SecretKey。
- // 为了保护密钥安全，建议将密钥设置在环境变量中或者配置文件中，请参考凭证管理 https://github.com/TencentCloud/tencentcloud-sdk-java?tab=readme-ov-file#%E5%87%AD%E8%AF%81%E7%AE%A1%E7%90%86。
- // 硬编码密钥到代码中有可能随代码泄露而暴露，有安全隐患，并不推荐。
- // SecretId、SecretKey 查询: https://console.cloud.tencent.com/cam/capi
- // Credential cred = new Credential("SecretId", "SecretKey");
-
- Credential cred = new Credential(smsProperties.getSecretid(), smsProperties.getSecretkey());
- // 实例化一个http选项，可选的，没有特殊需求可以跳过
- HttpProfile httpProfile = new HttpProfile();
- // 指定接入地域域名，默认就近地域接入域名为 sms.tencentcloudapi.com ，也支持指定地域域名访问，例如广州地域的域名为 sms.ap-guangzhou.tencentcloudapi.com
- httpProfile.setEndpoint("sms.tencentcloudapi.com");
- // 实例化一个客户端配置对象
- ClientProfile clientProfile = new ClientProfile();
- clientProfile.setHttpProfile(httpProfile);
- // 实例化要请求产品(sms)的client对象，第二个参数是地域信息，可以直接填写字符串ap-guangzhou，支持的地域列表参考 https://cloud.tencent.com/document/api/382/52071#.E5.9C.B0.E5.9F.9F.E5.88.97.E8.A1.A8
- smsClient = new SmsClient(cred, "ap-guangzhou", clientProfile);
- }
-
- public boolean sendSms(String phone,String templateId,String[] param){
- phone = phone.startsWith("+86")?phone:("+86"+phone);
- SendSmsRequest req = new SendSmsRequest();
- req.setSmsSdkAppid(smsProperties.getAppId());
- req.setPhoneNumberSet(new String[]{phone});
- req.setTemplateID(templateId);
- req.setSign(smsProperties.getSign());
- req.setTemplateParamSet(param);
- req.setSenderId("");
- req.setSessionContext("");
- req.setExtendCode("");
- try {
- SendSmsResponse sendSmsResponse = smsClient.SendSms(req);
- System.out.println(JSON.toJSONString(sendSmsResponse));
- return true;
- } catch (TencentCloudSDKException e) {
- log.error("发送短信失败,{},{}",phone,param,e);
- throw new ServiceException("发送短信失败");
- } catch (Exception e){
- log.error("发送短信失败1,{},{}",phone,param,e);
- throw new ServiceException("发送短信失败1");
- }
- }
-
-
-}
--
Gitblit v1.7.1