新增微信支付代码

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/OmsOrder.java

@@ -1,10 +1,11 @@
 package com.hwrj.cloud.portal.model;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-
+@ApiModel
 public class OmsOrder implements Serializable {
     @ApiModelProperty(value = "订单id")
     private Long id;

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/OmsOrderPayServiceImpl.java

@@ -21,7 +21,7 @@ public class OmsOrderPayServiceImpl implements OmsOrderPayService {
 
     @Autowired
     private OmsOrderMapper omsOrderMapper;
-    @Autowired
+
     @Override
     public void insert(OmsOrder omsOrder, Long orderNum) {
         UmsMember currentMember = memberService.getCurrentMember();

nacos/data/config-data/DEFAULT_GROUP/forest-admin → nacos/data/config-data/DEFAULT_GROUP/forest-admin.yml

@@ -55,30 +55,7 @@ logging:
     admin:
       client:
         url: http://localhost:9091
-secure:
-  ignored:
-    urls:
-      - /swagger-ui.html
-      - /swagger-resources/**
-      - /swagger/**
-      - /**/v2/api-docs
-      - /**/*.js
-      - /**/*.css
-      - /**/*.png
-      - /**/*.ico
-      - /webjars/springfox-swagger-ui/**
-      - /actuator/**
-      - /druid/**
-      - /admin/login
-      - /admin/register
-      - /admin/info
-      - /admin/logout
-      - /minio/upload
-      - /product/import
-      - /big/**
-      - /bigData/**
-      - /first/upload
-      - /doc.html
+
 jwt:
   tokenHeader: Authorization
   secret: forest-admin-secret
@@ -92,10 +69,4 @@ redis:
     token: 'ums:token'
     resourceList: 'ums:resourceList'
   expire:
-    common: 86400
-qiniu:
-  accessKey: FLWUJxiZY1_N-5d6J_jsdgbqyjVDUg86ghZHsaQW
-  bucket: forestcloud
-  path: http://fqn.hongweisoft.com/
-  processName: 'null'
-  secretKey: So55w4fQ2dTQ6uMlWuUywmKG8ZTqVhWfr_3Ii7GI
+    common: 86400

nacos/data/config-data/DEFAULT_GROUP/forest-gateway → nacos/data/config-data/DEFAULT_GROUP/forest-common.yml

@@ -1,22 +1,3 @@
-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
 secure:
   ignored:
     urls:
@@ -49,16 +30,16 @@ secure:
       - /big/**
       - /bigData/**
       - /first/upload
-jwt:
-  tokenHeader: Authorization
-  secret: forest-admin-secret
-  expiration: 604800
-  tokenHead: Bearer
-redis:
-  database: forest
-  key:
-    admin: 'ums:admin'
-    token: 'ums:token'
-    resourceList: 'ums:resourceList'
-  expire:
-    common: 86400
+      - /doc.html
+      - /sso/**
+      - /wechat/**
+      - /brand/**
+      - /app/pay
+      - /app/payResult
+
+qiniu:
+  accessKey: FLWUJxiZY1_N-5d6J_jsdgbqyjVDUg86ghZHsaQW
+  bucket: forestcloud
+  path: http://fqn.hongweisoft.com/
+  processName: 'null'
+  secretKey: So55w4fQ2dTQ6uMlWuUywmKG8ZTqVhWfr_3Ii7GI  

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

@@ -0,0 +1,34 @@
+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
+      
+jwt:
+  tokenHeader: Authorization
+  secret: forest-admin-secret
+  expiration: 604800
+  tokenHead: Bearer
+  
+redis:
+  database: forest
+  key:
+    admin: 'ums:admin'
+    token: 'ums:token'
+    resourceList: 'ums:resourceList'
+  expire:
+    common: 86400

nacos/data/config-data/DEFAULT_GROUP/forest-portal → nacos/data/config-data/DEFAULT_GROUP/forest-portal.yml

@@ -35,7 +35,10 @@ spring:
     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
@@ -45,30 +48,6 @@ mybatis:
   mapper-locations:
     - classpath:dao/*.xml
     - classpath*:com/**/mapper/*.xml
-jwt:
-  tokenHeader: Authorization
-  secret: forest-admin-secret
-  expiration: 604800
-  tokenHead: Bearer
-secure:
-  ignored:
-    urls:
-      - /swagger-ui.html
-      - /swagger-resources/**
-      - /swagger/**
-      - /**/v2/api-docs
-      - /**/*.js
-      - /**/*.css
-      - /**/*.png
-      - /**/*.ico
-      - /webjars/springfox-swagger-ui/**
-      - /druid/**
-      - /actuator/**
-      - /sso/**
-      - /wechat/**
-      - /home/**
-      - /product/**
-      - /brand/**
 rabbitmq:
   queue:
     name:
@@ -85,7 +64,16 @@ redis:
     authCode: 90
     authLoginCode: 240
     common: 86400
-
+jwt:
+  #JWT存储的请求头
+  tokenHeader: Authorization
+  #JWT加解密使用的密钥
+  secret: forest-admin-secret
+  #JWT的超期限时间(60*60*24*7)
+  expiration: 604800
+  #JWT负载中拿到开头
+  tokenHead: Bearer
+  
 forest:
   wx: 
     password: forest123456
@@ -94,6 +82,7 @@ sms:
   accessKeyId: LTAICB9TH0OAN3yJ
   accessKeySecret: lCuyL3MUQRLfoVw39W0NqWdVGoLV60
   signName: hywa
+  
 wx:
   mp:
     aesKey: 123
@@ -101,4 +90,9 @@ wx:
     secret: ec4a18ce1a7bcf17cf592c3d57cec68a
     token: 123
     url: http://wx.hw.hongweisoft.com/zddapi/forest-portal/wechat/h5/userInfo
-    before: http://172.16.90.25:8080
+    before: http://172.16.90.25:8080
+  pay:
+    appId: wxbe90cc7c5233dd84
+    mchId: 1583849731
+    mchKey: B5F5A628C91D869F4CA357D2BCD6300
+    wxpayAppcallbackurl: http://wx.hw.hongweisoft.com/zddtest/forest-portal/app/payResult