局域网main适配

src/main/java/com/fdkankan/ucenter/UserCenterApplication.java

@@ -24,6 +24,8 @@ public class UserCenterApplication implements CommandLineRunner {
     private String bucket;
     @Value("${fyun.type}")
     private String uploadType;
+    @Value("${main.url}")
+    private String mainUrl;
 
     public static void main(String[] args) {
         SpringApplication.run(UserCenterApplication.class, args);
@@ -33,5 +35,6 @@ public class UserCenterApplication implements CommandLineRunner {
     public void run(String... args) throws Exception {
         NacosProperty.bucket = bucket;
         NacosProperty.uploadType = uploadType;
+        NacosProperty.setMainUrl(mainUrl);
     }
 }

src/main/java/com/fdkankan/ucenter/common/constants/NacosProperty.java

@@ -1,7 +1,28 @@
 package com.fdkankan.ucenter.common.constants;
 
+import org.apache.commons.lang3.StringUtils;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 public class NacosProperty {
 
     public static String bucket;
     public static String uploadType;
+    private static String mainUrl;
+
+    public static String getMainUrl() {
+        if(StringUtils.isBlank(mainUrl)){
+            try {
+                return InetAddress.getLocalHost().getHostAddress();
+            } catch (UnknownHostException e) {
+                e.printStackTrace();
+            }
+        }
+        return mainUrl;
+    }
+
+    public static void setMainUrl(String mainUrl) {
+        NacosProperty.mainUrl = mainUrl;
+    }
 }

src/main/java/com/fdkankan/ucenter/controller/OrderPaypalController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.ResultData;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.pay.factory.PayFactory;
 import com.fdkankan.ucenter.pay.paypal.PayPalDefaultConfig;
 import com.fdkankan.ucenter.pay.paypal.sdk.PaypalService;
@@ -45,8 +46,6 @@ public class OrderPaypalController extends BaseController {
     @Autowired
     private PayPalDefaultConfig config;
 
-    @Value("${main.url}")
-    private String mainUrl;
     //正式环境或测试环境
     @Value("${spring.profiles.active}")
     private String ev;
@@ -70,7 +69,7 @@ public class OrderPaypalController extends BaseController {
         if (jsonObject != null && jsonObject.get("redirect") != null){
             return "redirect:" + jsonObject.getString("redirect");
         }
-        return  "redirect:" + mainUrl + config.getH5FailUrl();
+        return  "redirect:" + NacosProperty.getMainUrl() + config.getH5FailUrl();
     }
 
     /**
@@ -97,14 +96,14 @@ public class OrderPaypalController extends BaseController {
                     orderSn += "_" + custom.split("_")[2];
                 }
                 orderStrategyFactory.doHandler(orderSn, txnId, payerEmail, custom.split("_")[1], 2);
-                return "redirect:" + mainUrl + config.getSuccessUrl();
+                return "redirect:" + NacosProperty.getMainUrl() + config.getSuccessUrl();
             }
         } catch (PayPalRESTException e) {
             log.error(e.getMessage());
         } catch (Exception e) {
             log.error("paypal支付回调异常,errorMsg:{}", e.getMessage());
         }
-        return "redirect:" + mainUrl + config.getFailUrl();
+        return "redirect:" + NacosProperty.getMainUrl() + config.getFailUrl();
     }
 
     /**
@@ -130,14 +129,14 @@ public class OrderPaypalController extends BaseController {
                     orderSn += "_" + custom.split("_")[2];
                 }
                 orderStrategyFactory.doHandler(orderSn, txnId, payerEmail, custom.split("_")[1], 2);
-                return "redirect:" + mainUrl + config.getH5SuccessUrl();
+                return "redirect:" + NacosProperty.getMainUrl() + config.getH5SuccessUrl();
             }
         } catch (PayPalRESTException e) {
             log.error(e.getMessage());
         } catch (Exception e) {
             log.error("paypal支付回调异常,errorMsg:{}", e.getMessage());
         }
-        return "redirect:" + mainUrl + config.getH5FailUrl();
+        return "redirect:" + NacosProperty.getMainUrl() + config.getH5FailUrl();
     }
 
     /**
@@ -146,7 +145,7 @@ public class OrderPaypalController extends BaseController {
      */
     @RequestMapping(value = "/paypal/cancel", method = RequestMethod.GET)
     public String cancelPay(){
-        return "redirect:" + mainUrl + config.getFailUrl();
+        return "redirect:" + NacosProperty.getMainUrl() + config.getFailUrl();
     }
 
     /**
@@ -155,7 +154,7 @@ public class OrderPaypalController extends BaseController {
      */
     @RequestMapping(value = "/paypal/cancelH5", method = RequestMethod.GET)
     public String cancelPayH5(){
-        return "redirect:" + mainUrl + config.getH5FailUrl();
+        return "redirect:" + NacosProperty.getMainUrl() + config.getH5FailUrl();
     }
 
     /**

src/main/java/com/fdkankan/ucenter/controller/OrderWechatPayController.java

@@ -7,6 +7,7 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.pay.factory.PayFactory;
 import com.fdkankan.ucenter.pay.factory.impl.PayOrderService;
@@ -59,8 +60,6 @@ public class OrderWechatPayController extends BaseController {
     @Autowired
     PayOrderService payOrderService;
 
-    @Value("${main.url}")
-    private String mainUrl;
 
     @ResponseBody
     @RequestMapping(value = "/wechatPay", method = RequestMethod.POST)
@@ -106,7 +105,7 @@ public class OrderWechatPayController extends BaseController {
             switch (orderType){
                 case 0:
                     Order responseOrder = orderService.getById(orderId);
-                    if (responseOrder.getId() == null) return "redirect:" + mainUrl + "mobile.html#/payresult/fail";
+                    if (responseOrder.getId() == null) return "redirect:" + NacosProperty.getMainUrl() + "mobile.html#/payresult/fail";
 
                     List<OrderItem> items = orderItemService.getByOrderId(orderId);
                     for (int i = 0; i < items.size(); i++){
@@ -122,7 +121,7 @@ public class OrderWechatPayController extends BaseController {
                 case 1:
                     VirtualOrder virtualOrderEntity = virtualOrderService.getById(orderId);
                     if (virtualOrderEntity == null){
-                        return "redirect:" + mainUrl + "mobile.html#/payresult/fail";
+                        return "redirect:" + NacosProperty.getMainUrl() + "mobile.html#/payresult/fail";
                     }
                     sb.append(Constant.PAY_SUBJECT + "：" + virtualOrderEntity.getPoints());
                     totalFee = new BigDecimal(virtualOrderEntity.getPoints()).multiply(new BigDecimal(100));
@@ -132,7 +131,7 @@ public class OrderWechatPayController extends BaseController {
                 case 2:
                     ExpansionOrder expansion = expansionOrderService.getById(orderId);
                     if (expansion == null){
-                        return "redirect:" + mainUrl + "mobile.html#/payresult/fail";
+                        return "redirect:" + NacosProperty.getMainUrl() + "mobile.html#/payresult/fail";
                     }
                     //订单金额为国外金额就报错
                     if(expansion.getAbroad() == 1){
@@ -153,7 +152,7 @@ public class OrderWechatPayController extends BaseController {
                 case 4:
                     IncrementOrder incrementOrderEntity = incrementOrderService.getById(orderId);
                     if (incrementOrderEntity == null){
-                        return "redirect:" + mainUrl + "mobile.html#/payresult/fail";
+                        return "redirect:" + NacosProperty.getMainUrl() + "mobile.html#/payresult/fail";
                     }
                     //订单金额为国外金额就报错
                     if(incrementOrderEntity.getAbroad() == 1){
@@ -173,7 +172,7 @@ public class OrderWechatPayController extends BaseController {
             }
             Map<String, String> resp = payOrderService.wechatPay(orderSn, sb.toString(), body, totalFee, UrlUtils.getIpAddr(request), openid);
             String timeStamp = String.valueOf(System.currentTimeMillis() / 1000);
-            return "redirect:" + mainUrl + ConstantUrl.WEIXIN_MOBILE_PAY_URL + timeStamp + "&signType=MD5&appId=" + resp.get("appid")
+            return "redirect:" + NacosProperty.getMainUrl() + ConstantUrl.WEIXIN_MOBILE_PAY_URL + timeStamp + "&signType=MD5&appId=" + resp.get("appid")
                     + "&nonceStr=" + resp.get("nonce_str") + "&prepay_id=" + resp.get("prepay_id") + "&paySign=" + resp.get("paySign");
         }catch (Exception e){
             log.debug("获取access_token发生异常",e);
@@ -182,7 +181,7 @@ public class OrderWechatPayController extends BaseController {
                 is.close();
             }
         }
-        return "redirect:" + mainUrl + "mobile.html#/payresult/fail";
+        return "redirect:" + NacosProperty.getMainUrl() + "mobile.html#/payresult/fail";
     }
 
     @RequestMapping(value = "/wechatPay/notify", method = RequestMethod.POST)

src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -17,6 +17,7 @@ import com.fdkankan.ucenter.annotation.CheckInnerApiPermit;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.constant.CameraConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.*;
@@ -79,9 +80,6 @@ public class SceneApiController extends BaseController {
     @Autowired
     private IInnerService innerService;
 
-    @Value("${main.url}")
-    private String mainUrl;
-
     @Value("${scene.pro.url}")
     private String sceneProUrl;
 
@@ -188,19 +186,19 @@ public class SceneApiController extends BaseController {
         try {
             String redirect  = null;
             if(webSite.contains(sceneProUrl)){
-                 redirect = mainUrl + sceneProUrl.replace("show", "edit").replace("PC", "Mobile") +
+                 redirect = NacosProperty.getMainUrl() + sceneProUrl.replace("show", "edit").replace("PC", "Mobile") +
                         sceneNum + "&t=" +System.currentTimeMillis() + "&token=" + token + "&app" +
                         (lang == null ? "" : "&lang=" + lang) + (vlog == null ? "" : "&vlog=" + vlog);
             }
 
             if(webSite.contains(sceneProV4Url)){
-                 redirect = mainUrl + sceneProV4Url.replace("s", "e") +
+                 redirect = NacosProperty.getMainUrl() + sceneProV4Url.replace("s", "e") +
                         sceneNum + "&t=" +System.currentTimeMillis() + "&token=" + token + "&app" +
                         (lang == null ? "" : "&lang=" + lang) + (vlog == null ? "" : "&vlog=" + vlog);
             }
 
             if(webSite.contains(sceneProNewUrl)) {
-                 redirect = mainUrl + sceneProNewUrl.replace("s", "e") +
+                 redirect = NacosProperty.getMainUrl() + sceneProNewUrl.replace("s", "e") +
                         sceneNum + "&t=" + System.currentTimeMillis() + "&token=" + token + "&app" +
                         (lang == null ? "" : "&lang=" + lang) + (vlog == null ? "" : "&vlog=" + vlog);
 
@@ -230,7 +228,7 @@ public class SceneApiController extends BaseController {
         param.setPassword(password);
         LoginVo loginVo = loginService.loginClear(param);
         //登录成功
-        response.sendRedirect(mainUrl + "mobile.html?token="+ loginVo.getToken() + "&app" + (lang == null ? "" : "&lang=" + lang)+"#/consumption/0" );
+        response.sendRedirect(NacosProperty.getMainUrl() + "mobile.html?token="+ loginVo.getToken() + "&app" + (lang == null ? "" : "&lang=" + lang)+"#/consumption/0" );
     }
 
     /**

src/main/java/com/fdkankan/ucenter/pay/factory/impl/PayOrderService.java

@@ -12,6 +12,7 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.MD5;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.constant.QrCodeFilePath;
 import com.fdkankan.ucenter.pay.alipay.AlipayDefaultConfig;
 import com.fdkankan.ucenter.pay.alipay.sdk.AlipayGoodsDetail;
@@ -51,8 +52,6 @@ public class PayOrderService {
     @Autowired
     private PaypalService paypalService;
 
-    @Value("${main.url}")
-    private String mainUrl;
     @Autowired
     RedisUtil redisUtil;
 
@@ -68,7 +67,7 @@ public class PayOrderService {
         alipaymentEx.setGoodsDetailList(goodsDetailList);
         String pngPath = QrCodeFilePath.ALI_QRCODE_FOLDER + orderSn + ".png";
         try {
-            Map<String, String> alipayMap = alipayService.tradePrecreate(alipaymentEx, mainUrl + alipayDefaultConfig.getNotifyUrl());
+            Map<String, String> alipayMap = alipayService.tradePrecreate(alipaymentEx, NacosProperty.getMainUrl() + alipayDefaultConfig.getNotifyUrl());
             if ("0".equals(alipayMap.get("code"))){
                 BufferedImage image = AlipayUtil.getQRCodeImge(alipayMap.get("qr_code"));
                 File file = new File(pngPath);
@@ -124,9 +123,9 @@ public class PayOrderService {
         //将参数传入到 BizModel中
         alipayRequest.setBizModel(model);
         //异步回调地址
-        alipayRequest.setNotifyUrl(mainUrl + alipayDefaultConfig.getNotifyUrl());
+        alipayRequest.setNotifyUrl(NacosProperty.getMainUrl() + alipayDefaultConfig.getNotifyUrl());
         //同步回调地址
-        alipayRequest.setReturnUrl(mainUrl + alipayDefaultConfig.getReturnUrl());
+        alipayRequest.setReturnUrl(NacosProperty.getMainUrl() + alipayDefaultConfig.getReturnUrl());
 
         String result = "";
         try {
@@ -177,7 +176,7 @@ public class PayOrderService {
         data.put("fee_type", "CNY");
         data.put("total_fee", totalFee.stripTrailingZeros().toPlainString());
         data.put("spbill_create_ip", config.getCreateIP());
-        data.put("notify_url", mainUrl + config.getNotifyURL());
+        data.put("notify_url", NacosProperty.getMainUrl() + config.getNotifyURL());
         data.put("trade_type", "NATIVE");  // 此处指定为扫码支付
         data.put("product_id", orderSn); //多个商品，使用订单号
 
@@ -219,7 +218,7 @@ public class PayOrderService {
         data.put("fee_type", "CNY");
         data.put("total_fee", totalFee.stripTrailingZeros().toPlainString());
         data.put("spbill_create_ip", ipAddress);
-        data.put("notify_url", mainUrl + config.getNotifyURL());
+        data.put("notify_url", NacosProperty.getMainUrl() + config.getNotifyURL());
         data.put("trade_type", "MWEB");  // 此处指定为扫码支付
         data.put("product_id", orderSn); //多个商品，使用订单号
         data.put("nonce_str", MD5.getMessageDigest(String.valueOf(new Random().nextInt(10000)).getBytes()));
@@ -231,7 +230,7 @@ public class PayOrderService {
         String return_msg = resp.get("return_msg");
         if ("SUCCESS".equals(return_code) && "OK".equals(return_msg)) {
             mweb_url = resp.get("mweb_url");//调微信支付接口地址
-            mweb_url += "&redirect_url=" + URLEncoder.encode(mainUrl + config.getH5RedirectURL(), "UTF-8");
+            mweb_url += "&redirect_url=" + URLEncoder.encode(NacosProperty.getMainUrl() + config.getH5RedirectURL(), "UTF-8");
             log.warn("mweb_url=" + mweb_url);
         } else {
             log.error("微信统一支付接口获取预支付订单出错");
@@ -253,7 +252,7 @@ public class PayOrderService {
         data.put("fee_type", "CNY");
         data.put("total_fee", totalFee.stripTrailingZeros().toPlainString());
         data.put("spbill_create_ip", ipAddress);
-        data.put("notify_url", mainUrl + config.getNotifyURL());
+        data.put("notify_url", NacosProperty.getMainUrl() + config.getNotifyURL());
         data.put("trade_type", "JSAPI");
         data.put("product_id", orderSn);
         data.put("openid", openid);

src/main/java/com/fdkankan/ucenter/pay/factory/impl/commerce/PaypalCommerce.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.entity.CommerceOrder;
 import com.fdkankan.ucenter.pay.factory.PayEntity;
 import com.fdkankan.ucenter.pay.factory.impl.PayOrderService;
@@ -24,17 +25,15 @@ public class PaypalCommerce implements PayEntity {
     @Autowired
     private PayPalDefaultConfig payPalDefaultConfig;
 
-    @Value("${main.url}")
-    private String mainUrl;
 
     @Override
     public JSONObject scanPay(PlaceOrderParam order) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getPaySuccessUrl(), mainUrl + payPalDefaultConfig.getCancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getPaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getCancelUrl());
     }
 
     @Override
     public JSONObject h5Pay(PlaceOrderParam order, String ip) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getH5PaySuccessUrl(), mainUrl + payPalDefaultConfig.getH5CancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getH5PaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getH5CancelUrl());
     }
 
     private JSONObject getResult(PlaceOrderParam order, String successUrl, String cancelUrl) throws Exception {

src/main/java/com/fdkankan/ucenter/pay/factory/impl/down/PaypalDownload.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.entity.DownloadOrder;
 import com.fdkankan.ucenter.pay.factory.PayEntity;
 import com.fdkankan.ucenter.pay.factory.impl.PayOrderService;
@@ -24,17 +25,15 @@ public class PaypalDownload implements PayEntity {
     @Autowired
     private PayPalDefaultConfig payPalDefaultConfig;
 
-    @Value("${main.url}")
-    private String mainUrl;
 
     @Override
     public JSONObject scanPay(PlaceOrderParam order) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getPaySuccessUrl(), mainUrl + payPalDefaultConfig.getCancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getPaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getCancelUrl());
     }
 
     @Override
     public JSONObject h5Pay(PlaceOrderParam order, String ip) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getH5PaySuccessUrl(), mainUrl + payPalDefaultConfig.getH5CancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getH5PaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getH5CancelUrl());
     }
 
     private JSONObject getResult(PlaceOrderParam order, String successUrl, String cancelUrl) throws Exception {

src/main/java/com/fdkankan/ucenter/pay/factory/impl/expansion/PaypalExpansion.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.entity.ExpansionOrder;
 import com.fdkankan.ucenter.pay.factory.PayEntity;
 import com.fdkankan.ucenter.pay.factory.impl.PayOrderService;
@@ -24,17 +25,15 @@ public class PaypalExpansion implements PayEntity {
     @Autowired
     private PayPalDefaultConfig payPalDefaultConfig;
 
-    @Value("${main.url}")
-    private String mainUrl;
 
     @Override
     public JSONObject scanPay(PlaceOrderParam order) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getPaySuccessUrl(), mainUrl + payPalDefaultConfig.getCancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getPaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getCancelUrl());
     }
 
     @Override
     public JSONObject h5Pay(PlaceOrderParam order, String ip) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getH5PaySuccessUrl(), mainUrl + payPalDefaultConfig.getH5CancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getH5PaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getH5CancelUrl());
     }
 
     private JSONObject getResult(PlaceOrderParam order, String successUrl, String cancelUrl) throws Exception {

src/main/java/com/fdkankan/ucenter/pay/factory/impl/goods/PaypalGoods.java

@@ -3,6 +3,7 @@ package com.fdkankan.ucenter.pay.factory.impl.goods;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.entity.Order;
 import com.fdkankan.ucenter.entity.OrderItem;
 import com.fdkankan.ucenter.pay.alipay.sdk.AlipayGoodsDetail;
@@ -31,17 +32,14 @@ public class PaypalGoods implements PayEntity {
     @Autowired
     private IOrderItemService orderItemService;
 
-    @Value("${main.url}")
-    private String mainUrl;
-
     @Override
     public JSONObject scanPay(PlaceOrderParam order) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getPaySuccessUrl(), mainUrl + payPalDefaultConfig.getCancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getPaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getCancelUrl());
     }
 
     @Override
     public JSONObject h5Pay(PlaceOrderParam order, String ip) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getH5PaySuccessUrl(), mainUrl + payPalDefaultConfig.getH5CancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getH5PaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getH5CancelUrl());
     }
 
     @Override

src/main/java/com/fdkankan/ucenter/pay/factory/impl/increment/PaypalIncrement.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.entity.IncrementOrder;
 import com.fdkankan.ucenter.pay.factory.PayEntity;
 import com.fdkankan.ucenter.pay.factory.impl.PayOrderService;
@@ -24,17 +25,15 @@ public class PaypalIncrement implements PayEntity {
     @Autowired
     private PayPalDefaultConfig payPalDefaultConfig;
 
-    @Value("${main.url}")
-    private String mainUrl;
 
     @Override
     public JSONObject scanPay(PlaceOrderParam order) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getPaySuccessUrl(), mainUrl + payPalDefaultConfig.getCancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getPaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getCancelUrl());
     }
 
     @Override
     public JSONObject h5Pay(PlaceOrderParam order, String ip) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getH5PaySuccessUrl(), mainUrl + payPalDefaultConfig.getH5CancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getH5PaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getH5CancelUrl());
     }
 
     private JSONObject getResult(PlaceOrderParam order, String successUrl, String cancelUrl) throws Exception {

src/main/java/com/fdkankan/ucenter/pay/factory/impl/recharge/PaypalRecharge.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.entity.VirtualOrder;
 import com.fdkankan.ucenter.pay.factory.PayEntity;
 import com.fdkankan.ucenter.pay.factory.impl.PayOrderService;
@@ -26,17 +27,15 @@ public class PaypalRecharge implements PayEntity {
     @Autowired
     private PayPalDefaultConfig payPalDefaultConfig;
 
-    @Value("${main.url}")
-    private String mainUrl;
 
     @Override
     public JSONObject scanPay(PlaceOrderParam order) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getPaySuccessUrl(), mainUrl + payPalDefaultConfig.getCancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getPaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getCancelUrl());
     }
 
     @Override
     public JSONObject h5Pay(PlaceOrderParam order, String ip) throws Exception {
-        return getResult(order, mainUrl + payPalDefaultConfig.getH5PaySuccessUrl(), mainUrl + payPalDefaultConfig.getH5CancelUrl());
+        return getResult(order, NacosProperty.getMainUrl() + payPalDefaultConfig.getH5PaySuccessUrl(), NacosProperty.getMainUrl() + payPalDefaultConfig.getH5CancelUrl());
     }
 
     private JSONObject getResult(PlaceOrderParam order, String successUrl, String cancelUrl) throws Exception {

src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -15,6 +15,7 @@ import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.sms.SendMailAcceUtils;
 import com.fdkankan.sms.SmsService;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.constant.QrCodeFilePath;
 import com.fdkankan.ucenter.entity.Camera;
@@ -58,8 +59,6 @@ public class LoginService {
     private ILoginLogService loginLogService;
     @Value("${phone.code.cn}")
     private String cnCode;
-    @Value("${main.url}")
-    private String mainUrl;
     @Value("${admin.register.validCode:2a22bac40f44af4d3b5fdc20ea706fc5}")
     private String registerValidCode;
 
@@ -188,7 +187,7 @@ public class LoginService {
         String uuid = NumberUtils.getUUID();
         String filePath = QrCodeFilePath.LOGIN_QR_CODE_PATH + uuid + ".png";
         String path =this.getClass().getResource("/static/img/logo.jpg").getPath();
-        MatrixToImageWriterUtil.createQRCode(mainUrl + "app/index.html?m="+uuid, filePath,true,path);
+        MatrixToImageWriterUtil.createQRCode(NacosProperty.getMainUrl() + "app/index.html?m="+uuid, filePath,true,path);
         JSONObject json = new JSONObject();
         json.put("url", filePath.replace(ConstantFilePath.BASE_PATH, ""));
         json.put("uuid", uuid);

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -72,10 +72,6 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     @Autowired
     ISceneCopyLogService sceneCopyLogService;
 
-    @Value("${main.url}")
-    private String mainUrl;
-    @Value("${scene.pro.new.url}")
-    private String sceneProNewUrl;
 
     @Override
     public Long getCountByUserId(Long userId, List<?> sceneSourceList) {

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -20,6 +20,7 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.image.MatrixToImageWriterUtil;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.common.utils.ShellUtil;
 import com.fdkankan.ucenter.constant.CameraConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;
@@ -113,9 +114,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Autowired
     LaserService laserService;
 
-    @Value("${main.url}")
-    private String mainUrl;
-
     @Value("${scene.pro.url}")
     private String sceneProUrl;
 
@@ -1076,7 +1074,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public void setQrCode(String buildType,String num) throws Exception {
-        String basePath = mainUrl;
+        String basePath = NacosProperty.getMainUrl();
         if("V2".equals(buildType)){
             basePath += sceneProUrl;
         }

src/main/java/com/fdkankan/ucenter/service/impl/VaildCamerasServiceImpl.java

@@ -11,6 +11,7 @@ import com.fdkankan.ucenter.common.FileUtil;
 import com.fdkankan.ucenter.common.RSAEncrypt;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.constant.CameraConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.VaildCameras;
@@ -37,8 +38,6 @@ import java.util.UUID;
 @Service
 public class VaildCamerasServiceImpl extends ServiceImpl<IVaildCamerasMapper, VaildCameras> implements IVaildCamerasService {
 
-    @Value("${main.url}")
-    private String mainUrl;
 
     @Override
     public Result getVaildCameras(String file, String companyName) throws Exception {
@@ -87,7 +86,7 @@ public class VaildCamerasServiceImpl extends ServiceImpl<IVaildCamerasMapper, Va
 
         Map map = new HashMap();
         map.put("aecData", aesData);
-        map.put("keyUrl", mainUrl + "agent/" + companyName + "/secretData/" + resultName);
+        map.put("keyUrl", NacosProperty.getMainUrl() + "agent/" + companyName + "/secretData/" + resultName);
         return Result.success(map);
     }