Merge remote-tracking branch 'origin/master'

.idea/compiler.xml

@@ -7,14 +7,17 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="chuangqi_back" />
+        <module name="adcs" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="11">
+      <module name="adcs" target="11" />
       <module name="chuangqi_back" target="11" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="adcs" options="-parameters" />
       <module name="chuangqi_back" options="-parameters" />
     </option>
   </component>

src/main/resources/application.yaml

@@ -148,11 +148,11 @@ aliyun:
   oss-domain: https://cdn.raex.vip
   sms-sign: 绿洲数字藏品中心
   sms-code: SMS_228870098
-  sell-out-code: SMS_246085423
+  sell-out-code: SMS_232892483
 
 general:
   host: https://www.adcs.vip
-  contract-name: chuanqi
+  contract-name: raex_new
   name: 传奇数藏
   org: 传奇数藏
   short-name: 传奇数藏
@@ -179,12 +179,12 @@ mychain:
     bizid: a00e36c5
     cipher-suit: ec
     rest-url: https://rest.baas.alipay.com
-    access-id: 7YrE3UH4CCJYNXOX
-    access-secret: access.key
-    tenantid: CCJYNXOX
+    access-id: 1KKUWLPoBDCUECOE
+    access-secret: access2.key
+    tenantid: BDCUECOE
     read-file-from-ext: false
-    account: lasuo_official
-    kmsId: 8p313tyQCCJYNXOX1655445930940
+    account: raex_official
+    kmsId: W0A6XaE5BDCUECOE1638182878495
 alipay:
   app-id: 2021002186606637
   gateway: https://openapi.alipay.com/gateway.do
@@ -218,14 +218,17 @@ adapay:
   priv-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCLeSEu8CXg4iwpRtAapIGpbuoJdyAh3E2FgIqOJSME/0+DscuIUVzfQzMWgXT98Zd8aKQLmjTWHx6Tg60DCFJzJBkISZYaqF9Oc+YdPe15TINpp5syKDk72WeUEW/jlXiLwKyeFxzCvedbpbdAUi0cP64US/LslGohHGWUrgj/WBR33vgwA2NAHR+ziGp8IhFUXHoWtXdBjwGsWuZ6Wt9mWOVeGIHP6OyUYzhkVuDyFMZ6wlA60PqxPAQrvZG3VP2mSlpWTs7xQHM9nk8Rn2pQDUmexHmKS/wn4XZvl3S9KRs6/l8wDqlBW5QhmEZNRwiOG8n/FpqxUMIhFFj4SSq1AgMBAAECggEAVwmWXbZbzQUXzgJ058t1ZwjiYFnI4ZibgA6BaMdgHUQ+mM6hV0Z/EIzdGtRa8AaOJIMgrGTlSCJPcHshwty0p0oFnRhe5e/g2hKVrfXxdlr7PznrLdfQL7syWkKvcnTar0vj7Rw7RIRCFv1JaIhfwlszBVOIG39a46LW+XvJ/Z5Lk5wB8tkt0xWDUghAU1xP10P8OHcr/x3aFhiyAvmWWr7syYKD1rDAtC+n+6Imb8MvTxwk4Gz1wpM+a7gHeYk2n91yR94G6A2wMSeM80T4hCbYKutD5rkdi5i3hoeIiPiq5qbR0rmI/dudVbGkVT+xkh1z1IsKeYiD2ef4Ddy2QQKBgQDIqOuaml9bnJpKie9Z0ysiPWxc771byxhgx7bwsoJey4x5bcLx+G9IAvkGwWFUl+25jgpeVn/LZ6147e9ozeip7WSKvStniND+CB7SvA5ZDRm7CfqFQub//9Q1DWNfl+ThGAXHMlKgS7DanLqvpUsRdhUOceZwwrdkV93v7by8nQKBgQCx8EdYbxNIEnVI3Y98YCAWtvgBCCa8yurL+9IXe9VKCFGdGRZ4b61GWDNyjUAfiboXY4ByzvX4cdlZ1euVmqMYsEv28xXEFdGxSDpa+oeETbv1U2GEGL4Ups3z28Sx4TGGSyvReyQOhZftIF6vCZtZ8dZMEf8IdxyudJkcJp+u+QKBgBFtemkHF1khlNT8felTSd/DbfH0cIHUdd2R+vWUy3XoP98cBV52sVOTzoUjroxmVaNUDtp6sMa9znc+UxjLKXX4xE64d1iarWwi0GqFIsnhNWblSvjgAqghVBD3hLX8v0g9ieLvH/YEHOwfyKcQuCBgHRwQEG+iucLhTslT4JyRAoGAHa25CKwGKEhD3bJuw0z5LTC5btqgM28Y+Ir5AMe7zIxUqIJNuCrQWOJPOnUK0/fR3SLQgtW4OwcqPIysrZhMScrl8Luczsbg4dPtP813mv6oMgQFSNYjpigoQ9tNFGo+K2sQVPFYEz//FiMHB+TvT3JBzxBVXGEZnJOAEizzB2kCgYEAxUFRiJMcmp5IyGcFlmGP219OcEfzt8BV8s3yoPHPpgYX/zPsH9764UMSZb+FRXFLd8HC+UqqppQ4cq2RmMu5X7H/DWoj9FqXgusjOmZUyWiJgTPC4ktFesuhJhCHuk/50/nXmc6O8rWLwXqXf1XNaoNfzDmZNQ20jRZGr8eVc4g=
   app-public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwN6xgd6Ad8v2hIIsQVnbt8a3JituR8o4Tc3B5WlcFR55bz4OMqrG/356Ur3cPbc2Fe8ArNd/0gZbC9q56Eb16JTkVNA/fye4SXznWxdyBPR7+guuJZHc/VW2fKH2lfZ2P3Tt0QkKZZoawYOGSMdIvO+WqK44updyax0ikK6JlNQIDAQAB
   wx-app-id:
-  notify-url: https://njnft.izouma.vip/notify/adapay
+  notify-url: https://testorder.raex.vip/notify/adapay
 sandpay:
   url: https://cashier.sandpay.com.cn/qr/api
-  mid: 6888803044895
-  sign-cert-path: classpath:cert/0424.pfx
-  sign-cert-pwd: 220424
+  mid: 6888806043057
+  sign-cert-path: classpath:cert/6888806043057.pfx
+  sign-cert-pwd: 3edc#EDC
   sand-cert-path: classpath:cert/sand.cer
-  notify-url: https://test.adcs.vip/sandpay/notify
+  notify-url: http://xiongzhu.frp.izouma.com/sandpay/notify
+payease:
+  merchant-id: 896593123
+  notify-url: http://raex.frp.izouma.com/payease/notify
 rocketmq:
   name-server: 120.24.204.226:9876
   producer:
@@ -242,41 +245,41 @@ spring:
     username: raex_server
     password: tetQsjw!u4!c5$URduo7BH
   redis:
-    host: 120.78.171.194
+    host: 127.0.0.1
     database: 8
     password: jV%93RtjUx82Tp
 general:
-  host: https://www.lasuo.cc
-  create-order-group: create-order-group-test
-  create-order-topic: create-order-topic-test
-  update-stock-group: update-stock-group-test
-  update-stock-topic: update-stock-topic-test
-  update-sale-group: update-sale-group-test
-  update-sale-topic: update-sale-topic-test
-  order-notify-group: order-notify-group-test
-  order-notify-topic: order-notify-topic-test
-  mint-group: mint-group-test
-  mint-topic: mint-topic-test
-  update-activity-stock-group: update-activity-stock-group-test
-  update-activity-stock-topic: update-activity-stock-topic-test
-  update-quota-group: update-quota-group-test
-  update-quota-topic: update-quota-topic-test
-  broadcast-event-group: broadcast-event-group-test
-  broadcast-event-topic: broadcast-event-topic-test
-  register-group: register-group-test
-  register-topic: register-topic-test
+  host: https://legend.raex.vip
+  create-order-group: legend-create-order-group-test
+  create-order-topic: legend-create-order-topic-test
+  update-stock-group: legend-update-stock-group-test
+  update-stock-topic: legend-update-stock-topic-test
+  update-sale-group: legend-update-sale-group-test
+  update-sale-topic: legend-update-sale-topic-test
+  order-notify-group: legend-order-notify-group-test
+  order-notify-topic: legend-order-notify-topic-test
+  mint-group: legend-mint-group-test
+  mint-topic: legend-mint-topic-test
+  update-activity-stock-group: legend-update-activity-stock-group-test
+  update-activity-stock-topic: legend-update-activity-stock-topic-test
+  update-quota-group: legend-update-quota-group-test
+  update-quota-topic: legend-update-quota-topic-test
+  broadcast-event-group: legend-broadcast-event-group-test
+  broadcast-event-topic: legend-broadcast-event-topic-test
+  register-group: legend-register-group-test
+  register-topic: legend-register-topic-test
 wx:
   pay:
-    notify-url: https:/www.lasuo.cc/notify/order/weixin
-    refund-notify-url: https://www.lasuo.cc/wx/refundNotify
-    return-url: https://www.lasuo.cc/9th/orders
+    notify-url: https:/legend.raex.vip/notify/order/weixin
+    refund-notify-url: https://legend.raex.vip/wx/refundNotify
+    return-url: https://legend.raex.vip/9th/orders
 alipay:
-  notify-url: https://www.lasuo.cc/notify/order/alipay
-  return-url: https://www.lasuo.cc/9th/home
+  notify-url: https://legend.raex.vip/notify/order/alipay
+  return-url: https://legend.raex.vip/9th/home
 adapay:
-  notify-url: https://www.lasuo.cc/notify/adapay
+  notify-url: https://legend.raex.vip/notify/adapay
 sandpay:
-  notify-url: https://www.lasuo.cc/sandpay/notify
+  notify-url: https://legend.raex.vip/sandpay/notify
 ---
 
 spring:

src/main/resources/cert/hmpay_app_private_key.txt

@@ -0,0 +1 @@
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJCaYSAw8c2uk4gry+/uy5thmzgdg1tPr6TRRj25AKxa13hnhjMEzp/eD8++LHxyPXg0ZXlbotZ/g0ES1XHJMkmHA4fRZ6Ki35LxlY60Z8xRwaTZXIctlaCkjhJmURNncQzyB5XMFF2M6cgy1T0yr+czoVPelVEFbAWu4cg/kQ1tAgMBAAECgYAGQwktsbDm7UZqQStFqpuakPF9zplfnOXIR1+5UIec7xohlqoTD4Q7HAynPF8EzJWo3OwAA13b2A3BBaXElafdwod7J2H9zlGJiqfmsnSTMhapVYsBbqnXGYWFS33wAm1Wx4Y9hSQxUD6AsZ+A05RiolrTTfAAGMS9E4sGhh1O6QJBANGUbGUednN4/0A0KlH3pWgLKPT+JyMeZLFGXeFLJpwWf25Xj98JcGai5t9sDqPl6xSgkEnJHdLB7LNEnmqr5X8CQQCwoaZwsVd0jnW6RU6F3SZ+BY4YS7SAhMlElqaJbBTP7DbXH/Z3cS1V696bvKup6+HlI/l0YwTDdRJIR0hl9XsTAkEAwFpPWkepQ7ZL36uBJBX9FA8aGjGhzhO5KxOAWqTU3PGxJ57qBzTsmubsqybMERWWuynbBD24R5WBH8/c7d6zFQJAShIP9TQ5Y5SWRB3qVvKtwK1dsEyXDkohCRVQE1Lyy1rYiJBL0Dzy8RQvzwlox6I2odvbMXaQudKvbwYNk0xFZwJAAxAeFweoXqDWcYl7Oa4nmgbM9LVqAMCbjzkChquXvj5q5sE9LOXiSMfbnDalNlLonbApnuTx5YCJYB0jA0ml8g==

src/main/resources/cert/hmpay_app_public_key.txt

@@ -0,0 +1 @@
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCQmmEgMPHNrpOIK8vv7subYZs4HYNbT6+k0UY9uQCsWtd4Z4YzBM6f3g/Pvix8cj14NGV5W6LWf4NBEtVxyTJJhwOH0Weiot+S8ZWOtGfMUcGk2VyHLZWgpI4SZlETZ3EM8geVzBRdjOnIMtU9Mq/nM6FT3pVRBWwFruHIP5ENbQIDAQAB

src/main/resources/cert/hmpay_public_key.txt

@@ -0,0 +1 @@
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLobxNslmsua5fnegILQSMioA5N0E5Kfg1hYLzhOuPdyJbFIImFkRF8RYt6Fp24LpDfpEEBhX8EGYIJSPpRWPZYVBzlGWOj1jS0FeF/JK+8a8ihgSxAU2JwsUySqGv+8aXIofJUus/j/KEPQZgjyVebi9J/ww75pbpGrymnAZUdwIDAQAB