From 9863ed72ff1dec245baf3f0dbcee6cfdbc6e19b4 Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Wed, 28 May 2025 16:37:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=B4=E6=BB=B4=E6=BB=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CatmDogd-Mall-Front-test/.env.development | 3 +- .../src/main/resources/application-druid-root.yml | 155 ++++++++++++++ .../src/main/resources/application-druid.yml | 234 +++++++++++---------- ruoyi-admin/src/main/resources/application.yml | 2 +- .../java/com/cyl/h5/service/H5OrderService.java | 2 +- 5 files changed, 279 insertions(+), 117 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/application-druid-root.yml diff --git a/CatmDogd-Mall-Front-test/.env.development b/CatmDogd-Mall-Front-test/.env.development index 0dcde19..04a898d 100644 --- a/CatmDogd-Mall-Front-test/.env.development +++ b/CatmDogd-Mall-Front-test/.env.development @@ -6,8 +6,9 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台 # 若依管理系统/开发环境 https://pet-admin.hhlm1688.com/api # VUE_APP_BASE_API = 'https://api.catmdogd.com' +VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/' # VUE_APP_BASE_API = 'http://h5.xzaiyp.top' -VUE_APP_BASE_API = 'http://localhost:8002' +# VUE_APP_BASE_API = 'http://localhost:8002' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/ruoyi-admin/src/main/resources/application-druid-root.yml b/ruoyi-admin/src/main/resources/application-druid-root.yml new file mode 100644 index 0000000..b8a5d9f --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-druid-root.yml @@ -0,0 +1,155 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true + master: + url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20225?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true + username: root + password: Qweruiop@123 + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + statViewServlet: + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + # redis 配置 + redis: + # 地址 + host: 47.97.158.59 + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 5 + # 密码 + password: Qweruiop@123 +redisson: + address: "47.97.158.59" + password: "Qweruiop@123" # 如果有密码的话 + connectionPoolSize: 10 + idleConnectionTimeout: 10000 + timeout: 3000 + +ruoyi: + # 文件路径 示例（ Windows配置C:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + profile: /Users/daixiande/Work/ruoyi/uploadPath +scheduling: + enabled: false +#操作oss需要的一些参数 +aliyun: + accessKeyId: LTAI5tQSs47izVy8DLVdwUU9 # 阿里云的accessKeyId + secretAccessKey: qHI7C3PaXYZySr84HTToviC71AYlFq # accessKey 密码 + oss: + endPoint: oss-cn-shenzhen.aliyuncs.com # Endpoint:在阿里云oss控制台查看自己使用的endpoint + bucketName: hanhaiimage # bucket 名称 + cdnName: image.hhlm1688.com +wechat: + enabled: true + appId: wxd1a6ba7b5e17a5b6 + secret: 你的微信服务号密钥 + merchantId: 1665639691 + privateKeyPath: /data/software/app/key/apiclient_key.pem +# privateKeyPath: /root/pem/apiclient_key.pem +# privateKeyPath: F:\\java_work\\team_work_java\\pet-admin-25-01-25\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem + #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem + merchantSerialNumber: 6050244FC18200362585F1F9FD6557A1B291E8C0 + apiV3key: 19971022197001121966060120240731 + apiV2key: 19961022196901121965060120230731 +# notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify +# notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH +# notifyUrl: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notify +# notifyUrlForBCHSH: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notifyForBCHSH + notifyUrl: http://h5.xzaiyp.top/no-auth/wechat/notify + notifyUrlForBCHSH: http://h5.xzaiyp.top/no-auth/wechat/notifyForBCHSH + miniProgramAppId: wxd1a6ba7b5e17a5b6 + miniProgramSecret: 06e946a2c9010f8eb9e306018a779a7f + staffAppId: wx01f0f43759922fda + staffSecret: b0a5617e6e4c387262a32af2b355c8b6 + pay: + v3: + # 租户id + miniapp: + # 应用appId 服务商模式下为服务商的appid 必填 + app-id: wxd1a6ba7b5e17a5b6 + # v2 api 密钥 1.0.5版本以后如果用到V2的接口时必填 + app-secret: 06e946a2c9010f8eb9e306018a779a7f + # api v3 密钥 必填 + app-v3-secret: 19971022197001121966060120240731 + # 微信支付商户号 服务商模式下为服务商的mchid 必填 + mch-id: 1665639691 + # 商户服务器域名 用于回调 需要放开回调接口的安全策略 必填 + domain: https://api-test.catmdogd.com + # 商户 api 证书路径 必填 填写classpath路径 位于 maven项目的resources文件下 + cert-path: apiclient_cert.p12 + #cert-path: /data/software/app/key/apiclient_cert.p12 + + +sms: + enabled: true + # 阿里云 dysmsapi.aliyuncs.com + endpoint: dysmsapi.aliyuncs.com + accessKeyId: LTAI5tKHcnnn2Ydue8ZSXwaN #阿里云短信服务控制台查看 + accessKeySecret: 6qvhtCb9MkswKEGmRmlpOXwtKwKJFv #同上 + signName: 猫妈狗爸 + #猫妈狗爸 + templateId: SMS_301225389 + # 腾讯专用 + sdkAppId: +aes: + # aes的密钥 + key: 1111111111123456 + + + + + + + +# 伴宠师-相关配置信息 +wechat-admin: + enabled: true + appId: wx01f0f43759922fda + secret: b0a5617e6e4c387262a32af2b355c8b6 + merchantId: 1665639691 + privateKeyPath: ruoyi-admin/src/main/resources/apiclient_cert.p12 + #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem + merchantSerialNumber: 6050244FC18200362585F1F9FD6557A1B291E8C0 + apiV3key: 19971022197001121966060120240731 + apiV2key: 19961022196901121965060120230731 + notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify + notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH + miniProgramAppId: wxd1a6ba7b5e17a5b6 + miniProgramSecret: 06e946a2c9010f8eb9e306018a779a7f + staffAppId: wx01f0f43759922fda + staffSecret: b0a5617e6e4c387262a32af2b355c8b6 + pay: + v3: + # 租户id + miniapp: + # 应用appId 服务商模式下为服务商的appid 必填 + app-id: wxd1a6ba7b5e17a5b6 + # v2 api 密钥 1.0.5版本以后如果用到V2的接口时必填 + app-secret: 06e946a2c9010f8eb9e306018a779a7f + # api v3 密钥 必填 + app-v3-secret: 19971022197001121966060120240731 + # 微信支付商户号 服务商模式下为服务商的mchid 必填 + mch-id: 1665639691 + # 商户服务器域名 用于回调 需要放开回调接口的安全策略 必填 + domain: https://api-test.catmdogd.com + # 商户 api 证书路径 必填 填写classpath路径 位于 maven项目的resources文件下 + cert-path: apiclient_cert.p12 + #cert-path: /data/software/app/key/apiclient_cert.p12 + + + + + + + diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index d12f9f2..94054cf 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -1,94 +1,100 @@ # 数据源配置 spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - druid: - # 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true - master: - url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20225?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true - username: root - password: Qweruiop@123 - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - statViewServlet: - # 控制台管理用户名和密码 - login-username: ruoyi - login-password: 123456 - # redis 配置 - redis: - # 地址 - host: 47.97.158.59 - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 5 - # 密码 - password: Qweruiop@123 + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true + master: + url: jdbc:mysql://124.222.255.146:3306/catmdogf?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true + username: root + password: Tc$GePcZ + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + statViewServlet: + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + # redis 配置 + redis: + # 地址 + host: 124.222.255.146 + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 5 + # 密码 + password: Abc.123456 redisson: - address: "47.97.158.59" - password: "Qweruiop@123" # 如果有密码的话 - connectionPoolSize: 10 - idleConnectionTimeout: 10000 - timeout: 3000 + address: "redis://124.222.255.146" + password: "Abc.123456" # 如果有密码的话 + connectionPoolSize: 10 + idleConnectionTimeout: 10000 + timeout: 3000 ruoyi: - # 文件路径 示例（ Windows配置C:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: /Users/daixiande/Work/ruoyi/uploadPath + # 文件路径 示例（ Windows配置C:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + profile: /Users/daixiande/Work/ruoyi/uploadPath scheduling: - enabled: false + enabled: false +#aliyun: +# accessKeyId: LTAI5tQSs47izVy8DLVdwUU9 # 阿里云的accessKeyId +# secretAccessKey: qHI7C3PaXYZySr84HTToviC71AYlFq # accessKey 密码 +# oss: +# endPoint: oss-cn-shenzhen.aliyuncs.com # Endpoint:在阿里云oss控制台查看自己使用的endpoint +# bucketName: hanhaiimage # bucket 名称 +# cdnName: image.hhlm1688.com #操作oss需要的一些参数 aliyun: - accessKeyId: LTAI5tQSs47izVy8DLVdwUU9 # 阿里云的accessKeyId - secretAccessKey: qHI7C3PaXYZySr84HTToviC71AYlFq # accessKey 密码 - oss: - endPoint: oss-cn-shenzhen.aliyuncs.com # Endpoint:在阿里云oss控制台查看自己使用的endpoint - bucketName: hanhaiimage # bucket 名称 - cdnName: image.hhlm1688.com + accessKeyId: LTAI5tD3bjTBDvgmgXLTKL5X # 阿里云的accessKeyId + secretAccessKey: wCPlCO5nnnqBekd3wxAPU6CSUto6fQ # accessKey 密码 + oss: + endPoint: oss-cn-shanghai.aliyuncs.com # Endpoint:在阿里云oss控制台查看自己使用的endpoint + bucketName: catmdogf # bucket 名称 + cdnName: cdn.catmdogd.com wechat: - enabled: true - appId: wxd1a6ba7b5e17a5b6 - secret: 你的微信服务号密钥 - merchantId: 1665639691 -# privateKeyPath: /data/software/app/key/apiclient_key.pem -# privateKeyPath: /root/pem/apiclient_key.pem - privateKeyPath: F:\\java_work\\team_work_java\\pet-admin-25-01-25\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem - #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem - merchantSerialNumber: 6050244FC18200362585F1F9FD6557A1B291E8C0 - apiV3key: 19971022197001121966060120240731 - apiV2key: 19961022196901121965060120230731 -# notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify -# notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH -# notifyUrl: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notify -# notifyUrlForBCHSH: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notifyForBCHSH - notifyUrl: http://h5.xzaiyp.top/no-auth/wechat/notify - notifyUrlForBCHSH: http://h5.xzaiyp.top/no-auth/wechat/notifyForBCHSH - miniProgramAppId: wxd1a6ba7b5e17a5b6 - miniProgramSecret: 06e946a2c9010f8eb9e306018a779a7f - staffAppId: wx01f0f43759922fda - staffSecret: b0a5617e6e4c387262a32af2b355c8b6 - pay: - v3: - # 租户id - miniapp: - # 应用appId 服务商模式下为服务商的appid 必填 - app-id: wxd1a6ba7b5e17a5b6 - # v2 api 密钥 1.0.5版本以后如果用到V2的接口时必填 - app-secret: 06e946a2c9010f8eb9e306018a779a7f - # api v3 密钥 必填 - app-v3-secret: 19971022197001121966060120240731 - # 微信支付商户号 服务商模式下为服务商的mchid 必填 - mch-id: 1665639691 - # 商户服务器域名 用于回调 需要放开回调接口的安全策略 必填 - domain: https://api-test.catmdogd.com - # 商户 api 证书路径 必填 填写classpath路径 位于 maven项目的resources文件下 - cert-path: apiclient_cert.p12 - #cert-path: /data/software/app/key/apiclient_cert.p12 + enabled: true + appId: wxd1a6ba7b5e17a5b6 + secret: 你的微信服务号密钥 + merchantId: 1665639691 + privateKeyPath: /root/pem/apiclient_key.pem +# privateKeyPath: F:\\java_work\\team_work_java\\pet-admin-25-01-25\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem + #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem + merchantSerialNumber: 6050244FC18200362585F1F9FD6557A1B291E8C0 + apiV3key: 19971022197001121966060120240731 + apiV2key: 19961022196901121965060120230731 + # notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify + # notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH + notifyUrl: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notify + notifyUrlForBCHSH: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notifyForBCHSH + # notifyUrl: http://h5.xzaiyp.top/no-auth/wechat/notify + # notifyUrlForBCHSH: http://h5.xzaiyp.top/no-auth/wechat/notifyForBCHSH + miniProgramAppId: wxd1a6ba7b5e17a5b6 + miniProgramSecret: 06e946a2c9010f8eb9e306018a779a7f + staffAppId: wx01f0f43759922fda + staffSecret: b0a5617e6e4c387262a32af2b355c8b6 + pay: + v3: + # 租户id + miniapp: + # 应用appId 服务商模式下为服务商的appid 必填 + app-id: wxd1a6ba7b5e17a5b6 + # v2 api 密钥 1.0.5版本以后如果用到V2的接口时必填 + app-secret: 06e946a2c9010f8eb9e306018a779a7f + # api v3 密钥 必填 + app-v3-secret: 19971022197001121966060120240731 + # 微信支付商户号 服务商模式下为服务商的mchid 必填 + mch-id: 1665639691 + # 商户服务器域名 用于回调 需要放开回调接口的安全策略 必填 + domain: https://api-test.catmdogd.com + # 商户 api 证书路径 必填 填写classpath路径 位于 maven项目的resources文件下 + cert-path: apiclient_cert.p12 + #cert-path: /data/software/app/key/apiclient_cert.p12 sms: @@ -114,38 +120,38 @@ aes: # 伴宠师-相关配置信息 wechat-admin: - enabled: true - appId: wx01f0f43759922fda - secret: b0a5617e6e4c387262a32af2b355c8b6 - merchantId: 1665639691 - privateKeyPath: ruoyi-admin/src/main/resources/apiclient_cert.p12 - #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem - merchantSerialNumber: 6050244FC18200362585F1F9FD6557A1B291E8C0 - apiV3key: 19971022197001121966060120240731 - apiV2key: 19961022196901121965060120230731 - notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify - notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH - miniProgramAppId: wxd1a6ba7b5e17a5b6 - miniProgramSecret: 06e946a2c9010f8eb9e306018a779a7f - staffAppId: wx01f0f43759922fda - staffSecret: b0a5617e6e4c387262a32af2b355c8b6 - pay: - v3: - # 租户id - miniapp: - # 应用appId 服务商模式下为服务商的appid 必填 - app-id: wxd1a6ba7b5e17a5b6 - # v2 api 密钥 1.0.5版本以后如果用到V2的接口时必填 - app-secret: 06e946a2c9010f8eb9e306018a779a7f - # api v3 密钥 必填 - app-v3-secret: 19971022197001121966060120240731 - # 微信支付商户号 服务商模式下为服务商的mchid 必填 - mch-id: 1665639691 - # 商户服务器域名 用于回调 需要放开回调接口的安全策略 必填 - domain: https://api-test.catmdogd.com - # 商户 api 证书路径 必填 填写classpath路径 位于 maven项目的resources文件下 - cert-path: apiclient_cert.p12 - #cert-path: /data/software/app/key/apiclient_cert.p12 + enabled: true + appId: wx01f0f43759922fda + secret: b0a5617e6e4c387262a32af2b355c8b6 + merchantId: 1665639691 + privateKeyPath: ruoyi-admin/src/main/resources/apiclient_cert.p12 + #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem + merchantSerialNumber: 6050244FC18200362585F1F9FD6557A1B291E8C0 + apiV3key: 19971022197001121966060120240731 + apiV2key: 19961022196901121965060120230731 + notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify + notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH + miniProgramAppId: wxd1a6ba7b5e17a5b6 + miniProgramSecret: 06e946a2c9010f8eb9e306018a779a7f + staffAppId: wx01f0f43759922fda + staffSecret: b0a5617e6e4c387262a32af2b355c8b6 + pay: + v3: + # 租户id + miniapp: + # 应用appId 服务商模式下为服务商的appid 必填 + app-id: wxd1a6ba7b5e17a5b6 + # v2 api 密钥 1.0.5版本以后如果用到V2的接口时必填 + app-secret: 06e946a2c9010f8eb9e306018a779a7f + # api v3 密钥 必填 + app-v3-secret: 19971022197001121966060120240731 + # 微信支付商户号 服务商模式下为服务商的mchid 必填 + mch-id: 1665639691 + # 商户服务器域名 用于回调 需要放开回调接口的安全策略 必填 + domain: https://api-test.catmdogd.com + # 商户 api 证书路径 必填 填写classpath路径 位于 maven项目的resources文件下 + cert-path: apiclient_cert.p12 + #cert-path: /data/software/app/key/apiclient_cert.p12 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index a4d0754..6f94617 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -20,7 +20,7 @@ ruoyi: # 开发环境配置.0 server: # 服务器的HTTP端口，默认为8080 - port: 8002 + port: 8001 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java index 4fbfdae..74e5a3f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java @@ -1077,7 +1077,7 @@ public class H5OrderService { //TODO String payAmount = order.getPayAmount().multiply(new BigDecimal(100)).stripTrailingZeros().toPlainString(); -// payAmount = "1";//支付一分钱 + payAmount = "1";//支付一分钱 String prepayId = wechatPayService.jsapiPay( String.valueOf(order.getPayId()), orderDesc,