From 2c62a85dc41d3433279a9b611ba9038fd410d417 Mon Sep 17 00:00:00 2001 From: jianhao.cen Date: Mon, 7 Jul 2025 19:20:23 +0800 Subject: [PATCH] 前端代码分支 --- .gitignore | 20 +++++++++++++++++++- README.md | 33 ++++++++++++++++++++++++++++----- index.html | 13 +++++++++++++ package.json | 23 +++++++++++++++++++++++ pom.xml | 112 ---------------------------------------------------------------------------------------------------------------- public/config.js | 4 ++++ public/favicon.ico | Bin 0 -> 4286 bytes src/App.vue | 47 +++++++++++++++++++++++++++++++++++++++++++++++ src/api/api.js | 18 ++++++++++++++++++ src/assets/base.css | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/assets/logo.svg | 1 + src/assets/main.css | 35 +++++++++++++++++++++++++++++++++++ src/components/icons/IconCommunity.vue | 7 +++++++ src/components/icons/IconDocumentation.vue | 7 +++++++ src/components/icons/IconEcosystem.vue | 7 +++++++ src/components/icons/IconSupport.vue | 7 +++++++ src/components/icons/IconTooling.vue | 19 +++++++++++++++++++ src/main.js | 20 ++++++++++++++++++++ src/main/java/com/ectrip/demo/SNManageApplication.java | 16 ---------------- src/main/java/com/ectrip/demo/controller/SNController.java | 90 ------------------------------------------------------------------------------------------ src/main/java/com/ectrip/demo/dto/AddSNsDTO.java | 24 ------------------------ src/main/java/com/ectrip/demo/dto/DeleteSNsDTO.java | 17 ----------------- src/main/java/com/ectrip/demo/exception/SNRepetitiveException.java | 11 ----------- src/main/java/com/ectrip/demo/service/SNService.java | 35 ----------------------------------- src/main/java/com/ectrip/demo/service/impl/SNServiceImpl.java | 178 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/main/java/com/ectrip/demo/util/HttpResult.java | 40 ---------------------------------------- src/main/resources/application.properties | 22 ---------------------- src/main/resources/log4j2.xml | 64 ---------------------------------------------------------------- src/main/resources/sn/SN.txt | 3 --- src/main/resources/sn/SNTemp.txt | 3 --- src/main/resources/templates/Index.html | 139 ------------------------------------------------------------------------------------------------------------------------------------------- src/router/index.js | 25 +++++++++++++++++++++++++ src/views/HomeView.vue | 296 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vite.config.js | 27 +++++++++++++++++++++++++++ 34 files changed, 676 insertions(+), 760 deletions(-) create mode 100644 index.html create mode 100644 package.json delete mode 100644 pom.xml create mode 100644 public/config.js create mode 100644 public/favicon.ico create mode 100644 src/App.vue create mode 100644 src/api/api.js create mode 100644 src/assets/base.css create mode 100644 src/assets/logo.svg create mode 100644 src/assets/main.css create mode 100644 src/components/icons/IconCommunity.vue create mode 100644 src/components/icons/IconDocumentation.vue create mode 100644 src/components/icons/IconEcosystem.vue create mode 100644 src/components/icons/IconSupport.vue create mode 100644 src/components/icons/IconTooling.vue create mode 100644 src/main.js delete mode 100644 src/main/java/com/ectrip/demo/SNManageApplication.java delete mode 100644 src/main/java/com/ectrip/demo/controller/SNController.java delete mode 100644 src/main/java/com/ectrip/demo/dto/AddSNsDTO.java delete mode 100644 src/main/java/com/ectrip/demo/dto/DeleteSNsDTO.java delete mode 100644 src/main/java/com/ectrip/demo/exception/SNRepetitiveException.java delete mode 100644 src/main/java/com/ectrip/demo/service/SNService.java delete mode 100644 src/main/java/com/ectrip/demo/service/impl/SNServiceImpl.java delete mode 100644 src/main/java/com/ectrip/demo/util/HttpResult.java delete mode 100644 src/main/resources/application.properties delete mode 100644 src/main/resources/log4j2.xml delete mode 100644 src/main/resources/sn/SN.txt delete mode 100644 src/main/resources/sn/SNTemp.txt delete mode 100644 src/main/resources/templates/Index.html create mode 100644 src/router/index.js create mode 100644 src/views/HomeView.vue create mode 100644 vite.config.js diff --git a/.gitignore b/.gitignore index 2140a37..1d09c50 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,22 @@ build/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store + +node_modules/ +package-lock.json +npm-debug.log* +yarn-debug.log* +yarn-error.log* +tests/**/coverage/ +./unpackage/dist/* +.unpackage/dist/dev* +unpackage/ +.gitignore +.hbuilderx +*.sui +*.ntvs* +*.njsproj +*.sln +.tea +helper.json diff --git a/README.md b/README.md index 3a667c7..f113b12 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,29 @@ -**配置SN文件路径：** -在resources下设置**application.properties**文件中的**SN.file.path**属性（该属性是存储SN的文件的路径，文件格式是txt，例：D:/temp/SN.txt） -以及设置**SN.file.temp.path**属性（该属性是SN备份文件的路径，文件格式是txt，例：D:/temp/SNTemp.txt） +# y -**配置日志文件路径：** -在resources下设置**log4j2.xml**文件中"Property name="baseDir" value="./log"/"标签内的value值（该值为存储日志文件的文件夹路径,例：D:/temp/log） +This template should help get you started developing with Vue 3 in Vite. + +## Recommended IDE Setup + +[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur) + [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin). + +## Customize configuration + +See [Vite Configuration Reference](https://vitejs.dev/config/). + +## Project Setup + +```sh +npm install +``` + +### Compile and Hot-Reload for Development + +```sh +npm run dev +``` + +### Compile and Minify for Production + +```sh +npm run build +``` diff --git a/index.html b/index.html new file mode 100644 index 0000000..99f583a --- /dev/null +++ b/index.html @@ -0,0 +1,13 @@ + + + + + + + Vite App + + +
+ + + diff --git a/package.json b/package.json new file mode 100644 index 0000000..eacb0f7 --- /dev/null +++ b/package.json @@ -0,0 +1,23 @@ +{ + "name": "y", + "version": "0.0.0", + "private": true, + "scripts": { + "dev": "vite", + "build": "vite build", + "preview": "vite preview" + }, + "dependencies": { + "@element-plus/icons-vue": "^2.3.1", + "axios": "^1.4.0", + "element-plus": "^2.3.8", + "js-cookie": "^3.0.5", + "spark-md5": "^3.0.2", + "vue": "^3.3.4", + "vue-router": "^4.2.4" + }, + "devDependencies": { + "@vitejs/plugin-vue": "^4.2.3", + "vite": "^4.4.6" + } +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 96078f5..0000000 --- a/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - 4.0.0 - - com.ectrip - SNManage - 1.0 - - - - - - - - org.springframework.boot - spring-boot-starter-parent - 2.3.1.RELEASE - - - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - io.springfox - springfox-swagger2 - 2.7.0 - - - io.springfox - springfox-swagger-ui - 2.7.0 - - - - cn.hutool - hutool-http - 4.1.14 - - - - org.springframework.boot - spring-boot-starter-validation - - - org.projectlombok - lombok - 1.16.10 - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-logging - - - - - - org.springframework.boot - spring-boot-starter-log4j2 - - - - - - - - - - src/main/java - - **/*.xml - - - - src/main/resources - - **/*.* - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - \ No newline at end of file diff --git a/public/config.js b/public/config.js new file mode 100644 index 0000000..ea58f87 --- /dev/null +++ b/public/config.js @@ -0,0 +1,4 @@ +const BaseUrl = { + URL: "http://127.0.0.1:8080/" +} +export default BaseUrl; diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..df36fcf Binary files /dev/null and b/public/favicon.ico differ diff --git a/src/App.vue b/src/App.vue new file mode 100644 index 0000000..ef94181 --- /dev/null +++ b/src/App.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/api/api.js b/src/api/api.js new file mode 100644 index 0000000..f9c7947 --- /dev/null +++ b/src/api/api.js @@ -0,0 +1,18 @@ + +const baseUrl = '/api'; + +export const addSNsApi = { + method: 'post', + url: baseUrl + '/sn/add_sn' +} + +export const getSNsApi = { + method: 'get', + url: baseUrl + '/sn/get_sn' +} + +export const deleteSNsApi = { + method: 'post', + url: baseUrl + '/sn/delete_sn' +} + diff --git a/src/assets/base.css b/src/assets/base.css new file mode 100644 index 0000000..d3de42e --- /dev/null +++ b/src/assets/base.css @@ -0,0 +1,73 @@ +/* color palette from */ +:root { + --vt-c-white: #ffffff; + --vt-c-white-soft: #f8f8f8; + --vt-c-white-mute: #f2f2f2; + + --vt-c-black: #181818; + --vt-c-black-soft: #222222; + --vt-c-black-mute: #282828; + + --vt-c-indigo: #2c3e50; + + --vt-c-divider-light-1: rgba(60, 60, 60, 0.29); + --vt-c-divider-light-2: rgba(60, 60, 60, 0.12); + --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65); + --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48); + + --vt-c-text-light-1: var(--vt-c-indigo); + --vt-c-text-light-2: rgba(60, 60, 60, 0.66); + --vt-c-text-dark-1: var(--vt-c-white); + --vt-c-text-dark-2: rgba(235, 235, 235, 0.64); +} + +/* semantic color variables for this project */ +:root { + --color-background: var(--vt-c-white); + --color-background-soft: var(--vt-c-white-soft); + --color-background-mute: var(--vt-c-white-mute); + + --color-border: var(--vt-c-divider-light-2); + --color-border-hover: var(--vt-c-divider-light-1); + + --color-heading: var(--vt-c-text-light-1); + --color-text: var(--vt-c-text-light-1); + + --section-gap: 160px; +} + +@media (prefers-color-scheme: dark) { + :root { + --color-background: var(--vt-c-black); + --color-background-soft: var(--vt-c-black-soft); + --color-background-mute: var(--vt-c-black-mute); + + --color-border: var(--vt-c-divider-dark-2); + --color-border-hover: var(--vt-c-divider-dark-1); + + --color-heading: var(--vt-c-text-dark-1); + --color-text: var(--vt-c-text-dark-2); + } +} + +*, +*::before, +*::after { + box-sizing: border-box; + margin: 0; + font-weight: normal; +} + +body { + min-height: 100vh; + color: var(--color-text); + background: var(--color-background); + transition: color 0.5s, background-color 0.5s; + line-height: 1.6; + font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, + Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; + font-size: 15px; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} diff --git a/src/assets/logo.svg b/src/assets/logo.svg new file mode 100644 index 0000000..7565660 --- /dev/null +++ b/src/assets/logo.svg @@ -0,0 +1 @@ + diff --git a/src/assets/main.css b/src/assets/main.css new file mode 100644 index 0000000..e8667cd --- /dev/null +++ b/src/assets/main.css @@ -0,0 +1,35 @@ +@import './base.css'; + +#app { + max-width: 1280px; + margin: 0 auto; + padding: 2rem; + + font-weight: normal; +} + +a, +.green { + text-decoration: none; + color: hsla(160, 100%, 37%, 1); + transition: 0.4s; +} + +@media (hover: hover) { + a:hover { + background-color: hsla(160, 100%, 37%, 0.2); + } +} + +@media (min-width: 1024px) { + body { + display: flex; + place-items: center; + } + + #app { + display: grid; + grid-template-columns: 1fr 1fr; + padding: 0 2rem; + } +} diff --git a/src/components/icons/IconCommunity.vue b/src/components/icons/IconCommunity.vue new file mode 100644 index 0000000..2dc8b05 --- /dev/null +++ b/src/components/icons/IconCommunity.vue @@ -0,0 +1,7 @@ + diff --git a/src/components/icons/IconDocumentation.vue b/src/components/icons/IconDocumentation.vue new file mode 100644 index 0000000..6d4791c --- /dev/null +++ b/src/components/icons/IconDocumentation.vue @@ -0,0 +1,7 @@ + diff --git a/src/components/icons/IconEcosystem.vue b/src/components/icons/IconEcosystem.vue new file mode 100644 index 0000000..c3a4f07 --- /dev/null +++ b/src/components/icons/IconEcosystem.vue @@ -0,0 +1,7 @@ + diff --git a/src/components/icons/IconSupport.vue b/src/components/icons/IconSupport.vue new file mode 100644 index 0000000..7452834 --- /dev/null +++ b/src/components/icons/IconSupport.vue @@ -0,0 +1,7 @@ + diff --git a/src/components/icons/IconTooling.vue b/src/components/icons/IconTooling.vue new file mode 100644 index 0000000..660598d --- /dev/null +++ b/src/components/icons/IconTooling.vue @@ -0,0 +1,19 @@ + + diff --git a/src/main.js b/src/main.js new file mode 100644 index 0000000..af2583b --- /dev/null +++ b/src/main.js @@ -0,0 +1,20 @@ +// import './assets/main.css' + +import { createApp } from 'vue' +import App from './App.vue' +import router from './router' +import ElementPlus from 'element-plus' +import 'element-plus/dist/index.css' +import * as ElementPlusIconsVue from '@element-plus/icons-vue' + +const app = createApp(App) + +app.use(router) + .use(ElementPlus) + + +app.mount('#app') + +for (const [key, component] of Object.entries(ElementPlusIconsVue)) { + app.component(key, component) +} diff --git a/src/main/java/com/ectrip/demo/SNManageApplication.java b/src/main/java/com/ectrip/demo/SNManageApplication.java deleted file mode 100644 index b479346..0000000 --- a/src/main/java/com/ectrip/demo/SNManageApplication.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ectrip.demo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - - -@SpringBootApplication -@EnableSwagger2 -public class SNManageApplication { - - public static void main(String[] args) { - SpringApplication.run(SNManageApplication.class, args); - } - -} diff --git a/src/main/java/com/ectrip/demo/controller/SNController.java b/src/main/java/com/ectrip/demo/controller/SNController.java deleted file mode 100644 index 30bd00a..0000000 --- a/src/main/java/com/ectrip/demo/controller/SNController.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.ectrip.demo.controller; - -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.web.bind.annotation.*; - -import javax.validation.Valid; - -@Api(tags = "SN操作") -@RestController -@RequestMapping("/sn") -public class SNController { - static Logger logger = LogManager.getLogger(SNController.class); - - @Autowired - SNService snService; - -// @ApiOperation("首页") -// @GetMapping("/index.html") -// public String index() { -// return "Index"; -// } - - @ApiOperation("添加SN") - @PostMapping("/add_sn") - @ResponseBody - public HttpResult addSN(@RequestBody @Valid AddSNsDTO addSNsDTO) { - - try { - snService.addSN(addSNsDTO); - return HttpResult.success("添加成功"); - } catch (SNRepetitiveException e) { - return HttpResult.fail(e.getMessage()); - } catch (Exception e) { - logger.error(e.getMessage()); - return HttpResult.fail(); - } - - } - - -// @ApiOperation("获取全部SN") -// @GetMapping("/get_SNs") -// @ResponseBody -// public void getSNs(HttpServletRequest request, HttpServletResponse response) { -// try { -// snService.downloadSNFile(request, response); -// } catch (Exception e) { -// response.setStatus(500); -// } -// -// } - - @ApiOperation("获取全部base64加密后的SN") - @GetMapping("/get_sn") - @ResponseBody - public HttpResult getBase64SNs() { - try { - return HttpResult.success("",snService.getEncryptSNs()); - } catch (Exception e) { - logger.error(e.getMessage()); - return HttpResult.fail("服务器异常"); - } - - } - - @ApiOperation("删除指定SN") - @PostMapping("/delete_sn") - @ResponseBody - public HttpResult deleteSN(@RequestBody @Valid DeleteSNsDTO deleteSNsDTO) { - try { - snService.deleteSN(deleteSNsDTO); - return HttpResult.success("删除成功！"); - } - catch (Exception e) { - logger.error(e.getMessage()); - return HttpResult.fail("服务器异常！"); - } - } - - -} diff --git a/src/main/java/com/ectrip/demo/dto/AddSNsDTO.java b/src/main/java/com/ectrip/demo/dto/AddSNsDTO.java deleted file mode 100644 index 5b9f242..0000000 --- a/src/main/java/com/ectrip/demo/dto/AddSNsDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.ectrip.demo.dto; - - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -@Data -@ApiModel(description = "删除SNs入参") -public class AddSNsDTO { - - @ApiModelProperty(value = "项目名称") - @NotBlank(message = "项目名称不能为空！") - private String projectName; - - @ApiModelProperty(value = "设备码") - @NotNull(message = "设备码不能为空！") - private ArrayList sns; -} diff --git a/src/main/java/com/ectrip/demo/dto/DeleteSNsDTO.java b/src/main/java/com/ectrip/demo/dto/DeleteSNsDTO.java deleted file mode 100644 index 707ce1f..0000000 --- a/src/main/java/com/ectrip/demo/dto/DeleteSNsDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ectrip.demo.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -@Data -@ApiModel(description = "删除SNs入参") -public class DeleteSNsDTO { - @ApiModelProperty(value = "设备码") - @NotNull(message = "设备码不能为空！") - private ArrayList sns; -} diff --git a/src/main/java/com/ectrip/demo/exception/SNRepetitiveException.java b/src/main/java/com/ectrip/demo/exception/SNRepetitiveException.java deleted file mode 100644 index 0be5e56..0000000 --- a/src/main/java/com/ectrip/demo/exception/SNRepetitiveException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.ectrip.demo.exception; - -public class SNRepetitiveException extends Exception{ - - public SNRepetitiveException() {} - - public SNRepetitiveException(String message) { - super(message); - } - -} diff --git a/src/main/java/com/ectrip/demo/service/SNService.java b/src/main/java/com/ectrip/demo/service/SNService.java deleted file mode 100644 index d19f438..0000000 --- a/src/main/java/com/ectrip/demo/service/SNService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.ectrip.demo.service; - -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.IOException; - -public interface SNService { - /** - * 新增SN号 - * @param addSNsDTO SN号 - */ - void addSN(AddSNsDTO addSNsDTO) throws SNRepetitiveException, IOException; - - /** - * 下载所有SN号 - */ - void downloadSNFile(HttpServletRequest request, HttpServletResponse response) throws IOException; - - /** - * 获取所有加密后的SN字符串 - * @return - - */ - String getEncryptSNs() throws IOException; - - /** - * 删除指定SN记录 - * @param deleteSNsDTO SN号 - */ - void deleteSN(DeleteSNsDTO deleteSNsDTO) throws Exception; - -} diff --git a/src/main/java/com/ectrip/demo/service/impl/SNServiceImpl.java b/src/main/java/com/ectrip/demo/service/impl/SNServiceImpl.java deleted file mode 100644 index a76a23f..0000000 --- a/src/main/java/com/ectrip/demo/service/impl/SNServiceImpl.java +++ /dev/null @@ -1,178 +0,0 @@ -package com.ectrip.demo.service.impl; - -import cn.hutool.core.codec.Base64; -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; -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; -import java.util.Set; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -@Service -public class SNServiceImpl implements SNService { - /** - * 多线程改写文件存在并发问题，需加锁操作 - */ - private static final Lock lock = new ReentrantLock(); - - static Logger logger = LogManager.getLogger(SNServiceImpl.class); - - @Value("${SN.file.path}") - String SNFilePath; - - @Value("${SN.file.temp.path}") - String SNTempFilePath; - - @Override - public void addSN(AddSNsDTO addSNsDTO) throws SNRepetitiveException, IOException { - - //加try，catch只为释放锁 - try { - //加锁 - lock.lock(); - logger.info("-----------------------------开始添加SNs-----------------------------"); - StringBuilder SNs = new StringBuilder(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String currTime = sdf.format(new Date()); - //读取文件，判断SN是否重复 - Set set = new HashSet<>(); - 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("##"); - String SN = br.substring(0,index == -1? 0 : index); - set.add(SN); - } - for (String SN : addSNsDTO.getSns()) { - if (set.contains(SN)) { - throw new SNRepetitiveException("SN：" + SN + " 已存在，请勿重复添加"); - } - SNs.append(SN).append("##").append(addSNsDTO.getProjectName()).append("##").append(currTime); - SNs.append(System.lineSeparator()); - } - - - //写入 - 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(); - } - } - - @Override - public String getEncryptSNs() throws IOException { - //读取文件 - 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 Base64.encode(builder.toString()); - } - - @Override - public void deleteSN(DeleteSNsDTO deleteSNsDTO) throws Exception{ - try { - lock.lock(); - logger.info("-----------------------------开始删除SNs-----------------------------"); - - HashSet deleteSNsSet = new HashSet<>(deleteSNsDTO.getSns()); - - //读取文件，记录不用删除的数据 - 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(); - //所要删除的SN是否存在 - boolean SNExist = false; - while ((br=bufferedReader.readLine()) != null) { - //截取SN - 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(br).append(System.lineSeparator()); - SNExist = true; - } - } - bufferedReader.close(); - - //如果存在要删除的SN，先将数据备份，再将留存数据覆盖掉原SN文件。 - if (SNExist) { - //备份数据 - FileOutputStream tempFileOutputStream = new FileOutputStream(SNTempFilePath); - tempFileOutputStream.write(stringBuilder.toString().getBytes(StandardCharsets.UTF_8)); - tempFileOutputStream.flush(); - tempFileOutputStream.close(); - //覆盖掉原来的数据到SN文件中 - FileOutputStream fileOutputStream = new FileOutputStream(SNFilePath); - fileOutputStream.write(stringBuilder.toString().getBytes(StandardCharsets.UTF_8)); - fileOutputStream.flush(); - fileOutputStream.close(); - logger.warn("成功删除SNs：{}",existSNs); - } - - logger.info("-----------------------------结束删除SNs-----------------------------"); - - - } finally { - lock.unlock(); - } - } - - @Override - public void downloadSNFile(HttpServletRequest request, HttpServletResponse response) throws IOException { - File file = new File(SNFilePath); - - response.setCharacterEncoding("UTF-8"); - response.setHeader("Content-type","application/octet-stream;charset=UTF-8"); - response.setHeader("Content-Disposition", "attachment;filename=" + java.net.URLEncoder.encode(file.getName().trim(), "UTF-8")); - response.addHeader("Pargam", "no-cache"); - response.addHeader("Cache-Control", "no-cache"); - - //读取文件 - byte[] SNsByteArr = new byte[(int) file.length()]; - FileInputStream fileInputStream = new FileInputStream(file); - fileInputStream.read(SNsByteArr); - //加密 - String encodeSNs = Base64.encode(SNsByteArr); - - //写入到输出流 - response.addHeader("Content-Length",String.valueOf(encodeSNs.getBytes().length)); - OutputStream outputStream = response.getOutputStream(); - outputStream.write(encodeSNs.getBytes()); - outputStream.flush(); - outputStream.close(); - - } - -} diff --git a/src/main/java/com/ectrip/demo/util/HttpResult.java b/src/main/java/com/ectrip/demo/util/HttpResult.java deleted file mode 100644 index 6b61af8..0000000 --- a/src/main/java/com/ectrip/demo/util/HttpResult.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ectrip.demo.util; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class HttpResult implements Serializable { - public static final int CODE_SUCCESS = 200; - public static final int CODE_FAILED = 500; - - private Integer code; - - private String message; - - private T data; - - public static HttpResult success() { - return new HttpResult<>(200,"success",null); - } - - public static HttpResult success(String message) { - return new HttpResult<>(200,message,null); - } - - public static HttpResult success(String message, T data) { - return new HttpResult<>(200,message,data); - } - - public static HttpResult fail() { - return new HttpResult<>(500,"fail",null); - } - public static HttpResult fail(String message) { - return new HttpResult<>(500,message,null); - } -} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 7b465ca..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,22 +0,0 @@ - server.port=8080 - - -spring.web.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/ - - -logging.config=classpath:log4j2.xml - -#swagger.basic.enable = true -#swagger.basic.username = test -#swagger.basic.password = 123 - -#spring.thymeleaf.cache=false -#spring.thymeleaf.prefix=classpath:/templates/ -#spring.thymeleaf.suffix=.html - - -SN.file.path=src/main/resources/sn/SN.txt -SN.file.temp.path=src/main/resources/sn/SNTemp.txt - -#SN.file.path= -#SN.file.temp.path= \ No newline at end of file diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml deleted file mode 100644 index 0b1296d..0000000 --- a/src/main/resources/log4j2.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/sn/SN.txt b/src/main/resources/sn/SN.txt deleted file mode 100644 index 7e6fc04..0000000 --- a/src/main/resources/sn/SN.txt +++ /dev/null @@ -1,3 +0,0 @@ -sn6##项目2##2024-03-20 19:22:17 -sn7##项目2##2024-03-20 19:22:17 -sn8##项目2##2024-03-20 19:22:17 diff --git a/src/main/resources/sn/SNTemp.txt b/src/main/resources/sn/SNTemp.txt deleted file mode 100644 index 7e6fc04..0000000 --- a/src/main/resources/sn/SNTemp.txt +++ /dev/null @@ -1,3 +0,0 @@ -sn6##项目2##2024-03-20 19:22:17 -sn7##项目2##2024-03-20 19:22:17 -sn8##项目2##2024-03-20 19:22:17 diff --git a/src/main/resources/templates/Index.html b/src/main/resources/templates/Index.html deleted file mode 100644 index 32fac8a..0000000 --- a/src/main/resources/templates/Index.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - - -
-
- - -
- -
-
- -
-
- -
- -
-
- -
- - -
- - - - - - - - \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js new file mode 100644 index 0000000..385df97 --- /dev/null +++ b/src/router/index.js @@ -0,0 +1,25 @@ +import { createRouter, createWebHistory } from 'vue-router' +import HomeView from '../views/HomeView.vue' + +const router = createRouter({ + history: createWebHistory(import.meta.env.BASE_URL), + routes: [ + { + path: '/', + name: 'home', + component: HomeView, + meta: { + title: 'SN管理' + } + } + ] +}) + +router.beforeEach((to,from,next)=>{//beforeEach是router的钩子函数，在进入路由前执行 + if(to.meta.title){//判断是否有标题 + document.title = to.meta.title + } + next() //执行进入路由，如果不写就不会进入目标页 +}) + +export default router diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue new file mode 100644 index 0000000..d724c77 --- /dev/null +++ b/src/views/HomeView.vue @@ -0,0 +1,296 @@ + + + + + + + diff --git a/vite.config.js b/vite.config.js new file mode 100644 index 0000000..3bd3471 --- /dev/null +++ b/vite.config.js @@ -0,0 +1,27 @@ +import { fileURLToPath, URL } from 'node:url' +import BaseUrl from './public/config' +import { defineConfig } from 'vite' +import vue from '@vitejs/plugin-vue' + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [ + vue(), + ], + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)) + } + }, + //设置代理请求 + server: { + proxy: { + '/api': { + // 后台地址 + target: BaseUrl.URL, + changeOrigin: true, + rewrite: path => path.replace(/^\/api/, '') + } + } + } +}) -- libgit2 0.21.4