Merge branch 'staging' into 'master'

修改充值赠送与地狱ip价格相关

See merge request !156

src/main/java/com/edgec/browserbackend/account/controller/PayBackServiceController.java

+package com.edgec.browserbackend.account.controller;
+
+import com.edgec.browserbackend.account.service.PayBackService;
+import com.edgec.browserbackend.browser.domain.PayBack;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author xuxin
+ * @date 2020/7/24 15:19
+ * @description 充值满赠
+ */
+
+@RestController
+@RequestMapping("/payback")
+public class PayBackServiceController {
+
+    @Autowired
+    private PayBackService payBackService;
+
+    @GetMapping(path = "/all")
+    public List<PayBack> getAll() {
+        return payBackService.findAll();
+    }
+}

src/main/java/com/edgec/browserbackend/account/service/PayBackService.java

+package com.edgec.browserbackend.account.service;
+
+import com.edgec.browserbackend.browser.domain.PayBack;
+
+import java.util.List;
+
+/**
+ * @author xuxin
+ * @date 2020/7/24 15:14
+ * @description
+ */
+public interface PayBackService {
+
+    List<PayBack> findAll();
+}

src/main/java/com/edgec/browserbackend/account/service/impl/PayBackServiceImpl.java

+package com.edgec.browserbackend.account.service.impl;
+
+import com.edgec.browserbackend.account.service.PayBackService;
+import com.edgec.browserbackend.browser.domain.PayBack;
+import com.edgec.browserbackend.browser.repository.PayBackRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author xuxin
+ * @date 2020/7/24 15:15
+ * @description
+ */
+@Service
+public class PayBackServiceImpl implements PayBackService {
+
+    @Autowired
+    private PayBackRepository payBackRepository;
+
+    @Override
+    public List<PayBack> findAll() {
+        return payBackRepository.findAll();
+    }
+}

src/main/resources/ipOptions.json

@@ -50,123 +50,111 @@
       "本地"
     ]
   },
-
   "ipPlatForm": {
-
     "中国随机": [
-      "阿里云-68-38",
-
-      "腾讯云-68-38"
+      "阿里云-68-49",
+      "腾讯云-68-49"
     ],
     "杭州": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
     "上海": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
     "深圳": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
     "广州": [
-      "阿里云-68-38",
-      "腾讯云-68-38"
+      "阿里云-68-49",
+      "腾讯云-68-49"
     ],
     "北京": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
     "青岛": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
     "张家口": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
     "呼和浩特": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
     "成都": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
     "河源": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
-
     "香港": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
-
     "美国随机": [
-      "阿里云-58-38",
-      "亚马逊云-58-38"
+      "阿里云-58-49",
+      "亚马逊云-58-49"
     ],
     "加利福尼亚": [
-      "亚马逊云-58-38",
-      "阿里云-58-38"
+      "亚马逊云-58-49",
+      "阿里云-58-49"
     ],
     "弗吉尼亚": [
-      "阿里云-58-38",
-      "亚马逊云-58-38"
+      "阿里云-58-49",
+      "亚马逊云-58-49"
     ],
     "俄勒冈": [
-      "亚马逊云-58-38"
+      "亚马逊云-58-49"
     ],
     "俄亥俄": [
-      "亚马逊云-58-38"
+      "亚马逊云-58-49"
     ],
-
     "英国-伦敦": [
-      "阿里云-88-38",
-      "亚马逊云-88-38"
+      "阿里云-88-49",
+      "亚马逊云-88-49"
     ],
     "德国-法兰克福": [
-      "阿里云-88-38",
-      "亚马逊云-88-38"
+      "阿里云-88-49",
+      "亚马逊云-88-49"
     ],
     "俄罗斯-莫斯科": [
-      "腾讯云-88-38"
+      "腾讯云-88-49"
     ],
     "法国-巴黎": [
-      "亚马逊云-88-38"
+      "亚马逊云-88-49"
     ],
-
     "日本-东京": [
-      "阿里云-88-38",
-      "亚马逊云-88-38"
+      "阿里云-88-49",
+      "亚马逊云-88-49"
     ],
     "新加坡": [
-      "阿里云-88-38"
+      "阿里云-88-49"
     ],
     "澳大利亚-悉尼": [
-      "阿里云-88-38",
-      "亚马逊云-68-38"
+      "阿里云-88-49",
+      "亚马逊云-68-49"
     ],
     "马来西亚-吉隆坡": [
-      "阿里云-88-38"
+      "阿里云-88-49"
     ],
     "印度尼西亚-雅加达": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
-
     "孟买": [
-      "阿里云-68-38"
+      "阿里云-68-49"
     ],
-
     "加拿大": [
-      "亚马逊云-68-38"
+      "亚马逊云-68-49"
     ],
     "巴西-圣保罗": [
-      "亚马逊云-68-38"
+      "亚马逊云-68-49"
     ],
-
     "迪拜": [
-      "阿里云-88-38"
+      "阿里云-88-49"
     ],
-
     "本地": [
       "本地ip-0-0"
     ]
   },
   "supportedPlatForm": {
-
     "中国随机": {
       "阿里云": [
         "亚马逊-1",
@@ -385,7 +373,6 @@
         "其他平台-0"
       ]
     },
-
     "香港": {
       "阿里云": [
         "亚马逊-1",
@@ -422,7 +409,6 @@
         "其他平台-0"
       ]
     },
-
     "美国随机": {
       "阿里云": [
         "亚马逊-1",
@@ -561,7 +547,6 @@
         "其他平台-0"
       ]
     },
-
     "英国-伦敦": {
       "阿里云": [
         "亚马逊-1",
@@ -666,7 +651,6 @@
         "其他平台-0"
       ]
     },
-
     "日本-东京": {
       "阿里云": [
         "亚马逊-1",
@@ -807,7 +791,6 @@
         "其他平台-0"
       ]
     },
-
     "孟买": {
       "阿里云": [
         "亚马逊-1",
@@ -826,7 +809,6 @@
         "其他平台-0"
       ]
     },
-
     "加拿大": {
       "亚马逊云": [
         "亚马逊-1",
@@ -863,7 +845,6 @@
         "其他平台-0"
       ]
     },
-
     "迪拜": {
       "阿里云": [
         "亚马逊-1",
@@ -882,24 +863,24 @@
         "其他平台-0"
       ]
     },
-
     "本地": {
-    "本地": [
-      "亚马逊-1",
-      "ebay-1",
-      "全球速卖通-1",
-      "Wish-1",
-      "Shopee-1",
-      "Lazada-1",
-      "CDiscount-1",
-      "Joom-1",
-      "Vova-1",
-      "乐天-1",
-      "Ozon-1",
-      "FactoryMarket-1",
-      "PayPal-1",
-      "其他平台-1"
-    ]}
+      "本地": [
+        "亚马逊-1",
+        "ebay-1",
+        "全球速卖通-1",
+        "Wish-1",
+        "Shopee-1",
+        "Lazada-1",
+        "CDiscount-1",
+        "Joom-1",
+        "Vova-1",
+        "乐天-1",
+        "Ozon-1",
+        "FactoryMarket-1",
+        "PayPal-1",
+        "其他平台-1"
+      ]
+    }
   },
   "ipDurations": [
     "1周",