Merge branch 'register_info_update'

# Conflicts:
#	netflix-service/src/main/java/com/cyksj/service/register/impl/SpotifyServiceImpl.java
#	netflix-web/src/main/java/com/cyksj/web/controller/register/RegisterController.java

netflix-service/src/main/java/com/cyksj/service/register/impl/SpotifyServiceImpl.java

@@ -179,7 +179,7 @@ public class SpotifyServiceImpl implements SpotifyService {
             for (ProxyInfo proxyInfo : proxyInfos) {
                 try {
                     log.info("执行：info:{}", proxyInfo);
-                    Proxy proxy = new Proxy(Proxy.Type.HTTP,
+                    Proxy proxy = new Proxy(Proxy.Type.SOCKS,
                             new InetSocketAddress(proxyInfo.getIp(), proxyInfo.getPort()));
                     request.setProxy(proxy);
                     HttpResponse response = request.execute();
@@ -195,9 +195,8 @@ public class SpotifyServiceImpl implements SpotifyService {
                             log.info("spotify 注册 被监测出代理服务 。 删除该代理 ip:{}", proxyInfo.getIp());
                             if (proxyInfo.getId() != null) {
                                 int count = proxysMapper.deleteById(proxyInfo.getId());
-                                if(count == 0){
-                                    redisService.del(RedisKey.DOVEIP);
-                                }
+                            }else {
+                                redisService.del(RedisKey.DOVEIP);
                             }
                             continue;
                         }
@@ -230,6 +229,8 @@ public class SpotifyServiceImpl implements SpotifyService {
                 } catch (Exception e) {
                     if (proxyInfo.getId() != null) {
                         proxysMapper.deleteById(proxyInfo.getId());
+                    }else {
+                        redisService.del(RedisKey.DOVEIP);
                     }
                     e.printStackTrace();
                     log.error("错误 ip:{}", proxyInfo.getIp());

netflix-web/src/main/java/com/cyksj/web/controller/register/RegisterController.java

@@ -125,6 +125,21 @@ public class RegisterController {
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }
 
+    @PutMapping("/put")
+    public Result<String> update(@RequestBody RegisterOrderDon req){
+        if (req.getId() == null) {
+            throw new BusinessRuntimeException("缺少必填参数");
+        }
+        RegisterOrderDon registerOrderDon = registerOrderDonService.getById(req.getId());
+        if (!registerOrderDon.getStatus().equals(RegisterOrderDon.Status.error)) {
+            throw new BusinessRuntimeException("该状态下不可更改信息");
+        }
+        req.setStatus(RegisterOrderDon.Status.hasPayment);
+        registerOrderDonService.updateById(req);
+
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
     @GetMapping("/get/appleId/area/detail")
     public Result<AppleIdCountryOrAreaDataView> getAppleIdCountryOrAreaData() {
         AppleIdCountryOrAreaDataView appleIdCountryOrAreaDataView = new AppleIdCountryOrAreaDataView();