movie url address to application files.

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()) {

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/";
+    @Value("${royalcanin.goods}")
-//    String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020";
+    private String url ;
 
     @Autowired
     private MemberAccountService memberAccountService;

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;
 
     /**
      * 过期时间一天

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/";
+    @Value("${royalcanin.couponconfig}")
-    private String url = "http://crm.royalcanin.com.cn:8080/crm/couponConfig/";
+    private String url ;
 
     public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity);

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<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(couponCancelEntity);

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);

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<String, String> 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<String, String> 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<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(memberAddressUpdateEntity);
         paramMap.put("id",StringUtil.toString(memberAddressUpdateEntity.equals("0")?null:StringUtil.toString(memberAddressUpdateEntity.getId())));
         MapRemoveNullUtil.removeNullEntry(paramMap);

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<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberGetEntity);

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));

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/";
+    @Value("${royalcanin.goods}")
-    String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/";
+    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.setShowImgFile(goodsIp+goodsEntity.getShowImgFile());
-        goodsEntity.setPicture(ip+goodsEntity.getPicture());
+        goodsEntity.setPicture(goodsIp+goodsEntity.getPicture());
         return goodsEntity;
     }
 
     public List<GoodsEntity> listGoodsByNameBankNameTagUsedAge(String title,String petType){
-        String ip = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/";
         List<GoodsEntity> goodsList  = goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title,petType);
         for (GoodsEntity goodsEntity:goodsList) {
-            goodsEntity.setShowImgFile(ip+goodsEntity.getShowImgFile());
+            goodsEntity.setShowImgFile(goodsIp+goodsEntity.getShowImgFile());
-            goodsEntity.setPicture(ip+goodsEntity.getPicture());
+            goodsEntity.setPicture(goodsIp+goodsEntity.getPicture());
         }
         return goodsList;
     }

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/";
+    @Value("${royalcanin.order}")
-    String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/orderMaster/";
+    private String url ;
 
     @Transactional
     public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception {

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/";
+    @Value("${royalcanin.goods}")
-    String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/";
+    private String url;
 
     public String generateQRCode(WxPayEntity wxPayEntity) throws Exception {
         WXPay wxpay = new WXPay(config);

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/

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/