From: Xia Kaixiang <kaixiang.xia@supwisdom.com>
Date: Tue, 18 Feb 2020 09:40:20 +0000 (+0800)
Subject: 临时提交
X-Git-Tag: 1.0.12^2~9
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=80f1e9d63a19bf3406529575ae0582e9bca91318;p=epayment%2Ffood_payapi.git

临时提交
---

diff --git a/bus-qrcode/build.gradle b/bus-qrcode/build.gradle
new file mode 100644
index 00000000..8f2e1f12
--- /dev/null
+++ b/bus-qrcode/build.gradle
@@ -0,0 +1,54 @@
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id "com.palantir.git-version"
+}
+
+group = rootProject.group
+
+def sdkVersion = gitVersion()
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            groupId = project.group
+            artifactId = 'bus-qrcode'
+            version = sdkVersion
+            from components.java
+        }
+    }
+    repositories {
+        maven {
+            // change URLs to point to your repos, e.g. http://my.org/repo
+            def releasesRepoUrl = "http://ykt-nx.supwisdom.com/repository/ecard-repo/"
+            def snapshotsRepoUrl = "http://ykt-nx.supwisdom.com/repository/ecard-repo/snapshot/"
+            url = version.endsWith('dirty') ? snapshotsRepoUrl : releasesRepoUrl
+            credentials(PasswordCredentials) {
+                username = nxUser
+                password = nxPassword
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation "org.apache.commons:commons-lang3:3.7"
+    implementation 'com.eatthepath:java-otp:0.1.0'
+    implementation 'org.slf4j:slf4j-api:1.7.25'
+    implementation 'commons-codec:commons-codec:1.9'
+    runtime 'org.slf4j:slf4j-parent:1.7.25'
+    runtime 'org.slf4j:slf4j-simple:1.7.25'
+    testImplementation 'junit:junit:4.12'
+}
+
+jar {
+    enabled = true
+    baseName = "bus-qrcode"
+    manifest {
+        attributes('Bus-QRcode-Version': sdkVersion)
+    }
+}
+
+publish.dependsOn(jar)
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/busQRcode/BinUtil.java b/bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/BinUtil.java
similarity index 98%
rename from payapi/src/main/java/com/supwisdom/dlpay/busQRcode/BinUtil.java
rename to bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/BinUtil.java
index 5b8f43b7..ebb4f055 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/busQRcode/BinUtil.java
+++ b/bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/BinUtil.java
@@ -1,4 +1,4 @@
-package com.supwisdom.dlpay.busQRcode;
+package com.supwisdom.dlpay.busqrcode;
 
 import org.apache.commons.codec.binary.Base64;
 
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/busQRcode/CryptoUtil.java b/bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/CryptoUtil.java
similarity index 98%
rename from payapi/src/main/java/com/supwisdom/dlpay/busQRcode/CryptoUtil.java
rename to bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/CryptoUtil.java
index 75c4d082..839e3c01 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/busQRcode/CryptoUtil.java
+++ b/bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/CryptoUtil.java
@@ -1,4 +1,4 @@
-package com.supwisdom.dlpay.busQRcode;
+package com.supwisdom.dlpay.busqrcode;
 
 import javax.crypto.*;
 import javax.crypto.spec.DESKeySpec;
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/busQRcode/PbocAlgorithem.java b/bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/PbocAlgorithem.java
similarity index 98%
rename from payapi/src/main/java/com/supwisdom/dlpay/busQRcode/PbocAlgorithem.java
rename to bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/PbocAlgorithem.java
index f63b4f1c..49da1147 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/busQRcode/PbocAlgorithem.java
+++ b/bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/PbocAlgorithem.java
@@ -1,4 +1,4 @@
-package com.supwisdom.dlpay.busQRcode;
+package com.supwisdom.dlpay.busqrcode;
 
 import java.util.Arrays;
 
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/busQRcode/QrCode.java b/bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/QrCode.java
similarity index 98%
rename from payapi/src/main/java/com/supwisdom/dlpay/busQRcode/QrCode.java
rename to bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/QrCode.java
index 35a50e0d..5f8a7afd 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/busQRcode/QrCode.java
+++ b/bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/QrCode.java
@@ -1,4 +1,4 @@
-package com.supwisdom.dlpay.busQRcode;
+package com.supwisdom.dlpay.busqrcode;
 
 import com.eatthepath.otp.TimeBasedOneTimePasswordGenerator;
 import com.supwisdom.dlpay.util.TOTP;
@@ -14,8 +14,8 @@ import java.security.NoSuchAlgorithmException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import static com.supwisdom.dlpay.busQRcode.BinUtil.*;
-import static com.supwisdom.dlpay.busQRcode.CryptoUtil.*;
+import static com.supwisdom.dlpay.busqrcode.BinUtil.*;
+import static com.supwisdom.dlpay.busqrcode.CryptoUtil.*;
 
 public class QrCode {
   private static Logger logger = LoggerFactory.getLogger(QrCode.class);
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/busQRcode/StringJoin.java b/bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/StringJoin.java
similarity index 94%
rename from payapi/src/main/java/com/supwisdom/dlpay/busQRcode/StringJoin.java
rename to bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/StringJoin.java
index fdc5ca87..ae3b0c7f 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/busQRcode/StringJoin.java
+++ b/bus-qrcode/src/main/java/com/supwisdom/dlpay/busqrcode/StringJoin.java
@@ -1,4 +1,4 @@
-package com.supwisdom.dlpay.busQRcode;
+package com.supwisdom.dlpay.busqrcode;
 
 public class StringJoin {
   private String delimiter;
diff --git a/bus-qrcode/src/test/java/com/supwisdom/dlpay/busqrcode/QrcodeTest.java b/bus-qrcode/src/test/java/com/supwisdom/dlpay/busqrcode/QrcodeTest.java
new file mode 100644
index 00000000..e69de29b
diff --git a/settings.gradle b/settings.gradle
index 35b2274f..a1a579ba 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,3 @@
 rootProject.name = 'payapi'
-include 'payapi', 'payapi-sdk', 'payapi-common', 'ynrcc-agent','oauth'
+include 'payapi', 'payapi-sdk', 'payapi-common', 'ynrcc-agent','oauth','bus-qrcode'