1.7.8

Author: bambooww

core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.iottree</groupId>
 		<artifactId>iottree-parent</artifactId>
-		<version>1.7.7</version>
+		<version>1.7.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

driver-parent/driver-common/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>driver-parent</artifactId>
 		<groupId>org.iottree.driver</groupId>
-		<version>1.7.7</version>
+		<version>1.7.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>iottree-driver-common</artifactId>

driver-parent/driver-opc/pom.xml

@@ -4,8 +4,7 @@
   <parent>
     <artifactId>driver-parent</artifactId>
     <groupId>org.iottree.driver</groupId>
-    <version>1.7.7</version>
-
+    <version>1.7.8</version>
   </parent>
 
   <artifactId>iottree-driver-opc</artifactId>
@@ -41,6 +40,8 @@
 	     <systemPath>${basedir}/lib/jeasyopc.jar</systemPath>
 	</dependency>
 	 -->
+	
+	<!-- 
 	<dependency>
 	    <groupId>org.openscada.jinterop</groupId>
 	    <artifactId>org.openscada.jinterop.core</artifactId>
@@ -66,7 +67,18 @@
 	    <artifactId>bcprov-jdk15on</artifactId>
 	    <version>1.61</version>
 	</dependency>
+ -->
+<dependency>
+			<groupId>org.eclipse.milo</groupId>
+			<artifactId>milo-sdk-client</artifactId>
+		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/org.eclipse.milo/sdk-server -->
+		<dependency>
+			<groupId>org.eclipse.milo</groupId>
+			<artifactId>milo-sdk-server</artifactId>
+		</dependency>
+		
   </dependencies>
 
   <build>

driver-parent/driver-opc/src/main/java/org/iottree/driver/opc/da/Test.java

@@ -3,33 +3,33 @@
 import java.util.Collection;
 import java.util.concurrent.Executors;
 
-import org.openscada.opc.dcom.list.ClassDetails;
-import org.openscada.opc.lib.common.ConnectionInformation;
-import org.openscada.opc.lib.da.Server;
-import org.openscada.opc.lib.list.*;
+//import org.openscada.opc.dcom.list.ClassDetails;
+//import org.openscada.opc.lib.common.ConnectionInformation;
+//import org.openscada.opc.lib.da.Server;
+//import org.openscada.opc.lib.list.*;
 
 public class Test
 {
-	public static void main(String[] args) throws Exception
-	{
-		ConnectionInformation ci = new ConnectionInformation();
-		ci.setHost("localhost");
-		ci.setDomain("");
-		ci.setUser("zzj");
-		ci.setPassword("zhijun1090");
-		ci.setClsid("7BC0CC8E-482C-47CA-ABDC-0FE7F9C6E729");
-		Server server = new Server(ci, Executors.newSingleThreadScheduledExecutor());
-		server.connect();
-
-		// 或以下获取OPCEnum方法
-		ServerList serverList = new ServerList("localhost", "zzj", "zhijun1090", "");
-		Collection<ClassDetails> classDetails = serverList.listServersWithDetails(
-				new Category[] { Categories.OPCDAServer10, Categories.OPCDAServer20, Categories.OPCDAServer30 },
-				new Category[] {});
-		for (ClassDetails cds : classDetails)
-		{
-			System.out.println(cds.getProgId() + "=" + cds.getDescription());
-		}
-	}
+//	public static void main(String[] args) throws Exception
+//	{
+//		ConnectionInformation ci = new ConnectionInformation();
+//		ci.setHost("localhost");
+//		ci.setDomain("");
+//		ci.setUser("zzz");
+//		ci.setPassword("");
+//		ci.setClsid("7BC0CC8E-482C-47CA-ABDC-0FE7F9C6E729");
+//		Server server = new Server(ci, Executors.newSingleThreadScheduledExecutor());
+//		server.connect();
+//
+//		// 或以下获取OPCEnum方法
+//		ServerList serverList = new ServerList("localhost", "lll", "", "");
+//		Collection<ClassDetails> classDetails = serverList.listServersWithDetails(
+//				new Category[] { Categories.OPCDAServer10, Categories.OPCDAServer20, Categories.OPCDAServer30 },
+//				new Category[] {});
+//		for (ClassDetails cds : classDetails)
+//		{
+//			System.out.println(cds.getProgId() + "=" + cds.getDescription());
+//		}
+//	}
 
 }