diff --git a/DataBase/20211015144001.nb3 b/DataBase/20211015144001.nb3 deleted file mode 100644 index 6e7ba68..0000000 Binary files a/DataBase/20211015144001.nb3 and /dev/null differ diff --git a/DataBase/20230619112614.nb3 b/DataBase/20230619112614.nb3 new file mode 100644 index 0000000..c66f212 Binary files /dev/null and b/DataBase/20230619112614.nb3 differ diff --git a/ETL/.idea/.gitignore b/ETL/.idea/.gitignore new file mode 100644 index 0000000..1c2fda5 --- /dev/null +++ b/ETL/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/ETL/.idea/ETL.iml b/ETL/.idea/ETL.iml new file mode 100644 index 0000000..7a69165 --- /dev/null +++ b/ETL/.idea/ETL.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/ETL/.idea/inspectionProfiles/Project_Default.xml b/ETL/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..2432abe --- /dev/null +++ b/ETL/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/ETL/.idea/inspectionProfiles/profiles_settings.xml b/ETL/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/ETL/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/ETL/.idea/misc.xml b/ETL/.idea/misc.xml new file mode 100644 index 0000000..e2a013c --- /dev/null +++ b/ETL/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/ETL/.idea/modules.xml b/ETL/.idea/modules.xml new file mode 100644 index 0000000..62cd943 --- /dev/null +++ b/ETL/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ETL/.idea/vcs.xml b/ETL/.idea/vcs.xml new file mode 100644 index 0000000..2e3f692 --- /dev/null +++ b/ETL/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index f59eadd..4f70b2a 100644 --- a/pom.xml +++ b/pom.xml @@ -55,13 +55,13 @@ com.jfinal jfinal - 5.0.8 + 5.1.1 com.jfinal jfinal-undertow - 3.4 + 3.5 @@ -216,23 +216,7 @@ httpmime 4.5.13 - - com.aliyun - aliyun-java-sdk-ram - 3.3.0 - - - - com.aliyun - aliyun-java-sdk-core - 4.6.2 - - - - com.aliyun - aliyun-java-sdk-dysmsapi - 2.2.1 - + org.apache.logging.log4j log4j-core diff --git a/src/main/java/Tools/XT_ChangeLiziToBaoBiao.java b/src/main/java/Tools/XT_ChangeLiziToBaoBiao.java deleted file mode 100644 index 6b5f98c..0000000 --- a/src/main/java/Tools/XT_ChangeLiziToBaoBiao.java +++ /dev/null @@ -1,33 +0,0 @@ -package Tools; - -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.io.file.FileReader; -import cn.hutool.core.io.file.FileWriter; - -import java.io.File; - -public class XT_ChangeLiziToBaoBiao { - public static void main(String[] args) { - - String path = "C:\\20230323"; - File[] f1s = FileUtil.ls(path); - for (File f1 : f1s) { - if (f1.isDirectory()) { - File[] f2s = FileUtil.ls(f1.getAbsoluteFile().toString()); - for (File f2 : f2s) { - if (f2.getName().equals("index.html")) { - FileReader f = new FileReader(f2); - String t = f.readString(); - t=t.replace("例子","报表"); - //保存 - String finalString = f1.getAbsoluteFile() + "\\index.html"; - if (FileUtil.exist(finalString)) FileUtil.del(finalString); - FileWriter writer = new FileWriter(finalString); - writer.write(t); - } - } - } - } - System.out.println("恭喜,所有操作成功完成!"); - } -} diff --git a/src/main/java/Tools/XT_GenerateMenu.java b/src/main/java/Tools/XT_GenerateMenu.java deleted file mode 100644 index a96bd90..0000000 --- a/src/main/java/Tools/XT_GenerateMenu.java +++ /dev/null @@ -1,93 +0,0 @@ -package Tools; - - -import cn.hutool.core.io.file.FileReader; -import cn.hutool.core.io.file.FileWriter; -import com.jfinal.kit.PropKit; -import com.jfinal.plugin.activerecord.ActiveRecordPlugin; -import com.jfinal.plugin.activerecord.Db; -import com.jfinal.plugin.activerecord.Record; -import com.jfinal.plugin.druid.DruidPlugin; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; - -import java.io.IOException; -import java.util.*; - - -public class XT_GenerateMenu { - //用途:根据Excel为湘潭项目生成菜单 - //办法:用Navicat Prenium的导入功能,将Excel导入到Mysql中,然后针对表进行读取 - - /*** - * delete CRLF; delete empty line ;delete blank lines - * - * @param input - * @return - */ - private static String deleteCRLFOnce(String input) { - return input.replaceAll("((\r\n)|\n)[\\s\t ]*(\\1)+", "$1"); - } - - /** - * delete CRLF; delete empty line ;delete blank lines - * - * @param input - * @return - */ - public static String deleteCRLF(String input) { - input = deleteCRLFOnce(input); - return deleteCRLFOnce(input); - } - - public static void main(String[] args) throws IOException { - //1、配置数据库 - PropKit.use("application.properties"); - - String jdbcUrl = "jdbc:mysql://10.10.14.199:22066/xt_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai"; - - DruidPlugin druid = new DruidPlugin(jdbcUrl, "root", "DsideaL147258369", "com.mysql.cj.jdbc.Driver"); - druid.start(); - // 配置ActiveRecord插件 - ActiveRecordPlugin arp = new ActiveRecordPlugin(druid); - arp.start(); - //读取模板内容 - String level_1_template = "xt_template_level1.txt"; - String level_2_template = "xt_template_level2.txt"; - FileReader f1 = new FileReader(level_1_template); - String t1 = f1.readString(); - - FileReader f2 = new FileReader(level_2_template); - String t2 = f2.readString(); - //开始读表 - Set _set = new HashSet<>(); - String sql = "select * from t1"; - List list = Db.find(sql); - for (Record record : list) { - _set.add(record.getStr("level_1_name")); - } - String result = ""; - for (String level_1_name : _set) { - String rt1, rt2 = ""; - for (Record record : list) { - String l1 = record.getStr("level_1_name"); - String l2 = record.getStr("level_2_name"); - String directory = record.getStr("directory"); - //二级名称 - if (l1.equals(level_1_name)) { - rt2 = rt2 + t2.replace("{{level_2_name}}", l2).replace("{{level_2_url}}", "./20230323/" + directory + "/index.html"); - } - } - //一级名称 - rt1 = t1.replace("{{level_1_name}}", level_1_name).replace("{{level_2_content}}", rt2); - if (result.length() > 0) result = result + "\n" + rt1; - else result = rt1; - } - //删除空行 -// result = deleteCRLF(result); - //保存 - FileWriter writer = new FileWriter("c:\\菜单.html"); - writer.write(result); - System.out.println("恭喜,菜单成功生成!"); - } -} \ No newline at end of file diff --git a/src/main/java/Tools/XT_OneKeyIframe.java b/src/main/java/Tools/XT_OneKeyIframe.java deleted file mode 100644 index b910efa..0000000 --- a/src/main/java/Tools/XT_OneKeyIframe.java +++ /dev/null @@ -1,41 +0,0 @@ -package Tools; - -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.io.file.FileReader; -import cn.hutool.core.io.file.FileWriter; - -import java.io.File; - -public class XT_OneKeyIframe { - public static void main(String[] args) { - String template = "D:\\dsWork\\baseService\\Doc\\Template.html"; - FileReader fileReader = new FileReader(template); - String templateContent = fileReader.readString(); - - String path = "D:\\dsWork\\baseService\\Doc\\Test"; - File[] f1s = FileUtil.ls(path); - for (File f1 : f1s) { - if (f1.isDirectory()) { - // - String run = templateContent; - File[] f2s = FileUtil.ls(f1.getAbsoluteFile().toString()); - int cnt = 0; - String iframe = ""; - String height = "400px"; - if (f2s.length == 1) height = "100%"; - for (File f2 : f2s) { - cnt++; - iframe = iframe + "\n" + ""; - } - run = run.replace("{{iframe}}", iframe); - //保存 - String finalString = f1.getAbsoluteFile() + "\\index.html"; - if (FileUtil.exist(finalString)) FileUtil.del(finalString); - FileWriter writer = new FileWriter(finalString); - writer.write(run); - } - } - System.out.println("恭喜,所有操作成功完成!"); - } -} diff --git a/src/main/resource/application.properties b/src/main/resource/application.properties index c15c9a1..75e0e01 100644 --- a/src/main/resource/application.properties +++ b/src/main/resource/application.properties @@ -2,10 +2,9 @@ driverClassName=com.mysql.cj.jdbc.Driver user=root password=DsideaL147258369 -# 手工在hosts文件中增加: 10.10.14.169 gtzz.dsideal.com -jdbcUrl=jdbc:mysql://gtzz.dsideal.com:22066/gtzz_base_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +jdbcUrl=jdbc:mysql://10.10.14.169:22066/gtzz_base_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # redis ip -redis_ip=gtzz.dsideal.com +redis_ip=10.10.14.169 # redis port redis_port=18890 @@ -34,8 +33,4 @@ excelExportTemplatePathSuffix=/ExcelExportTemplate/ # 导入excel 的模板配置路径 ExcelImportTemplatePathSuffix=/ExcelImportTemplate/ #file下载的前缀 -filePrefix=/baseService - -#新高考系统地址 -xgkHost=http://1.207.122.239:7777/ -#xgkHost=http://10.10.14.199/ \ No newline at end of file +filePrefix=/baseService \ No newline at end of file diff --git a/target/classes/application.properties b/target/classes/application.properties index c15c9a1..75e0e01 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -2,10 +2,9 @@ driverClassName=com.mysql.cj.jdbc.Driver user=root password=DsideaL147258369 -# 手工在hosts文件中增加: 10.10.14.169 gtzz.dsideal.com -jdbcUrl=jdbc:mysql://gtzz.dsideal.com:22066/gtzz_base_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +jdbcUrl=jdbc:mysql://10.10.14.169:22066/gtzz_base_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # redis ip -redis_ip=gtzz.dsideal.com +redis_ip=10.10.14.169 # redis port redis_port=18890 @@ -34,8 +33,4 @@ excelExportTemplatePathSuffix=/ExcelExportTemplate/ # 导入excel 的模板配置路径 ExcelImportTemplatePathSuffix=/ExcelImportTemplate/ #file下载的前缀 -filePrefix=/baseService - -#新高考系统地址 -xgkHost=http://1.207.122.239:7777/ -#xgkHost=http://10.10.14.199/ \ No newline at end of file +filePrefix=/baseService \ No newline at end of file diff --git a/测试文档.txt b/测试文档.txt index 85481e2..64dad19 100644 --- a/测试文档.txt +++ b/测试文档.txt @@ -6,20 +6,22 @@ xtrabackup备份数据库 https://www.cnblogs.com/zcpeng/articles/15693848.html 可以只备份指定数据库 +# 项目地址 https://www.ccsjy.cn/baseService/html/login.html -# 装备中心管理员 -董建华 djh 123456 - +# 项目申报单位 # 第一中学 A45C4F60-C821-4096-BB37-8AEC3CBF5AA0 yizhong Y8z3BFS - # 第二中学 B89A647E-6180-4755-8E42-79958E64C332 erzhong 123456 - # 教辅单位 tea145 778704 +# 项目审核管理员 +# 装备中心管理员 +董建华 djh 123456 + + # 获取项目列表 https://www.ccsjy.cn/baseService/gtzz/getSubjectList?org_code=3422000030&year=2020&page=1&limit=10