diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/ProxyController.java b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/ProxyController.java index 95d7c74..aea909d 100644 --- a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/ProxyController.java +++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/ProxyController.java @@ -91,7 +91,7 @@ public class ProxyController { return Result.success(); } - @GetMapping("/writeProxy") + @PostMapping("/writeProxy") @Inner(value = false) @ApiOperation("文件写入代理信息") public Result writeProxy(@RequestParam("file") MultipartFile file){ diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/RequestXhsApi.java b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/RequestXhsApi.java index cb44b0f..700ebd6 100644 --- a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/RequestXhsApi.java +++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/RequestXhsApi.java @@ -39,7 +39,7 @@ public class RequestXhsApi { headMap.put("Referer", "https://creator.xiaohongshu.com/creator/home"); headMap.put("Accept-Encoding", "gzip, deflate, br"); headMap.put("Accept-Language", "zh-CN,zh;q=0.9"); - headMap.put("Cookie", cid); + headMap.put("Cookie", cid); return HttpRequest.get(requestUrl).timeout(10_0000).headerMap(headMap, true).execute().body(); } diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/test/java/com/baiye/fileread/ReadTet.java b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/test/java/com/baiye/fileread/ReadTet.java new file mode 100644 index 0000000..314da3e --- /dev/null +++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/test/java/com/baiye/fileread/ReadTet.java @@ -0,0 +1,97 @@ +package com.baiye.fileread; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.json.JSONUtil; +import com.baiye.dao.LexiconFilterMapper; +import com.baiye.dao.LexiconPinyinMapper; +import com.baiye.entity.LexiconFilter; +import com.baiye.entity.LexiconPinyin; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author YQY + * @Date 2023/3/22 + */ +@SpringBootTest +@RunWith(SpringJUnit4ClassRunner.class)//mybatis-plus加上此注解 +public class ReadTet { + + @Autowired + public LexiconPinyinMapper lexiconPinyinMapper; + + @Autowired + public LexiconFilterMapper lexiconFilterMapper; + + /** + * 读取txt文件写入 + */ + @Test + public void readFile() { + try { + FileReader reader = new FileReader("C:\\Users\\Admin\\Desktop\\小红书\\组合拼音.txt"); + // 读取到缓冲区 + BufferedReader br = new BufferedReader(reader); + String line; + List arrayList = new ArrayList<>(); + // 一次读入一行数据 + while ((line = br.readLine()) != null) { + String[] split = line.split("\t"); + + LexiconPinyin lexiconPinyin = new LexiconPinyin(); + lexiconPinyin.setId(1L); + lexiconPinyin.setPhoneticTranscription(split[0]); + + if (split.length >= 2){ + List list = new ArrayList<>(); + for (int i = 1; i < split.length; i++) { + list.add(split[i]); + } + lexiconPinyin.setWords(JSONUtil.toJsonStr(list)); + } + arrayList.add(lexiconPinyin); + if (arrayList.size() >= 3000){ + lexiconPinyinMapper.insertAll(arrayList); + arrayList.clear(); + } + } + if (CollUtil.isNotEmpty(arrayList)){ + lexiconPinyinMapper.insertAll(arrayList); + } + reader.close(); + br.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + @Test + public void readFile2() { + try { + FileReader reader = new FileReader("C:\\Users\\Admin\\Desktop\\小红书\\过滤词.txt"); + // 读取到缓冲区 + BufferedReader br = new BufferedReader(reader); + String line; + // 一次读入一行数据 + while ((line = br.readLine()) != null) { + String[] split = line.split("\t"); + LexiconFilter lexiconFilter = new LexiconFilter(); + lexiconFilter.setSpeech(split[0]); + lexiconFilter.setOrganizeId(6L); + lexiconFilter.setOrganizeName("最高级"); + lexiconFilterMapper.insert(lexiconFilter); + } + }catch (IOException e) { + e.printStackTrace(); + } + } + +} diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/test/java/com/baiye/redis/HashTest.java b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/test/java/com/baiye/redis/HashTest.java new file mode 100644 index 0000000..b447b14 --- /dev/null +++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/test/java/com/baiye/redis/HashTest.java @@ -0,0 +1,36 @@ +package com.baiye.redis; + +import com.baiye.core.util.RedisUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import java.util.HashMap; +import java.util.Map; + +/** + * @Author YQY + * @Date 2023/3/23 + */ +@SpringBootTest +@RunWith(SpringJUnit4ClassRunner.class) +public class HashTest { + + @Autowired + private RedisUtils redisUtils; + + @Test + public void Test1(){ + Map map = new HashMap<>(); + map.put("de", "[\"的\",\"地\",\"得\",\"德\",\"嘚\",\"徳\",\"锝\",\"脦\",\"悳\",\"淂\",\"鍀\",\"惪\",\"恴\",\"棏\"]"); + map.put("le", "[\"了\",\"乐\",\"叻\",\"肋\",\"樂\",\"楽\",\"仂\",\"泐\",\"簕\",\"饹\",\"竻\",\"砳\",\"玏\",\"鳓\",\"扐\",\"艻\",\"忇\",\"氻\",\"阞\",\"韷\",\"鰳\",\"餎\"]"); + +// redisUtils.hmset("chai", map); +// Map de = redisUtils.hmget("chai"); +// System.out.println(de); + Object hget = redisUtils.hget("chai", "de"); + System.out.println(hget); + } +} diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/entity/ProxyEntity.java b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/entity/ProxyEntity.java index fb072f6..aa9d3fd 100644 --- a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/entity/ProxyEntity.java +++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/entity/ProxyEntity.java @@ -84,6 +84,8 @@ public class ProxyEntity { @TableField(exist = false) private List phoneList = new ArrayList<>(); + @TableField(exist = false) + private List ProxyAccountList; public ProxyEntity(String ip, Integer port, String account, String password, String address, String agreementType, Integer surplusDay, String isDomestic, String agent, String status) { diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/java/com/baiye/service/impl/ProxyServiceImpl.java b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/java/com/baiye/service/impl/ProxyServiceImpl.java index 4ccbaef..1ff35a1 100644 --- a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/java/com/baiye/service/impl/ProxyServiceImpl.java +++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/java/com/baiye/service/impl/ProxyServiceImpl.java @@ -196,8 +196,10 @@ public class ProxyServiceImpl implements ProxyService { Page iPage = proxyMapper.selectPage(page, wrapper); for (ProxyEntity record : iPage.getRecords()) { if (map.containsKey(record.getId())) { - List phoneList = map.get(record.getId()).stream().map(ProxyAccountEntity::getNid).collect(Collectors.toList()); - record.setPhoneList(phoneList); + List proxyAccountEntities = map.get(record.getId()); +// List phoneList = map.get(record.getId()).stream().map(ProxyAccountEntity::getNid).collect(Collectors.toList()); +// record.setPhoneList(phoneList); + record.setProxyAccountList(proxyAccountEntities); } } return PageResult.success(iPage.getTotal(), iPage.getPages(), iPage.getRecords());