From 90cf0dceaf00112b8d4ef5b4cd118d8e49f87571 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 02:09:43 +0800 Subject: [PATCH 1/5] debugger --- .../module/system/royalcanin/good/GoodController.java | 2 ++ .../module/system/royalcanin/good/OrderController.java | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java index ddf13acb..d6fefcf2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java @@ -72,6 +72,7 @@ public class GoodController { List tagNameList = new ArrayList<>(); int count = 0; for (String categoryKey : paramMap.keySet()) { + System.out.println("categoryKey："+ categoryKey); if(categoryKey == "categoryName" || categoryKey == "tagFunction" || categoryKey == "tagUsedAge" || categoryKey == "tagBreed" || categoryKey == "tagStatus") { switch (categoryKey) { case "categoryName": @@ -96,6 +97,7 @@ public class GoodController { } } if(count > 0) { + System.out.println("count："+ count); List productSearchTagList = productSearchTagService.findAllByCondition(brandNameList, productQueryEntity.getPetType(), tagNameList, productQueryEntity.getTagStatus()); List tagCodeList = new ArrayList<>(); for (ProductSearchTagEntity productSearchTagEntity : productSearchTagList) { diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 25731848..5effc0d0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -16,7 +16,6 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderRespon import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity; -import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductMasterQueryEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService; import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService; import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity; @@ -24,8 +23,6 @@ import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.QueryEntity; import net.lab1024.smartadmin.module.system.wxpay.WxpayService; import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity; import net.lab1024.smartadmin.util.GenerateSequenceUtil; -import net.lab1024.smartadmin.util.MapRemoveNullUtil; -import net.lab1024.smartadmin.util.SmartHttpUtil; import net.sf.json.JSONArray; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; From 7f38b232dcdd7ac5af52584e87553e45dbf7aeee Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 8 Feb 2022 11:44:42 +0800 Subject: [PATCH 2/5] movie url address to application files. --- smart-admin-service/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/smart-admin-service/pom.xml b/smart-admin-service/pom.xml index 614d201d..6afc9b2f 100644 --- a/smart-admin-service/pom.xml +++ b/smart-admin-service/pom.xml @@ -325,7 +325,9 @@ dev - + + true + telework @@ -350,9 +352,7 @@ prod - - true - + From e9c6ba294bb61cbbee5f0b31a931cfc8d797b6a1 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 8 Feb 2022 11:46:25 +0800 Subject: [PATCH 3/5] movie url address to application files. --- .../module/system/royalcanin/good/GoodController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java index 82089432..e1cc7c96 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java @@ -71,7 +71,6 @@ public class GoodController { List tagNameList = new ArrayList<>(); int count = 0; for (String categoryKey : paramMap.keySet()) { - System.out.println("categoryKey："+ categoryKey); if(categoryKey == "categoryName" || categoryKey == "tagFunction" || categoryKey == "tagUsedAge" || categoryKey == "tagBreed" || categoryKey == "tagStatus") { switch (categoryKey) { case "categoryName": @@ -96,7 +95,6 @@ public class GoodController { } } if(count > 0) { - System.out.println("count："+ count); List productSearchTagList = productSearchTagService.findAllByCondition(brandNameList, productQueryEntity.getPetType(), tagNameList, productQueryEntity.getTagStatus()); List tagCodeList = new ArrayList<>(); for (ProductSearchTagEntity productSearchTagEntity : productSearchTagList) { From 34cf4177a3157fe6d47fe2e4d1efd5726b296658 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 8 Feb 2022 14:29:38 +0800 Subject: [PATCH 4/5] movie url address to application files. --- .../smartadmin/module/system/wxpay/MyConfig.java | 13 +++++++------ .../src/main/resources/dev/application.properties | 2 +- .../src/main/resources/prod/application.properties | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java index 63de0f70..525ac22d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java @@ -4,17 +4,19 @@ package net.lab1024.smartadmin.module.system.wxpay; import net.lab1024.smartadmin.module.system.wxpay.sdk.IWXPayDomain; import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConfig; import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConstants; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import org.springframework.util.ResourceUtils; +import javax.annotation.PostConstruct; import java.io.*; + + + @Component public class MyConfig implements WXPayConfig { -// private String path ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/"; - private String path ="/var/www/html/shop/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/"; - -// public String notify_url = "http://47.96.75.242:10086/smart-admin-api/royalcanin/updateOrderWX"; public String notify_url = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/updateOrderWX"; @@ -26,9 +28,8 @@ public class MyConfig implements WXPayConfig { private byte[] certData; - public MyConfig() throws Exception { - File file = new File(path+"apiclient_cert.p12"); + File file = ResourceUtils.getFile("classpath:wxpay/pro/apiclient_cert.p12"); InputStream certStream = new FileInputStream(file); this.certData = new byte[(int) file.length()]; certStream.read(this.certData); diff --git a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties index 3f86d801..a886a753 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties @@ -132,4 +132,4 @@ royalcanin.memberaddress = http://miniapp-test.royalcanin.com.cn:7080/crm/member royalcanin.member = http://miniapp-test.royalcanin.com.cn:7080/crm/member/ royalcanin.order = https://miniapp-test.royalcanin.com.cn/rcmini/h5/orderMaster/ royalcanin.goods = https://miniapp-test.royalcanin.com.cn/rcmini/h5/ -royalcanin.goods.ip = https://royalcanincn.escase.cn/jc/royalcanin/ \ No newline at end of file +royalcanin.goods.ip = https://royalcanincn.escase.cn/jc/royalcanin/ diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties index 0b4340f4..cfa97b2f 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties @@ -128,4 +128,4 @@ royalcanin.memberaddress = http://crm.royalcanin.com.cn:8080/crm/memberAddress/ royalcanin.member = http://crm.royalcanin.com.cn:8080/crm/member/ royalcanin.order = https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/orderMaster/ royalcanin.goods = https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/ -royalcanin.goods.ip = https://shop.royalcanin.com.cn/royalcanin/royalcanin/ \ No newline at end of file +royalcanin.goods.ip = https://shop.royalcanin.com.cn/royalcanin/royalcanin/ From e5e9c6d9de7ed11f4b5afe007a6237307dcd9911 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 8 Feb 2022 14:49:56 +0800 Subject: [PATCH 5/5] movie url address to application files. --- .../lab1024/smartadmin/module/system/wxpay/MyConfig.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java index 525ac22d..7500b708 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java @@ -4,11 +4,9 @@ package net.lab1024.smartadmin.module.system.wxpay; import net.lab1024.smartadmin.module.system.wxpay.sdk.IWXPayDomain; import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConfig; import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConstants; -import org.springframework.beans.factory.annotation.Value; +import org.apache.commons.io.IOUtils; import org.springframework.stereotype.Component; -import org.springframework.util.ResourceUtils; -import javax.annotation.PostConstruct; import java.io.*; @@ -29,9 +27,8 @@ public class MyConfig implements WXPayConfig { private byte[] certData; public MyConfig() throws Exception { - File file = ResourceUtils.getFile("classpath:wxpay/pro/apiclient_cert.p12"); - InputStream certStream = new FileInputStream(file); - this.certData = new byte[(int) file.length()]; + InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("wxpay/pro/apiclient_cert.p12"); + this.certData = IOUtils.toByteArray(certStream); certStream.read(this.certData); certStream.close(); }