xiongzhu 4 years ago
parent
commit
bd45b37b76

+ 0 - 4
src/main/java/com/izouma/nineth/config/Constants.java

@@ -11,15 +11,11 @@ public interface Constants {
 
     String DEFAULT_AVATAR = "https://9space-2021.oss-cn-shenzhen.aliyuncs.com/image/2021-11-26-18-49-04fkFHRAhM.jpg";
 
-    String SMS_SIGN_NAME = "身份验证";
 
-    String SMS_TEMPLATE_CODE_GENERIC = "SMS_11685095";
 
     String bizId = "a00e36c5";
 
     String kmsKey = "ydtg$@WZ9NH&EB2e";
 
-    String CONTRACT_NAME = "nine_space";
-
     String SMS_TOKEN_SECRET = "rjbcsj39s9mg9r";
 }

+ 7 - 3
src/main/java/com/izouma/nineth/service/NFTService.java

@@ -18,6 +18,7 @@ import com.izouma.nineth.utils.HashUtils;
 import com.izouma.nineth.utils.SnowflakeIdWorker;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.retry.annotation.Backoff;
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,9 @@ public class NFTService {
     private final RestClient           restClient;
     private final RestClientProperties restClientProperties;
 
+    @Value("${mychain.contract-name}")
+    private String contractName;
+
     public NFTAccount createAccount(String username) {
         CallRestBizParam callRestBizParam = CallRestBizParam.builder()
                 .orderId(String.valueOf(new SnowflakeIdWorker(0, 0).nextId()))
@@ -65,7 +69,7 @@ public class NFTService {
                 .orderId(String.valueOf(new SnowflakeIdWorker(0, 0).nextId()))
                 .bizid(restClientProperties.getBizid())
                 .account(restClientProperties.getAccount())
-                .contractName(Constants.CONTRACT_NAME)
+                .contractName(contractName)
                 .methodSignature("mint(identity)")
                 .inputParamListStr(jsonArray.toJSONString())
                 .outTypes("[]")//合约返回值类型
@@ -112,7 +116,7 @@ public class NFTService {
                 .orderId(String.valueOf(new SnowflakeIdWorker(0, 0).nextId()))
                 .bizid(restClientProperties.getBizid())
                 .account(restClientProperties.getAccount())
-                .contractName(Constants.CONTRACT_NAME)
+                .contractName(contractName)
                 .methodSignature("transferFrom(identity,identity,uint256)")
                 .inputParamListStr(jsonArray.toJSONString())
                 .outTypes("[]")//合约返回值类型
@@ -157,7 +161,7 @@ public class NFTService {
                 .orderId(String.valueOf(new SnowflakeIdWorker(0, 0).nextId()))
                 .bizid(restClientProperties.getBizid())
                 .account(restClientProperties.getAccount())
-                .contractName(Constants.CONTRACT_NAME)
+                .contractName(contractName)
                 .methodSignature("setApprovalForAll(identity,bool)")
                 .inputParamListStr(jsonArray.toJSONString())
                 .outTypes("[]")//合约返回值类型

+ 5 - 0
src/main/java/com/izouma/nineth/service/OrderService.java

@@ -312,6 +312,11 @@ public class OrderService {
         if (aliChannels.contains(payChannel)) {
             return MapUtils.getMap(response, "expend");
         }
+
+        switch (payChannel){
+            case "alipay":
+                MapUtils.getString(MapUtils.getMap(response,"expend"),"pay_info");
+        }
         return response;
     }
 

+ 10 - 4
src/main/java/com/izouma/nineth/service/sms/AliSmsService.java

@@ -29,8 +29,14 @@ import java.util.HashMap;
 @Service
 @Slf4j
 public class AliSmsService implements SmsService {
-    private final String accessKeyId     = "LTAI5tEL3wr9XeiyseqKLrEK";
-    private final String accessKeySecret = "I9JzOThjzeJMcpVf6melaMY3nt7ucU";
+    @Value("${aliyun.access-key-id}")
+    private String accessKeyId;
+    @Value("${aliyun.access-key-secret}")
+    private String accessKeySecret;
+    @Value("${aliyun.sms-sign}")
+    private String smsSign;
+    @Value("${aliyun.sms-code}")
+    private String smsCode;
 
     @Autowired
     private SmsRecordRepo smsRecordRepo;
@@ -55,8 +61,8 @@ public class AliSmsService implements SmsService {
         request.setVersion("2017-05-25");
         request.setAction("SendSms");
         request.putQueryParameter("PhoneNumbers", phone);
-        request.putQueryParameter("SignName", Constants.SMS_SIGN_NAME);
-        request.putQueryParameter("TemplateCode", Constants.SMS_TEMPLATE_CODE_GENERIC);
+        request.putQueryParameter("SignName", smsSign);
+        request.putQueryParameter("TemplateCode", smsCode);
         request.putQueryParameter("TemplateParam", "{\"code\":\"" + code + "\",\"product\":\"用户\"}");
         try {
             CommonResponse response = client.getCommonResponse(request);

+ 0 - 12
src/main/java/com/izouma/nineth/web/OrderPayController.java

@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.exception.WxPayException;
-import com.huifu.adapay.core.exception.BaseAdaPayException;
-import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.service.AssetService;
 import com.izouma.nineth.service.GiftOrderService;
 import com.izouma.nineth.service.OrderService;
@@ -20,7 +18,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.regex.Pattern;
 
 @Controller
@@ -99,13 +96,4 @@ public class OrderPayController {
         model.addAttribute("ios", ios);
         model.addAttribute("android", android);
     }
-
-    @RequestMapping(value = "/adapay/alipay", method = RequestMethod.GET)
-    @ResponseBody
-    public Object payOrderAdapayAlipay(Long id, String channel) throws BaseAdaPayException {
-        if (!Arrays.asList("alipay", "alipay_qr", "alipay_wap").contains(channel)) {
-            throw new BusinessException("不支持此渠道");
-        }
-        return orderService.payAdapay(id, channel, null);
-    }
 }

+ 28 - 0
src/main/resources/access2.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDe6T9Z/aPOIXjy
+BQZwuUugDnwSlsMmZRuEhbxf5FdbiJabKi8wF0XW3d0ZAv9/L9BcqwtvOfYpapfQ
+iXG28EkAhzNyH0s7Zj9AAEqwxQn5JzGoc7Y/lmBaU5atCt3lMfozZL9d0KnPw2gd
++O0UnPy8ZaNsIAeAc2z/uSDCriLaX40jJkptK0jHj4stv0yk/RkLvfX/086FnVdo
+aG+EmhqB78L5CmRSkE2xjUbGN1aLqodxYVH3SutALyghTKntYLQ3jWZJVhmlAhEh
+AFEME6E+ZXi/gvDFqE2nkX/YARVXOkgHKsatnwXBRF57Y2sbIvVcky8Lp7hIMp9s
+6YI0M7X1AgMBAAECggEAA2ES0kjrjkjonfagid3tPRBrJhb9/1uCBsjGOcfq4RrZ
+eaGylG6N4vt7ChGHEQUHChiXtEhzKF6SzZj/zc+ns6fZCk5aJBzhMZWvjC14gLvs
+30pdxWoArO3ed2IWSg6vZc8NrZznrhwevHGVGn5kwHBkAVQc+QAG83t5eSoNojTQ
+Xti8avc2hSgMmwK3Vtan6G4b0LVGrNCa8ODCUyvr5DaPgP5HkKLpHPPqeMtl3ZzA
+Rj6q6vc3q+4djkPwXWKNW2X6Lc8tFwcsErS+3amSXH2s/FFwA6CnBPVwWdvXrmJc
+RBUkQr3as0RWA0WvHD9+EuFXte0KOO9n7iUQSedTowKBgQD0Ep8rCj9vJlKvcrDM
+EoVi8msmKrSHeHCBCnMbwbVf+UELc5k+B0v1VE0lK8iuIhyDJt9mJhCShtP511KG
+0Z1ZlNImhNWd1GB0J/0nJOyA9z7DiKvkQ67HHbSp77yl2t+6pQA5GwSRdDgGEGQq
+r8lEFUL76/v8tEfGgIEcrzEeKwKBgQDpzeQ0NMOHFCSRwzgnyf9xRw52+10FUijo
+BaczDfE1qvcyShqOSZkvTOF0hTUns3o0ejE6Hbj1WjM+rpm7soY5BZerh9tXCy9O
+7bitV0HrDUssxuZseY6ucxG1PBc0CISkt7zz5lFrH001Fq/KCQVZkrRpbIWv/ST8
+2yUpGm6MXwKBgCtWpyaoUi01W9dFgTkrTL4OF5KWYKnxa+Ct71SNZ9xb0P3sj9hg
+yU8NogkopiCtc+yh2Wc0+RpbkIY7gq7nx43hjBNE4P1+eYYGl7/8oXYg8OcdfJAy
+qHU4xByssg2tOK7Wn5yEPKJrRYtmG7MstYs+Tz+WXo83n8sShFqIjSszAoGARboi
+mbM2sN0//ryizbL/XHAdjzxtxH15N6Ef+SjqS+Ad8sCI5PBsH+AkyNRFQv7Srj3W
+2ocstvdcmxAFRyX5w524Wu6canwqcraQwhlozknbppH2/FjQRZSJrmwqW1lC/cDS
+OEby9yiRpQiMCovgLZOD/IDh6ddsJYDRt01rtK8CgYAExSSWQaEYhsgSKkwUeFG/
+t59rHZcQ0kNiJMu3uYRd9qofdsj46xiryp/PlTC91p8lqfFE6swVoxOetKT2eKsN
+F3MPqIgQuA04VVHQrf0CMsIgre79PC+0E5YIqQwNNIgg+GDHg8/zeYrqiHoAnTft
+EGC9vflmm8MEt27jFK9RoA==
+-----END PRIVATE KEY-----

+ 115 - 0
src/main/resources/application.yaml

@@ -83,9 +83,12 @@ aliyun:
   oss-end-point: oss-cn-shenzhen.aliyuncs.com
   oss-bucket-name: 9space-2021
   oss-domain: https://9space-2021.oss-cn-shenzhen.aliyuncs.com
+  sms-sign: 身份验证
+  sms-code: SMS_11685095
 general:
   host: https://nfttest.9space.vip
 mychain:
+  contract-name: nine_space
   rest:
     bizid: a00e36c5
     cipher-suit: ec
@@ -168,3 +171,115 @@ alipay:
   return-url: https://nft.9space.vip/9th/home
 adapay:
   notify-url: https://nft.9space.vip/notify/adapay
+---
+spring:
+  profiles: dev_raex
+  datasource:
+    url: jdbc:mysql://rm-wz9sc79f5255780opqo.mysql.rds.aliyuncs.com/raex_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    username: raex
+    password: K@SdS7e6NTw4CK
+  redis:
+    host: 120.78.171.194
+    password: jV%93RtjUx82Tp
+wx:
+  mp:
+    app_id: wx32eeacbe7e6e7f6e
+    app_secret: fbeb320efd8401ac52c28f4c94389771
+  ma:
+    app_id: wx6517cbf58115c508
+    app_secret: 8af0e8ba28ffddfb7e574e6c7cb6aaf1
+    msg_token: msgToken
+    msg_aes_key: aesKey
+    msg_format: JSON
+  pay:
+    app-id: wx32eeacbe7e6e7f6e
+    mch-id: 1614898941
+    mch-key: A2qWTQzN5EkvgeWgmnnTSY4vV3Y6Xxbj
+    sub-app-id:
+    sub-mch-id:
+    key-path: classpath:/cert/apiclient_cert.p12
+    notify-url: https://raextest.izouma.com/notify/order/weixin
+    refund-notify-url: https://raextest.izouma.com/wx/refundNotify
+    return-url: https://raextest.izouma.com/9th/orders
+storage:
+  provider: aliyun
+  local_path: /var/www/upload/
+aliyun:
+  access-key-id: LTAI5tPoBCiEMSDaS1Q4HKr9
+  access-key-secret: F8ZNiqdH35T7gikBkn6Fq8tgbvdY88
+  oss-end-point: oss-cn-shenzhen.aliyuncs.com
+  oss-bucket-name: raex-meta
+  oss-domain: https://raex-meta.oss-cn-shenzhen.aliyuncs.com
+  sms-sign: 华储艺术品中心
+  sms-code: SMS_228870098
+general:
+  host: https://raextest.izouma.com
+mychain:
+  contract-name:
+  rest:
+    bizid: BDCUECOE
+    cipher-suit: ec
+    rest-url: https://rest.baas.alipay.com
+    access-id: 1KKUWLPoBDCUECOE
+    access-secret: access2.key
+    tenantid: HEHBGVZM
+    read-file-from-ext: false
+    account: raex_official
+    kmsId: W0A6XaE5BDCUECOE1638182878495
+alipay:
+  app-id: 2021002186606637
+  gateway: https://openapi.alipay.com/gateway.do
+  private-key: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDGPN0GkL4ISuFSgeqPAjC6VXTdvnkrC6EyYhRBAwurYLYVcHmI+ffx4pcxXLXrbveXwdxNj2GpUCvy56a5ACu9wiaWwxaF6moV3NILKmJa6c7D/4N3Cy4KG7RcLRyeWpdbRFP7OeM+Y8iRFRp0EhAv7btAqimny32ETvIXMyCSvZbI0hrmtwUFMgPW8ofpIoQ5VhMixdKn2niAyQs5TBL1QuVEP1Qe7WRWBrvtwMx1VmI01zkjgFkfehVJwG+BtHYhRwI1pcDrpQv3sDAHl6Qa2th+BkOX1Qtwmzc/SvUELeqJJCsZ+DVr9kTBNke1A4aR2DrlfTezZpl/sN/fJmlTAgMBAAECggEBAIks+K1gX3+RgVX8vHj1RQ7Lr7D56xLUW1ln8SgDmYGfzKANUqxsfRyOdZ0c0G34PbBv36hz/VqSNbdCgWYnLh2DSfytRtqoGXzDbz12uNS8Ue3i0+/+dn9cKHRYayNRAMeRAqQnrI4xskpi1glXrofb8+WNWoHYGCUEFBXltTaUbSNa4saIuvRQvy1i8qZMiAGu+rd/A5TaI+6C7MnHWmYtZ6fFFUeMnJAPRbn4CqNntKmPwF2IrSHaQlefgaQMY6Il56Ws7D9LuNAqn9xuD1duOiK2VrJTLONkEY001iXczZi6JqGzX83ZyDy3kcbQ4BoWRZ6ehwlfPTmovyuKysECgYEA+5QwUXOlStA3wvYbT5lwvva/y51Di/fi5PCnSL3wBEcTXGPkbAvaH6CV6x11nuJWOSgwD1fBMyzAVASDYd0oRQq2+NUBx2v1PFRc3PM4Yp85oZV3eNDyRV9SzhsT1dR/OfuWyJefuCuxJDsBGJpJV0t7e5lq2qqYgZjvpymZhKMCgYEAybizrkcexSnhlnSaY7ENa7fZsIP5l/y3xbtg/65JsARF1VNOLURj9QgbVEoi5FnCMHiYEal25mTZGEWIawCD+XWdkCu4orvxBXU4boIca6R9lfbzJuY3We3Ts3TEXOp1Tkmn5bMM8ImLU9teetufvQa3+Mq7qI21gB0vEXawI5ECgYAZnagh0wWkjXjwCAEV5Mi/GP7Ea7nh+ZaHux09YeGbfeUxxhYPDlHiYIaDTxeX2vHulfH2zfelD0xyAZejElK0XPfudDnfJVXuE6T09mrqV84VbtOgYJ4ahC85PzaQ0jc2HzDmMdIYfZJm3v8okyUel1f2aNOhejdXEsxsF+dCwwKBgQCuV8Zj/+/mNBZW9RxiwSl6SgIJf2b/J1qluRdSpA3n5Sl+AGv2z78cjg8gwJp7heBCCFhWG4M6CTtgsOgAowdtWWv+qOsBKzJapz9Is4dguWAZdsAchKiePuDTnz3/mFwed6Z27lNmqVoT9esogB0FQINMsduTCDcwLQj7LPt7IQKBgCcPiM5BXeOnIQBlQNA4MrP7th4NIltOEIF6uarqUfnzCy52blRJaXf2VTZNgnY4KovdBIl4JukRyk2Iwcg/Kt+IIv/uBQOLNpQm1cSqMpDs+YZlmKjeTfZiqShuUDueypjQ6t4kK8cHRBQs7FEuKfg842MjJHenNt97TNHAoT5P
+  app-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjzdBpC+CErhUoHqjwIwulV03b55KwuhMmIUQQMLq2C2FXB5iPn38eKXMVy16273l8HcTY9hqVAr8uemuQArvcImlsMWhepqFdzSCypiWunOw/+DdwsuChu0XC0cnlqXW0RT+znjPmPIkRUadBIQL+27QKopp8t9hE7yFzMgkr2WyNIa5rcFBTID1vKH6SKEOVYTIsXSp9p4gMkLOUwS9ULlRD9UHu1kVga77cDMdVZiNNc5I4BZH3oVScBvgbR2IUcCNaXA66UL97AwB5ekGtrYfgZDl9ULcJs3P0r1BC3qiSQrGfg1a/ZEwTZHtQOGkdg65X03s2aZf7Df3yZpUwIDAQAB
+  ali-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2KS67bzs6FQ7+PYCm6Zp1gE06VVpuTpV9Mbqn7RqSKmzKZORbL0pG7UyN/Iu3dooNJLQIcxuUDZF6JNgOiX7nxRPyhLud45EXBBR+TUeJCfdSU/7kg2+XBgwD/zzLfj+cAR8SnlmYE5dA81hsM/l1MQrtLTryT/lAHR36eChb6QUnxAwwUZC8QiWDaFerlScJrJG0VJUEKQD6ANV2qP2fmU8IMxNZBT6WMvRvPIN34hCm9B8Kx2Tr8rOjZvwLwVwd1nR5a5mrbwG+kNY7olHW2ICYxJxIxXzypg4jTa5NyW7XR7tdgecRlAGJNxMeBqWwMRmN5l8G2ozV3iOIwhCMQIDAQAB
+  ali-pub-cert-path: classpath:cert/alipayCertPublicKey_RSA2.crt
+  api-key: CRv5YFAOIEGY5PgVf14Y9g==
+  app-cert-path: classpath:cert/appCertPublicKey_2021002120645023.crt
+  root-cert-path: classpath:cert/alipayRootCert.crt
+  notify-url: https://raextest.izouma.com/notify/order/alipay
+  return-url: https://raextest.izouma.com/9th/home
+adapay:
+  app-id: app_0e8d3acb-3d95-4ebb-8445-e470c378a787
+  debug: true
+  prod: true
+  api-key: api_live_dc298e47-c0be-4acf-a962-a2c2988e4cae
+  mock-key: api_test_26e9eee7-6695-4169-90a1-203c6d2cf196
+  public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi3khLvAl4OIsKUbQGqSBqW7qCXcgIdxNhYCKjiUjBP9Pg7HLiFFc30MzFoF0/fGXfGikC5o01h8ek4OtAwhScyQZCEmWGqhfTnPmHT3teUyDaaebMig5O9lnlBFv45V4i8Csnhccwr3nW6W3QFItHD+uFEvy7JRqIRxllK4I/1gUd974MANjQB0fs4hqfCIRVFx6FrV3QY8BrFrmelrfZljlXhiBz+jslGM4ZFbg8hTGesJQOtD6sTwEK72Rt1T9pkpaVk7O8UBzPZ5PEZ9qUA1JnsR5ikv8J+F2b5d0vSkbOv5fMA6pQVuUIZhGTUcIjhvJ/xaasVDCIRRY+EkqtQIDAQAB
+  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://raextest.izouma.com/notify/adapay
+---
+spring:
+  profiles: test_raex
+  datasource:
+    url: jdbc:mysql://rm-wz9sc79f5255780opqo.mysql.rds.aliyuncs.com/raex_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    username: raex
+    password: K@SdS7e6NTw4CK
+  redis:
+    host: 120.78.171.194
+    password: jV%93RtjUx82Tp
+---
+
+spring:
+  profiles: prod_raex
+  datasource:
+    url: jdbc:mysql://rm-wz9sc79f5255780op.mysql.rds.aliyuncs.com/raex?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    username: raex
+    password: K@SdS7e6NTw4CK
+  redis:
+    host: 127.0.0.1
+    database: 1
+    password: jV%93RtjUx82Tp
+general:
+  host: https://raex.izouma.com
+wx:
+  pay:
+    notify-url: https://raex.izouma.com/notify/order/weixin
+    refund-notify-url: https://raex.izouma.com/wx/refundNotify
+    return-url: https://raex.izouma.com/9th/orders
+alipay:
+  notify-url: https://raex.izouma.com/notify/order/alipay
+  return-url: https://raex.izouma.com/9th/home
+adapay:
+  notify-url: https://raex.izouma.com/notify/adapay

+ 94 - 0
src/main/resources/logback-spring.xml

@@ -96,4 +96,98 @@
         <logger name="io.swagger.models.parameters.AbstractSerializableParameter" level="ERROR"/>
     </springProfile>
 
+    <springProfile name="dev_raex">
+        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+            <encoder>
+                <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            </encoder>
+        </appender>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+        <logger name="org.hibernate.SQL" level="DEBUG"/>
+        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>
+        <logger name="org.springframework.jdbc.core.JdbcTemplate" level="DEBUG"/>
+        <logger name="org.springframework.jdbc.core.StatementCreatorUtils" level="TRACE"/>
+        <logger name="cn.binarywang.wx.miniapp" level="DEBUG"/>
+        <!--swagger 类型转换异常日志去除-->
+        <logger name="io.swagger.models.parameters.AbstractSerializableParameter" level="ERROR"/>
+        <logger name="org.freemarker" level="DEBUG"/>
+
+        <!-- dingding log -->
+        <appender name="HTTP_INVOKE_LOGGER_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
+            <param name="append" value="true"/>
+            <param name="encoding" value="UTF-8"/>
+            <param name="threshold" value="INFO"/>
+            <encoder>
+                <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            </encoder>
+        </appender>
+
+        <!-- ding open sdk log -->
+        <appender name="DING_OPEN_CLIENT_SDK_LOGGER_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
+            <param name="append" value="true"/>
+            <param name="encoding" value="UTF-8"/>
+            <param name="threshold" value="INFO"/>
+            <encoder>
+                <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            </encoder>
+        </appender>
+        <logger name="HTTP_INVOKE_LOGGER" additivity="false">
+            <level value="WARN"/>
+            <appender-ref ref="HTTP_INVOKE_LOGGER_APPENDER"/>
+        </logger>
+        <logger name="DING_OPEN_CLIENT_SDK_LOGGER" additivity="false">
+            <level value="WARN"/>
+            <appender-ref ref="DING_OPEN_CLIENT_SDK_LOGGER_APPENDER"/>
+        </logger>
+        <!-- end of dingding log -->
+    </springProfile>
+
+    <springProfile name="test_raex">
+        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+            <encoder>
+                <pattern>${FILE_LOG_PATTERN}</pattern>
+            </encoder>
+            <file>/var/www/raex_test/app.log</file>
+            <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+                <fileNamePattern>app.log.%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
+                <maxFileSize>10MB</maxFileSize>
+                <maxHistory>60</maxHistory>
+            </rollingPolicy>
+        </appender>
+        <root level="INFO">
+            <appender-ref ref="FILE"/>
+        </root>
+        <logger name="org.hibernate.SQL" level="DEBUG"/>
+        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>
+        <logger name="org.springframework.jdbc.core.JdbcTemplate" level="DEBUG"/>
+        <logger name="org.springframework.jdbc.core.StatementCreatorUtils" level="TRACE"/>
+        <logger name="cn.binarywang.wx.miniapp" level="DEBUG"/>
+        <logger name="io.swagger.models.parameters.AbstractSerializableParameter" level="ERROR"/>
+    </springProfile>
+
+    <springProfile name="prod_raex">
+        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+            <encoder>
+                <pattern>${FILE_LOG_PATTERN}</pattern>
+            </encoder>
+            <file>/var/www/raex/app.log</file>
+            <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+                <fileNamePattern>app.log.%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
+                <maxFileSize>10MB</maxFileSize>
+                <maxHistory>60</maxHistory>
+            </rollingPolicy>
+        </appender>
+        <root level="INFO">
+            <appender-ref ref="FILE"/>
+        </root>
+        <logger name="org.hibernate.SQL" level="DEBUG"/>
+        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>
+        <logger name="org.springframework.jdbc.core.JdbcTemplate" level="DEBUG"/>
+        <logger name="org.springframework.jdbc.core.StatementCreatorUtils" level="TRACE"/>
+        <logger name="cn.binarywang.wx.miniapp" level="DEBUG"/>
+        <logger name="io.swagger.models.parameters.AbstractSerializableParameter" level="ERROR"/>
+    </springProfile>
+
 </configuration>

+ 17 - 0
src/test/java/com/izouma/nineth/service/AdapayServiceTest.java

@@ -3,6 +3,7 @@ package com.izouma.nineth.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
+import com.huifu.adapay.model.AdapayCommon;
 import com.huifu.adapay.model.Payment;
 import com.izouma.nineth.ApplicationTests;
 import org.junit.Test;
@@ -50,6 +51,22 @@ public class AdapayServiceTest extends ApplicationTests {
         System.out.println("payment result=" + JSON.toJSONString(payment, SerializerFeature.PrettyFormat));
     }
 
+    @Test
+    public void testWxPay() throws BaseAdaPayException {
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("order_no", "host_wx_lite_params_sdk_" + System.currentTimeMillis());
+        params.put("adapay_func_code", "wxpay.createOrder");
+        params.put("pay_amt", "0.02");
+        params.put("app_id", "app_f8760acc-f4d8-46f6-8f70-d80e36517075");
+        params.put("currency", "cny");
+        params.put("goods_title", "Your goods_title");
+        params.put("goods_desc", "Your goods_desc");
+        params.put("description", "payment Discription");
+        params.put("callback_url", "http://localhost:8080/");
+        Map<String, Object> response = AdapayCommon.requestAdapayUits(params);
+        System.out.println("payment result=" + JSON.toJSONString(response, SerializerFeature.PrettyFormat));
+    }
+
     @Test
     public void createMember() throws BaseAdaPayException {
         adapayService.createMember(99999999999999L, "15077886171", "熊竹", "321002199408304614");