diff --git a/ZhuQue/Dockerfile b/ZhuQue/Dockerfile index a27ccdd..533162a 100644 --- a/ZhuQue/Dockerfile +++ b/ZhuQue/Dockerfile @@ -10,6 +10,6 @@ ENV TZ=Asia/Shanghai COPY ./ZhuQue /root/ZhuQue #设置这个环境变量后,您可以在Docker容器中启动Java应用程序时使用这些参数。 -ENV JAVA_OPTS="-Xms2048m -Xmx4096m" +ENV JAVA_OPTS="-Xms1024m -Xmx2048m" ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/ZhuQue/target/classes:/root/ZhuQue/lib/* com.dsideal.ZhuQue.Start" ] diff --git a/ZhuQue/Sql/t_ext_ketuo_station.sql b/ZhuQue/Sql/t_ext_ketuo_station.sql index 55524c8..cc35b10 100644 --- a/ZhuQue/Sql/t_ext_ketuo_station.sql +++ b/ZhuQue/Sql/t_ext_ketuo_station.sql @@ -11,7 +11,7 @@ Target Server Version : 50742 (5.7.42-log) File Encoding : 65001 - Date: 12/08/2024 11:45:06 + Date: 13/08/2024 08:15:10 */ SET NAMES utf8mb4; @@ -22,15 +22,20 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- DROP TABLE IF EXISTS `t_ext_ketuo_station`; CREATE TABLE `t_ext_ketuo_station` ( - `station_sn` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '车场号', + `station_id` int(11) NOT NULL COMMENT '车场ID', `station_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '车场名称', + `third_party_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '第三方道闸的供应商名称', + `third_party_station_id` int(255) NOT NULL DEFAULT 0 COMMENT '第三方的车场ID', + `third_party_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '第三方车场对接的URL', + `third_party_appId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '第三方车场对接的appId', + `third_party_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '第三方车场对接的pwd', `b_use` int(11) NOT NULL DEFAULT 1 COMMENT '是否启用', - PRIMARY KEY (`station_sn`) USING BTREE + PRIMARY KEY (`station_id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '与科拓闸机对接,充电结束,免费2小时停车费用。' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of t_ext_ketuo_station -- ---------------------------- -INSERT INTO `t_ext_ketuo_station` VALUES ('2201002022121', '驿来特充电站(中东港站)', 1); +INSERT INTO `t_ext_ketuo_station` VALUES (114, '驿来特充电站(中东港站)', '科拓', 431008480, 'http://kp-open.keytop.cn/unite-api', '13492', '28a2b82f3e9c48338eafbf84fecf8f9b', 1); SET FOREIGN_KEY_CHECKS = 1; diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java index dfd0a0c..a77c371 100644 --- a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java +++ b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java @@ -3,9 +3,7 @@ package com.dsideal.ZhuQue.Ylt.Model; import com.dsideal.ZhuQue.Util.JwtUtil; import com.jfinal.plugin.activerecord.Db; import io.jsonwebtoken.Claims; - import javax.servlet.http.HttpServletRequest; - import com.jfinal.plugin.activerecord.Record; public class YltModel { @@ -76,9 +74,7 @@ public class YltModel { * @return */ public Record getStationById(String station_id) { - String sql = "select * from t_station where id=?"; - Record record = Db.findFirst(sql, station_id); - return record; + return Db.findById("t_station", "id", station_id); } /** @@ -88,8 +84,6 @@ public class YltModel { * @return */ public Record getEquipmentById(int equipment_id) { - String sql = "select * from t_equipment where id=?"; - Record record = Db.findFirst(sql, equipment_id); - return record; + return Db.findById("t_equipment", "id", equipment_id); } } diff --git a/ZhuQue/src/main/resource/cron4j.properties b/ZhuQue/src/main/resource/cron4j.properties deleted file mode 100644 index 70cb5ed..0000000 --- a/ZhuQue/src/main/resource/cron4j.properties +++ /dev/null @@ -1,18 +0,0 @@ -# cron 表达式由五部分组成:分 时 天 月 周 # 分 :从 0 到 59 # 时 :从 0 到 23 # 天 :从 1 到 31,字母 L 可以表示月的最后一天 # 月 :从 1 到 12,可以别名:jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov" and "dec" -# 周 :从 0 到 6,0 表示周日,6 表示周六,可以使用别名: "sun", "mon", "tue", "wed", "thu", "fri" and "sat" -# -# 数字 n:表示一个具体的时间点,例如 5 * * * * 表示 5 分这个时间点时执行 -# 逗号 , :表示指定多个数值,例如 3,5 * * * * 表示 3 和 5 分这两个时间点执行 -# 减号 -:表示范围,例如 1-3 * * * * 表示 1 分、2 分再到 3 分这三个时间点执行 -# 星号 *:表示每一个时间点,例如 * * * * * 表示每分钟执行 -# 除号 /:表示指定一个值的增加幅度。例如 n/m表示从 n 开始,每次增加 m 的时间点执行 -# cron4j 集成cron 只有 分 时 天 月 周 没有秒 -cron4j=clearRubbish -# 每天凌晨2点执行一次 -clearRubbish.cron=0 2 * * * -clearRubbish.class=com.dsideal.QingLong.clearRubbish.clearRubbishAction -clearRubbish.daemon=true -clearRubbish.enable=true - - - diff --git a/ZhuQue/src/main/resource/license.xml b/ZhuQue/src/main/resource/license.xml deleted file mode 100644 index 20b1b90..0000000 --- a/ZhuQue/src/main/resource/license.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Aspose.Total for Java - - Enterprise - 20991231 - 20991231 - 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7 - - sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU= - \ No newline at end of file