Merge branch 'master' of http://git.izouma.com/xiongzhu/pms

src/main/resources/application.yaml

@@ -116,8 +116,8 @@ wx:
     subAppId: #服务商模式下的子商户公众账号ID
     subMchId: #服务商模式下的子商户号
     keyPath: classpath:/cert/apiclient_cert.p12
-    notifyUrl: http://test.zmjpms.com/wx/payNotify
-    refundNotifyUrl: http://test.zmjpms.com/wx/refundNotify
+    notifyUrl: http://pms.izouma.com/wx/payNotify
+    refundNotifyUrl: http://pms.izouma.com/wx/refundNotify
 storage:
   provider: aliyun
   local_path: /var/www/upload/
@@ -172,11 +172,11 @@ spring:
     password: 3G$KnSsSZiLZ
 wx:
   pay:
-    notifyUrl: https://zmjpms.com/wx/payNotify
-    refundNotifyUrl: https://zmjpms.com/wx/refundNotify
+    notifyUrl: http://pms.izouma.com/wx/payNotify
+    refundNotifyUrl: http://pms.izouma.com/wx/refundNotify
 generic:
-  server-address: https://zmjpms.com
-  mp-address: https://zmjpms.com/mp
+  server-address: https://pms.izouma.com
+#  mp-address: https://zmjpms.com/mp
 alipay:
   appCertPath: /var/www/zmj/cert/appCertPublicKey_2021002120645023.crt
   aliPubCertPath: /var/www/zmj/cert/alipayCertPublicKey_RSA2.crt

src/test/java/com/izouma/zhumj/repo/RoomFeeRepoTest.java

@@ -1,19 +0,0 @@
-package com.izouma.zhumj.repo;
-
-import com.izouma.zhumj.ZhumjApplicationTests;
-import com.izouma.zhumj.dto.FeeRecordResult;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-
-public class RoomFeeRepoTest extends ZhumjApplicationTests {
-    @Autowired
-    private RoomFeeRepo roomFeeRepo;
-
-    @Test
-    public void findRoomFeeRecord() {
-//        Page<FeeRecordResult> page = roomFeeRepo.findRoomFeeRecord(15304L, PageRequest.of(0, 10));
-//        System.out.println(page);
-    }
-}