sacada跳转登录代码提交

pom.xml

@@ -143,6 +143,30 @@
             <artifactId>mapstruct</artifactId>
             <version>${mapstruct.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.websocket</groupId>
+            <artifactId>javax.websocket-api</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <version>1.2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-mqtt</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

src/api/smart/operationitem.js

@@ -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
-  })
-}
-

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");

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";
 
 }

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));
 	}