From bb55a471a8103b6bd20f9f0d2a1902a907a3f8b5 Mon Sep 17 00:00:00 2001 From: userA Date: Fri, 21 Apr 2023 03:36:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=9E=B6?= =?UTF-8?q?=E6=9E=84=E7=9A=84=E5=B0=8F=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 36 +++++-- .../org/example/bean/ModuleConfigSrc.java | 15 --- .../org/example/bean/ModuleSrcConfigFile.java | 51 +++++++++ .../org/example/init/ModuleConfigSrcInit.java | 99 ------------------ .../example/init/ModuleSrcConfigFileInit.java | 89 ++++++++++++++++ FileModule/src/main/resources/student2.json | 19 +++- .../org/example/util/JsonFileUtilTest.java | 21 ++++ .../org/example/bean/ModuleConfigSrc.class | Bin 1790 -> 0 bytes .../example/init/ModuleConfigSrcInit.class | Bin 4259 -> 0 bytes FileModule/target/classes/student2.json | 19 +++- .../org/example/util/JsonFileUtilTest.class | Bin 3088 -> 4380 bytes .../java/org/example/common/ConfigFile.java | 52 +++++++++ .../java/org/example/constpool/ConstPool.java | 20 ++++ config/moduleConfig.json | 23 ---- .../java/org/example/ConsoleApplication.java | 4 +- 15 files changed, 296 insertions(+), 152 deletions(-) delete mode 100644 FileModule/src/main/java/org/example/bean/ModuleConfigSrc.java create mode 100644 FileModule/src/main/java/org/example/bean/ModuleSrcConfigFile.java delete mode 100644 FileModule/src/main/java/org/example/init/ModuleConfigSrcInit.java create mode 100644 FileModule/src/main/java/org/example/init/ModuleSrcConfigFileInit.java delete mode 100644 FileModule/target/classes/org/example/bean/ModuleConfigSrc.class delete mode 100644 FileModule/target/classes/org/example/init/ModuleConfigSrcInit.class create mode 100644 common/src/main/java/org/example/common/ConfigFile.java create mode 100644 common/src/main/java/org/example/constpool/ConstPool.java delete mode 100644 config/moduleConfig.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ae0bae..35e97e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,16 +3,20 @@ ```markdown 格式： ## [版本号] - 日期 - ### 模块名称 - - 🎈新增 - - 🐞修复 - - 📝文档 - - 🚀性能 - - 🎨样式 - - 🧹重构 - - 🧪测试 - - 🚧工作中(勿动) - ...... + ### 模板名称 (可选 console-ui, console, FileModule, common, ...) + - 🎈新增: {模块名称} {功能介绍} + - 🐞Bug: #{issue号} {bug描述} + - ⛏修复: #{issue号} {修复描述} + - 📝文档: {文件名} 添加注释 + - 🚀性能: {类} {方法} {描述} + - 🎨样式: + - 🧹重构: + - 🧪测试: {类|方法} {测试结果} + - 🛑更名: {旧名} ➡ {新名} + - ❌移除: {模块|方法} + + ------ + ``` ## [V 1.0.0] - 2023.4.20 ### console-ui @@ -23,7 +27,7 @@ - 🎈新增: 新增 `FileUtil` 工具类，用于进行文件复制文件删除等操作 - 🎈新增: 新增 `FileCondition` 方法，用于对文件递归删除进行条件过滤 - 🎈新增: 新增 `ModuleConfigSrcInit` 初始化模块，用于初始化各个模块的配置文件夹，以及模块配置文件路径管理 -- 🎈新增: 新增 `ModuleConfigSrc` 模块配置类 +- 🎈新增: 新增 `ModuleConfigSrc` 存放文件src路径 - 🧪测试: 测试 `FileUtil` 工具类, 测试 `JsonFileUtil` 工具类 ### console @@ -32,5 +36,15 @@ ### 🎈新增 common 模块 - 🎈新增: 新增 `InitMachine` 初始化机器接口，为所有模块初始化类提供统一接口 +------ +## [V 1.0.1] - 2023.4.21 +### common +- 🎈新增: 新增 `ConstPool` 常量池，用于存放常量，目前存放了模块名称常量，便于开发统一 +- 🎈新增: 新增 `ConfigFile` 配置文件类，用于存放配置文件路径, 包装配置文件,目前配置文件主要内容为data,新增更新时间 +### FileModule +- 🛑更名：`ModuleConfigSrcInit` ➡ `ModuleSrcConfigInit` +- 🛑更名：`ModuleConfigSrc` ➡ `ModuleSrcConfig` +- 🧹重构: 重构 `ModuleSrcConfig` 现在作为某块路径的配置文件类，负责管理模块的配置文件路径 +- ❌移除: 移除 `ModuleSrcConfigInit` 模块配置文件路径管理功能，只负责**初始化** diff --git a/FileModule/src/main/java/org/example/bean/ModuleConfigSrc.java b/FileModule/src/main/java/org/example/bean/ModuleConfigSrc.java deleted file mode 100644 index 72df930..0000000 --- a/FileModule/src/main/java/org/example/bean/ModuleConfigSrc.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.example.bean; - -import lombok.AllArgsConstructor; -import lombok.Data; - -/** - * @author Genius - * @date 2023/04/20 19:29 - **/ - -@Data -@AllArgsConstructor -public class ModuleConfigSrc { - private String src; -} diff --git a/FileModule/src/main/java/org/example/bean/ModuleSrcConfigFile.java b/FileModule/src/main/java/org/example/bean/ModuleSrcConfigFile.java new file mode 100644 index 0000000..0dec81b --- /dev/null +++ b/FileModule/src/main/java/org/example/bean/ModuleSrcConfigFile.java @@ -0,0 +1,51 @@ +package org.example.bean; + +import org.example.common.ConfigFile; +import org.example.constpool.ConstPool; + +import java.util.Map; + +/** + * @author Genius + * @date 2023/04/20 19:29 + **/ + + +public class ModuleSrcConfigFile extends ConfigFile> { + + private static final Map config; + + public static class SRC{ + private String src; + public SRC(String src) { + this.src = src; + } + + public String getSrc() { + return src; + } + } + + static{ + config = Map.of( + ConstPool.ACCOUNT, new SRC("./config/"+ConstPool.ACCOUNT), + ConstPool.SECTION, new SRC("./config/"+ConstPool.SECTION), + ConstPool.BARRAGE, new SRC("./config/"+ConstPool.BARRAGE), + ConstPool.CREEPER, new SRC("./config/"+ConstPool.CREEPER), + ConstPool.SECTION_WORK, new SRC("./config/"+ConstPool.SECTION_WORK), + ConstPool.HOT, new SRC("./config/"+ConstPool.HOT), + ConstPool.PUBLISH, new SRC("./config/"+ConstPool.PUBLISH) + ); + } + + + public ModuleSrcConfigFile() { + super("./config" + , "moduleConfig.json" + , config); + } + + public Map packageConfig() { + return super.packageConfig(); + } +} diff --git a/FileModule/src/main/java/org/example/init/ModuleConfigSrcInit.java b/FileModule/src/main/java/org/example/init/ModuleConfigSrcInit.java deleted file mode 100644 index bef80f5..0000000 --- a/FileModule/src/main/java/org/example/init/ModuleConfigSrcInit.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.example.init; - -import org.example.bean.ModuleConfigSrc; -import org.example.util.FileUtil; -import org.example.util.JsonFileUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Map; -import java.util.Objects; - -/** - * @author Genius - * @date 2023/04/20 18:34 - **/ - -public class ModuleConfigSrcInit implements InitMachine { - - private Logger logger = LoggerFactory.getLogger(ModuleConfigSrcInit.class); - private static final Map config; - - static{ - config = Map.of( - "account", new ModuleConfigSrc("./config/account"), - "section", new ModuleConfigSrc("./config/section"), - "barrage", new ModuleConfigSrc("./config/barrage"), - "creeper", new ModuleConfigSrc("./config/creeper"), - "videowork", new ModuleConfigSrc("./config/videowork"), - "hot", new ModuleConfigSrc("./config/hot"), - "publish", new ModuleConfigSrc("./config/publish") - ); - } - - private static final String CONFIG_SRC = "./config"; - private static final String CONFIG_SRC_FILE = "moduleConfig.json"; - - // 初始化每个模块的配置文件夹 - @Override - public boolean init() { - Path dir = Paths.get(CONFIG_SRC); - if (!createConfigDirectory(dir)) { - return false; - } - if (!createConfigFile(dir)) { - return false; - } - if (!createModuleDirectory()) { - return false; - } - return true; - } - - private boolean createConfigDirectory(Path dir) { - try { - if (!Files.exists(dir)) { - Files.createDirectory(dir); - logger.info("创建 config 文件夹成功 √ "); - } - }catch (Exception e) { - logger.error("创建配置文件夹失败"); - return false; - } - return true; - } - - private boolean createConfigFile(Path dir) { - Path path = Paths.get(dir.toString(), CONFIG_SRC_FILE); - try { - if (!Files.exists(path)) { - JsonFileUtil.writeJsonFile(path.toString(),config); - logger.info("创建 {} 配置文件成功 √",CONFIG_SRC_FILE); - } - }catch (Exception e) { - logger.error("创建配置文件失败"); - return false; - } - return true; - } - - private boolean createModuleDirectory() { - for (Map.Entry stringModuleConfigSrcEntry : config.entrySet()) { - ModuleConfigSrc moduleConfigSrc = stringModuleConfigSrcEntry.getValue(); - try { - if (!FileUtil.isFileExist(moduleConfigSrc.getSrc())) { - Files.createDirectory(Path.of(moduleConfigSrc.getSrc())); - logger.info("创建 {} 模块文件夹成功 √ ",moduleConfigSrc.getSrc()); - } - }catch (Exception e) { - logger.error("创建 {} 模块文件夹失败 ×",moduleConfigSrc.getSrc()); - return false; - } - } - return true; - } -} diff --git a/FileModule/src/main/java/org/example/init/ModuleSrcConfigFileInit.java b/FileModule/src/main/java/org/example/init/ModuleSrcConfigFileInit.java new file mode 100644 index 0000000..acb5ece --- /dev/null +++ b/FileModule/src/main/java/org/example/init/ModuleSrcConfigFileInit.java @@ -0,0 +1,89 @@ +package org.example.init; + +import org.example.bean.ModuleSrcConfigFile; +import org.example.util.FileUtil; +import org.example.util.JsonFileUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Map; + +/** + * @author Genius + * @date 2023/04/20 18:34 + **/ + +public class ModuleSrcConfigFileInit implements InitMachine { + + private Logger logger = LoggerFactory.getLogger(ModuleSrcConfigFileInit.class); + + ModuleSrcConfigFile moduleSrcConfigFile; + public ModuleSrcConfigFileInit() { + moduleSrcConfigFile = new ModuleSrcConfigFile(); + } + @Override + public boolean init() { + Path dir = Paths.get(moduleSrcConfigFile.getFilePath()); + if (!createConfigDirectory(dir)) { + return false; + } + if (!createConfigFile(dir)) { + return false; + } + if (!createModuleDirectory()) { + return false; + } + return true; + } + + private boolean createConfigDirectory(Path dir) { + try { + if (!Files.exists(dir)) { + Files.createDirectory(dir); + logger.info("创建 config 文件夹成功 √ "); + } + }catch (Exception e) { + logger.error("创建配置文件夹失败"); + return false; + } + return true; + } + + private boolean createConfigFile(Path dir) { + Path path = Paths.get(dir.toString(), moduleSrcConfigFile.getFileName()); + try { + if (!Files.exists(path)) { + JsonFileUtil.writeJsonFile(path.toString(),moduleSrcConfigFile.packageConfig()); + logger.info("创建 {} 配置文件成功 √",moduleSrcConfigFile.getFileName()); + } + }catch (Exception e) { + logger.error("创建配置文件失败"); + return false; + } + return true; + } + + private boolean createModuleDirectory() { + + Map moduleSrcConfigFileMap + = (Map) moduleSrcConfigFile.packageConfig().get("data"); + + for (Map.Entry stringModuleConfigSrcEntry : moduleSrcConfigFileMap.entrySet()) { + + ModuleSrcConfigFile.SRC src = stringModuleConfigSrcEntry.getValue(); + try { + if (!FileUtil.isFileExist(src.getSrc())) { + Files.createDirectory(Path.of(src.getSrc())); + logger.info("创建 {} 模块文件夹成功 √ ",src.getSrc()); + } + }catch (Exception e) { + logger.error("创建 {} 模块文件夹失败 ×",src.getSrc()); + return false; + } + } + return true; + } +} diff --git a/FileModule/src/main/resources/student2.json b/FileModule/src/main/resources/student2.json index c4be758..5d5bcbe 100644 --- a/FileModule/src/main/resources/student2.json +++ b/FileModule/src/main/resources/student2.json @@ -1 +1,18 @@ -[{"age":18,"hobby":["Coding","Reading","Playing"],"info":{"QQ":"123456789","WeChat":"987654321"},"major":"CS","name":"Genius","school":"HUST"}] \ No newline at end of file +{ + "hello":"11234", + "Student":{ + "age":18, + "hobby":[ + "Coding", + "Reading", + "Playing" + ], + "info":{ + "QQ":"123456789", + "WeChat":"987654321" + }, + "major":"CS", + "name":"Genius", + "school":"HUST" + } +} \ No newline at end of file diff --git a/FileModule/src/test/java/org/example/util/JsonFileUtilTest.java b/FileModule/src/test/java/org/example/util/JsonFileUtilTest.java index 3e5685c..dfef6a2 100644 --- a/FileModule/src/test/java/org/example/util/JsonFileUtilTest.java +++ b/FileModule/src/test/java/org/example/util/JsonFileUtilTest.java @@ -22,6 +22,26 @@ import java.util.Map; public class JsonFileUtilTest { + @Test + public void writeMapObj() throws IOException { + Student student = new Student( + "Genius", + 18, + "HUST", + "CS", + List.of("Coding", "Reading", "Playing"), + Map.of("QQ", "123456789", "WeChat", "987654321") + ); + JsonFileUtil.writeJsonFile("E:\\Project\\ChopperBot\\FileModule\\src\\main\\resources\\student2.json", + Map.of("Student", student,"hello","11234")); + Map stringObjectMap = JsonFileUtil.readJsonFile("E:\\Project\\ChopperBot\\FileModule\\src\\main\\resources\\student2.json"); + stringObjectMap.forEach( + (k,v)->{ + System.out.println(k); + System.out.println(v.getClass()); + } + ); + } @Test @@ -64,4 +84,5 @@ public class JsonFileUtilTest { JsonFileUtil.writeBigJsonFile(dir.toString(),maps); } + } diff --git a/FileModule/target/classes/org/example/bean/ModuleConfigSrc.class b/FileModule/target/classes/org/example/bean/ModuleConfigSrc.class deleted file mode 100644 index 38e1a2474959b59b362a11bff22a4e906a4038b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1790 zcmah}TW=dh7(HX}`j&0thFqEwdQFQjNz5f&8Ycm2S`o=96|RB=FHD@l-e$9FcGngC z7d#?<0DZ|rkswHYK=48(eiKm6>~0;WHXwOtzM1(h=bZV*fBgOA7Xa_z!#q+bXHh9| zuIgdAfIL?8usThbH?;L;7Hb0Oz;6poH}A^_vgSy)Q)`93?RM${nT`ru`gEpL9(Qgu zynQ7w)wEr8r+>Jo{CjfG;m&l^YfEQW`nFytn?~5R1A!||&+pXK*YdFEsM?;AZf(cg z?>nmDxnJ5H*3*@Pr1ETOv~YP>ptz&LuD5?z`tneP%4gz?`l>G-8mD4D-n*~bVZHpB zfbdT9OpXLhFYGE`Ag2*7MSA3;t=K-(3T69XNA?mTxwdp~=~|5F%AgyokS>+Cnddi+09WLEi}lj5tp&^kQjwv|+n;xFt|%d40dFZrfV6nHPju)puf{fC+(1|EHRT z3z)ZH;f#ejZC%7A>U7id!XWfzFBUAA%HXXW-nQ5!?^?Ky8}vE3`dE?z*1=1ddjU>~ z%4~|V!2F>+(AU+L;iq;;{%#OTH>C8}$6eRx4YKP><=recG>rEJmQE1Z?gQ^YB|R9| zxGmeE=ReHiCWUKy-a)@7U~Rju@*9o}0>#4L4i`>x#Ed_Z?!Kdfr8uxY3T9~MRN%db zJvGMt^CAD|%{8=@q-aRTY1yHwXVDP2Ho|WlHh~NO?T5>J$$36s!I@n_D@&VK&T*2f z8fU@Tto#V^m_`ay95d18B#N}H*a2su{|5wK!VJB1@H*#|_O4Wag7|^faP&kJJr{c< z(K@q+!6!#=lif@w_6_Fgrc*xVY;tZ?E8oL3j;g;Q^&QOgQT11(c9tv0NJmQ=#+_vj z>&D7cOe`3`6MCib()5lt`NM zku-dh%%r9HhA9lr7mM``V>1$9u~_etey&)3gzU;OGGA;ij;CFTLz7x*(z=W*Oss2O zrKP)Lmee(EP4+5M&&b6fSs_RiLOkQq$(q{?zcy&3HLi3c6*RCX>@r^EIMQ)96%rtP z|ATJYA_%Qmq4G0wV>`+k>Zs=#=s(&~X}lU0FX26%kia(a0k+7l#&wSC*Z95u4{SMG AYXATM diff --git a/FileModule/target/classes/org/example/init/ModuleConfigSrcInit.class b/FileModule/target/classes/org/example/init/ModuleConfigSrcInit.class deleted file mode 100644 index 593c22dd0534f79ae9a2c62917e1ff52be56b070..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4259 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 diff --git a/FileModule/target/classes/student2.json b/FileModule/target/classes/student2.json index c4be758..5d5bcbe 100644 --- a/FileModule/target/classes/student2.json +++ b/FileModule/target/classes/student2.json @@ -1 +1,18 @@ -[{"age":18,"hobby":["Coding","Reading","Playing"],"info":{"QQ":"123456789","WeChat":"987654321"},"major":"CS","name":"Genius","school":"HUST"}] \ No newline at end of file +{ + "hello":"11234", + "Student":{ + "age":18, + "hobby":[ + "Coding", + "Reading", + "Playing" + ], + "info":{ + "QQ":"123456789", + "WeChat":"987654321" + }, + "major":"CS", + "name":"Genius", + "school":"HUST" + } +} \ No newline at end of file diff --git a/FileModule/target/test-classes/org/example/util/JsonFileUtilTest.class b/FileModule/target/test-classes/org/example/util/JsonFileUtilTest.class index 46f933c68400d0c3fdf958702d56ba07b5ae4d84..a9384e8a2f90c441957c43111349733df9ed38e0 100644 GIT binary patch literal 4380 zcmbtX`CAlM7CjHpDwi))C0Tiu7_*zCEYomTZ?B@h-eu$9rVwy(zp8@7M4F9Uqka59#=@^zacK zAC>**b-bYAV<~(bpJ>7-@hLg@X=(Hs3H-AfKBwXH0$a~Gt`nRSsP8;HCD4%Z^0vT^ ztmE33E5$k6pS0!*95J(A&MHh-?ECOf}O4eP9c4%?71UO z!M@JUq+JdM1)84ooxmQmN>}EV1hjHc$=hxq@JPaX&bHk2MD&eDJIaCYxC=C~a{+B7 zv?c4N6-D6y=d>oFEtjhB`jb=7MBRerE--?0JE)9AAqLOUVQTnR&MpOx=aw~mL7?qg z#SNUIJ>`@gl0WadUSNfv1s)60FI6aFdZ|((LqBbmoODdOB_y3GSmpAlTNOpX@NFw! z>oydv5_N0{sFajCWEkR%Q3-4d9o0@$^lhtHPCjq7;nd1fL#ZUu`Z z*HW;Gb9t*Hw2!jUaZKQeP9^Gw>c|oiHvw}O{VS4qD4g;Pn{e%(cgExw@1U5tC8nc5%FJIoV72j;ex7d8U8CMK^2j4aDJ$zrF??F(psA6CtE*bg< zlIjl){0Kk(|EM01UH$|=)$lU|KgTZwo_Y|JNr=D1uQa@9;3fQ8V0&#{XC1i?8s&0` zBah%W%x5voiGi2#3QJ9Xj*=kB{#M}JgCMGTVUB7GFRE${zmw5^ui>_VJ6MrgGNCWw zu7P`aRbZc5#p~{T39r#|7I-KO#FaUEWp%G%0ekZT7uAIrFMnleZa8u{niOJ?`f;gm zt0@|8oih*UdTn?$ShNWze8*eDsA3ooZ8TDYtgQZfmeZtV@ zJ%8BBEeh<90fms)n=F+WSqJq-lB(xN45UWCLv<8$Qqjg0)Eu4?L(W2VCl}~dE!T=2 z8m@eh$M%EH8Wv`TT)_FKo7jgikYge8C8$_ z^sGjpo;r02)5Me{ETi0M_@jY8;co^m;|iBpZF_gzo8ApOoel3oJdmw+uoTyZJoq<3`xaUm8GzkheWP``Jsg6>PV3 z-GO+SFLgM<=hkrWVg6GAMl=B@af&^G(=@IRjc=ogZ@|c_sGBkCn@zL9++uDuHB(yLh;cXFBLjMn8l`J|BgN zcI+Ya4*qsM$>%Y)eK<%2hcJxp5M6tOAV$}L{TRfV5T${$I7dEjqA$teG@obj6i3c; zq=6$t$nZ^aeKT7@pMCr)WqFaz>e$Y_A!fVHwj(Qegp}Akx`M~1%{_eEJN*hCH`~p+ z73{l>{j$?+9*8~TkYaG{P zHD!r!gKBC{$^DJu$ZERGS(3g<)w^yZ&4#KUO9;O`OjIYA=V9{hQaGC!$5mR>9@i){ hPgY`-D|HfoWt-y2pYeD61#Kv>FKfNXIW9bu{s+W3o8ABb delta 1088 zcmZ9KSyK~15Xb+s3+%A09E%1}Ae;%3NaQ}E2+Ac8K~V#EMu;4SB$9x5#v5;;_K7M# zgH=kE2CMV~SeBOG#Rs1(dy+_yeVCr^?VjJir{_)CN`B<)pHE)^G-Fl8UK~--#nH{t z!_mvp$8nUSKLdpr;27j^aUA0q%D^y=tB`PlV}#?Ric>hv;TDOb!WrWj7xqj#&f*-$ zdEs18aS(5=UL;m=b|$ju{2BDz3nnfjRg^FrXl);OgpkpW%@5j6P;H zele#-oA-Jq`$GYL&y3H@kTT~9h8VI2XFZD^$3l3<=Wuy~PGek}%2d0TCcMG$Ou!#f zFmDveR=FBBqgNi1LkJsda#iMnh7cAtRO1>$gYiRdFxFDCxPm1OPFy#>$z7^QxuM}E zZjsw=s;`+Px`x}hqadQ;F77dOP^nW-{JD<@3La{BgvZ8cs@c+nWrno5z~q9@tKkWr zGN@s1C|sAwcj6gCdkp?F)tviWA@ zMWYj6Dj2n3qt#BHgDex#>W^UWXd_`Ct!c4f9%^W>#SrW~8@Gb)v+0Hm5;^|lM> Jq_~8`e*tx1p}YV9 diff --git a/common/src/main/java/org/example/common/ConfigFile.java b/common/src/main/java/org/example/common/ConfigFile.java new file mode 100644 index 0000000..78fa6c4 --- /dev/null +++ b/common/src/main/java/org/example/common/ConfigFile.java @@ -0,0 +1,52 @@ +package org.example.common; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +/** + * @author Genius + * @date 2023/04/21 02:24 + **/ + +//配置文件的抽象类 +public abstract class ConfigFile { + + private String filePath; + private String fileName; + + private T data; + + /** + * 用于打包配置文件 + */ + public Map packageConfig() { + + + return Map.of( + "data",data, + "updateTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + ); + } + + public ConfigFile() { + } + + public ConfigFile(String filePath, String fileName, T data) { + this.filePath = filePath; + this.fileName = fileName; + this.data = data; + } + + public String getFilePath() { + return filePath; + } + + public String getFileName() { + return fileName; + } + + protected T getData() { + return data; + } +} diff --git a/common/src/main/java/org/example/constpool/ConstPool.java b/common/src/main/java/org/example/constpool/ConstPool.java new file mode 100644 index 0000000..cf5b12a --- /dev/null +++ b/common/src/main/java/org/example/constpool/ConstPool.java @@ -0,0 +1,20 @@ +package org.example.constpool; + +/** + * @author Genius + * @date 2023/04/21 03:03 + **/ +//常量池 +public class ConstPool { + + /**模块名**/ + public static final String ACCOUNT = "account"; + public static final String SECTION = "section"; + public static final String BARRAGE = "barrage"; + public static final String CREEPER = "creeper"; + public static final String SECTION_WORK = "sectionwork"; + public static final String HOT = "hot"; + public static final String PUBLISH = "publish"; + + +} diff --git a/config/moduleConfig.json b/config/moduleConfig.json deleted file mode 100644 index 776ae56..0000000 --- a/config/moduleConfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "account":{ - "src":"./config/account" - }, - "section":{ - "src":"./config/section" - }, - "hot":{ - "src":"./config/hot" - }, - "publish":{ - "src":"./config/publish" - }, - "creeper":{ - "src":"./config/creeper" - }, - "barrage":{ - "src":"./config/barrage" - }, - "videowork":{ - "src":"./config/videowork" - } -} \ No newline at end of file diff --git a/console/src/main/java/org/example/ConsoleApplication.java b/console/src/main/java/org/example/ConsoleApplication.java index 44b4e04..996e45d 100644 --- a/console/src/main/java/org/example/ConsoleApplication.java +++ b/console/src/main/java/org/example/ConsoleApplication.java @@ -2,7 +2,7 @@ package org.example; import org.example.init.InitWorld; -import org.example.init.ModuleConfigSrcInit; +import org.example.init.ModuleSrcConfigFileInit; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -19,7 +19,7 @@ public class ConsoleApplication { public static void main(String[] args) { if (InitWorld.getInstance() - .setInitMachines(List.of(new ModuleConfigSrcInit())) + .setInitMachines(List.of(new ModuleSrcConfigFileInit())) .start()) { SpringApplication.run(ConsoleApplication.class, args); }