Skip to content

Commit b1bf3f2

Browse files
authored
Merge pull request #2 from BSNDA/dev
Add some methods
2 parents 2274911 + f5d1a2b commit b1bf3f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+3450
-1672
lines changed

pom.xml

Lines changed: 142 additions & 206 deletions
Original file line numberDiff line numberDiff line change
@@ -1,217 +1,153 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
45

5-
<groupId>com.reddate</groupId>
6-
<artifactId>did.sdk</artifactId>
7-
<version>1.0</version>
8-
<packaging>jar</packaging>
6+
<groupId>com.reddate</groupId>
7+
<artifactId>did.sdk</artifactId>
8+
<version>1.0</version>
9+
<packaging>jar</packaging>
10+
<name>did-sdk</name>
911

10-
<name>did-sdk</name>
11-
<url>http://maven.apache.org</url>
12+
<properties>
13+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
<maven.compiler.source>1.8</maven.compiler.source>
15+
<maven.compiler.target>1.8</maven.compiler.target>
16+
</properties>
1217

13-
<properties>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<maven.compiler.source>1.8</maven.compiler.source>
16-
<maven.compiler.target>1.8</maven.compiler.target>
17-
</properties>
18-
19-
20-
21-
<dependencies>
22-
23-
<dependency>
24-
<groupId>org.apache.directory.studio</groupId>
25-
<artifactId>org.apache.commons.codec</artifactId>
26-
<version>1.8</version>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.apache.commons</groupId>
30-
<artifactId>commons-lang3</artifactId>
31-
<version>3.5</version>
32-
</dependency>
33-
<dependency>
34-
<groupId>com.alibaba</groupId>
35-
<artifactId>fastjson</artifactId>
36-
<version>1.2.47</version>
37-
</dependency>
38-
<dependency>
39-
<groupId>org.bouncycastle</groupId>
40-
<artifactId>bcprov-jdk15on</artifactId>
41-
<version>1.68</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>cn.hutool</groupId>
45-
<artifactId>hutool-all</artifactId>
46-
<version>5.6.3</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.fisco-bcos.java-sdk</groupId>
50-
<artifactId>java-sdk</artifactId>
51-
<version>2.7.0</version>
52-
</dependency>
18+
<dependencies>
5319
<dependency>
54-
<groupId>org.fisco-bcos</groupId>
55-
<artifactId>web3sdk</artifactId>
56-
<version>2.6.4</version>
57-
</dependency>
58-
59-
<dependency>
60-
<groupId>com.squareup.okhttp3</groupId>
61-
<artifactId>okhttp</artifactId>
62-
<version>4.9.0</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>com.squareup.okhttp3</groupId>
66-
<artifactId>logging-interceptor</artifactId>
67-
<version>4.9.0</version>
68-
</dependency>
69-
<dependency>
70-
<groupId>junit</groupId>
71-
<artifactId>junit</artifactId>
72-
<version>4.13.2</version>
73-
<scope>test</scope>
74-
</dependency>
75-
76-
77-
<dependency>
78-
<groupId>org.web3j</groupId>
79-
<artifactId>core</artifactId>
80-
<version>4.8.4</version>
81-
</dependency>
82-
<dependency>
83-
<groupId>org.web3j</groupId>
84-
<artifactId>crypto</artifactId>
85-
<version>4.8.4</version>
20+
<groupId>org.apache.directory.studio</groupId>
21+
<artifactId>org.apache.commons.codec</artifactId>
22+
<version>1.8</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.apache.commons</groupId>
26+
<artifactId>commons-lang3</artifactId>
27+
<version>3.5</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>com.alibaba</groupId>
31+
<artifactId>fastjson</artifactId>
32+
<version>1.2.47</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.bouncycastle</groupId>
36+
<artifactId>bcprov-jdk15on</artifactId>
37+
<version>1.68</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>cn.hutool</groupId>
41+
<artifactId>hutool-all</artifactId>
42+
<version>5.6.3</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.fisco-bcos.java-sdk</groupId>
46+
<artifactId>java-sdk</artifactId>
47+
<version>2.7.0</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.fisco-bcos</groupId>
51+
<artifactId>web3sdk</artifactId>
52+
<version>2.6.4</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>com.squareup.okhttp3</groupId>
56+
<artifactId>okhttp</artifactId>
57+
<version>4.9.0</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.squareup.okhttp3</groupId>
61+
<artifactId>logging-interceptor</artifactId>
62+
<version>4.9.0</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>junit</groupId>
66+
<artifactId>junit</artifactId>
67+
<version>4.13.2</version>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.web3j</groupId>
72+
<artifactId>core</artifactId>
73+
<version>4.8.4</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.web3j</groupId>
77+
<artifactId>crypto</artifactId>
78+
<version>4.8.4</version>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.bitcoinj</groupId>
82+
<artifactId>bitcoinj-core</artifactId>
83+
<version>0.15.10</version>
8684
</dependency>
87-
88-
89-
<dependency>
90-
<groupId>junit</groupId>
91-
<artifactId>junit</artifactId>
92-
<version>4.13.2</version>
93-
<scope>test</scope>
94-
</dependency>
95-
</dependencies>
96-
85+
<dependency>
86+
<groupId>junit</groupId>
87+
<artifactId>junit</artifactId>
88+
<version>4.13.2</version>
89+
<scope>test</scope>
90+
</dependency>
91+
</dependencies>
9792

98-
99-
100-
101-
<build>
102-
<finalName>did-sdk-${project.version}</finalName>
103-
<plugins>
104-
<!-- <plugin>
105-
<artifactId>maven-assembly-plugin</artifactId>
106-
<configuration>
107-
<archive>
108-
<manifest>
109-
<mainClass>netty.client.TcpClient809</mainClass>
110-
</manifest>
111-
</archive>
112-
<descriptorRefs>
113-
<descriptorRef>jar-with-dependencies</descriptorRef>
114-
</descriptorRefs>
115-
</configuration>
116-
<executions>
117-
<execution>
118-
<id>make-assembly</id>
119-
<phase>package</phase>
120-
<goals>
121-
<goal>single</goal>
122-
</goals>
123-
</execution>
124-
</executions>
125-
</plugin> -->
126-
127-
<!-- <plugin>
128-
<groupId>org.apache.maven.plugins</groupId>
129-
<artifactId>maven-assembly-plugin</artifactId>
130-
<version>CHOOSE LATEST VERSION HERE</version>
131-
<configuration>
132-
<descriptorRefs>
133-
<descriptorRef>jar-with-dependencies</descriptorRef>
134-
</descriptorRefs>
135-
</configuration>
136-
<executions>
137-
<execution>
138-
<id>assemble-all</id>
139-
<phase>package</phase>
140-
<goals>
141-
<goal>single</goal>
142-
</goals>
143-
</execution>
144-
</executions>
145-
</plugin> -->
146-
147-
<!-- <plugin>
148-
<groupId>com.jolira</groupId>
149-
<artifactId>onejar-maven-plugin</artifactId>
150-
<version>1.4.4</version>
151-
<executions>
152-
<execution>
153-
<goals>
154-
<goal>one-jar</goal>
155-
</goals>
156-
</execution>
157-
</executions>
158-
</plugin> -->
159-
160-
<plugin>
161-
<groupId>org.apache.maven.plugins</groupId>
162-
<artifactId>maven-jar-plugin</artifactId>
163-
<configuration>
164-
<archive>
165-
<manifest>
166-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
167-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
168-
</manifest>
169-
</archive>
170-
</configuration>
171-
</plugin>
93+
<build>
94+
<finalName>did-sdk-${project.version}</finalName>
95+
<plugins>
96+
<plugin>
97+
<groupId>org.apache.maven.plugins</groupId>
98+
<artifactId>maven-jar-plugin</artifactId>
99+
<configuration>
100+
<archive>
101+
<manifest>
102+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
103+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
104+
</manifest>
105+
</archive>
106+
</configuration>
107+
</plugin>
172108

173109
<plugin>
174-
<groupId>org.apache.maven.plugins</groupId>
175-
<artifactId>maven-source-plugin</artifactId>
176-
<version>2.1.2</version>
177-
<executions>
178-
<execution>
179-
<id>attach-sources</id>
180-
<phase>verify</phase>
181-
<goals>
182-
<goal>jar-no-fork</goal>
183-
</goals>
184-
</execution>
185-
</executions>
186-
</plugin>
110+
<groupId>org.apache.maven.plugins</groupId>
111+
<artifactId>maven-source-plugin</artifactId>
112+
<version>2.1.2</version>
113+
<executions>
114+
<execution>
115+
<id>attach-sources</id>
116+
<phase>verify</phase>
117+
<goals>
118+
<goal>jar-no-fork</goal>
119+
</goals>
120+
</execution>
121+
</executions>
122+
</plugin>
187123

188-
<plugin>
189-
<groupId>org.sonarsource.scanner.maven</groupId>
190-
<artifactId>sonar-maven-plugin</artifactId>
191-
</plugin>
124+
<plugin>
125+
<groupId>org.sonarsource.scanner.maven</groupId>
126+
<artifactId>sonar-maven-plugin</artifactId>
127+
</plugin>
192128

193-
<plugin>
194-
<groupId>org.jacoco</groupId>
195-
<artifactId>jacoco-maven-plugin</artifactId>
196-
<version>0.8.7</version>
197-
<executions>
198-
<execution>
199-
<goals>
200-
<goal>prepare-agent</goal>
201-
<goal>report</goal>
202-
</goals>
203-
</execution>
204-
</executions>
205-
</plugin>
206-
</plugins>
207-
<pluginManagement>
208-
<plugins>
209-
<plugin>
210-
<groupId>org.sonarsource.scanner.maven</groupId>
211-
<artifactId>sonar-maven-plugin</artifactId>
212-
<version>3.6.0.1398</version>
213-
</plugin>
214-
</plugins>
215-
</pluginManagement>
216-
</build>
129+
<plugin>
130+
<groupId>org.jacoco</groupId>
131+
<artifactId>jacoco-maven-plugin</artifactId>
132+
<version>0.8.7</version>
133+
<executions>
134+
<execution>
135+
<goals>
136+
<goal>prepare-agent</goal>
137+
<goal>report</goal>
138+
</goals>
139+
</execution>
140+
</executions>
141+
</plugin>
142+
</plugins>
143+
<pluginManagement>
144+
<plugins>
145+
<plugin>
146+
<groupId>org.sonarsource.scanner.maven</groupId>
147+
<artifactId>sonar-maven-plugin</artifactId>
148+
<version>3.6.0.1398</version>
149+
</plugin>
150+
</plugins>
151+
</pluginManagement>
152+
</build>
217153
</project>

0 commit comments

Comments
 (0)