From 00bb91a508c018f801fb70be4eb0e8aa051e387f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 14 Jun 2023 13:22:36 +0800 Subject: [PATCH] 'commit' --- Doc/党建知识问答.txt | 15 ++++++++- pom.xml | 13 +++++--- src/main/java/UnitTest/CutImage.java | 20 +++++++++++ src/main/java/UnitTest/SaveImageByAspose.java | 22 +++++++++++++ src/main/java/UnitTest/TestDingTalk.java | 23 ++++++------- .../FengHuang/Exam/Model/ExamModel.java | 2 +- src/main/resource/application.properties | 6 ++-- src/main/resource/dingtalk.properties | 17 ++++++---- target/classes/application.properties | 6 ++-- target/classes/check.sh | 33 +++++++++++++++++++ target/classes/check.txt | 10 ++++++ target/classes/dingtalk.properties | 17 ++++++---- 12 files changed, 149 insertions(+), 35 deletions(-) create mode 100644 src/main/java/UnitTest/CutImage.java create mode 100644 src/main/java/UnitTest/SaveImageByAspose.java create mode 100644 target/classes/check.sh create mode 100644 target/classes/check.txt diff --git a/Doc/党建知识问答.txt b/Doc/党建知识问答.txt index ac08665..e6990e9 100644 --- a/Doc/党建知识问答.txt +++ b/Doc/党建知识问答.txt @@ -4,4 +4,17 @@ admin 123456 清库接口 -https://www.ccsjy.cn/FengHuang/exam/ClearDataBase \ No newline at end of file +https://www.ccsjy.cn/FengHuang/exam/ClearDataBase + + +# 查看定时任务错误 +tail -300 /var/log/cron + +# 查看有哪些定时任务 +crontab -l + +# 加载用户工作环境 +. /etc/profile + +# 检查日志： +/usr/local/tomcat8/webapps/FengHuang/WEB-INF/classes/log.log \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6150b60..950d6ec 100644 --- a/pom.xml +++ b/pom.xml @@ -238,10 +238,15 @@ - - org.opengauss - opengauss-jdbc - 5.0.0 + + + + + + + org.postgresql + postgresql + 42.6.0 diff --git a/src/main/java/UnitTest/CutImage.java b/src/main/java/UnitTest/CutImage.java new file mode 100644 index 0000000..599a51c --- /dev/null +++ b/src/main/java/UnitTest/CutImage.java @@ -0,0 +1,20 @@ +package UnitTest; +// 引入需要的类 +import cn.hutool.core.img.ImgUtil; +import cn.hutool.core.io.FileUtil; + +import java.io.File; + +public class CutImage { + public static void main(String[] args) { + String MyPath="C:\\Qiao\\"; + // 读取指定目录下所有PNG图片并缩放为原始大小的15％，然后将其保存为以“small_”开头的文件名 + File[] files = FileUtil.ls(MyPath); + for (File file : files) { + if (file.getName().endsWith(".png")) { + String smallFileName = "small_" + file.getName(); + ImgUtil.scale(file, FileUtil.file(smallFileName), 0.15f); + } + } + } +} diff --git a/src/main/java/UnitTest/SaveImageByAspose.java b/src/main/java/UnitTest/SaveImageByAspose.java new file mode 100644 index 0000000..456a461 --- /dev/null +++ b/src/main/java/UnitTest/SaveImageByAspose.java @@ -0,0 +1,22 @@ +package UnitTest; + +import com.aspose.words.Document; +import com.aspose.words.NodeCollection; +import com.aspose.words.NodeType; +import com.aspose.words.Shape; + +public class SaveImageByAspose { + public static void main(String[] args) throws Exception { + String MyDir="C:\\Users\\Administrator\\Documents\\WeChat Files\\wxid_wutao583xh1j22\\FileStorage\\File\\2023-06\\"; + Document doc = new Document(MyDir + "少儿B2.docx"); + NodeCollection shapes = doc.getChildNodes(NodeType.SHAPE, true); + int imageIndex = 0; + for (Shape shape : (Iterable) shapes) { + if (shape.hasImage()) { + String imageFileName = String.format("c:\\Qiao\\%s.png", imageIndex); + shape.getImageData().save(imageFileName); + imageIndex++; + } + } + } +} diff --git a/src/main/java/UnitTest/TestDingTalk.java b/src/main/java/UnitTest/TestDingTalk.java index 440966c..c1f1925 100644 --- a/src/main/java/UnitTest/TestDingTalk.java +++ b/src/main/java/UnitTest/TestDingTalk.java @@ -3,6 +3,7 @@ package UnitTest; import com.alibaba.druid.filter.stat.StatFilter; import com.dsideal.FengHuang.DingTalk.Common; import com.dsideal.FengHuang.DingTalk.Model; +import com.dsideal.FengHuang.DingTalk.OrgPerson; import com.dsideal.FengHuang.DingTalk.RolePerson; import com.dsideal.FengHuang.Util.CommonUtil; import com.jfinal.kit.PropKit; @@ -69,16 +70,16 @@ public class TestDingTalk { Record rOrg = Model.getOrgByOrgName(orgName); //同步组织机构 - //OrgPerson.syncOrg(accessToken, rOrg); + OrgPerson.syncOrg(accessToken, rOrg); //从数据库中获取最新的部门列表(已与钉钉匹配完毕) - //Model.fillDeptListByDataBase(rOrg); + Model.fillDeptListByDataBase(rOrg); //删除所有的组织机构 //OrgPerson.delAllDept(accessToken); //同步人员 - //OrgPerson.syncPerson(accessToken, rOrg); + OrgPerson.syncPerson(accessToken, rOrg); //删除单位下所有人员(开发测试时使用) // OrgPerson.delBureauPerson(accessToken, rOrg); @@ -86,7 +87,7 @@ public class TestDingTalk { //创建角色组【执行一次即可】 //RolePerson.createRoleGroup(accessToken, "义务教育阶段角色组"); ---> 3779920123 - long groupId = 3779920123L; + //long groupId = 3779920123L; //获取指定角色组下有哪些角色 //List list = RolePerson.getRoleList(accessToken, groupId); @@ -99,13 +100,13 @@ public class TestDingTalk { //RolePerson.syncRole(accessToken, groupId); //获取钉钉侧指定角色下人员信息 - RolePerson.getRolePersonList(accessToken, 3780868223L, 0); - - for (int i = 0; i < RolePerson.rolePersonList.size(); i++) { - System.out.println(RolePerson.rolePersonList.get(i)); - } - //获取云平台侧指定角色下人员信息 - List list2 = Model.getRolePersonReleation(); +// RolePerson.getRolePersonList(accessToken, 3780868223L, 0); +// +// for (int i = 0; i < RolePerson.rolePersonList.size(); i++) { +// System.out.println(RolePerson.rolePersonList.get(i)); +// } +// //获取云平台侧指定角色下人员信息 +// List list2 = Model.getRolePersonReleation(); //尝试同步两个人员信息 diff --git a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java index 38760b5..26170f3 100644 --- a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java +++ b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java @@ -237,7 +237,7 @@ public class ExamModel { //2、扩展答题时长 record.set("ys", getYs(st, ed)); record.set("start_time", st.toLocalDate() + " " + st.toLocalTime()); - record.set("end_time", st.toLocalDate() + " " + st.toLocalTime()); + record.set("end_time", ed.toLocalDate() + " " + ed.toLocalTime()); } return pageRecord; } diff --git a/src/main/resource/application.properties b/src/main/resource/application.properties index 7dafb06..f363280 100644 --- a/src/main/resource/application.properties +++ b/src/main/resource/application.properties @@ -3,12 +3,12 @@ driverClassName=org.postgresql.Driver user=postgres password=DsideaL147258369 -master_jdbcUrl=jdbc:postgresql://10.10.14.209:5432/ccdjzswd_db -slave_jdbcUrl=jdbc:postgresql://10.10.14.209:5432/ccdjzswd_db +master_jdbcUrl=jdbc:postgresql://10.10.14.215:15400/base_db +slave_jdbcUrl=jdbc:postgresql://10.10.14.215:15400/base_db # redis ip -redis_ip=10.10.14.169 +redis_ip=10.10.14.199 # redis port redis_port=18890 # ============================================================== diff --git a/src/main/resource/dingtalk.properties b/src/main/resource/dingtalk.properties index dbfb4e3..2ef9336 100644 --- a/src/main/resource/dingtalk.properties +++ b/src/main/resource/dingtalk.properties @@ -1,14 +1,19 @@ # 企业管理员可以直接点击登录钉钉开放平台 -【基本信息】-【开发信息（旧版）】查看企业的CorpID和SSOsecret。 # 公司ID -corpId=dingbb7089b2561d88a435c2f4657eb6378f - +corpId=ding0b95901147fc6be0f2c783f7214b6d69 # 每个应用都拥有唯一的AgentId -agentId=2620299417 +agentId=2619270936 # AK SK -appKey=dingzsnabwy3lrgnpdmb -appSecret=mFA7Ov9lTZ7BghKZKeiAYdNGKmtVygLxDp_WVSbrBZMbjoVDhwqtg2PWo9zKP-V_ +appKey=dingr94qyhpr8bflyxqz +appSecret=hnxZ93QqkGJpRyBziaR2vlbOPZo1U9eeqj73DfFuFnIxIUHNPbMR2DkIol9oGteh + +# user +userName=18946740350 +pwd=mdcija780522 + + # redis ip -redis_ip=10.10.14.169 +redis_ip=10.10.14.199 # redis port redis_port=18890 diff --git a/target/classes/application.properties b/target/classes/application.properties index 7dafb06..f363280 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -3,12 +3,12 @@ driverClassName=org.postgresql.Driver user=postgres password=DsideaL147258369 -master_jdbcUrl=jdbc:postgresql://10.10.14.209:5432/ccdjzswd_db -slave_jdbcUrl=jdbc:postgresql://10.10.14.209:5432/ccdjzswd_db +master_jdbcUrl=jdbc:postgresql://10.10.14.215:15400/base_db +slave_jdbcUrl=jdbc:postgresql://10.10.14.215:15400/base_db # redis ip -redis_ip=10.10.14.169 +redis_ip=10.10.14.199 # redis port redis_port=18890 # ============================================================== diff --git a/target/classes/check.sh b/target/classes/check.sh new file mode 100644 index 0000000..be42bd5 --- /dev/null +++ b/target/classes/check.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +source /etc/profile + +# 检查java进程是否正常运行中 +if pgrep -f "com.dsideal.FengHuang" >/dev/null 2>&1 +then + echo "$(date): Java程序已经运行" +else + echo "$(date): Java程序未运行，将尝试启动..." + + # 进入程序目录 + cd /usr/local/tomcat8/webapps/FengHuang/WEB-INF/classes + + # 启动入口类，该脚本文件用于别的项目时要改这里 + MAIN_CLASS=com.dsideal.FengHuang.Start + + # Java 命令行参数，根据需要开启下面的配置，改成自己需要的，注意等号前后不能有空格 + export JAVA_HOME=/usr/java/jdk + export JRE_HOME=${JAVA_HOME}/jre + export CLASSPATH=.:${JAVA_HOME}/lib:${JRE_HOME}/lib + export PATH=${JAVA_HOME}/bin:$PATH + + JAVA_OPTS="-Xms1024m -Xmx2048m" + + # 生成 class path 值 + CP=.:/usr/local/tomcat8/webapps/FengHuang/WEB-INF/lib/* + + # 运行为后台进程，并且将信息输出到 logback.xml配置的日志文件位置 + nohup java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS} >> /usr/local/tomcat8/webapps/FengHuang/WEB-INF/classes/log.log 2>&1 & + + echo "$(date): Java程序启动完成" +fi diff --git a/target/classes/check.txt b/target/classes/check.txt new file mode 100644 index 0000000..778c743 --- /dev/null +++ b/target/classes/check.txt @@ -0,0 +1,10 @@ +打开终端，输入 crontab -e 进入crontab编辑器 +添加如下内容： + +* * * * * /bin/bash -c 'for i in {1..6}; do /usr/local/tomcat8/webapps/FengHuang/WEB-INF/classes/check.sh; sleep 10; done' + + +其中 {1..6} 表示循环6次，实际上就是每10秒执行一次脚本。 +将 /path/to/your/shell_script.sh 替换为你实际的脚本所在路径。 +保存并退出编辑器。 +这样就能每10秒执行一次你的脚本，检查Java程序是否正在运行并重启程序。 diff --git a/target/classes/dingtalk.properties b/target/classes/dingtalk.properties index dbfb4e3..2ef9336 100644 --- a/target/classes/dingtalk.properties +++ b/target/classes/dingtalk.properties @@ -1,14 +1,19 @@ # 企业管理员可以直接点击登录钉钉开放平台 -【基本信息】-【开发信息（旧版）】查看企业的CorpID和SSOsecret。 # 公司ID -corpId=dingbb7089b2561d88a435c2f4657eb6378f - +corpId=ding0b95901147fc6be0f2c783f7214b6d69 # 每个应用都拥有唯一的AgentId -agentId=2620299417 +agentId=2619270936 # AK SK -appKey=dingzsnabwy3lrgnpdmb -appSecret=mFA7Ov9lTZ7BghKZKeiAYdNGKmtVygLxDp_WVSbrBZMbjoVDhwqtg2PWo9zKP-V_ +appKey=dingr94qyhpr8bflyxqz +appSecret=hnxZ93QqkGJpRyBziaR2vlbOPZo1U9eeqj73DfFuFnIxIUHNPbMR2DkIol9oGteh + +# user +userName=18946740350 +pwd=mdcija780522 + + # redis ip -redis_ip=10.10.14.169 +redis_ip=10.10.14.199 # redis port redis_port=18890