SNManage commit

岑健浩
1 parent 03d2bc11
Showing 12 changed files with 65 additions and 63 deletions
pom.xml
src/main/java/com/example/demo/SNManageApplication.java → src/main/java/com/ectrip/demo/SNManageApplication.java
src/main/java/com/example/demo/controller/SNController.java → src/main/java/com/ectrip/demo/controller/SNController.java
src/main/java/com/example/demo/dto/AddSNsDTO.java → src/main/java/com/ectrip/demo/dto/AddSNsDTO.java
src/main/java/com/example/demo/dto/DeleteSNsDTO.java → src/main/java/com/ectrip/demo/dto/DeleteSNsDTO.java
src/main/java/com/example/demo/exception/SNRepetitiveException.java → src/main/java/com/ectrip/demo/exception/SNRepetitiveException.java
src/main/java/com/example/demo/service/SNService.java → src/main/java/com/ectrip/demo/service/SNService.java
src/main/java/com/example/demo/service/impl/SNServiceImpl.java → src/main/java/com/ectrip/demo/service/impl/SNServiceImpl.java
src/main/java/com/example/demo/util/HttpResult.java → src/main/java/com/ectrip/demo/util/HttpResult.java
src/main/resources/log4j2.xml
src/main/resources/sn/SN.txt
src/main/resources/sn/SNTemp.txt
@@ -4,8 +4,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.haoge</groupId>
-    <artifactId>SNManageDemo</artifactId>
+    <groupId>com.ectrip</groupId>
+    <artifactId>SNManage</artifactId>
     <version>1.0</version>
     <properties>
@@ -33,10 +33,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-        <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
             <version>2.7.0</version>
-package com.example.demo;
+package com.ectrip.demo;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
-package com.example.demo.controller;
+package com.ectrip.demo.controller;
-import com.example.demo.dto.AddSNsDTO;
-import com.example.demo.dto.DeleteSNsDTO;
-import com.example.demo.exception.SNRepetitiveException;
-import com.example.demo.service.SNService;
-import com.example.demo.util.HttpResult;
+import com.ectrip.demo.util.HttpResult;
+import com.ectrip.demo.dto.AddSNsDTO;
+import com.ectrip.demo.dto.DeleteSNsDTO;
+import com.ectrip.demo.exception.SNRepetitiveException;
+import com.ectrip.demo.service.SNService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
 @Api(tags = "SN操作")
 @RestController
-package com.example.demo.dto;
+package com.ectrip.demo.dto;
 import io.swagger.annotations.ApiModel;
-package com.example.demo.dto;
+package com.ectrip.demo.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-package com.example.demo.exception;
+package com.ectrip.demo.exception;
 public class SNRepetitiveException extends Exception{
-package com.example.demo.service;
+package com.ectrip.demo.service;
-import com.example.demo.dto.AddSNsDTO;
-import com.example.demo.dto.DeleteSNsDTO;
-import com.example.demo.exception.SNRepetitiveException;
+import com.ectrip.demo.dto.AddSNsDTO;
+import com.ectrip.demo.dto.DeleteSNsDTO;
+import com.ectrip.demo.exception.SNRepetitiveException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 public interface SNService {
-package com.example.demo.service.impl;
+package com.ectrip.demo.service.impl;
 import cn.hutool.core.codec.Base64;
-import com.example.demo.controller.SNController;
-import com.example.demo.dto.AddSNsDTO;
-import com.example.demo.dto.DeleteSNsDTO;
-import com.example.demo.exception.SNRepetitiveException;
-import com.example.demo.service.SNService;
+import com.ectrip.demo.dto.DeleteSNsDTO;
+import com.ectrip.demo.service.SNService;
+import com.ectrip.demo.dto.AddSNsDTO;
+import com.ectrip.demo.exception.SNRepetitiveException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Value;
@@ -14,6 +13,9 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashSet;
@@ -49,11 +51,12 @@ public class SNServiceImpl implements SNService {
             String currTime = sdf.format(new Date());
             //读取文件，判断SN是否重复
             Set<String> set = new HashSet<>();
-            BufferedReader bufferedReader = new BufferedReader(new FileReader(SNFilePath));
+            Reader reader = new InputStreamReader(Files.newInputStream(Paths.get(SNFilePath)),StandardCharsets.UTF_8);
+            BufferedReader bufferedReader = new BufferedReader(reader);
             String br;
             while ((br=bufferedReader.readLine()) != null) {
                 //截取SN
-                int index = br.indexOf('#');
+                int index = br.indexOf("##");
                 String SN = br.substring(0,index == -1? 0 : index);
                 set.add(SN);
             }
@@ -67,11 +70,11 @@ public class SNServiceImpl implements SNService {
             //写入
-            FileWriter fileWriter = new FileWriter(SNFilePath,true);
-            fileWriter.write(SNs.toString());
-            fileWriter.flush();
-            fileWriter.close();
-            logger.info("-----------------------------结束添加SNs-----------------------------");
+            FileOutputStream fileOutputStream = new FileOutputStream(SNFilePath,true);
+            fileOutputStream.write(SNs.toString().getBytes(StandardCharsets.UTF_8));
+            fileOutputStream.flush();
+            fileOutputStream.close();
+            logger.info("成功写入SNs：{}",SNs);
         } finally { //释放锁
             lock.unlock();
         }
@@ -79,15 +82,18 @@ public class SNServiceImpl implements SNService {
     @Override
     public String getEncryptSNs() throws IOException {
-        File file = new File(SNFilePath);
         //读取文件
-        byte[] SNsByteArr = new byte[(int) file.length()];
-        FileInputStream fileInputStream = new FileInputStream(file);
-        fileInputStream.read(SNsByteArr);
-        //加密
-        String encodeSNs = Base64.encode(SNsByteArr);
+        Reader reader = new InputStreamReader(Files.newInputStream(Paths.get(SNFilePath)),StandardCharsets.UTF_8);
+        char[] chars = new char[1000];
+        StringBuilder builder = new StringBuilder();
+        int len = reader.read(chars);
+        while (len != -1) {
+            builder.append(chars,0,len);
+            len = reader.read(chars);
+        }
-        return encodeSNs;
+        //加密
+        return Base64.encode(builder.toString());
     }
     @Override
@@ -99,7 +105,8 @@ public class SNServiceImpl implements SNService {
             HashSet<String> deleteSNsSet = new HashSet<>(deleteSNsDTO.getSns());
             //读取文件，记录不用删除的数据
-            BufferedReader bufferedReader = new BufferedReader(new FileReader(SNFilePath));
+            Reader reader = new InputStreamReader(Files.newInputStream(new File(SNFilePath).toPath()), StandardCharsets.UTF_8);
+            BufferedReader bufferedReader = new BufferedReader(reader);
             String br;
             StringBuilder stringBuilder = new StringBuilder();
             StringBuilder existSNs = new StringBuilder();
@@ -107,33 +114,33 @@ public class SNServiceImpl implements SNService {
             boolean SNExist = false;
             while ((br=bufferedReader.readLine()) != null) {
                 //截取SN
-                int index = br.indexOf('#');
+                int index = br.indexOf("##");
                 String str = br.substring(0,index == -1? 0 : index);
                 if (!deleteSNsSet.contains(str)) {
                     stringBuilder.append(br);
                     stringBuilder.append(System.lineSeparator());
                 } else {
-                    existSNs.append(str).append("、");
+                    existSNs.append(br).append(System.lineSeparator());
                     SNExist = true;
                 }
             }
             bufferedReader.close();
-            //如果存在要删除的SN，先将数据备份，再将留存数据覆盖掉原SN文件，避免数据写一半断电丢失。
+            //如果存在要删除的SN，先将数据备份，再将留存数据覆盖掉原SN文件。
             if (SNExist) {
                 //备份数据
-                FileWriter SNTempfileWriter = new FileWriter(SNTempFilePath);
-                SNTempfileWriter.write(stringBuilder.toString());
-                SNTempfileWriter.flush();
-                SNTempfileWriter.close();
+                FileOutputStream tempFileOutputStream = new FileOutputStream(SNTempFilePath);
+                tempFileOutputStream.write(stringBuilder.toString().getBytes(StandardCharsets.UTF_8));
+                tempFileOutputStream.flush();
+                tempFileOutputStream.close();
                 //覆盖掉原来的数据到SN文件中
-                FileWriter SNfileWriter = new FileWriter(SNFilePath);
-                SNfileWriter.write(stringBuilder.toString());
-                SNfileWriter.flush();
-                SNfileWriter.close();
-
+                FileOutputStream fileOutputStream = new FileOutputStream(SNFilePath);
+                fileOutputStream.write(stringBuilder.toString().getBytes(StandardCharsets.UTF_8));
+                fileOutputStream.flush();
+                fileOutputStream.close();
+                logger.warn("成功删除SNs：{}",existSNs);
             }
-            logger.warn("成功删除SNs：{}",existSNs);
+
             logger.info("-----------------------------结束删除SNs-----------------------------");
-package com.example.demo.util;
+package com.ectrip.demo.util;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -56,7 +56,7 @@
         <logger name="org.mybatis" level="INFO"></logger>
         <root level="all">
             <appender-ref ref="Console"/>
-<!--            <appender-ref ref="RollingFileInfo"/>-->
+            <appender-ref ref="RollingFileInfo"/>
             <appender-ref ref="RollingFileWarn"/>
             <appender-ref ref="RollingFileError"/>
         </root>
-
+sn6##项目2##2024-03-20 19:22:17
+sn7##项目2##2024-03-20 19:22:17
+sn8##项目2##2024-03-20 19:22:17
+sn6##项目2##2024-03-20 19:22:17
+sn7##项目2##2024-03-20 19:22:17
+sn8##项目2##2024-03-20 19:22:17