Revert "小程序微信支付开发成功"

This reverts commit 0b6a0412211e02e328b8a47bf190d9381f45f6e6.

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/WechatAppPayController.java

@@ -55,7 +55,6 @@ public class WechatAppPayController extends BaseController {
     @ApiResponse(code = 500, message = "请求的配置参数有问题")
     @AuthCarbonValidate
     @PostMapping
-    @ResponseBody
     public ResponseBase pay(@RequestBody WxPayFrom wxPayFrom, HttpServletRequest request) {
         String orderId = wxPayFrom.getOrderId();
         String openid = wxPayFrom.getOpenid();
@@ -67,8 +66,6 @@ public class WechatAppPayController extends BaseController {
             throw new RuntimeException("订单已支付");
         }
         WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
-        //加密方式
-        orderRequest.setSignType(WxPayConstants.SignType.MD5);
         //随机字符串
         String s = UUIDUtils.randomUUID();
 

nacos/data/config-data/DEFAULT_GROUP/carbon-admin.yml

@@ -1,72 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://172.16.90.253:3306/cq-carbon-platform-dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-    druid:
-      initial-size: 5
-      min-idle: 10
-      max-active: 20
-      web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-      stat-view-servlet:
-        login-username: druid
-        login-password: druid
-  redis:
-    host: 172.16.90.253
-    database: 0
-    port: 6379
-    password: 123456
-    timeout: 300ms
-  zipkin:
-    base-url: http://localhost:9411
-    locator:
-      discovery:
-        enabled: true
-  sleuth:
-    sampler:
-      probability: 1.0
-  boot:
-    admin:
-      client:
-        url: http://localhost:8095
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: always
-mybatis:
-  mapper-locations:
-    - classpath:dao/*.xml
-    - classpath*:com/**/mapper/*.xml
-logging:
-  level:
-    root: info 
-    com.hcloud: debug
-
-  sleuth:
-    sampler:
-      probability: 1.0
-  boot:
-    admin:
-      client:
-        url: http://localhost:9091
-
-jwt:
-  tokenHeader: Authorization
-  secret: carbon-admin-secret
-  expiration: 604800
-  tokenHead: Bearer
-
-redis:
-  database: carbon
-  key:
-    admin: 'sys:admin'
-    token: 'sys:token'
-    resourceList: 'sys:permission'
-  expire:
-    common: 86400

nacos/data/config-data/DEFAULT_GROUP/carbon-back.yml

@@ -1,75 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://172.16.90.253:3306/cq-carbon-platform-dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-    druid:
-      initial-size: 5
-      min-idle: 10
-      max-active: 20
-      web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-      stat-view-servlet:
-        login-username: druid
-        login-password: druid
-  redis:
-    host: 172.16.90.253
-    database: 0
-    port: 6379
-    password: 123456
-    timeout: 300ms
-  zipkin:
-    base-url: http://localhost:9411
-    locator:
-      discovery:
-        enabled: true
-  sleuth:
-    sampler:
-      probability: 1.0
-  boot:
-    admin:
-      client:
-        url: http://localhost:8095
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: always
-mybatis:
-# 搜索指定包别名
-  typeAliasesPackage: com.hcloud.microserver.system.facade.carbon.entity
-  mapper-locations:
-    - classpath:system/*.xml
-    - classpath:carbon/*.xml
-    - classpath*:com/**/mapper/*.xml
-logging:
-  level:
-    root: info 
-    com.hcloud: debug
-
-  sleuth:
-    sampler:
-      probability: 1.0
-  boot:
-    admin:
-      client:
-        url: http://localhost:9091
-
-jwt:
-  tokenHeader: Authorization
-  secret: carbon-admin-secret
-  expiration: 604800
-  tokenHead: Bearer
-
-redis:
-  database: carbon
-  key:
-    admin: 'sys:admin'
-    token: 'sys:token'
-    resourceList: 'sys:permission'
-  expire:
-    common: 86400

nacos/data/config-data/DEFAULT_GROUP/carbon-bank.yml

@@ -1,87 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://172.16.90.253:3306/cq-carbon-platform-dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-    druid:
-      initial-size: 5
-      min-idle: 10
-      max-active: 20
-      web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-      stat-view-servlet:
-        login-username: druid
-        login-password: druid
-  redis:
-    host: 172.16.90.253
-    database: 0
-    port: 6379
-    password: 123456
-    timeout: 300ms
-  zipkin:
-    base-url: http://localhost:9411
-    locator:
-      discovery:
-        enabled: true
-  sleuth:
-    sampler:
-      probability: 1.0
-  boot:
-    admin:
-      client:
-        url: http://localhost:8095
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: always
-mybatis:
-  mapper-locations:
-    - classpath:bank/*.xml
-    - classpath:mapper/*.xml
-    - classpath*:com/**/mapper/*.xml
-logging:
-  level:
-    root: info 
-    com.hwrj.cloud: debug
-
-  sleuth:
-    sampler:
-      probability: 1.0
-  boot:
-    admin:
-      client:
-        url: http://localhost:9091
-
-jwt:
-  tokenHeader: Authorization
-  secret: carbon-admin-secret
-  expiration: 604800
-  tokenHead: Bearer
-
-redis:
-  database: carbon
-  buser:
-    key: cq:carbon:bank
-    expire: 43200
-  clearing:
-    expire: 30
-    key: cq:carbon:clearing
-  key:
-    admin: 'sys:admin'
-    token: 'sys:token'
-    resourceList: 'sys:permission'
-  expire:
-    common: 86400
-cqrcb:
-  bank:
-    sign:
-      ip: 172.16.90.102
-      port: 8853
-    sslclient:
-      ip: 172.16.90.102
-      port: 8852

nacos/data/config-data/DEFAULT_GROUP/carbon-common.yml

@@ -1,47 +0,0 @@
-secure:
-  ignored:
-    urls:
-      - /swagger-ui.html
-      - /swagger-resources/**
-      - /swagger/**
-      - /doc.html
-      - /**/v2/api-docs
-      - /**/*.js
-      - /**/*.css
-      - /**/*.png
-      - /**/*.ico
-      - /webjars/springfox-swagger-ui/**
-      - /actuator/**
-      - /druid/**
-      - /home/**
-      - /user/login
-      - /wap/customer/customerLogin
-      - /sys/user/login
-      - /wap/goods/**
-      - /wap/goodsManage/**
-      - /login
-      - /wechat/app/login
-      - /wap/apply/**
-      - /back/apply/**
-      - /wechat/pay/payResultNotified
-
-qiniu:
-  accessKey: FLWUJxiZY1_N-5d6J_jsdgbqyjVDUg86ghZHsaQW
-  bucket: forestcloud
-  path: http://fqn.hongweisoft.com/
-  processName: 'null'
-  secretKey: So55w4fQ2dTQ6uMlWuUywmKG8ZTqVhWfr_3Ii7GI
-
-jwt:
-  tokenHeader: Authorization
-  secret: carbon-admin-secret
-  expiration: 72500
-  tokenHead: Bearer
-redis:
-  database: carbon
-  key:
-    admin: 'sys:admin'
-    token: 'sys:token'
-    resourceList: 'sys:permission'
-  expire:
-    common: 726400 

nacos/data/config-data/DEFAULT_GROUP/carbon-gateway.yml

@@ -1,21 +0,0 @@
-spring:
-  redis:
-    host: 172.16.90.253
-    database: 0
-    port: 6379
-    password: 123456
-    timeout: 300ms
-  boot:
-    admin:
-      client:
-        url: http://localhost:9091
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: always
-      
-  

nacos/data/config-data/DEFAULT_GROUP/carbon-h5.yml

@@ -1,125 +0,0 @@
-spring:
-  http:
-    multipart:
-      maxFileSize: 30Mb
-      maxRequestSize: 30Mb
-  mvc:
-    static-path-pattern: /**
-  resources:
-    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,file:${img.location}
-  datasource:
-    url: jdbc:mysql://172.16.90.253:3306/cq-carbon-platform-dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-    druid:
-      initial-size: 5
-      min-idle: 10
-      max-active: 20
-      web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-      stat-view-servlet:
-        login-username: druid
-        login-password: druid
-  boot:
-    admin:
-      client:
-        url: http://localhost:9091
-  data:
-    mongodb:
-      host: 172.16.90.253
-      port: 27017
-      database: mall-port
-  redis:
-    host: 172.16.90.253
-    database: 0
-    port: 6379
-    password: 123456
-    timeout: 300ms
-  rabbitmq:
-    host: 172.16.90.64
-    port: 5672
-    virtual-host: /forest
-    username: forest
-    password: 123456
-    publisher-confirms: true
-myredis:
-  address: redis://${spring.redis.host}:${spring.redis.port}
-  passord: ${spring.redis.password}
-  
-logging:
-  level:
-    org.springframework.data.mongodb.core: debug
-    com.hwrj.cloud.portal.mapper: debug
-    com.hwrj.cloud.portal.dao: debug
-    com.hcloud: debug
-mybatis:
-# 搜索指定包别名
-  typeAliasesPackage: com.hcloud.microserver.h5.entity,com.hcloud.microserver.h5.facade.carbon
-  mapper-locations:
-    - classpath:*/*.xml
-    - classpath:carbon/*.xml
-    - classpath*:com/**/mapper/*.xml
-rabbitmq:
-  queue:
-    name:
-      cancelOrder: cancelOrderQueue
-redis:
-  database: carbon
-  key:
-    authCode: 'sys:authCode'
-    telLoginCode: 'sys:authCode'
-    orderId: 'sys:orderId'
-    member: 'sys:member'
-    token: 'sys:token'
-  expire:
-    authCode: 90
-    authLoginCode: 240
-    common: 86400
-# jwt:
-#   #JWT存储的请求头
-#   tokenHeader: Authorization
-#   #JWT加解密使用的密钥
-#   secret: carbon-admin-secret
-#   #JWT的超期限时间(60*60*24*7)
-#   expiration: 604800
-#   #JWT负载中拿到开头
-#   tokenHead: Bearer
-  
-carbon:
-  wx: 
-    password: forest123456
-
-sms:
-  accessKeyId: LTAICB9TH0OAN3yJ
-  accessKeySecret: lCuyL3MUQRLfoVw39W0NqWdVGoLV60
-  signName: hywa
-  
-wx:
-  auth:
-    baseurl: http://cqthht.hongweisoft.com/ht/wap/weChat/baseLogin
-    redirecturl: http://cqthht.hongweisoft.com/ht/wap/weChat/doLogin
-    weChatforwardurl: http://cqth.hongweisoft.com?userId=
-    wxpaycallbackurl: http://cqthht.hongweisoft.com/ht/wap/weChat/payResultNotified
-  mp:
-    appId: wxbe90cc7c5233dd84
-    secret: ec4a18ce1a7bcf17cf592c3d57cec68a
-    aesKey: 123
-    token: 123
-  pay:
-    appId: wxc950eea640108c5e
-    mchId: 1583849731
-    mchKey: B5F5A628C91D869F4CA357D2BCD63006
-    wxpayAppcallbackurl: http://wx.hw.hongweisoft.com/cqthminapp/carbon-h5/wechat/pay/payResultNotified
-    flag: test
-  ma:
-    appId: wxc950eea640108c5e
-    secret: 6df8516d6b483bc84368239c238c7cd6
-img:
-  location: E:/FakeFTP/
-accessKeyId: LTAICB9TH0OAN3yJ
-accessKeySecret: lCuyL3MUQRLfoVw39W0NqWdVGoLV60
-export:
-  file:
-    excel:
-      path: E:/FakeFTP/
-signName: 慧云网安

nacos/data/config-data/DEFAULT_GROUP/system.yml

@@ -1,67 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://172.16.90.253:3306/cq-carbon-platform-dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-    druid:
-      initial-size: 5
-      min-idle: 10
-      max-active: 20
-      web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-      stat-view-servlet:
-        login-username: druid
-        login-password: druid
-  redis:
-    host: 172.16.90.253
-    database: 0
-    port: 6379
-    password: 123456
-    timeout: 300ms
-  zipkin:
-    base-url: http://localhost:9411
-    locator:
-      discovery:
-        enabled: true
-  sleuth:
-    sampler:
-      probability: 1.0
-  boot:
-    admin:
-      client:
-        url: http://localhost:8095
-
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: always
-mybatis:
-# 搜索指定包别名
-  typeAliasesPackage: com.hcloud.microserver
-  mapper-locations:
-    - classpath:carbon/*.xml
-    - classpath:system/*.xml
-    - classpath*:com/**/mapper/*.xml
-logging:
-  level:
-    root: info 
-    com.hcloud: debug
-
-  sleuth:
-    sampler:
-      probability: 1.0
-  boot:
-    admin:
-      client:
-        url: http://localhost:9091
-
-
-