From 432f2dd840cad5634d6c2ea5b68c212d20970cf3 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 8 Feb 2022 11:21:56 +0800 Subject: [PATCH] movie url address to application files. --- .../module/system/alipay/AliPayService.java | 3 +-- .../system/alipay/AlipayController.java | 5 +++-- .../system/login/LoginTokenService.java | 3 ++- .../royalcanin/CouponConfigService.java | 6 +++--- .../system/royalcanin/CouponService.java | 6 +++--- .../royalcanin/MemberAccountService.java | 5 +++-- .../royalcanin/MemberAddressService.java | 10 +++++----- .../system/royalcanin/MemberService.java | 11 +++-------- .../royalcanin/TransitionController.java | 4 ++-- .../royalcanin/good/service/GoodService.java | 19 ++++++++++--------- .../royalcanin/good/service/OrderService.java | 5 +++-- .../module/system/wxpay/WxpayService.java | 6 +++--- .../main/resources/dev/application.properties | 10 ++++++++++ .../resources/prod/application.properties | 11 +++++++++++ 14 files changed, 62 insertions(+), 42 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java index 8f7710f3..24474c3d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java @@ -17,7 +17,6 @@ import java.util.UUID; @Service public class AliPayService { - public static String notify_url = "http://47.96.75.242:10086/smart-admin-api/royalcanin/updateOrderAliPay"; @Autowired private OrderService orderService; @@ -34,7 +33,7 @@ public class AliPayService { model.setGoodsDetail(aliPayEntity.getGoodsDetail()); AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest(); request.setBizModel(model); - request.setNotifyUrl(notify_url); + request.setNotifyUrl(AlipayConfig.notify_url); AlipayClient alipayClient = new DefaultAlipayClient(AlipayConfig.gatewayUrl, AlipayConfig.app_id, AlipayConfig.merchant_private_key, "json", AlipayConfig.charset, AlipayConfig.alipay_public_key, AlipayConfig.sign_type); AlipayTradePrecreateResponse alipayTradePrecreateResponse = alipayClient.execute(request); if (alipayTradePrecreateResponse.isSuccess()) { diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java index d7349743..33706d7b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java @@ -26,6 +26,7 @@ import net.lab1024.smartadmin.module.system.royalcanin.notify.service.NotifyServ import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,8 +48,8 @@ public class AlipayController { @Autowired private OrderService orderService; - String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; -// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; + @Value("${royalcanin.goods}") + private String url ; @Autowired private MemberAccountService memberAccountService; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/login/LoginTokenService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/login/LoginTokenService.java index bfeb7e43..6552a2a3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/login/LoginTokenService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/login/LoginTokenService.java @@ -38,7 +38,8 @@ import java.util.UUID; @Service public class LoginTokenService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/member/"; + @Value("${royalcanin.member}") + private String url; /** * 过期时间一天 diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java index fdd9b83a..a88c4901 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java @@ -5,16 +5,16 @@ import net.lab1024.smartadmin.module.system.royalcanin.couponConfig.CouponConfig import net.lab1024.smartadmin.module.system.royalcanin.couponConfig.CouponConfigGetEntity; import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.HashMap; import java.util.Map; @Service public class CouponConfigService { -// private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/"; - private String url = "http://crm.royalcanin.com.cn:8080/crm/couponConfig/"; + @Value("${royalcanin.couponconfig}") + private String url ; public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{ Map paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java index 8ddbd7bd..25043477 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java @@ -4,17 +4,17 @@ import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.module.system.royalcanin.coupon.*; import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.HashMap; import java.util.Map; @Service public class CouponService { -// private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/"; - private String url = "http://crm.royalcanin.com.cn:8080/crm/coupon/"; + @Value("${royalcanin.coupon}") + private String url ; public String couponCancel(CouponCancelEntity couponCancelEntity) throws Exception{ Map paramMap = MapRemoveNullUtil.setConditionMap(couponCancelEntity); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java index 95699e18..5e7bd3ef 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java @@ -5,9 +5,9 @@ import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccou import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountHistoryEntity; import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.HashMap; import java.util.Map; /** @@ -16,7 +16,8 @@ import java.util.Map; @Service public class MemberAccountService { - private String url = "http://crm.royalcanin.com.cn:8080/crm/memberAccount/"; + @Value("${royalcanin.memberaccount}") + private String url ; public String memberAccountChange(MemberAccountChangeEntity memberAccountChangeEntity){ memberAccountChangeEntity.setChannelId(15); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java index d1eee1e4..5ef6d169 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java @@ -7,16 +7,16 @@ import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddre import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressUpdateEntity; import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; import java.util.Map; @Service public class MemberAddressService { - private String url = "http://crm.royalcanin.com.cn:8080/crm/memberAddress/"; - + @Value("${royalcanin.memberaddress}") + private String url ; public String membberAddressGetAll(MemberAddressGetAllEntity memberAddressGetAllEntity) throws Exception { Map paramMap = MapRemoveNullUtil.setConditionMap(memberAddressGetAllEntity); @@ -24,14 +24,14 @@ public class MemberAddressService { return SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null); } - public String memberAddressAdd(MemberAddressAddEntity memberAddressAddEntity) throws Exception{ + public String memberAddressAdd(MemberAddressAddEntity memberAddressAddEntity) { Map paramMap = MapRemoveNullUtil.setConditionMap(memberAddressAddEntity); MapRemoveNullUtil.removeNullEntry(paramMap); net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap); return SmartHttpUtil.httpPostRaw(url+"add",jsonObject.toString(),null,"utf-8"); } - public String memberAddressUpdate(MemberAddressUpdateEntity memberAddressUpdateEntity) throws Exception{ + public String memberAddressUpdate(MemberAddressUpdateEntity memberAddressUpdateEntity){ Map paramMap = MapRemoveNullUtil.setConditionMap(memberAddressUpdateEntity); paramMap.put("id",StringUtil.toString(memberAddressUpdateEntity.equals("0")?null:StringUtil.toString(memberAddressUpdateEntity.getId()))); MapRemoveNullUtil.removeNullEntry(paramMap); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java index 6facd3a8..df9925b2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java @@ -6,20 +6,15 @@ import net.lab1024.smartadmin.module.system.royalcanin.member.*; import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartJWTUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import java.util.Map; @Service public class MemberService { - private String url = "http://crm.royalcanin.com.cn:8080/crm/member/"; - - - - - - + @Value("${royalcanin.member}") + private String url ; public String memberGet(MemberGetEntity memberGetEntity)throws Exception { Map paramMap = MapRemoveNullUtil.setConditionMap(memberGetEntity); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java index b9058627..ab8aaa66 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java @@ -73,13 +73,13 @@ public class TransitionController { switch (type) { case "get": - result = memberService.memberGet(objectMapper.convertValue(object,MemberGetEntity.class)).toString(); + result = memberService.memberGet(objectMapper.convertValue(object,MemberGetEntity.class)); break; case "check": result = memberService.memberCheck(objectMapper.convertValue(object,MemberCheckEntity.class)); break; case "add": - result = memberService.memberAdd(objectMapper.convertValue(object,MemberAddEntity.class)).toString(); + result = memberService.memberAdd(objectMapper.convertValue(object,MemberAddEntity.class)); break; case "updateMemberLevel": result = memberService.memberUpdateMemberLevel(objectMapper.convertValue(object, MemberUpdateMemberLevelEntity.class)); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index 1e844e4e..e64431c3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -11,8 +11,8 @@ import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.service. import net.lab1024.smartadmin.util.AESUtil; import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -24,8 +24,11 @@ import java.util.concurrent.TimeUnit; @Service public class GoodService { -// String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; - String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/"; + @Value("${royalcanin.goods}") + private String url; + + @Value("${royalcanin.goods.ip}") + private String goodsIp; @Autowired private GoodsDao goodsDao; @@ -38,19 +41,17 @@ public class GoodService { public GoodsEntity listGoodsByProductCode(String productCode){ - String ip = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/"; GoodsEntity goodsEntity = goodsDao.findByProductCode(productCode); - goodsEntity.setShowImgFile(ip+goodsEntity.getShowImgFile()); - goodsEntity.setPicture(ip+goodsEntity.getPicture()); + goodsEntity.setShowImgFile(goodsIp+goodsEntity.getShowImgFile()); + goodsEntity.setPicture(goodsIp+goodsEntity.getPicture()); return goodsEntity; } public List listGoodsByNameBankNameTagUsedAge(String title,String petType){ - String ip = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/"; List goodsList = goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title,petType); for (GoodsEntity goodsEntity:goodsList) { - goodsEntity.setShowImgFile(ip+goodsEntity.getShowImgFile()); - goodsEntity.setPicture(ip+goodsEntity.getPicture()); + goodsEntity.setShowImgFile(goodsIp+goodsEntity.getShowImgFile()); + goodsEntity.setPicture(goodsIp+goodsEntity.getPicture()); } return goodsList; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index e25e1d4a..1772a63b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -24,6 +24,7 @@ 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.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,8 +48,8 @@ public class OrderService { @Autowired private NotifyService notifyService; -// String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; - String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/orderMaster/"; + @Value("${royalcanin.order}") + private String url ; @Transactional public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception { diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java index bff70258..bb11c540 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java @@ -16,6 +16,7 @@ import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; import net.lab1024.smartadmin.util.SmartIPUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -26,7 +27,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.Inet4Address; import java.net.InetAddress; -import java.net.URLEncoder; import java.util.*; @Service @@ -46,8 +46,8 @@ public class WxpayService { @Autowired private MemberAccountService memberAccountService; -// String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; - String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/"; + @Value("${royalcanin.goods}") + private String url; public String generateQRCode(WxPayEntity wxPayEntity) throws Exception { WXPay wxpay = new WXPay(config); 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 c12dbd0e..3f86d801 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 @@ -123,3 +123,13 @@ spring.quartz.jdbc.schema=classpath:sql/quartz_mysql_2.3.0.sql org.quartz.plugin.jobInitializer.scanInterval = 300 spring.mvc.static-path-pattern=/** + +######################### royalcanin URL ############################# +royalcanin.couponconfig = http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/ +royalcanin.coupon = http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/ +royalcanin.memberaccount = http://miniapp-test.royalcanin.com.cn:7080/crm/memberAccount/ +royalcanin.memberaddress = http://miniapp-test.royalcanin.com.cn:7080/crm/memberAddress/ +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 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 76ad0985..0b4340f4 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 @@ -118,3 +118,14 @@ spring.quartz.job-store-type=jdbc #ALWAYS,EMBEDDED,NEVER spring.quartz.jdbc.initialize-schema=NEVER spring.quartz.jdbc.schema=classpath:sql/quartz_mysql_2.3.0.sql + + +######################### royalcanin URL ############################# +royalcanin.couponconfig = http://crm.royalcanin.com.cn:8080/crm/couponConfig/ +royalcanin.coupon = http://crm.royalcanin.com.cn:8080/crm/coupon/ +royalcanin.memberaccount = http://crm.royalcanin.com.cn:8080/crm/memberAccount/ +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