diff --git a/peidu/backend/src/main/resources/application-prod.yml b/peidu/backend/src/main/resources/application-prod.yml index dba5019..f796aca 100644 --- a/peidu/backend/src/main/resources/application-prod.yml +++ b/peidu/backend/src/main/resources/application-prod.yml @@ -30,9 +30,9 @@ spring: maintainTimeStats: false redis: - host: ${REDIS_HOST:your-prod-redis-host} + host: ${REDIS_HOST:localhost} port: ${REDIS_PORT:6379} - password: ${REDIS_PASSWORD} + password: ${REDIS_PASSWORD:} database: 0 timeout: 3000 lettuce: @@ -45,10 +45,11 @@ spring: # JWT配置 - 生产环境使用环境变量 jwt: - secret: ${JWT_SECRET:peidu-secret-key-2026-change-this-in-production-min-256-bits} # 默认值 - expiration: 604800 # 7天(秒) + secret: ${JWT_SECRET:peiduSecretKeyForJwtTokenGenerationMustBeAtLeast256BitsLongToWorkProperly} # 默认值(与dev保持一致) + expiration: 604800000 # 7天(毫秒) header: Authorization - prefix: Bearer + prefix: Bearer + refresh-time: 518400000 # 6天(毫秒) # 文件上传配置 - 生产环境 file: @@ -60,15 +61,15 @@ file: # 微信小程序配置 - 生产环境 wx: - appid: ${WX_APPID} # 通过环境变量设置 - secret: ${WX_SECRET} # 通过环境变量设置 + appid: ${WX_APPID:your-wx-appid} # 通过环境变量设置 + secret: ${WX_SECRET:your-wx-secret} # 通过环境变量设置 # 微信支付配置 - 生产环境 wechat: pay: - appid: ${WX_PAY_APPID} - mchid: ${WX_PAY_MCHID} - key: ${WX_PAY_KEY} + appid: ${WX_PAY_APPID:your-wx-pay-appid} + mchid: ${WX_PAY_MCHID:your-mchid} + key: ${WX_PAY_KEY:your-pay-key} cert-path: /data/peidu/cert/apiclient_cert.p12 notify-url: https://your-domain.com/api/payment/notify/wechat @@ -83,21 +84,21 @@ sms: region: ${ALIYUN_SMS_REGION:cn-hangzhou} endpoint: ${ALIYUN_SMS_ENDPOINT:dysmsapi.aliyuncs.com} provider: aliyun - access-key: ${ALIYUN_SMS_ACCESS_KEY} - access-secret: ${ALIYUN_SMS_ACCESS_SECRET} + access-key: ${ALIYUN_SMS_ACCESS_KEY:} + access-secret: ${ALIYUN_SMS_ACCESS_SECRET:} sign-name: ${SMS_SIGN_NAME:陪读服务} template: - verify-code: ${SMS_TEMPLATE_VERIFY_CODE} - order-notify: ${SMS_TEMPLATE_ORDER_NOTIFY} + verify-code: ${SMS_TEMPLATE_VERIFY_CODE:} + order-notify: ${SMS_TEMPLATE_ORDER_NOTIFY:} # 阿里云OSS配置 - 生产环境 aliyun: oss: endpoint: ${ALIYUN_OSS_ENDPOINT:oss-cn-hangzhou.aliyuncs.com} - access-key-id: ${ALIYUN_OSS_ACCESS_KEY} - access-key-secret: ${ALIYUN_OSS_ACCESS_SECRET} - bucket-name: ${ALIYUN_OSS_BUCKET} - domain: ${ALIYUN_OSS_DOMAIN} + access-key-id: ${ALIYUN_OSS_ACCESS_KEY:} + access-key-secret: ${ALIYUN_OSS_ACCESS_SECRET:} + bucket-name: ${ALIYUN_OSS_BUCKET:} + domain: ${ALIYUN_OSS_DOMAIN:} # 备份配置 - 生产环境 backup: diff --git a/peidu/uniapp/src/pages/booking/components/ParentBooking.vue b/peidu/uniapp/src/pages/booking/components/ParentBooking.vue index ac0cefa..55fe584 100644 --- a/peidu/uniapp/src/pages/booking/components/ParentBooking.vue +++ b/peidu/uniapp/src/pages/booking/components/ParentBooking.vue @@ -102,6 +102,24 @@ + + 服务时段 + + + + {{ form.startTime || '开始时间' }} + + + + + + {{ form.endTime || '结束时间' }} + + + + 预计服务时长:{{ serviceDuration }}小时 + + 其他需求