Browse Source

登录调整,加多一个特殊信息

liuchengsen 13 hours ago
parent
commit
39ef1eddf7
2 changed files with 132 additions and 0 deletions
  1. 2 0
      .idea/encodings.xml
  2. 130 0
      zhijiayun-gateway/src/main/resources/application-test.yml

+ 2 - 0
.idea/encodings.xml

@@ -13,6 +13,8 @@
     <file url="file://$PROJECT_DIR$/zhijiayun-invite/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/zhijiayun-payment/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/zhijiayun-payment/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/zhijiayun-quiz/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/zhijiayun-quiz/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/zhijiayun-test/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/zhijiayun-test/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/zhijiayun-user/src/main/java" charset="UTF-8" />

+ 130 - 0
zhijiayun-gateway/src/main/resources/application-test.yml

@@ -0,0 +1,130 @@
+# ========================================
+# 开发环境配置(本地 Docker 环境)
+# 启动方式:-Dspring.profiles.active=dev
+# ========================================
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://8.135.32.236:3306/zhijiayun_pharmacy?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    username: ${DB_USERNAME:user}
+    password: ${DB_PASSWORD:qPa5*gt8o.}
+    hikari:
+      minimum-idle: 5
+      maximum-pool-size: 20
+      idle-timeout: 300000
+      max-lifetime: 1800000
+      connection-timeout: 30000
+      pool-name: ZhijiayunHikariPool-Dev
+
+  data:
+    redis:
+      host: 127.0.0.1
+      port: 6379
+      password: 123456
+      database: 1
+      timeout: 5000ms
+      lettuce:
+        pool:
+          max-active: 16
+          max-idle: 8
+          min-idle: 2
+          max-wait: 3000ms
+
+# 开发环境日志:更详细
+logging:
+  level:
+    com.xuekairui: debug
+    org.springframework.security: debug
+    com.zaxxer.hikari: info
+
+# 短信测试模式:开发环境启用,不发送真实短信,验证码固定为 123456
+sms:
+  test-mode: true
+  test-code: "123456"
+  # 测试白名单号:无论 test-mode 是否开启,这些号均可用 123456 登录(仅限非生产环境)
+  test-phones: "18776156917"
+
+# 微信配置(开发环境)
+wechat:
+  # 微信开放平台(网站扫码登录)
+  open:
+    app-id: ${WECHAT_APP_ID:wxd5f6a9d072f9a9f0}
+    app-secret: ${WECHAT_APP_SECRET:67d696a9f0a9d072f9a9f0d5f6a9d072}
+    qr-connect:
+      redirect-uri: ${WECHAT_REDIRECT_URI:http://localhost:8001/api/auth/wechat/callback}
+      scope: snsapi_login
+
+# 邀请码配置
+invite:
+  base-url: http://localhost:8001
+  # 补填邀请码有效窗口(天),注册后30天内可补填
+  bind-window-days: 30
+  # 客户端安装包本地存储目录(流式下载)
+  download-base-path: ${INVITE_DOWNLOAD_BASE_PATH:/desktop-updates}
+  windows-filename: ${INVITE_WINDOWS_FILENAME:智价云-x64.exe}
+  mac-filename: ${INVITE_MAC_FILENAME:智价云-arm64.dmg}
+
+# 支付模块(开发环境启用真实支付,手动确认按钮用于测试回调)
+payment:
+  mock: false
+  order-expire-minutes: 15
+  qrcode:
+    width: 200
+    height: 200
+  # 支付宝(开发/测试环境):电脑网站支付,将沙箱证书文件复制到 certs/dev/alipay/ 目录下
+  alipay:
+    app-id: ${ALIPAY_APP_ID:9021000165614119}
+    notify-url: ${ALIPAY_NOTIFY_URL:https://priceapi.kailin.com.cn/api/payment/callback/alipay}
+    return-url: ${ALIPAY_RETURN_URL:http://localhost:8001/payment/success}
+    server-url: ${ALIPAY_SERVER_URL:https://openapi-sandbox.dl.alipaydev.com/gateway.do}
+    # 公钥模式(优先):配置了 alipay-public-key 即走公钥模式
+    app-private-key: ${ALIPAY_APP_PRIVATE_KEY:MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDlmkkSgxXgmdl8H2q+AFUtHxZ6yBNjJTHPSalYKnxVSbyL2YKqhJwdJ4UzRn1aXSB8Tgl1bZndg/XJfammNvBNHTjMUsXdhWbTPqN5SHuDgwboJ2/RmG4wJQg8bQ0BmnChfG1YSnpzLJ8cGf576jnSmg2SEb0KaAl220xH/a7nPfHM45q2PyxRvclThZBkd4eG1T14//VczQeJ4Qsaw/9XnADaFCR3tqNs/9cml70tqM3GkcjsYCxKi2cSwJKAcupZc0lt2gmlAr5GzHjWJTpyGVA1dl8LIPDNhXLhHczriJ3J8Jsojx6h2wcM+nxATeGMCQ7pn67zMIoTyrCDXLAFAgMBAAECggEBAI24QcpPZz2PORLIQZatleWX/sQiovTbjHcqPIDTGJN8RAj+ZQzjdYj5T9pqdA1G1jpj4Kq+z+5O+XM5QXH7DzBKDTjxDnjBUsqpKzY9ax+tzKGXVgnFUJ4e/YputUx8C3Fh4AxTTGmy7TLnSJEr7iz0MdQrZsf5l33ptpfpGgBYrECVp1goqUFsFYIxMylzRg3K6RcnO8et8T3bu96LQ488qyaOgWyTMQVsMnWi68CZ3Ft7cSABAlwf9huRjuW/UQKESo6ZJ+4BZ4eATh/9hReP5bkVhJWCPBLhJ0+0b5peU5IjPigUFJNfKjdSgUBWHmOc5OSk9gVHMGTJW65XHTECgYEA/b/4si7jOrX1FO1aGpYb5QT7w4OC8ezFNdDn1BwkBhYMwjpoAaO1FAs8AHBvlwT0vwekrZRFjat/+PBRrdH0MomNUM5eUbZKONhJp3/A8QjEQ6LUSnDlCDFEQL+tobEIyJ6ZiHYTeNTBHQehkBqRDo3gLeLNJTldo4xPoI3eDKsCgYEA56N/jWMVj+IscsvWuc7S0OakwSduQxvtO9cD1fOrYH7xxtfO6uPfwX/n/N+WSAG8JumBatvZf0aBzzdrqa3fmjVfrILN7BWlK/Dt9h3krBqMh3c/jEsCQj1yNw+4UWjWRH9DbXO3LpNwDCdW5MnTnWRoQw7PVOGpC8QlrOhJ1g8CgYEAzn1w0PcM3FMDzHLVtvreWkDy64hSf7JQTVnhvZ7kxbsdyNSknGjuyw/VVPoqJLfYvrdmkAYvj3i3HAncPdmzoYiD4fT9lfsEbTu8vDxe8wZSSEPyA13ZUxBcXWBd2E1rO26su/pyIArp10jFdbHYxwI3IsAEdr028QcWKS4pOx8CgYEAtMC8k9Oxy6kuDhZJ5IwjraeNALyIKg3svTk3YQjXvmDQwd09NcXDoPbyTD0cw+u2qpajyoLr4YlfWhdhB/MJ/QeRNMiNb6AkV3mV9uu0uSeuaTcAe7U8efwA2D6IEd7A9IpqT0pwswOR96nrAHUNkE/9m/Y+i3nbs7bHv3kzxLkCgYBH58zAeQLVKl7vCqtG/iBAuGjD8+Y+YH702+kK58ufr1zRFj9WiiLER0OxTpdzBqEu9FG12V2jCsVVH3m5E4RjAiBYPbXAmN1w4BjtM8zKRnl7PECSVcIlIFNV1foAhS+ubFwKLgeox8z2A19sZZ/HgdnLqBr9z+0b6KXRHDrUrA==}
+    alipay-public-key: ${ALIPAY_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg7TfqIiv1ghpv1oF05HM8deLMT1Da8VYLkPIYTGcVa/+XNNaCivQCPiJQUe78TL2CPfuT49tNspQBtZXnwiZ4XJYSvzfOTko0sssFOgLW76TWNyr1cVL0bPOzemY84Dz1ezdRo1TiGlNVcJnQPq8abzYDtgPgh4pDuoXEyMKQGFnmXdPZdtZFBIlMTe3Smf0DMn98307cZxS+Kh3bWtA0WQt+RMuBjbugvms1xrmTWAFs5Q9cuUgDjxX4C1+CgIlTfJvB0XPotljHQ0kGytD9mDrWR29t7CKW+K6qjSWiq6SrM3llWO4wGp6Af34qzc05wegdgv73Ai0DjueAIQUtwIDAQAB}
+    # 证书模式(备选):未配置 alipay-public-key 时回退到证书模式,从 certs/dev/alipay/ 读取
+    app-private-key-path: ${ALIPAY_APP_PRIVATE_KEY_PATH:certs/dev/alipay/appPrivateKey.txt}
+    app-cert-path: ${ALIPAY_APP_CERT_PATH:certs/dev/alipay/appCertPublicKey_2021005188648051.crt}
+    alipay-cert-path: ${ALIPAY_CERT_PATH:certs/dev/alipay/alipayCertPublicKey_RSA2.crt}
+    alipay-root-cert-path: ${ALIPAY_ROOT_CERT_PATH:certs/dev/alipay/alipayRootCert.crt}
+  # 安心付(周期卡-小程序会员卡管理):独立小程序应用,与网页应用的 alipay 配置完全独立
+  anxin-alipay:
+    enabled: false
+    app-id: ${ALIPAY_ANXIN_APP_ID:}
+    app-private-key: ${ALIPAY_ANXIN_APP_PRIVATE_KEY:}
+    alipay-public-key: ${ALIPAY_ANXIN_PUBLIC_KEY:}
+    notify-url: ${ALIPAY_ANXIN_NOTIFY_URL:https://priceapi.kailin.com.cn/api/payment/anxin/notify/deduct}
+    card-notify-url: ${ALIPAY_ANXIN_CARD_NOTIFY_URL:https://priceapi.kailin.com.cn/api/payment/anxin/notify/card-change}
+    server-url: https://openapi.alipay.com/gateway.do
+    format: json
+    charset: UTF-8
+    sign-type: RSA2
+
+
+#    # 公钥模式(优先):配置了 alipay-public-key 即走公钥模式
+#    app-private-key: ${ALIPAY_APP_PRIVATE_KEY:MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDPZKA2tBUzhVUOlQkoSaovA6Mg9hTyHuI/lK0eqx5C478MKi4Ve1LMDdatY7jKhY0HVT5vu8VQ+NYyzP6CXTlRhWRCzzWa6BYPzWvR3JAIj+mJN/7jRsWvMx8DFjzR+1VIaO2eA3FHU673pCJwuM8PTgM0t/dW0NuzoYus6/cEUXAKYoM7Bm8qewHjSVIB7bC9Dy1IUwMwbXLtBjb6IPquYfCkXqcgfLSXspxqQ5PTYbWkUxeI24kP+4IcoDo3C8LwOseXD8EHPo1J9N2IbiPD8mfEmTJPo4F+vvlI8oudFcLLVd46YP5gRcmkZkM3F6863vHumXwciFZgVsqqdOSVAgMBAAECggEAbcoxXoQ67Qlam9ud+2vz4eulAiADuqFK2KnWc/PWk0aJruDtgIXGsStqSGQQQXYt0IH6CaB3toPksQQAf/bmDxf0mcGj+RuAAmGXAIQo4797vB6emqaupC8F7dZp4CeTYD/b+tiLsVzFtWd4q//J7ao43EG/eIAcrp2ImcRZAjk+arRv+ZftP98bNwD5H3zPL+M66Y2mVqYSWq5N6ZNTMdrL8rU3s46piKhLQvcjwtiX3EoCju2ubQswDt0Z4K0gQ+TqL6HctIc4mltJlSzxqBSUb3WyifPzhbZWqFPKbuDU+aU5HSJFA6j0YJgFSV8Lg1NYh3BxCu/l1v2UNE0+CQKBgQDta+QAzNdh0P0je/lMPTcqW5X6s0uCA5hCcOGMhVbDxP9fI6sBOnUeNVp0H3wgG1vFRbeZeIqO6qSrdDOG+TfKuG+8lumQCLg0UxpkBvAS0zyTVsHg5N9+qtJQ0lf2jE2BWiP5x/7vqqlLb0x4tD8QIe2itCdRlZTZthhmbDQRXwKBgQDfnzI8uuT+CF3WNlhyvC8APmvKsplxeIlE2Ejn930hQOmSgomwbgSoSkanzZ3yxF9othOc7gDNyz833aWOQrhZ59t3s3QfrkI/ZHlAhfmQ+/+CuxEMvN+RPbkA9a2dLWNMzU9yPDKcVq0JNmlGvrrkpbG4V0Koaf1iMrYkARZKiwKBgAG6YE11MDghCkag116rr2QaiIvrlCgdGJWbNrkMG2aPX4B0xQDcSQ/wOXlQ5VlieZeE+2Idk3yYzpwE238m/zX1g7KusoJ+3cBbvnxt5H9ulClKX1zgrZPBcIhwD33W5ZWEb3CY+Q0Lg/HtnHPgc/kNFiqx/vtECHJRNfpA3VwnAoGBAKTFxtyc0dKlE4+d57pTE0bYt9BZnVrQ+ER0IfRalicEj5bW/OG1j1T5teo7ReD19V9Qmk8NyCXbVy+w8CZM303P3BTtc+lMG6BeRkHW9jdwl6sab8u09/8rPcCJRm4EXaDfv2RrGte7vjCFmTj5nPiRZsxv77vsrTnIKBGLg4NVAoGBAKei4bfOwPsh33KT+e0jMJFlDO3lJ3KvQ47j6kela2LyFvG8rAkwDfqQjdUp2HfrumSQ8+WeJ1fYKpfKEn5XMRAtsCBhCYr0wQyhevG3m1JcuJqioAqo1WljYfUL9PJUFskssAmF9FxrG14mthdbiIlo5H0hYLWTn8aKYv3uvS+e}
+#    alipay-public-key: ${ALIPAY_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ZB3OubP0KcNtCVLFsXdkvwMGXnzlLse6lFifFTjo5z3UJQQCRjRgFVgPO5idGiUT4TQaV5IzqDGoP/S4w9l2+oFYw/6Lc5QBAjO441NlD8hf05K8+HEc6qtRAhzimzVyvGPsPFjHxmLaQbjiF0Oqvhez5UKUoFiZcBrqnpy+bB9ym5rMoUUPaTKV/fgdAnS3h4NxIzb2kP/nWMIEWt320yQkkeyIbiWcKmdHwwzgPOIjJm6gDfoN4KQvjuc8CwNXb21YTn4FFqfXMhCSIW5Weh4uS+MN5YL8JeqBaMtit9x1crqnBKKYLxhbrV381O/O9P6qbsI3tPk6ePLFVGxWQIDAQAB}
+#    # 证书模式(备选):未配置 alipay-public-key 时回退到证书模式,从 certs/dev/alipay/ 读取
+#    app-private-key-path: ${ALIPAY_APP_PRIVATE_KEY_PATH:certs/dev/alipay/appPrivateKey.txt}
+#    app-cert-path: ${ALIPAY_APP_CERT_PATH:certs/dev/alipay/appCertPublicKey_2021005188648051.crt}
+#    alipay-cert-path: ${ALIPAY_CERT_PATH:certs/dev/alipay/alipayCertPublicKey_RSA2.crt}
+#    alipay-root-cert-path: ${ALIPAY_ROOT_CERT_PATH:certs/dev/alipay/alipayRootCert.crt}
+  # 微信支付(开发/测试环境):将测试商户证书文件复制到 certs/dev/wechat/ 目录下
+  wechat:
+    app-id: ${WECHAT_PAY_APP_ID:wx24a9669e84ba1f0b}
+    mch-id: ${WECHAT_PAY_MCH_ID:1612111355}
+    api-v3-key: ${WECHAT_PAY_API_V3_KEY:iD1xB1mH6zO7pP2wD1rU4aD2nH7oL2lN}
+    # 三份证书文件(从微信支付商户平台下载,放入 certs/dev/wechat/):
+    private-key-path: ${WECHAT_PAY_PRIVATE_KEY_PATH:certs/dev/wechat/apiclient_key.pem}         # 证书密钥pem(商户私钥)
+    private-cert-path: ${WECHAT_PAY_PRIVATE_CERT_PATH:certs/dev/wechat/apiclient_cert.pem}      # 证书pem格式(商户证书)
+    key-path: ${WECHAT_PAY_KEY_PATH:certs/dev/wechat/apiclient_cert.p12}                        # 证书pkcs12格式(密码默认为商户号)
+    serial-no: ${WECHAT_PAY_SERIAL_NO:68E43B250D73977F1DC0E0D0827AF25A8BFB1777}
+    # 微信支付公钥(新商户必须配置,从商户平台 → 账户中心 → API安全 → 申请微信支付公钥)
+    public-key-path: ${WECHAT_PAY_PUBLIC_KEY_PATH:certs/dev/wechat/pub_key.pem}              # 微信支付公钥文件
+    public-key-id: ${WECHAT_PAY_PUBLIC_KEY_ID:}                                              # 微信支付公钥ID
+    notify-url: ${WECHAT_PAY_NOTIFY_URL:https://priceapi.kailin.com.cn/api/payment/callback/wechat}
+  # 微信小程序支付(JSAPI 调起支付签名 appId)
+  # 小程序 JSAPI 下单签名的 appId 必须为小程序自身的 appId,与 Native 扫码的 appId 区分
+  # 不配置时自动回退到 payment.wechat.app-id(当两者相同时可省略)
+  miniapp:
+    app-id: ${WECHAT_PAY_MINIAPP_APP_ID:wx24a9669e84ba1f0b}
+    app-secret: ${WECHAT_PAY_MINIAPP_APP_SECRET:}