From ce748709006c22f3e65e602d56d65e8ba6399ea6 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Fri, 10 Mar 2023 14:10:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cweb/controller/BsMerController.java  |  4 ++--
 .../com/cweb/controller/TestController.java   |  4 ++--
 .../src/main/resources/prod/config.properties |  8 +++++++
 cweb/src/main/resources/prod/logback.xml      | 22 +++++++++++++++++++
 service/pom.xml                               |  8 -------
 .../resources/prod/commonConfig.properties    |  4 ++--
 6 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/cweb/src/main/java/com/cweb/controller/BsMerController.java b/cweb/src/main/java/com/cweb/controller/BsMerController.java
index cc1a9f5..9d31a8b 100644
--- a/cweb/src/main/java/com/cweb/controller/BsMerController.java
+++ b/cweb/src/main/java/com/cweb/controller/BsMerController.java
@@ -296,8 +296,8 @@ public class BsMerController {
                 || StringUtils.isBlank(merSettleAcct.getBankCardNo())
                 || StringUtils.isBlank(merSettleAcct.getBankCardHolder())
                 || merSettleAcct.getOpenningBankAreaCode() == null
-/*                || merSettleAcct.getMerRateList() == null
-                || merSettleAcct.getMerRateList().size() == 0*/
+                || merSettleAcct.getMerRateList() == null
+                || merSettleAcct.getMerRateList().size() == 0
             ) {
                 log.error("configMerBasis error!","参数错误");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
diff --git a/cweb/src/main/java/com/cweb/controller/TestController.java b/cweb/src/main/java/com/cweb/controller/TestController.java
index b85ac86..5571adc 100644
--- a/cweb/src/main/java/com/cweb/controller/TestController.java
+++ b/cweb/src/main/java/com/cweb/controller/TestController.java
@@ -60,8 +60,8 @@ public class TestController {
     public ResponseData getApplyment() {
         try {
 
-            HttpClientBuilder clientBuilder = new HttpClientBuilder();
-            return ResponseMsgUtil.success(clientBuilder.getApplyment("1668965085182"));
+
+            return ResponseMsgUtil.success(LaKaLaConfig.queryCardBin("6226633602992094"));
 
         } catch (Exception e) {
             log.error(e.getMessage(), e);
diff --git a/cweb/src/main/resources/prod/config.properties b/cweb/src/main/resources/prod/config.properties
index 5bfbba3..4437ab6 100644
--- a/cweb/src/main/resources/prod/config.properties
+++ b/cweb/src/main/resources/prod/config.properties
@@ -1,5 +1,13 @@
 fileUrl=/home/project/gratia-pay/filesystem
 cmsPath=/home/project/gratia-pay/filesystem/cmsPath
 
+domainName=https://pay.dctpay.com
+
 wxAppId=wxa075e8509802f826
 wxAppSecret=0e606fc1378d35e359fcf3f15570b2c5
+
+// WeChat service provider
+wxUnifiedOrderUrl=https://api.mch.weixin.qq.com/pay/unifiedorder
+wxMchAppId=wx637bd6f7314daa46
+wxApiKey=Skufk5oi85wDFGl888i6wsRSTkdd5df5
+wxMchId=1289663601
diff --git a/cweb/src/main/resources/prod/logback.xml b/cweb/src/main/resources/prod/logback.xml
index e509de0..19f75d1 100644
--- a/cweb/src/main/resources/prod/logback.xml
+++ b/cweb/src/main/resources/prod/logback.xml
@@ -69,4 +69,26 @@
     <logger name="com.hfkj" level="ERROR">
         <appender-ref ref="errorlog" />
     </logger>
+
+
+    <appender name="alipaylog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <File>log/alipay/alipaylog.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>log/alipay.log.%d.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- or whenever the file size reaches 64 MB -->
+                <maxFileSize>64 MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <pattern>
+                %d %p (%file:%line\)- %m%n
+            </pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+    </appender>
+    <logger name="com.hfkj.channel.alipay" level="INFO">
+        <appender-ref ref="alipaylog" />
+    </logger>
+
 </configuration>
diff --git a/service/pom.xml b/service/pom.xml
index 5d3917a..bdcf515 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -232,7 +232,6 @@
             <artifactId>javase</artifactId>
             <version>3.3.0</version>
         </dependency>
-
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>kernel</artifactId>
@@ -248,18 +247,11 @@
             <artifactId>xmlworker</artifactId>
             <version>5.5.13</version>
         </dependency>
-
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itext-asian</artifactId>
             <version>5.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <version>4.1.6.Final</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
diff --git a/service/src/main/resources/prod/commonConfig.properties b/service/src/main/resources/prod/commonConfig.properties
index 0c4e162..47548c0 100644
--- a/service/src/main/resources/prod/commonConfig.properties
+++ b/service/src/main/resources/prod/commonConfig.properties
@@ -1,5 +1,5 @@
-obs_bucket_name=xuan-pay-private
-obs_end_point=https://obs.cn-east-3.myhuaweicloud.com
+obs_bucket_name=gratia-pay
+obs_end_point=https://obs.cn-southwest-2.myhuaweicloud.com
 obs_url=https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com
 
 qr_code_data_url=https://pay.dctpay.com/scanPay