From bfcac500a0cd253b4458ea1de27b14634c872866 Mon Sep 17 00:00:00 2001 From: ccongli <1441652193@qq.com> Date: Tue, 18 Apr 2023 16:08:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=A9=E5=8F=B0=E7=A5=A5=E5=92=8C485?= =?UTF-8?q?=E4=B8=B2=E5=8F=A3=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 -------- .idea/.name | 1 - .idea/vcs.xml | 6 ------ .../java/org/jeecg/custom/task/TtDataCollectTask.java | 7 +++++-- 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/.name delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 73f69e0..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 9559630..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -linkage-boot-parent \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/custom/task/TtDataCollectTask.java b/linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/custom/task/TtDataCollectTask.java index e1b7a5b..59a1af2 100644 --- a/linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/custom/task/TtDataCollectTask.java +++ b/linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/custom/task/TtDataCollectTask.java @@ -84,6 +84,7 @@ public class TtDataCollectTask implements SchedulingConfigurer { TtPouringEquip ttPouringEquip = new TtPouringEquip(); ttPouringEquip.setTemperature(new BigDecimal(temp)); ttPouringEquip.setCreateTime(new Date()); + ttPouringEquip.setCreateBy("system"); ttPouringEquip.setType(type); ttPouringEquip.setEqtNo(Optional.ofNullable(eqtNoIpMap.get(eqtIp)).orElse("0")); ttPouringEquip.setEqtIp(eqtIp); @@ -107,6 +108,7 @@ public class TtDataCollectTask implements SchedulingConfigurer { TtFeedingEquip ttFeedingEquip = new TtFeedingEquip(); ttFeedingEquip.setTemperature(new BigDecimal(temp)); ttFeedingEquip.setCreateTime(new Date()); + ttFeedingEquip.setCreateBy("system"); ttFeedingEquip.setEqtNo(Optional.ofNullable(eqtNoIpMap.get(eqtIp)).orElse("0")); ttFeedingEquip.setEqtIp(eqtIp); feedingEquipService.save(ttFeedingEquip); @@ -116,8 +118,8 @@ public class TtDataCollectTask implements SchedulingConfigurer { } -// String cron2 = "0 0 8 * * ?"; - String cron2 = "0/5 * * * * ?"; + String cron2 = "0 0 8 * * ?"; +// String cron2 = "0 0/5 * * * ?"; // 创建数字电表定时任务 for(Map.Entry entry : meterHandlerMap.entrySet()) { RS485Handler handler = entry.getValue(); @@ -134,6 +136,7 @@ public class TtDataCollectTask implements SchedulingConfigurer { TtElectricMeter ttElectricMeter = new TtElectricMeter(); ttElectricMeter.setTotalPower(totalPower); ttElectricMeter.setCreateTime(new Date()); + ttElectricMeter.setCreateBy("system"); ttElectricMeter.setEqtNo(Optional.ofNullable(eqtNoIpMap.get(eqtIp)).orElse("0")); ttElectricMeter.setEqtIp(eqtIp); // 获取昨日用电量 From 598195a3b5f7cb784d19c1e2d54d1dca30be66f5 Mon Sep 17 00:00:00 2001 From: ccongli <1441652193@qq.com> Date: Tue, 18 Apr 2023 16:21:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=A9=E5=8F=B0=E7=A5=A5=E5=92=8C485?= =?UTF-8?q?=E4=B8=B2=E5=8F=A3=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linkage-boot/linkage-module-system/linkage-system-start/src/main/resources/application-prod.yml b/linkage-boot/linkage-module-system/linkage-system-start/src/main/resources/application-prod.yml index a443368..e8cc178 100644 --- a/linkage-boot/linkage-module-system/linkage-system-start/src/main/resources/application-prod.yml +++ b/linkage-boot/linkage-module-system/linkage-system-start/src/main/resources/application-prod.yml @@ -130,9 +130,9 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: root - password: root + url: jdbc:mysql://127.0.0.1:3306/ttxh?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + username: ttxh + password: ttxh2023&.M driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: From 19041d8287ce767ff151ead7cd35d54cd8e1af33 Mon Sep 17 00:00:00 2001 From: ccongli <1441652193@qq.com> Date: Wed, 19 Apr 2023 09:35:44 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=A9=E5=8F=B0=E7=A5=A5=E5=92=8C=20?= =?UTF-8?q?=E7=A1=AB=E5=8C=96=E6=9C=BA=E3=80=81=E6=B5=87=E6=B3=A8=E6=9C=BA?= =?UTF-8?q?=20=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ttpouringequip/service/impl/TtPouringEquipServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/service/impl/TtPouringEquipServiceImpl.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/service/impl/TtPouringEquipServiceImpl.java index df42686..c0be65b 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/service/impl/TtPouringEquipServiceImpl.java +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/service/impl/TtPouringEquipServiceImpl.java @@ -86,7 +86,7 @@ public class TtPouringEquipServiceImpl extends ServiceImpl Date: Thu, 20 Apr 2023 15:15:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=A9=E5=8F=B0=E7=A5=A5=E5=92=8C=20?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linkage-boot/linkage-module-system/linkage-system-start/src/main/resources/application-prod.yml b/linkage-boot/linkage-module-system/linkage-system-start/src/main/resources/application-prod.yml index e8cc178..954b28e 100644 --- a/linkage-boot/linkage-module-system/linkage-system-start/src/main/resources/application-prod.yml +++ b/linkage-boot/linkage-module-system/linkage-system-start/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8091 tomcat: max-swallow-size: -1 error: @@ -7,7 +7,7 @@ server: include-stacktrace: ALWAYS include-message: ALWAYS servlet: - context-path: /jeecg-boot + context-path: /linkage-boot compression: enabled: true min-response-size: 1024 @@ -196,7 +196,7 @@ jeecg: elasticsearch: cluster-name: jeecg-ES cluster-nodes: 127.0.0.1:9200 - check-enabled: true + check-enabled: false # 在线预览文件服务器地址配置 file-view-domain: http://fileview.jeecg.com # minio文件上传 @@ -245,7 +245,7 @@ knife4j: #开启生产环境屏蔽 production: false basic: - enable: true + enable: false username: jeecg password: jeecg1314 #第三方登录 From d4f6b2c21581e69ee9e02e000e3a0f51b717f5e3 Mon Sep 17 00:00:00 2001 From: ccongli <1441652193@qq.com> Date: Fri, 21 Apr 2023 14:37:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81=E8=87=AA=E5=8A=A8=E5=A1=AB?= =?UTF-8?q?=E5=85=85=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue/src/views/user/LoginAccount.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ant-design-vue/src/views/user/LoginAccount.vue b/ant-design-vue/src/views/user/LoginAccount.vue index fed0275..2078992 100644 --- a/ant-design-vue/src/views/user/LoginAccount.vue +++ b/ant-design-vue/src/views/user/LoginAccount.vue @@ -2,12 +2,12 @@
- + - + @@ -43,8 +43,8 @@ currdatetime: '', loginType: 0, model:{ - username: 'admin', - password: '123456', + username: '', + password: '', inputCode: '' }, validatorRules:{ From 79f9edceb138bc8e42201e3e73e5b8edb90eaaa6 Mon Sep 17 00:00:00 2001 From: ccongli <1441652193@qq.com> Date: Fri, 21 Apr 2023 16:29:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=A9=E5=8F=B0=E7=A5=A5=E5=92=8C=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AFapi=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=9C=8D=E5=8A=A1=E5=99=A8ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue/.env.production | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ant-design-vue/.env.production b/ant-design-vue/.env.production index 34b8410..e81e98a 100644 --- a/ant-design-vue/.env.production +++ b/ant-design-vue/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://222.71.165.188:8091/linkage-boot -VUE_APP_CAS_BASE_URL=http://localhost:8888/cas +VUE_APP_API_BASE_URL=http://192.168.20.233:8091/linkage-boot +VUE_APP_CAS_BASE_URL=http://192.168.20.233:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file