diff --git a/pom.xml b/pom.xml
index 1b50e45..0e445b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,30 @@
mapstruct
${mapstruct.version}
+
+
+ com.squareup.okhttp3
+ okhttp
+ 4.9.3
+
+
+
+ javax.websocket
+ javax.websocket-api
+ 1.1
+
+
+
+ org.eclipse.paho
+ org.eclipse.paho.client.mqttv3
+ 1.2.5
+
+
+
+ org.springframework.integration
+ spring-integration-mqtt
+
+
diff --git a/src/api/smart/operationitem.js b/src/api/smart/operationitem.js
deleted file mode 100644
index fa93f7f..0000000
--- a/src/api/smart/operationitem.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import request from '@/axios';
-
-export const getList = (current, size, params) => {
- return request({
- url: '/api/smart/operationitem/list',
- method: 'get',
- params: {
- ...params,
- current,
- size,
- }
- })
-}
-
-export const getDetail = (id) => {
- return request({
- url: '/api/smart/operationitem/detail',
- method: 'get',
- params: {
- id
- }
- })
-}
-
-export const remove = (ids) => {
- return request({
- url: '/api/smart/operationitem/remove',
- method: 'post',
- params: {
- ids,
- }
- })
-}
-
-export const add = (row) => {
- return request({
- url: '/api/smart/operationitem/submit',
- method: 'post',
- data: row
- })
-}
-
-export const update = (row) => {
- return request({
- url: '/api/smart/operationitem/submit',
- method: 'post',
- data: row
- })
-}
-
diff --git a/src/main/java/org/energy/common/config/DafConfiguration.java b/src/main/java/org/energy/common/config/DafConfiguration.java
index 1ad4a97..9a48583 100644
--- a/src/main/java/org/energy/common/config/DafConfiguration.java
+++ b/src/main/java/org/energy/common/config/DafConfiguration.java
@@ -35,6 +35,7 @@ public class DafConfiguration implements WebMvcConfigurer {
SecureRegistry secureRegistry = new SecureRegistry();
secureRegistry.setEnabled(true);
secureRegistry.excludePathPatterns("/daf-auth/**");
+ secureRegistry.excludePathPatterns("/daf-scada/**");
secureRegistry.excludePathPatterns("/daf-system/menu/auth-routes");
secureRegistry.excludePathPatterns("/daf-system/tenant/info");
secureRegistry.excludePathPatterns("/doc.html");
diff --git a/src/main/java/org/energy/common/constant/CommonConstant.java b/src/main/java/org/energy/common/constant/CommonConstant.java
index 9881b24..e44b2ca 100644
--- a/src/main/java/org/energy/common/constant/CommonConstant.java
+++ b/src/main/java/org/energy/common/constant/CommonConstant.java
@@ -45,6 +45,6 @@ public interface CommonConstant {
/**
* 默认密码
*/
- String DEFAULT_PASSWORD = "123456";
+ String DEFAULT_PASSWORD = "8Nn!yjWKpR";
}
diff --git a/src/main/java/org/energy/modules/system/controller/MenuController.java b/src/main/java/org/energy/modules/system/controller/MenuController.java
index 06a1c22..2d9cb41 100644
--- a/src/main/java/org/energy/modules/system/controller/MenuController.java
+++ b/src/main/java/org/energy/modules/system/controller/MenuController.java
@@ -123,6 +123,9 @@ public class MenuController extends DafController {
@ApiOperation(value = "新增或修改", notes = "传入menu")
public R submit(@Valid @RequestBody Menu menu) {
menu.setIsDeleted(DafConstant.DB_NOT_DELETED);
+ if (menu.getParentId() == null) {
+ menu.setParentId(Long.parseLong("0"));
+ }
return R.status(menuService.saveOrUpdate(menu));
}