upg jframe-pay 2.0.0

dzh · Jul 21, 2019 · 60baa73 · 60baa73
1 parent 49d5696
commit 60baa73
Show file tree

Hide file tree

Showing 69 changed files with 1,108 additions and 1,142 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,18 +20,10 @@ jframe-plugin/release/lib/
 jframe-plugin/release/plugin/
 
 
-jframe-pay/release/jframe-pay/lib/
-jframe-pay/release/jframe-pay/plugin/
-jframe-pay/release/jframe-pay/temp/
-jframe-pay/release/jframe-pay/log/
-jframe-pay/release/jframe-pay/conf/cache/
-
-
-jframe-demo/demo-release/lib/
-jframe-demo/demo-release/plugin/
-jframe-demo/demo-release/temp/
-jframe-demo/demo-release/log/
-jframe-demo/demo-release/conf/cache/
+jframe-pay/jframe-pay-release/tmp/
+jframe-pay/jframe-pay-release/log/
+jframe-pay/jframe-pay-release/conf/
+jframe-pay/jframe-pay-release/filter.properties
 
 # idea
 *.iml

diff --git a/jframe-pay/README.md b/jframe-pay/README.md
@@ -0,0 +1,10 @@
+jframe pay
+===================================
+通用的支付网关
+
+
+## 工程源码
+
+
+## 使用说明
+
diff --git a/jframe-pay/jframe-pay-client/pom.xml b/jframe-pay/jframe-pay-client/pom.xml
diff --git a/jframe-pay/jframe-pay-lib/jframe-pay-domain/pom.xml b/jframe-pay/jframe-pay-lib/jframe-pay-domain/pom.xml
@@ -1,45 +1,52 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn</groupId>
-		<artifactId>jframe-pay-lib</artifactId>
-		<version>1.0.0</version>
-	</parent>
-	<artifactId>jframe-pay-domain</artifactId>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.github.dzh</groupId>
+        <artifactId>jframe-pay-lib</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>jframe-pay-domain</artifactId>
 
-	<dependencies>
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>1.2.6</version>
-		</dependency>
-		<dependency>
-			<groupId>com.jayway.jsonpath</groupId>
-			<artifactId>json-path</artifactId>
-			<version>2.0.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>net.minidev</groupId>
-					<artifactId>asm</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>3.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongo-java-driver</artifactId>
-			<version>3.0.2</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongo-java-driver</artifactId>
+            <version>3.0.2</version>
+        </dependency>
 
-	</dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+
+    </dependencies>
 </project>
diff --git a/...ame-pay-lib/jframe-pay-domain/src/main/java/jframe/pay/domain/dao/mapper/Environment.java b/...ame-pay-lib/jframe-pay-domain/src/main/java/jframe/pay/domain/dao/mapper/Environment.java
@@ -1,21 +1,21 @@
 /**
- * 
+ *
  */
 package jframe.pay.domain.dao.mapper;
 
 /**
  * enviroment id
- * 
+ *
  * @author dzh
  * @date Jul 20, 2015 11:59:10 AM
  * @since 1.0
  */
 public interface Environment {
 
-	String RUN = "run";
+    String RUN = "run";
 
-	String RUN_RO1 = "run_ro1";
+    String RUN_RO1 = "run_ro1";
 
-	String DEV = "dev";
+    String DEV = "dev";
 
 }
diff --git a/...e-pay/jframe-pay-lib/jframe-pay-domain/src/main/java/jframe/pay/domain/util/HttpUtil.java b/...e-pay/jframe-pay-lib/jframe-pay-domain/src/main/java/jframe/pay/domain/util/HttpUtil.java
@@ -1,22 +1,17 @@
 /**
- * 
+ *
  */
 package jframe.pay.domain.util;
 
-import static java.util.stream.Collectors.toList;
-
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URLEncodedUtils;
 import org.apache.http.message.BasicNameValuePair;
 
+import java.io.UnsupportedEncodingException;
+import java.util.*;
+
+import static java.util.stream.Collectors.toList;
+
 /**
  * @author dzh
  * @date Jul 13, 2015 5:44:13 PM
@@ -27,7 +22,7 @@ public class HttpUtil {
     /**
      * If req not contains all mustParas , then return emptyList contains empty
      * parameter
-     * 
+     *
      * @param req
      *            req parameters
      * @param mustParas
@@ -70,7 +65,7 @@ public final static String format(Map<String, String> paras, String charset) {
 
     /**
      * 目前只支持单值情况， 不支持多值和编码
-     * 
+     *
      * @param content
      * @return
      * @throws UnsupportedEncodingException

diff --git a/jframe-pay/jframe-pay-lib/jframe-pay-domain/src/main/java/jframe/pay/domain/util/IDUtil.java b/jframe-pay/jframe-pay-lib/jframe-pay-domain/src/main/java/jframe/pay/domain/util/IDUtil.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package jframe.pay.domain.util;
 
@@ -27,7 +27,7 @@ public class IDUtil {
 
     /**
      * 生成短信验证码 4位数字
-     * 
+     *
      * @return
      */
     public static String genVCode() {
@@ -220,7 +220,7 @@ public static String genSysTaskId() {
 
     /**
      * 线路ID
-     * 
+     *
      * @return
      */
     public static String genPathId() {
@@ -289,7 +289,7 @@ public static String genMsgGroupId() {
 
     /**
      * 消息头的key
-     * 
+     *
      * @return
      */
     public static String genSignKey() {
@@ -298,15 +298,15 @@ public static String genSignKey() {
             int category = new Random().nextInt() % 3;
             char ch = '0';
             switch (category) {
-            case 0:
-                ch = (char) ((new Random().nextInt(10) % 10 + 48) & 0xffff);
-                break;
-            case 1:
-                ch = (char) ((new Random().nextInt(26) % 26 + 65) & 0xffff);
-                break;
-            case 2:
-                ch = (char) ((new Random().nextInt(26) % 26 + 97) & 0xffff);
-                break;
+                case 0:
+                    ch = (char) ((new Random().nextInt(10) % 10 + 48) & 0xffff);
+                    break;
+                case 1:
+                    ch = (char) ((new Random().nextInt(26) % 26 + 65) & 0xffff);
+                    break;
+                case 2:
+                    ch = (char) ((new Random().nextInt(26) % 26 + 97) & 0xffff);
+                    break;
             }
             buf.append(ch);
         }
@@ -315,7 +315,7 @@ public static String genSignKey() {
 
     /**
      * 生成邀请码
-     * 
+     *
      * @return
      */
     public static String genInviteCode() {

diff --git a/...e-pay/jframe-pay-lib/jframe-pay-domain/src/main/java/jframe/pay/domain/util/ToString.java b/...e-pay/jframe-pay-lib/jframe-pay-domain/src/main/java/jframe/pay/domain/util/ToString.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package jframe.pay.domain.util;
 
@@ -10,19 +10,20 @@
  * @date Aug 15, 2014 5:26:56 PM
  * @since 1.0
  */
+@Deprecated
 public class ToString {
 
-	public static final String toString(Map<?, ?> map) {
-		if (map == null || map.isEmpty())
-			return "";
-		StringBuilder buf = new StringBuilder();
-		buf.append("\nbegin\n");
-		for (Object o : map.keySet()) {
-			buf.append(String.valueOf(o) + "->" + String.valueOf(map.get(o))
-					+ ",");
-		}
-		buf.append("\nend\n");
-		return buf.toString();
-	}
+    public static final String toString(Map<?, ?> map) {
+        if (map == null || map.isEmpty())
+            return "";
+        StringBuilder buf = new StringBuilder();
+        buf.append("\nbegin\n");
+        for (Object o : map.keySet()) {
+            buf.append(String.valueOf(o) + "->" + String.valueOf(map.get(o))
+                    + ",");
+        }
+        buf.append("\nend\n");
+        return buf.toString();
+    }
 
 }
diff --git a/jframe-pay/jframe-pay-lib/pom.xml b/jframe-pay/jframe-pay-lib/pom.xml
@@ -1,17 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn</groupId>
-		<artifactId>jframe-pay</artifactId>
-		<version>1.0.0</version>
-	</parent>
-	<artifactId>jframe-pay-lib</artifactId>
-	<packaging>pom</packaging>
-	<modules>
-		<module>jframe-pay-domain</module>
-	</modules>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.github.dzh</groupId>
+        <artifactId>jframe-pay</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>jframe-pay-lib</artifactId>
+    <packaging>pom</packaging>
 
-	<dependencies>
-	</dependencies>
+    <modules>
+        <module>jframe-pay-domain</module>
+    </modules>
+
+    <dependencies></dependencies>
 </project>