Merge branch 'dev'

更新版号
arloor · Jan 13, 2019 · 8d3b7c4 · 8d3b7c4
2 parents d9036d6 + 0313e46
commit 8d3b7c4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/proxyclient/pom.xml b/proxyclient/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.arloor</groupId>
     <artifactId>proxyclient</artifactId>
-    <version>1.2</version>
+    <version>2.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.arloor</groupId>
             <artifactId>proxycommon</artifactId>
-            <version>1.0</version>
+            <version>2.0</version>
         </dependency>
     </dependencies>
 

diff --git a/proxycommon/pom.xml b/proxycommon/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.arloor</groupId>
     <artifactId>proxycommon</artifactId>
-    <version>1.0</version>
+    <version>2.0</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/proxycommon/src/main/resources/proxy.properties b/proxycommon/src/main/resources/proxy.properties
@@ -7,8 +7,8 @@ crypto.key=你想用我的代理吗？？？
 #作为分割
 crypto.delimiter=br
 #代理服务器运行在8080
-server.port=8080
+server.port=9090
 #默认为127.0.0.1
-#server.host=proxy
+server.host=proxy
 #默认为8081
-client.port=8888
+client.port=9091
diff --git a/proxyserver/pom.xml b/proxyserver/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.arloor</groupId>
     <artifactId>proxyserver</artifactId>
-    <version>1.2</version>
+    <version>2.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.arloor</groupId>
             <artifactId>proxycommon</artifactId>
-            <version>1.0</version>
+            <version>2.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->