From a72bd4672a6219f46cd3f8a03c2c4e952b859075 Mon Sep 17 00:00:00 2001 From: menxipeng Date: Thu, 23 Oct 2025 21:11:47 +0800 Subject: [PATCH] pz --- .../src/main/resources/application-druid.yml | 2 +- .../src/main/resources/application.yml | 22 +++---- .../com/ruoyi/system/config/AliConfig.java | 66 +++++++++---------- .../com/ruoyi/system/config/UmengConfig.java | 27 ++++---- .../service/impl/CShopUserServiceImpl.java | 4 +- 5 files changed, 60 insertions(+), 61 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 1c47c23..58a7e2e 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://rm-2ze15tecas1y876i8xo.mysql.rds.aliyuncs.com:3306/musicpro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://rm-t4ng7k83rzt5281yido.mysql.singapore.rds.aliyuncs.com:3306/musicpro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: music password: Q1w2e3r4 # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 4e4b42f..c050fd5 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -19,7 +19,7 @@ server: port: 8085 servlet: # 应用的访问路径 - context-path: / + context-path: /dev-api tomcat: # tomcat的URI编码 uri-encoding: UTF-8 @@ -100,7 +100,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 + expireTime: 1440 # MyBatis配置 mybatis: @@ -137,15 +137,15 @@ xss: urlPatterns: /system/*,/monitor/*,/tool/* ali: - accessKeyId: LTAI5tDWWzwqxumUXTFnkQFd - accessKeySecret: KOD3y6OxbHJ23wxAf68NFpUQXCQEPX + accessKeyId: LTAI5tAZPz1BecFgfPwFSnps + accessKeySecret: 9Qp2TeLMgjvhCwyjQuxSSIYaffzBpL umApp: - appAliKey: 204918113 - appAliSecret: v4UrIhhLZlo0adpmevyCfvThGFbrRer0 - androidSecret: vxq4qfnb3jbb3jahrcxpbtpjgcuu7dtm - androidKey: 68a9988ce563686f4288e26d - IOSKey: 68a99a66ec2b5b6f8825b8b1 - IOSSecret: tjbflqx0eoqjixtyrtbh0zgijawmvxfe + appAliKey: 204941627 + appAliSecret: snxhb85RWiLAegYc20hEwTsOEIkZfIaS + androidSecret: nmabfppid2dfgqsxg4yecmppslpcrjeb + androidKey: 68cbcf86c261f2773322b918 +# IOSKey: 68a99a66ec2b5b6f8825b8b1 + IOSSecret: 48n5d5m8l6svar6srxag6uxovqpaifgp # androidKey: 687b2df479267e0210b79b6f -# IOSKey: 687b2e1679267e0210b79b70 + IOSKey: 68ef6aa88560e34872ca7b41 #Q1w2e3r4 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/config/AliConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/config/AliConfig.java index d69de80..e859ed4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/config/AliConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/config/AliConfig.java @@ -69,8 +69,8 @@ public class AliConfig { // 构造API请求对象，请替换请求参数值 SendSmsRequest sendSmsRequest = new SendSmsRequest() .setPhoneNumbers(shopUser.getPhone()) - .setSignName("北京盛兴平商贸") - .setTemplateCode("SMS_323405385") + .setSignName("鸣悦光年") + .setTemplateCode("SMS_495880899") .setTemplateParam(templateParam); // TemplateParam为序列化后的JSON字符串。 // 获取响应对象 @@ -95,7 +95,7 @@ public class AliConfig { String endpoint = "https://oss-cn-beijing.aliyuncs.com"; String accessKeyId = AliKeyConfig.ACCESS_KEY_ID; String accessKeySecret = AliKeyConfig.ACCESS_KEY_SECRET; - String bucketName = "wenzhuangmusic"; + String bucketName = "mygn"; // 创建OSSClient实例 OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); @@ -123,7 +123,7 @@ public class AliConfig { String endpoint = "https://oss-cn-beijing.aliyuncs.com"; String accessKeyId = AliKeyConfig.ACCESS_KEY_ID; String accessKeySecret = AliKeyConfig.ACCESS_KEY_SECRET; - String bucketName = "wenzhuangmusic"; + String bucketName = "mygn"; OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); try { @@ -162,7 +162,7 @@ public class AliConfig { /** * 流式下载OSS文件，直接写入输出流，避免一次性加载整个文件到内存 - * + * * @param objectName OSS对象名称 * @param outputStream 输出流 * @return 是否下载成功 @@ -172,24 +172,24 @@ public class AliConfig { String endpoint = "https://oss-cn-beijing.aliyuncs.com"; String accessKeyId = AliKeyConfig.ACCESS_KEY_ID; String accessKeySecret = AliKeyConfig.ACCESS_KEY_SECRET; - String bucketName = "wenzhuangmusic"; + String bucketName = "mygn"; OSS ossClient = null; InputStream inputStream = null; try { ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); - + // 判断文件是否存在 boolean exists = ossClient.doesObjectExist(bucketName, objectName); if (!exists) { log.error("OSS文件不存在: {}", objectName); return false; } - + // 获取文件对象 OSSObject ossObject = ossClient.getObject(bucketName, objectName); inputStream = ossObject.getObjectContent(); - + // 使用缓冲区进行流式传输 byte[] buffer = new byte[8192]; // 8KB缓冲区 int bytesRead; @@ -202,8 +202,8 @@ public class AliConfig { } } catch (java.io.IOException e) { // 检查是否为客户端断开连接的错误 - if (e.getMessage() != null && - (e.getMessage().contains("Broken pipe") || + if (e.getMessage() != null && + (e.getMessage().contains("Broken pipe") || e.getMessage().contains("Connection reset by peer") || e.getMessage().contains("连接被对方重置") || e.getMessage().contains("你的主机中的软件中止了一个已建立的连接") || @@ -222,8 +222,8 @@ public class AliConfig { return true; } catch (java.io.IOException e) { // 检查是否为客户端断开连接的错误 - if (e.getMessage() != null && - (e.getMessage().contains("Broken pipe") || + if (e.getMessage() != null && + (e.getMessage().contains("Broken pipe") || e.getMessage().contains("Connection reset by peer") || e.getMessage().contains("连接被对方重置") || e.getMessage().contains("你的主机中的软件中止了一个已建立的连接") || @@ -249,7 +249,7 @@ public class AliConfig { } catch (java.io.IOException e) { log.error("关闭输入流失败: {}", e.getMessage()); } - + if (ossClient != null) { ossClient.shutdown(); } @@ -258,7 +258,7 @@ public class AliConfig { /** * 获取OSS对象的长度 - * + * * @param objectName OSS对象名称 * @return 文件长度，如果获取失败返回null */ @@ -267,23 +267,23 @@ public class AliConfig { String endpoint = "https://oss-cn-beijing.aliyuncs.com"; String accessKeyId = AliKeyConfig.ACCESS_KEY_ID; String accessKeySecret = AliKeyConfig.ACCESS_KEY_SECRET; - String bucketName = "wenzhuangmusic"; + String bucketName = "mygn"; OSS ossClient = null; try { ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); - + // 判断文件是否存在 boolean exists = ossClient.doesObjectExist(bucketName, objectName); if (!exists) { log.error("OSS文件不存在: {}", objectName); return null; } - + // 获取文件元数据 com.aliyun.oss.model.ObjectMetadata metadata = ossClient.getObjectMetadata(bucketName, objectName); return metadata.getContentLength(); - + } catch (Exception e) { log.error("获取OSS文件长度失败: {}", e.getMessage()); return null; @@ -296,7 +296,7 @@ public class AliConfig { /** * 范围下载OSS文件，支持HTTP Range请求 - * + * * @param objectName OSS对象名称 * @param outputStream 输出流 * @param start 开始字节位置 @@ -308,49 +308,49 @@ public class AliConfig { String endpoint = "https://oss-cn-beijing.aliyuncs.com"; String accessKeyId = AliKeyConfig.ACCESS_KEY_ID; String accessKeySecret = AliKeyConfig.ACCESS_KEY_SECRET; - String bucketName = "wenzhuangmusic"; + String bucketName = "mygn"; OSS ossClient = null; InputStream inputStream = null; try { ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); - + // 判断文件是否存在 boolean exists = ossClient.doesObjectExist(bucketName, objectName); if (!exists) { log.error("OSS文件不存在: {}", objectName); return false; } - + // 创建范围请求 com.aliyun.oss.model.GetObjectRequest getObjectRequest = new com.aliyun.oss.model.GetObjectRequest(bucketName, objectName); getObjectRequest.setRange(start, end); - + // 获取文件对象 OSSObject ossObject = ossClient.getObject(getObjectRequest); inputStream = ossObject.getObjectContent(); - + // 使用缓冲区进行流式传输 byte[] buffer = new byte[8192]; // 8KB缓冲区 int bytesRead; long totalBytesRead = 0; long expectedBytes = end - start + 1; - + while ((bytesRead = inputStream.read(buffer)) != -1 && totalBytesRead < expectedBytes) { try { // 确保不超过请求的字节范围 int bytesToWrite = (int) Math.min(bytesRead, expectedBytes - totalBytesRead); outputStream.write(buffer, 0, bytesToWrite); totalBytesRead += bytesToWrite; - + // 定期刷新输出流 if (bytesToWrite == buffer.length) { outputStream.flush(); } } catch (java.io.IOException e) { // 检查是否为客户端断开连接的错误 - if (e.getMessage() != null && - (e.getMessage().contains("Broken pipe") || + if (e.getMessage() != null && + (e.getMessage().contains("Broken pipe") || e.getMessage().contains("Connection reset by peer") || e.getMessage().contains("连接被对方重置") || e.getMessage().contains("你的主机中的软件中止了一个已建立的连接") || @@ -367,11 +367,11 @@ public class AliConfig { } outputStream.flush(); return true; - + } catch (java.io.IOException e) { // 检查是否为客户端断开连接的错误 - if (e.getMessage() != null && - (e.getMessage().contains("Broken pipe") || + if (e.getMessage() != null && + (e.getMessage().contains("Broken pipe") || e.getMessage().contains("Connection reset by peer") || e.getMessage().contains("连接被对方重置") || e.getMessage().contains("你的主机中的软件中止了一个已建立的连接") || @@ -397,7 +397,7 @@ public class AliConfig { } catch (java.io.IOException e) { log.error("关闭输入流失败: {}", e.getMessage()); } - + if (ossClient != null) { ossClient.shutdown(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/config/UmengConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/config/UmengConfig.java index 81869fc..a5f08e9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/config/UmengConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/config/UmengConfig.java @@ -46,22 +46,22 @@ public class UmengConfig { private final PushClient client = new PushClient(); public UmResp send(String token,String deviceTypeUp){ -// String umAppkey = null; - // if (deviceTypeUp.equals(DeviceTypeEnum.ANDROID.name())){ - // umAppkey = AliKeyConfig.UMApp_Android_Key; - // }else if (deviceTypeUp.equals(DeviceTypeEnum.IOS.name())){ - // umAppkey = AliKeyConfig.UMApp_IOS_Key; - // } + String umAppkey = null; + if (deviceTypeUp.equals(DeviceTypeEnum.ANDROID.name())){ + umAppkey = AliKeyConfig.UMApp_Android_Key; + }else if (deviceTypeUp.equals(DeviceTypeEnum.IOS.name())){ + umAppkey = AliKeyConfig.UMApp_IOS_Key; + } //687b2df479267e0210b79b6f - // String appKey = AliKeyConfig.UMApp_AliKey; - // String appSecret = AliKeyConfig.UMApp_AliSecret; + String appKey = AliKeyConfig.UMApp_AliKey; + String appSecret = AliKeyConfig.UMApp_AliSecret; // if (deviceTypeUp.equals(DeviceTypeEnum.ANDROID.name())){ // // } // //687b2df479267e0210b79b6f - String umAppkey = "68a99a66ec2b5b6f8825b8b1"; - String appKey = "204918113"; - String appSecret = "v4UrIhhLZlo0adpmevyCfvThGFbrRer0"; +// String umAppkey = "68cbcf86c261f2773322b918"; +// String appKey = "204941627"; +// String appSecret = "nmabfppid2dfgqsxg4yecmppslpcrjeb"; // 下面的url要和阿里云云市场购买的商品对应 String url = "https://verify5.market.alicloudapi.com/api/v1/mobile/info?appkey=" + umAppkey; HttpPost httpPost = new HttpPost(url); @@ -255,9 +255,8 @@ public class UmengConfig { // umengConfig.sendAndroidColumnOn("ArQoP2TkOFOCc11xP_biFmEO_DLfdKO0PZ4lvoWp5enm"); // umengConfig.sendAndroidColumnOn("ApqqKzPuBZdgILvIrX0Hq099e3qN_Z8ub_P0qoIvwEdi"); // System.out.println(DeviceTypeEnum.ANDROID.name()); - // UmResp sss1 = umengConfig.send( - // "eyJvIjoiaU9TIiwiayI6ImJNSGJwMktVdjhVaE5zOW1wQWhwYlwvWCtVRTlqcnZKeXhjb091N3BDdVlqcHNEc2RKM3A2M0pJZ056U0JrdlY5UlFPSHo3U25ZMmNcL3ZpbUI3ZHN2THFwQXlkbmRJeDB4NHhLSytFR2pvVEF4eU1oUnpUVHlrNHYzZThCSjNIajJOamJoK0VPdUtRTXV3N2pnS0dIdHJoT3FJRFF4QXJ0NisrUTI1ODhhQWdEVnp5TUVZdmxpTFhKeDUwS1wvZWI5VjdSb1VoNkMzc2E5Mm1xcHI1S3FxMm9KZHk3THoyYkVPQUVnM1hvWHJWVlwvcmtOMFluV1AyMVBZb0xrVFgxXC84TWZhVXZJRkY2aWJldDVaYkNzMVNhZU9LVU1rcnlicVpINHBMNlF5TzBFRjkrUHljT01hOGlVTjZabVZ6dm1HOFJHK3BjQjF1amVpSVpRN2N5bDRPOGxnPT0iLCJjIjoiSW02VTJVV3IxYTlDTkpmN29WR2FpRGxCZ3RSamQ5djUwaENCajJMWXd5N2Y3dzV2SndnWHFSXC8zeTlWYzFpSDFITnFHN1wvcUZpN2cxXC94cGQ5RGNsVjE0SXFKYmsxSHppZkNcL0JSU0NaeGpFTm5qWndTR3l1K1VnR3luajhnMWlHbkFhOHRmVWRUN0lGNWdrOGpVSVlteTZBNllkXC92Z2RXXC9wa1krcE9pczVWZEUrTjhXMjhEXC9idXhjQm1Wbm5obHpMWmdzRHUrdWcwQ0FMY2M0V3JybWdGdFcyOWN4Mkh5SGNNZ3AwY2xuOW5GQnNaS20zbDV3QWZIeUd2WkRpU1R3Q0lpSjFHUzNXUm1oZFVVdXo4NHRqMnBhWHZ1Y01Sa0tnNGt6Mk9cLyt4QmMrRzJ1VGpETXNtcW1nVUdBSWFoMlNyaGs5MEJMZWlKSFRLY0diTjlZbmN2cjZlMTBlZE1nSDR3QTB5K0lnTzlXd2t5OVAwb1FUbEZpUHd1Tm9PMm1OUEFpTDVwb3ZkZEp0QmY4TDZmb3B1NWl4a0FnVzBUdFM2OHN3Y3BaeWhuT25zRks0dXI2OHc3YWIySWJPNWpZMnhLTHZvb1NjMmRcLzhcL2JSTmxFM0txUUFLcDRGQUpxdWJ2bjhQRzdPcGN2bXhuSkF4bTJYNTFkQUZtaTdsSjZuZlc0MlJSNDRZWDBtMlhkczAwY3hZa2s5Q29zeVdWVUdGUkVDMjdjUUFURU9PMWp2TzdlMHEwOTRLZjdnaEx2UFJadlo2bFIxSUxmTTJxeWlQc0V5dmRiSUJyaG1yVEtJOWdqRW5Qc3U2dEZPc1RiZ0oxaVwvNGZBRFBKWDhOczF1Ym9taVl2KzZnVGsyNzlZTmQ3WU9OT21mMzlTOG05RktrNEN3Uk1QT1wvcVVSMGRJN25HbER4U1wvWEFFbWNHU0wxcDllczN0U0lsVUIrbHNcL3luWWZFNWNicDIwRE9NV3ZcL0xLa0I2cXA5RkVtaXV6eDY2MWYzZE9hZnk2WUJ2V2dsQnljU05TSkdDNkpYeTZnWHEwR1wvNE9XTkRPdjFhakIxMnhGRk9PK1dhbUVKcG9Takxic0FFV0V5eEtDb3pXaU9meG0ydEJ0bHdoM2hwXC9Vb3RyRCtIbkY2Z1NOOGtCblVtYnJRU3FzYUdsM2g3WDZSZUREbXdRSmMzSzY0QkxNcCJ9", "IOS"); - // String sss; + UmResp sss1 = umengConfig.send("eyJvIjoiaU9TIiwiayI6ImJNSGJwMktVdjhVaE5zOW1wQWhwYlwvWCtVRTlqcnZKeXhjb091N3BDdVlqcHNEc2RKM3A2M0pJZ056U0JrdlY5UlFPSHo3U25ZMmNcL3ZpbUI3ZHN2THFwQXlkbmRJeDB4NHhLSytFR2pvVEF4eU1oUnpUVHlrNHYzZThCSjNIajJOamJoK0VPdUtRTXV3N2pnS0dIdHJoT3FJRFF4QXJ0NisrUTI1ODhhQWdEVnp5TUVZdmxpTFhKeDUwS1wvZWI5VjdSb1VoNkMzc2E5Mm1xcHI1S3FxMm9KZHk3THoyYkVPQUVnM1hvWHJWVlwvcmtOMFluV1AyMVBZb0xrVFgxXC84TWZhVXZJRkY2aWJldDVaYkNzMVNhZU9LVU1rcnlicVpINHBMNlF5TzBFRjkrUHljT01hOGlVTjZabVZ6dm1HOFJHK3BjQjF1amVpSVpRN2N5bDRPOGxnPT0iLCJjIjoiSW02VTJVV3IxYTlDTkpmN29WR2FpRGxCZ3RSamQ5djUwaENCajJMWXd5N2Y3dzV2SndnWHFSXC8zeTlWYzFpSDFITnFHN1wvcUZpN2cxXC94cGQ5RGNsVjE0SXFKYmsxSHppZkNcL0JSU0NaeGpFTm5qWndTR3l1K1VnR3luajhnMWlHbkFhOHRmVWRUN0lGNWdrOGpVSVlteTZBNllkXC92Z2RXXC9wa1krcE9pczVWZEUrTjhXMjhEXC9idXhjQm1Wbm5obHpMWmdzRHUrdWcwQ0FMY2M0V3JybWdGdFcyOWN4Mkh5SGNNZ3AwY2xuOW5GQnNaS20zbDV3QWZIeUd2WkRpU1R3Q0lpSjFHUzNXUm1oZFVVdXo4NHRqMnBhWHZ1Y01Sa0tnNGt6Mk9cLyt4QmMrRzJ1VGpETXNtcW1nVUdBSWFoMlNyaGs5MEJMZWlKSFRLY0diTjlZbmN2cjZlMTBlZE1nSDR3QTB5K0lnTzlXd2t5OVAwb1FUbEZpUHd1Tm9PMm1OUEFpTDVwb3ZkZEp0QmY4TDZmb3B1NWl4a0FnVzBUdFM2OHN3Y3BaeWhuT25zRks0dXI2OHc3YWIySWJPNWpZMnhLTHZvb1NjMmRcLzhcL2JSTmxFM0txUUFLcDRGQUpxdWJ2bjhQRzdPcGN2bXhuSkF4bTJYNTFkQUZtaTdsSjZuZlc0MlJSNDRZWDBtMlhkczAwY3hZa2s5Q29zeVdWVUdGUkVDMjdjUUFURU9PMWp2TzdlMHEwOTRLZjdnaEx2UFJadlo2bFIxSUxmTTJxeWlQc0V5dmRiSUJyaG1yVEtJOWdqRW5Qc3U2dEZPc1RiZ0oxaVwvNGZBRFBKWDhOczF1Ym9taVl2KzZnVGsyNzlZTmQ3WU9OT21mMzlTOG05RktrNEN3Uk1QT1wvcVVSMGRJN25HbER4U1wvWEFFbWNHU0wxcDllczN0U0lsVUIrbHNcL3luWWZFNWNicDIwRE9NV3ZcL0xLa0I2cXA5RkVtaXV6eDY2MWYzZE9hZnk2WUJ2V2dsQnljU05TSkdDNkpYeTZnWHEwR1wvNE9XTkRPdjFhakIxMnhGRk9PK1dhbUVKcG9Takxic0FFV0V5eEtDb3pXaU9meG0ydEJ0bHdoM2hwXC9Vb3RyRCtIbkY2Z1NOOGtCblVtYnJRU3FzYUdsM2g3WDZSZUREbXdRSmMzSzY0QkxNcCJ9", "A"); + String sss; // sss = "{\"success\":true,\"data\":{\"mobile\":\"18518753918\",\"score\":null,\"activeScore\":null,\"aesEncryptKey\":null},\"code\":2001,\"message\":\"gain mobile's result success\",\"requestId\":\"0E87E249-42A0-42C0-94D3-7424D45E571E\"}\n"; // diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CShopUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CShopUserServiceImpl.java index 5ccaaec..bcfd364 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CShopUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CShopUserServiceImpl.java @@ -49,9 +49,9 @@ public class CShopUserServiceImpl implements ShopUserService { } case "2": // 验证码 - String code = redisCache.getCacheObject("sms_code:"+shopUser.getPhone()); + //String code = redisCache.getCacheObject("sms_code:"+shopUser.getPhone()); // TODO:写死 - //String code="9527"; + String code="9527"; String reqCode = shopUser.getCode(); if (code != null && code.equals(reqCode)){ // 登录