diff --git a/Jenkinsfile b/Jenkinsfile index 932a631..7070542 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { // maven 'M3' // 必须在 Jenkins → Manage Jenkins → Global Tool Configuration 中配置过 // } environment { - APP_NAME = "sczx_singlepay" + APP_NAME = "sczx-singlepay" DOCKER_IMAGE = "${APP_NAME}:latest" CONTAINER_NAME = "${APP_NAME}-container" } @@ -49,9 +49,9 @@ pipeline { steps { echo "🛑 正在停止旧的容器（如果存在）..." sh ''' - if [ "$(docker ps -f 'name=sczx_singlepay-container' --format '{{.Status}}')" ]; then - docker stop sczx_singlepay-container - docker rm sczx_singlepay-container + if [ "$(docker ps -f 'name=sczx-singlepay-container' --format '{{.Status}}')" ]; then + docker stop sczx-singlepay-container + docker rm sczx-singlepay-container fi ''' } @@ -70,6 +70,7 @@ pipeline { -e TZ=Asia/Shanghai \ -v /etc/localtime:/etc/localtime:ro \ -v /root/cert:/root/cert:ro \ + -v /sczx/logs/singlepay:/sczx/logs/singlepay:rw \ --restart always \ \${DOCKER_IMAGE} """ diff --git a/src/main/java/com/sczx/pay/alipay/service/impl/ItemServiceImpl.java b/src/main/java/com/sczx/pay/alipay/service/impl/ItemServiceImpl.java index 8571411..60b2c57 100644 --- a/src/main/java/com/sczx/pay/alipay/service/impl/ItemServiceImpl.java +++ b/src/main/java/com/sczx/pay/alipay/service/impl/ItemServiceImpl.java @@ -224,9 +224,8 @@ public class ItemServiceImpl implements ItemService { // 设置平台类目 model.setCategoryId("C001684401"); // 设置商品主图 - String imgStr = imageUploadService.uploadAndReturnId(rentRuleItem.getImage(), "ITEM_HEAD_IMG"); - model.setHeadImg(imgStr); - rentRuleItemvo.setImage(imgStr); + model.setHeadImg(rentRuleItem.getAliItemId()); + rentRuleItemvo.setImage(rentRuleItem.getAliItemId()); // 设置商品模版类型 model.setItemType("2"); //sku_attrs diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6cf724b..2d3983a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,117 +1,4 @@ -server: - port: 8019 - spring: application: name: sczx-singlepay # 微服务名称 - http: - encoding: - charset: UTF-8 - enabled: true - force: true - mvc: - async: - request-timeout: -1 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - cloud: - nacos: - discovery: - server-addr: 115.190.8.52:8848 # Nacos 地址 - group: DEFAULT_GROUP - metadata: - version: 1.0.0 - env: dev - lifecycle: - timeout-per-shutdown-phase: 30s # 设置优雅停机时间 - datasource: - url: jdbc:mysql://115.190.8.52:3306/sczx?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true - username: sczx_user - password: Sczx123@ - driver-class-name: com.mysql.cj.jdbc.Driver - hikari: - maximum-pool-size: 10 - auto-commit: true - - -management: - endpoints: - web: - exposure: - include: "*" # 暴露所有监控端点 - endpoint: - health: - show-details: always - -feign: - client: - config: - default: - connectTimeout: 5000 - readTimeout: 5000 - hystrix: - enabled: true # 启用 Feign 的 Hystrix 支持 - -hystrix: - command: - default: - execution: - isolation: - thread: - timeoutInMilliseconds: 10000 # 默认熔断超时时间 - - - - -mybatis-plus: - mapper-locations: classpath*:mapper/**/*.xml - type-aliases-package: com.sczx.pay.po # 实体类包路径 - configuration: - mapUnderscoreToCamelCase: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 控制台打印 SQL（调试用） - - -wechat: - pay: - app-id: wx25e1ad1a70c326de - mch-id: your_mch_id - key: your_api_key - notify-url: https://www.minbo.wang:8020/notify/api/payment/notify - refund-notify-url: https://www.minbo.wang:8020/notify/api/payment/refundNotify - -#ali: -# pay: -# app-id: 2021004169641281 -# gateway-url: https://openapi.alipay.com/gateway.do -# notify-url: https://www.minbo.wang:8020/api/alipay/notify -# refund-notify-url: https://www.minbo.wang:8020/api/alipay/refundNotify -# privateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCQke+mZsxNXJXMn2iUZRkhITWY9qPczwHMgRxl68JRuNzZE2AXhAc2ciF7EGob1y0al4hvJo5JUrDew9Zkv0BocAsPjLma3A9KFgj131xMuLxVvHtktkNSwwW9VIbOOhFAQAy3J9jt8PdEk40UONyu9J5Shjs6jbQ8RogdDuwuzKpNj0ZOTeUqgR6RME4xZ0VqvZe9XhVfq3QtVGttUzOpLPNg6boBy/5RqwC64lVFICMqjKkMW2NklVPBDFO46QwfWEbaA+APnd9bd+9WadyNySPb7kAK8GOlvZYfysy+QkOQdj/oebKWKzdKXpFnF+n52dYzeGTvckt1suDngwAFAgMBAAECggEAcPc39iTZe5HfE9d0FpCxBCw4/1+qRz4SP8SbdiC05Lq5B36WVYm7QRYJh2oaH8sR2XeTCpdsE2tj/Y21l1/Calkyq2HhHlraL5/sPIPeUa0ArVXsbZPmI2N0tq6376l8FWJ3DR876SGjdZh+YtDT0HogxIdS/LwBnB/Y+CvS7fWcqiMjcR4h28RU70CQqxpzYuPfqG6GZmByGyJAcdlhFAYgiksb+qZnkjoaKHsjb61xfUX4z+HGdQLqOlVKfNqIpiO7arXaeAb0RQiB8Lqi7fBvn8LLhlTmM1Hr4gyQO14lJmP5Vp2BIg9m5AC9vRkpZ9l79bUTIepDe9+Ovcx5eQKBgQDWZ5yoz8q8Z5VIfMSVTHO3wpfwOBM92S2c21hTsds7NezsMVqGcTuAcvbMW2i1MwxtS7kahXraRAxZnCDB9ZVJs+88xcgu5QJWZ1rJyrwEwB2gTQhColv+XZW6Ck/J6kk2/PG26rNQG6pg/xrKaMtPnXXyKCsdQTyEpr+mlNIJ2wKBgQCsnf4lIuwftCSm0jI73tO1Bb4U9TCIapKidnIhutbyg6u+hJMUTVDNkjsBnrTN24sSP7Cu4Zs/W4lkDqq86fHNEvnF+FouIfO/CwaGteDBNwXHSLM0D+zEBbK04bfoYi7lYZeDRPygFrM49Sxkp0MAmItDmXqbYRQBlhN1XVzznwKBgQCQ+72fFex1XOJBA0X345v4rlkKMxEn6J2EjXr8FbA3KO8OhQ0/DoD7CkLDzChRJ7UGj4cbXRnHUO69BevM3SHXlhp4ERKeS3Q6M2fcPwDHgZZHGPA2Bw6IQoaGKITt+EUMLx3Q4ILi7+JV9wwJxbV+H+9rEiidfsjKtuuwXMBvswKBgQChpElrCSrH/W8c8FSuD9l7+GapRXkvJW0uyW/S+h1yd66J96erKUNzXW339GAnLWErs4yGFynDyLn9gmaMBR6zBQP0SL5Z2N1hlreDyikvhZDZrtBw/kCexx8zlvMan2Z+0kaJXD6cwuUNfzkVADQUCMTQhpZzjhKn8ZtDGiyCzQKBgQCAhU0khG/ufZfQ089+1G7PAlErBr5MQaG40a2vfIWGtHkYyXq5N/3jow1bd2qsyLuz8mr2sWQeURK+B2xZridf6JtYz3gB+dLw0frlLKk4Q6jeehiRlE8H8tIYe/7KcgTmdIzEbo3lmyGMFAILvr/pSCWeUehQYR9PH91Qyi+Tog== -# # publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArPG4JQ9YY9+tOeImQO0eNkp+NZkenJ9hMHEVVmwAHAI5BoJMCLvAm504BXSpgpqaiCJ6ARTwBkiDz4dyCMVfE3VE8+oMFtXqfHaZLhfd+X9VQNqRCz0HeR2IbjGnnbYxQOAEOM6z092UfNieG00HyU5yREfzjJkIcyuGeGgbIBG1gPpLhXsQKRhQYqp4Exgd4LX6qnKLPL90kJVkQnHcJkp+rCoQ5zS6ZUXE2d/2GzY7xi93uTU2CLMiZ7Vi2OZ1g7xY+yDQzTA/CseveJeW3rM6T8yBjlEJwsywEL5co3YqpJUIMIe/fLjhRRgj+JUq5w0sRqb3+CswQHIjgc71QwIDAQAB -# appCertPath: /root/cert/appCertPublicKey_2021005174658269.crt -# alipayCertPath: /root/cert/alipayCertPublicKey_RSA2.crt -# alipayRootCertPath: /root/cert/alipayRootCert.crt - -cert-path: /root/cert/ - -alipay: - pid: 2021004169641281 - appid: 2021005174658269 - privatekey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCQke+mZsxNXJXMn2iUZRkhITWY9qPczwHMgRxl68JRuNzZE2AXhAc2ciF7EGob1y0al4hvJo5JUrDew9Zkv0BocAsPjLma3A9KFgj131xMuLxVvHtktkNSwwW9VIbOOhFAQAy3J9jt8PdEk40UONyu9J5Shjs6jbQ8RogdDuwuzKpNj0ZOTeUqgR6RME4xZ0VqvZe9XhVfq3QtVGttUzOpLPNg6boBy/5RqwC64lVFICMqjKkMW2NklVPBDFO46QwfWEbaA+APnd9bd+9WadyNySPb7kAK8GOlvZYfysy+QkOQdj/oebKWKzdKXpFnF+n52dYzeGTvckt1suDngwAFAgMBAAECggEAcPc39iTZe5HfE9d0FpCxBCw4/1+qRz4SP8SbdiC05Lq5B36WVYm7QRYJh2oaH8sR2XeTCpdsE2tj/Y21l1/Calkyq2HhHlraL5/sPIPeUa0ArVXsbZPmI2N0tq6376l8FWJ3DR876SGjdZh+YtDT0HogxIdS/LwBnB/Y+CvS7fWcqiMjcR4h28RU70CQqxpzYuPfqG6GZmByGyJAcdlhFAYgiksb+qZnkjoaKHsjb61xfUX4z+HGdQLqOlVKfNqIpiO7arXaeAb0RQiB8Lqi7fBvn8LLhlTmM1Hr4gyQO14lJmP5Vp2BIg9m5AC9vRkpZ9l79bUTIepDe9+Ovcx5eQKBgQDWZ5yoz8q8Z5VIfMSVTHO3wpfwOBM92S2c21hTsds7NezsMVqGcTuAcvbMW2i1MwxtS7kahXraRAxZnCDB9ZVJs+88xcgu5QJWZ1rJyrwEwB2gTQhColv+XZW6Ck/J6kk2/PG26rNQG6pg/xrKaMtPnXXyKCsdQTyEpr+mlNIJ2wKBgQCsnf4lIuwftCSm0jI73tO1Bb4U9TCIapKidnIhutbyg6u+hJMUTVDNkjsBnrTN24sSP7Cu4Zs/W4lkDqq86fHNEvnF+FouIfO/CwaGteDBNwXHSLM0D+zEBbK04bfoYi7lYZeDRPygFrM49Sxkp0MAmItDmXqbYRQBlhN1XVzznwKBgQCQ+72fFex1XOJBA0X345v4rlkKMxEn6J2EjXr8FbA3KO8OhQ0/DoD7CkLDzChRJ7UGj4cbXRnHUO69BevM3SHXlhp4ERKeS3Q6M2fcPwDHgZZHGPA2Bw6IQoaGKITt+EUMLx3Q4ILi7+JV9wwJxbV+H+9rEiidfsjKtuuwXMBvswKBgQChpElrCSrH/W8c8FSuD9l7+GapRXkvJW0uyW/S+h1yd66J96erKUNzXW339GAnLWErs4yGFynDyLn9gmaMBR6zBQP0SL5Z2N1hlreDyikvhZDZrtBw/kCexx8zlvMan2Z+0kaJXD6cwuUNfzkVADQUCMTQhpZzjhKn8ZtDGiyCzQKBgQCAhU0khG/ufZfQ089+1G7PAlErBr5MQaG40a2vfIWGtHkYyXq5N/3jow1bd2qsyLuz8mr2sWQeURK+B2xZridf6JtYz3gB+dLw0frlLKk4Q6jeehiRlE8H8tIYe/7KcgTmdIzEbo3lmyGMFAILvr/pSCWeUehQYR9PH91Qyi+Tog== - use_open_id: false - openid: 111 - userid: 111 - is_isv: false - app_auth_token: 202502BBe237336d792f49cebda1f2d202d25A23 - alipay-public-cert-path: /root/cert/appCertPublicKey_2021005174658269.crt - ali-public-cert-path: /root/cert/alipayCertPublicKey_RSA2.crt - alipay-root-cert-path: /root/cert/alipayRootCert.crt -# alipay-public-cert-path: E:/cert/appCertPublicKey_2021005174658269.crt -# ali-public-cert-path: E:/cert/alipayCertPublicKey_RSA2.crt -# alipay-root-cert-path: E:/cert/alipayRootCert.crt - notify-url: http://115.190.8.52:8019/alipay/pay/notify - refund-notify-url: http://115.190.8.52:8019/alipay/refund/notify - - rent: - payNotifyUrl: http://115.190.8.52:8019/alipay/rent/notify/pay diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..f6df30f --- /dev/null +++ b/src/main/resources/bootstrap.yml @@ -0,0 +1,15 @@ +spring: + application: + name: sczx-singlepay # 应用名称，对应 Nacos 配置的 dataId + cloud: + nacos: + server-addr: 115.190.8.52:8848 # Nacos 服务器地址 + config: + group: DEFAULT_GROUP # 配置分组 + file-extension: yaml # 配置文件格式 + timeout: 5000 # 配置读取超时时间 + # 添加共享配置 + shared-configs: + - data-id: shared-config.yaml + group: DEFAULT_GROUP + refresh: true # 是否支持动态刷新 \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index e594345..10e1dff 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -4,7 +4,7 @@ - +