From 0678202baa7bdceedeab243808dce26616b27e43 Mon Sep 17 00:00:00 2001
From: kang <1115610574@qq.com>
Date: Sat, 7 Aug 2021 11:07:52 +0800
Subject: [PATCH 1/3] ci: add deploy snapshot workflow

---
 .github/workflows/deploy-snapshot.yml | 44 +++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 .github/workflows/deploy-snapshot.yml

diff --git a/.github/workflows/deploy-snapshot.yml b/.github/workflows/deploy-snapshot.yml
new file mode 100644
index 0000000..9959970
--- /dev/null
+++ b/.github/workflows/deploy-snapshot.yml
@@ -0,0 +1,44 @@
+name: Deploy SNAPSHOT
+
+on: 
+  push:
+    branches: [ dev ]
+    paths:
+      - src/**
+      - pom.xml
+  pull_request:
+    branches: [ dev ]
+    paths:
+      - src/**
+      - pom.xml
+
+jobs:
+  get-latest-tag:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.2.0
+      - name: Set up Java and Maven
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+      - name: Cache m2 package
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: get current project version to set env.VERSION
+        run: echo "VERSION=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`" >> $GITHUB_ENV
+      - name: set snapshot version
+        if: ${{ !endsWith( env.VERSION , '-SNAPSHOT') }} 
+        run: mvn versions:set -DnewVersion=${{ env.VERSION }}-SNAPSHOT
+      - name: deploy snapshot to ossrh repository
+        run: mvn -B deploy -P snapshot
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

From 3f4436bcb65ce31b5b4b562d22855626c758b0ac Mon Sep 17 00:00:00 2001
From: kang <1115610574@qq.com>
Date: Sat, 7 Aug 2021 11:12:10 +0800
Subject: [PATCH 2/3] ci: add upload ossrh snapshotRepository config

---
 pom.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f3ec0d2..3b511fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,15 @@
     </plugins>
   </build>
   <profiles>
+    <profile>
+      <id>snapshot</id>
+      <distributionManagement>
+        <snapshotRepository>
+          <id>ossrh</id>
+          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
     <profile>
       <id>release</id>
       <build>
@@ -222,10 +231,6 @@
           </plugins>
       </build>
       <distributionManagement>
-        <snapshotRepository>
-          <id>sonatype-nexus-snapshots</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-        </snapshotRepository>
         <repository>
           <id>sonatype-nexus-staging</id>
           <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>

From 9fc3131640f7442eef54efb69e3ee575c07f53fc Mon Sep 17 00:00:00 2001
From: kang <1115610574@qq.com>
Date: Sat, 7 Aug 2021 11:28:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?test:=20=E4=BF=AE=E5=A4=8D=20twitter=20user?=
 =?UTF-8?q?Info=20api=20=E4=BF=AE=E6=94=B9=E5=90=8E=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/me/zhyd/oauth/utils/GlobalAuthUtilsTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/me/zhyd/oauth/utils/GlobalAuthUtilsTest.java b/src/test/java/me/zhyd/oauth/utils/GlobalAuthUtilsTest.java
index 3c002c5..88ef405 100644
--- a/src/test/java/me/zhyd/oauth/utils/GlobalAuthUtilsTest.java
+++ b/src/test/java/me/zhyd/oauth/utils/GlobalAuthUtilsTest.java
@@ -145,7 +145,7 @@ public class GlobalAuthUtilsTest {
         oauthParams.forEach((k, v) -> oauthParams.put(k, "\"" + GlobalAuthUtils.urlEncode(v) + "\""));
 
         String actual = "OAuth " + GlobalAuthUtils.parseMapToString(oauthParams, false).replaceAll("&", ", ");
-        assertEquals("OAuth oauth_nonce=\"sTj7Ivg73u052eXstpoS1AWQCynuDEPN\", oauth_signature=\"yHHq2J1W5QLAO8gGipnY1V%2Bzxqk%3D\", oauth_token=\"1961977975-PcFQaCnpN9h9xqtqHwHlpGBXFrHJ9bOLy7OtGAL\", oauth_consumer_key=\"HD0XLqzi5Wz0G08rh45Cg8mgh\", oauth_signature_method=\"HMAC-SHA1\", oauth_timestamp=\"1569751082\", oauth_version=\"1.0\"", actual);
+        assertEquals("OAuth oauth_nonce=\"sTj7Ivg73u052eXstpoS1AWQCynuDEPN\", oauth_signature=\"OsqHjRmBf7syxlz8lB7MRdzqEjY%3D\", oauth_token=\"1961977975-PcFQaCnpN9h9xqtqHwHlpGBXFrHJ9bOLy7OtGAL\", oauth_consumer_key=\"HD0XLqzi5Wz0G08rh45Cg8mgh\", oauth_signature_method=\"HMAC-SHA1\", oauth_timestamp=\"1569751082\", oauth_version=\"1.0\"", actual);
     }
 
     @Test
@@ -200,7 +200,7 @@ public class GlobalAuthUtilsTest {
         queryParams.put("name", "你好");
         queryParams.put("gender", "male");
 
-        assertEquals("J6MAQH1kcgUdj2jmygN3rdfI4lo=", GlobalAuthUtils.generateTwitterSignature(queryParams, "GET", TWITTER.userInfo(), "xxxxx", "xxxxx"));
+        assertEquals("20FYnV2aZnxNQtp+I0tpMRTvcx0=", GlobalAuthUtils.generateTwitterSignature(queryParams, "GET", TWITTER.userInfo(), "xxxxx", "xxxxx"));
     }
 
     @Test