ip接口bug

ip配置获取接口

src/main/java/com/edgec/browserbackend/auth/config/ResourceServerConfiguration.java

@@ -23,7 +23,6 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
                 .logoutUrl("/oauth/logout")
                 .and()
                 .authorizeRequests()
-                .antMatchers("/browser/").permitAll()
                 .antMatchers("/secure/**").authenticated();
     }
 }
\ No newline at end of file

src/main/java/com/edgec/browserbackend/auth/config/WebSecurityConfig.java

@@ -30,8 +30,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     public void configure(WebSecurity web) throws Exception {
         web.ignoring()
-                .antMatchers("/users/verify/**", "/users/changepass", "/account/authCode", "/account/signup",
-                "/account/reset*", "/token");
+                .antMatchers( "/account/authCode", "/user/signup",
+                "/user/reset*", "/token");
     }
 
     @Override

src/main/java/com/edgec/browserbackend/browser/controller/ConfigController.java

+package com.edgec.browserbackend.browser.controller;
+
+import com.edgec.browserbackend.account.dto.ResultDto;
+import com.edgec.browserbackend.browser.dto.GroupDto;
+import com.edgec.browserbackend.browser.service.IpResourceService;
+import com.edgec.browserbackend.common.commons.error.ClientRequestException;
+import com.edgec.browserbackend.common.dto.Result;
+import com.edgec.browserbackend.common.utils.FileUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Desc
+ * @Author jason
+ * @CreateTime 2020/3/11 7:52 下午
+ **/
+@RestController
+@RequestMapping("/config")
+public class ConfigController {
+
+    @Autowired
+    private IpResourceService ipResourceService;
+
+    @RequestMapping(value = "/ipOptions", method = RequestMethod.POST)
+    public ResultDto getIpOptions() {
+        ResultDto resultDto = new ResultDto();
+        try {
+            resultDto.setData(ipResourceService.getIpOptions());
+            resultDto.setStatus(0);
+        }catch (ClientRequestException e) {
+            resultDto.setStatus(-1);
+            Map<String, Object> statusInfo = new HashMap<>();
+            statusInfo.put("code", e.getErrorCode());
+            statusInfo.put("message", e.getMessage());
+            resultDto.setStatusInfo(statusInfo);
+        }
+        return resultDto;
+    }
+}

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

 package com.edgec.browserbackend.browser.service.Impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.edgec.browserbackend.account.domain.Account;
 import com.edgec.browserbackend.account.exception.AccountErrorCode;
 import com.edgec.browserbackend.account.repository.AccountRepository;
@@ -12,6 +13,7 @@ import com.edgec.browserbackend.browser.repository.ShopRepository;
 import com.edgec.browserbackend.browser.repository.UserShopRepository;
 import com.edgec.browserbackend.browser.service.IpResourceService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
+import com.edgec.browserbackend.common.utils.FileUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,6 +26,8 @@ import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.File;
+import java.net.URL;
 import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -272,11 +276,11 @@ public class IpResourceServiceImpl implements IpResourceService {
                 notUsed = ipResourceRepository.findByOwnerAndShopIdIsNull(username);
                 break;
             case 2:
-                ipResources = ipResourceRepository.findByStatusAndIdIn(2, ipIds);;
+                ipResources = ipResourceRepository.findByStatusAndIdIn(2, ipIds);
                 notUsed = ipResourceRepository.findByOwnerAndStatusAndShopIdIsNull(username, 2);
                 break;
             case 3:
-                ipResources = ipResourceRepository.findByStatusAndIdIn(1, ipIds);;
+                ipResources = ipResourceRepository.findByStatusAndIdIn(1, ipIds);
                 notUsed = ipResourceRepository.findByOwnerAndStatusAndShopIdIsNull(username, 1);
                 break;
             case 4:
@@ -361,5 +365,10 @@ public class IpResourceServiceImpl implements IpResourceService {
         return ipPageResultDto;
     }
 
+    @Override
+    public JSONObject getIpOptions() {
+        JSONObject jsonObject = JSONObject.parseObject(FileUtil.read(new File("src/main/resources/ipOptions.json"), "UTF-8"));
+        return jsonObject;
+    }
 
 }

src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java

@@ -220,7 +220,7 @@ public class ShopServiceImpl implements ShopService {
             ipResource.setShopName(null);
             ipResourceRepository.save(ipResource);
             shopRepository.save(shop);
-            userShop.setIpId(ipResource.getId());
+            userShop.setIpId(null);
             userShopRepository.save(userShop);
         } catch (Exception e) {
             logger.error("fail to unbind", e.getMessage());

src/main/java/com/edgec/browserbackend/browser/service/IpResourceService.java

 package com.edgec.browserbackend.browser.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.edgec.browserbackend.browser.dto.*;
 
 import java.util.List;
@@ -13,4 +14,6 @@ public interface IpResourceService {
     IpOperationResultDto deleteIp(String username, List<String> ipAddrs) throws Exception;
 
     IpPageResultDto getIpList(String username, int groupType, int page, int amount, IpFilterDto ipFilterDto);
+
+    JSONObject getIpOptions();
 }

src/main/java/com/edgec/browserbackend/common/utils/FileUtil.java

+package com.edgec.browserbackend.common.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Desc
+ * @Author jason
+ * @CreateTime 2020/3/11 7:36 下午
+ **/
+public class FileUtil {
+    private static Logger log = LoggerFactory.getLogger(FileUtil.class);
+    private static final String CHARSET = "UTF-8";
+
+    public static String read(File f, String charset) {
+        String line = null;
+        StringBuffer buf = new StringBuffer();
+        try (InputStreamReader reader = new InputStreamReader(new FileInputStream(f), charset);
+             BufferedReader br = new BufferedReader(reader);){
+            while ((line = br.readLine()) != null) {
+                buf.append(line+System.getProperty("line.separator"));
+            }
+        } catch (Exception e) {
+            log.error("[" + f.getName() + "]文件读出失败{}",e);
+            return null;
+        }
+        log.debug("[" + f.getName() + "]文件读出成功");
+        return buf.toString();
+    }
+
+    public static List<String> readLine(File f, String charset) {
+        String line = null;
+        List<String> lineList = new ArrayList<String>();
+        StringBuffer buf = new StringBuffer();
+        try (InputStreamReader reader = new InputStreamReader(new FileInputStream(f), charset);
+             BufferedReader br = new BufferedReader(reader);){
+            while ((line = br.readLine()) != null) {
+                lineList.add(line);
+            }
+            br.close();
+            reader.close();
+        } catch (Exception e) {
+            log.error("[" + f.getName() + "]文件读出失败{}",e);
+            return null;
+        }
+        log.debug("[" + f.getName() + "]文件读出成功");
+        return lineList;
+    }
+
+    public static boolean write(String content, File file) {
+        try (BufferedWriter bw = new BufferedWriter(new FileWriter(file))){
+            bw.write(content);
+        } catch (Exception e) {
+            log.error("[" + file.getName() + "]写入失败{}",e);
+            return false;
+        }
+        log.debug("[" + file.getName() + "]文件写入成功");
+        return true;
+    }
+}