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/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
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:{
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 6bff518..4a583cd 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
@@ -87,6 +87,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);
@@ -119,6 +120,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);
@@ -128,8 +130,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();
@@ -146,6 +148,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);
// 获取昨日用电量
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..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
@@ -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:
@@ -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
#第三方登录