first commit

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+            + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if (mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if (mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if (!outputFile.getParentFile().exists()) {
+            if (!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

HELP.md

@@ -0,0 +1,9 @@
+# Getting Started
+
+### Reference Documentation
+For further reference, please consider the following sections:
+
+* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
+* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.3.1.RELEASE/maven-plugin/reference/html/)
+* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.3.1.RELEASE/maven-plugin/reference/html/#build-image)
+

mvnw

@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

pom.xml

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.0.6.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>info.aspirecn.iov.sjjh</groupId>
+    <artifactId>iov-sjjh-servicenode-supplier-10000044</artifactId>
+    <version>1.0.4</version>
+    <name>iov-sjjh-servicenode-supplier-10000044</name>
+    <description>Demo project for Spring Boot</description>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- 服务注册 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-config-client</artifactId>
+        </dependency>
+
+        <!-- aspire maven私服 -->
+        <dependency>
+            <groupId>info.aspirecn.rdc</groupId>
+            <artifactId>aspirecloud-commons-sleuthlog-starter</artifactId>
+            <version>5.0.1</version>
+        </dependency>
+
+        <!--错误日志-->
+        <dependency>
+            <groupId>info.aspirecn.rdc</groupId>
+            <artifactId>aspirecloud-commons-errorlog-starter</artifactId>
+            <version>5.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>info.aspirecn.iov.sjjh</groupId>
+            <artifactId>iov-sjjh-commons-lang</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+                 <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.70</version>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>Finchley.SR2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <!-- <configuration>
+                    <includes>
+
+                        <include>
+                            <groupId>info.aspirecn.iov.sjjh</groupId>
+                            <artifactId>iov-sjjh-commons-lang</artifactId>
+                        </include>
+                    </includes>
+                </configuration>-->
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <!-- <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                        </manifest>
+                    </archive>
+                </configuration>-->
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <!-- <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <excludeGroupIds>
+                                info.aspirecn.iov.sjjh
+                            </excludeGroupIds>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.directory}/lib
+                            </outputDirectory>
+                            <excludeGroupIds>
+                                info.aspirecn.iov.sjjh
+                            </excludeGroupIds>
+                        </configuration>
+                    </execution>
+                </executions>-->
+            </plugin>
+
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/classes</outputDirectory>
+                            <useDefaultDelimiters>false</useDefaultDelimiters>
+                            <delimiters>
+                                <delimiter>@</delimiter>
+                            </delimiters>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </resource>
+
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+
+        </plugins>
+    </build>
+
+</project>

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/App.java

@@ -0,0 +1,37 @@
+package info.aspirecn.iov.sjjh.supplier10000044;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.util.StopWatch;
+
+@EnableScheduling
+@SpringBootApplication
+@EnableConfigurationProperties
+@Slf4j
+@EnableEurekaClient
+@ComponentScan("info.aspirecn.rdc.aspirecloud.node.except")
+@ComponentScan("info.aspirecn.rdc.aspirecloud.node.brave")
+@ComponentScan("info.aspirecn.iov.sjjh.supplier10000044")
+public class App {
+
+    public static void main(String[] args) {
+        StopWatch watch = new StopWatch();
+        watch.start();
+
+        ApplicationContext context = SpringApplication.run(App.class, args);
+        Environment environment = context.getBean(Environment.class);
+        String applicationName = environment.getProperty("spring.application.name");
+
+
+        watch.stop();
+        log.info("{} 启动完毕，times={}s", applicationName, watch.getTotalTimeSeconds());
+    }
+
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/SwaggerConfig.java

@@ -0,0 +1,32 @@
+package info.aspirecn.iov.sjjh.supplier10000044;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @author minmin
+ */
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    private boolean swaggerShow = true;
+
+    @Bean
+    public Docket createRestApi() {
+
+        return new Docket(DocumentationType.SWAGGER_2).enable(swaggerShow).apiInfo(apiInfo()).select()
+                .apis(RequestHandlerSelectors.basePackage("info.aspirecn.iov.sjjh.supplier10000044.action"))
+                .paths(PathSelectors.any()).build();
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder().title("10000044通道接口").description("").termsOfServiceUrl("").version("1.0.0").build();
+    }
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/action/ChannelAction.java

@@ -0,0 +1,307 @@
+package info.aspirecn.iov.sjjh.supplier10000044.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import info.aspirecn.iov.sjjh.commons.lang.ChannelTypeHandleResponseObject;
+import info.aspirecn.iov.sjjh.commons.lang.Constant;
+import info.aspirecn.iov.sjjh.supplier10000044.constant.SjjhConstant;
+import info.aspirecn.iov.sjjh.supplier10000044.service.ChannelService;
+import info.aspirecn.rdc.aspirecloud.node.except.utils.ErrorUtils;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.tomcat.util.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/7/8 15:31
+ * @version: V1.0
+ **/
+@Slf4j
+@RestController
+public class ChannelAction {
+    @Autowired
+    ChannelService channelService;
+
+    @ApiOperation(value = "身份证二要素接口", notes = "")
+    @PostMapping(value = "/twoElementsCheck.do")
+    public ChannelTypeHandleResponseObject twoElementsCheck(
+            @ApiParam(value = "通道ID") @RequestHeader(name = "channelId") String channelId,
+            @ApiParam(value = "超时时间,单位：毫秒", example = "10000") @RequestParam(name = "outTime", required = true) int outTime,
+            @ApiParam(value = "请求参数JSON串") @RequestParam(name = "customBody", required = true) String customBody) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+
+        ChannelTypeHandleResponseObject ret = channelService.twoElementsCheck(request, customBody, outTime);
+
+        //把接口参数、调用结果和是否收费放入访问日志中
+        if (ret.getCode() != Constant.SUCCESS) {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_ERROR_CODE);
+        } else {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_SUCCESS_CODE);
+        }
+        request.setAttribute(SjjhConstant.Charge_Log_Key, ret.getIsCharge());
+
+        try {
+            request.setAttribute(Constant.CHANNEL_LOG_QUERY,
+                    Base64.encodeBase64String(customBody.getBytes(SjjhConstant.PARA_ENCODE)));
+
+        } catch (Exception ex) {
+            ErrorUtils.captureException(ex);
+            log.error("twoElementsCheck.encodeBase64String.Exception={}", ex);
+        }
+        request.setAttribute(Constant.CHANNEL_TYPE_KEY, Constant.CHANNEL_TYPE_SYNC);
+        return ret;
+    }
+
+    @ApiOperation(value = "人像接口", notes = "")
+    @PostMapping(value = "/photoIdentityCheck.do")
+    public ChannelTypeHandleResponseObject photoIdentityCheck(
+            @ApiParam(value = "通道ID") @RequestHeader(name = "channelId") String channelId,
+            @ApiParam(value = "超时时间,单位：毫秒", example = "10000") @RequestParam(name = "outTime", required = true) int outTime,
+            @ApiParam(value = "请求参数JSON串") @RequestBody String customBody) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+
+        //调用service
+        ChannelTypeHandleResponseObject ret = channelService.photoIdentityCheck(request, customBody, outTime);
+
+        //把接口参数、调用结果和是否收费放入访问日志中
+        if (ret.getCode() != Constant.SUCCESS) {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_ERROR_CODE);
+        } else {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_SUCCESS_CODE);
+        }
+        request.setAttribute(SjjhConstant.Charge_Log_Key, ret.getIsCharge());
+
+        request.setAttribute(Constant.CHANNEL_TYPE_KEY, Constant.CHANNEL_TYPE_SYNC);
+        return ret;
+    }
+
+    @ApiOperation(value = "身份证二要素接口-返回通用版", notes = "")
+    @PostMapping(value = "/twoElementsCheckNew.do")
+    public ChannelTypeHandleResponseObject twoElementsCheckNew(
+            @ApiParam(value = "通道ID") @RequestHeader(name = "channelId") String channelId,
+            @ApiParam(value = "超时时间,单位：毫秒", example = "10000") @RequestParam(name = "outTime", required = true) int outTime,
+            @ApiParam(value = "请求参数JSON串") @RequestParam(name = "customBody", required = true) String customBody) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+
+        ChannelTypeHandleResponseObject ret = channelService.twoElementsCheckNew(request, customBody, outTime, SjjhConstant.DECODE_TYPE_COMMON);
+
+        //把接口参数、调用结果和是否收费放入访问日志中
+        if (ret.getCode() != Constant.SUCCESS) {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_ERROR_CODE);
+        } else {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_SUCCESS_CODE);
+        }
+        request.setAttribute(SjjhConstant.Charge_Log_Key, ret.getIsCharge());
+
+        try {
+            request.setAttribute(Constant.CHANNEL_LOG_QUERY,
+                    Base64.encodeBase64String(customBody.getBytes(SjjhConstant.PARA_ENCODE)));
+
+        } catch (Exception ex) {
+            ErrorUtils.captureException(ex);
+            log.error("twoElementsCheckNew.encodeBase64String.Exception={}", ex);
+        }
+        request.setAttribute(Constant.CHANNEL_TYPE_KEY, Constant.CHANNEL_TYPE_SYNC);
+        return ret;
+    }
+
+    @ApiOperation(value = "身份证二要素接口-返回通用版-WZ加密版", notes = "")
+    @PostMapping(value = "/twoElementsCheckNewWZ.do")
+    public ChannelTypeHandleResponseObject twoElementsCheckNewWZ(
+            @ApiParam(value = "通道ID") @RequestHeader(name = "channelId") String channelId,
+            @ApiParam(value = "超时时间,单位：毫秒", example = "10000") @RequestParam(name = "outTime", required = true) int outTime,
+            @ApiParam(value = "请求参数JSON串") @RequestParam(name = "customBody", required = true) String customBody) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+
+        ChannelTypeHandleResponseObject ret = channelService.twoElementsCheckNew(request, customBody, outTime, SjjhConstant.DECODE_TYPE_WEIZHONG);
+
+        //把接口参数、调用结果和是否收费放入访问日志中
+        if (ret.getCode() != Constant.SUCCESS) {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_ERROR_CODE);
+        } else {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_SUCCESS_CODE);
+        }
+        request.setAttribute(SjjhConstant.Charge_Log_Key, ret.getIsCharge());
+
+        try {
+            request.setAttribute(Constant.CHANNEL_LOG_QUERY,
+                    Base64.encodeBase64String(customBody.getBytes(SjjhConstant.PARA_ENCODE)));
+
+        } catch (Exception ex) {
+            ErrorUtils.captureException(ex);
+            log.error("twoElementsCheckNew.encodeBase64String.Exception={}", ex);
+        }
+        request.setAttribute(Constant.CHANNEL_TYPE_KEY, Constant.CHANNEL_TYPE_SYNC);
+        return ret;
+    }
+
+    @ApiOperation(value = "人像接口-中心通用版", notes = "")
+    @PostMapping(value = "/photoIdentityCheckNew.do")
+    public ChannelTypeHandleResponseObject photoIdentityCheckNew(
+            @ApiParam(value = "通道ID") @RequestHeader(name = "channelId") String channelId,
+            @ApiParam(value = "超时时间,单位：毫秒", example = "10000") @RequestParam(name = "outTime", required = true) int outTime,
+            @ApiParam(value = "请求参数JSON串") @RequestBody String customBody) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+
+        //调用service
+        ChannelTypeHandleResponseObject ret = channelService.photoIdentityCheckNew(request, customBody, outTime, SjjhConstant.DECODE_TYPE_COMMON);
+
+        //把接口参数、调用结果和是否收费放入访问日志中
+        if (ret.getCode() != Constant.SUCCESS) {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_ERROR_CODE);
+        } else {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_SUCCESS_CODE);
+        }
+        request.setAttribute(SjjhConstant.Charge_Log_Key, ret.getIsCharge());
+
+        request.setAttribute(Constant.CHANNEL_TYPE_KEY, Constant.CHANNEL_TYPE_SYNC);
+        return ret;
+    }
+
+    @ApiOperation(value = "人像接口-中心通用版-WZ加密", notes = "")
+    @PostMapping(value = "/photoIdentityCheckNewWZ.do")
+    public ChannelTypeHandleResponseObject photoIdentityCheckNewWZ(
+            @ApiParam(value = "通道ID") @RequestHeader(name = "channelId") String channelId,
+            @ApiParam(value = "超时时间,单位：毫秒", example = "10000") @RequestParam(name = "outTime", required = true) int outTime,
+            @ApiParam(value = "请求参数JSON串") @RequestBody String customBody) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+
+        //调用service
+        ChannelTypeHandleResponseObject ret = channelService.photoIdentityCheckNew(request, customBody, outTime, SjjhConstant.DECODE_TYPE_WEIZHONG);
+
+        //把接口参数、调用结果和是否收费放入访问日志中
+        if (ret.getCode() != Constant.SUCCESS) {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_ERROR_CODE);
+        } else {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_SUCCESS_CODE);
+        }
+        request.setAttribute(SjjhConstant.Charge_Log_Key, ret.getIsCharge());
+
+        request.setAttribute(Constant.CHANNEL_TYPE_KEY, Constant.CHANNEL_TYPE_SYNC);
+        return ret;
+    }
+
+    @ApiOperation(value = "身份证二要素接口-返回通用版-MD5", notes = "")
+    @PostMapping(value = "/twoElementsCheckNewMD5.do")
+    public ChannelTypeHandleResponseObject twoElementsCheckNewMD5(
+            @ApiParam(value = "通道ID") @RequestHeader(name = "channelId") String channelId,
+            @ApiParam(value = "超时时间,单位：毫秒", example = "10000") @RequestParam(name = "outTime", required = true) int outTime,
+            @ApiParam(value = "请求参数JSON串") @RequestParam(name = "customBody", required = true) String customBody) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+
+        ChannelTypeHandleResponseObject ret = channelService.twoElementsCheckNew(request, customBody, outTime, SjjhConstant.DECODE_TYPE_MD5);
+
+        //把接口参数、调用结果和是否收费放入访问日志中
+        if (ret.getCode() != Constant.SUCCESS) {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_ERROR_CODE);
+        } else {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_SUCCESS_CODE);
+        }
+        request.setAttribute(SjjhConstant.Charge_Log_Key, ret.getIsCharge());
+
+        try {
+            request.setAttribute(Constant.CHANNEL_LOG_QUERY,
+                    Base64.encodeBase64String(customBody.getBytes(SjjhConstant.PARA_ENCODE)));
+
+        } catch (Exception ex) {
+            ErrorUtils.captureException(ex);
+            log.error("twoElementsCheckNew.encodeBase64String.Exception={}", ex);
+        }
+        request.setAttribute(Constant.CHANNEL_TYPE_KEY, Constant.CHANNEL_TYPE_SYNC);
+        return ret;
+    }
+
+    @ApiOperation(value = "身份证二要素接口-返回通用版-SHA256", notes = "")
+    @PostMapping(value = "/twoElementsCheckNewSHA256.do")
+    public ChannelTypeHandleResponseObject twoElementsCheckNewSHA256(
+            @ApiParam(value = "通道ID") @RequestHeader(name = "channelId") String channelId,
+            @ApiParam(value = "超时时间,单位：毫秒", example = "10000") @RequestParam(name = "outTime", required = true) int outTime,
+            @ApiParam(value = "请求参数JSON串") @RequestParam(name = "customBody", required = true) String customBody) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+
+        ChannelTypeHandleResponseObject ret = channelService.twoElementsCheckNew(request, customBody, outTime, SjjhConstant.DECODE_TYPE_SHA256);
+
+        //把接口参数、调用结果和是否收费放入访问日志中
+        if (ret.getCode() != Constant.SUCCESS) {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_ERROR_CODE);
+        } else {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_SUCCESS_CODE);
+        }
+        request.setAttribute(SjjhConstant.Charge_Log_Key, ret.getIsCharge());
+
+        try {
+            request.setAttribute(Constant.CHANNEL_LOG_QUERY,
+                    Base64.encodeBase64String(customBody.getBytes(SjjhConstant.PARA_ENCODE)));
+
+        } catch (Exception ex) {
+            ErrorUtils.captureException(ex);
+            log.error("twoElementsCheckNew.encodeBase64String.Exception={}", ex);
+        }
+        request.setAttribute(Constant.CHANNEL_TYPE_KEY, Constant.CHANNEL_TYPE_SYNC);
+        return ret;
+    }
+
+    @ApiOperation(value = "人像接口-中心通用版-MD5", notes = "")
+    @PostMapping(value = "/photoIdentityCheckNewMD5.do")
+    public ChannelTypeHandleResponseObject photoIdentityCheckNewMD5(
+            @ApiParam(value = "通道ID") @RequestHeader(name = "channelId") String channelId,
+            @ApiParam(value = "超时时间,单位：毫秒", example = "10000") @RequestParam(name = "outTime", required = true) int outTime,
+            @ApiParam(value = "请求参数JSON串") @RequestBody String customBody) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+
+        //调用service
+        ChannelTypeHandleResponseObject ret = channelService.photoIdentityCheckNew(request, customBody, outTime, SjjhConstant.DECODE_TYPE_MD5);
+
+        //把接口参数、调用结果和是否收费放入访问日志中
+        if (ret.getCode() != Constant.SUCCESS) {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_ERROR_CODE);
+        } else {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_SUCCESS_CODE);
+        }
+        request.setAttribute(SjjhConstant.Charge_Log_Key, ret.getIsCharge());
+
+        request.setAttribute(Constant.CHANNEL_TYPE_KEY, Constant.CHANNEL_TYPE_SYNC);
+        return ret;
+    }
+
+    @ApiOperation(value = "人像接口-中心通用版-SHA256", notes = "")
+    @PostMapping(value = "/photoIdentityCheckNewSHA256.do")
+    public ChannelTypeHandleResponseObject photoIdentityCheckNewSHA256(
+            @ApiParam(value = "通道ID") @RequestHeader(name = "channelId") String channelId,
+            @ApiParam(value = "超时时间,单位：毫秒", example = "10000") @RequestParam(name = "outTime", required = true) int outTime,
+            @ApiParam(value = "请求参数JSON串") @RequestBody String customBody) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+
+        //调用service
+        ChannelTypeHandleResponseObject ret = channelService.photoIdentityCheckNew(request, customBody, outTime, SjjhConstant.DECODE_TYPE_SHA256);
+
+        //把接口参数、调用结果和是否收费放入访问日志中
+        if (ret.getCode() != Constant.SUCCESS) {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_ERROR_CODE);
+        } else {
+            request.setAttribute(SjjhConstant.Charge_Log_ResponseCode, Constant.CHANNEL_LOG_SUCCESS_CODE);
+        }
+        request.setAttribute(SjjhConstant.Charge_Log_Key, ret.getIsCharge());
+
+        request.setAttribute(Constant.CHANNEL_TYPE_KEY, Constant.CHANNEL_TYPE_SYNC);
+        return ret;
+    }
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/constant/SjjhConstant.java

@@ -0,0 +1,65 @@
+package info.aspirecn.iov.sjjh.supplier10000044.constant;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/7/7 17:29
+ * @version: V1.0
+ **/
+public class SjjhConstant {
+    public static final String RET_CODE_0 = "0";
+
+    public static final int PARA_ZERO = 0;
+
+    public static String Charge_Log_Key = "isCharge";
+
+    public static String Charge_Log_ResponseCode = "respnoseCode";
+
+    public static final String PARA_ENCODE = "UTF-8";
+
+    public static final String REDIS_TOKEN_KEY = "supplier10000044-DaBai-token-timestamp";
+
+    // 身份简项以及有效期计费码
+    public static final String[] IDENTITY_CHARGE_CODE = {"0XXX", "5XXX"};
+
+    // 人像计费码
+    public static final String[] PHOTO_IDENTITY_CHARGE_CODE = {"00XX","5XXX", "01XX", "02XX", "0JXX", "0EXX", "0FXX", "0GXX"};
+
+    // 人像照片质量不合格码
+    public static final String[] PHOTO_BELOW_STANDARD = {"0EXX", "0FXX", "0GXX", "0JXX"};
+
+    public static final String RESPONSE_CODE_0XXX = "0XXX";
+
+    public static final String RESPONSE_CODE_5XXX = "5XXX";
+
+    public static final String RESPONSE_CODE_6XXX = "6XXX";
+
+    public static final String RESPONSE_CODE_00XX = "00XX";
+
+    public static final String RESPONSE_CODE_01XX = "01XX";
+
+    public static final String RESPONSE_CODE_02XX = "02XX";
+
+    public static final String RESPONSE_CODE_0CXX = "0CXX";
+
+    public static final String RESPONSE_CODE_4002 = "4002";
+
+    public static final String RESPONSE_CODE_4022 = "4022";
+
+    public static final String RESPONSE_CODE_0DXX = "0DXX";
+
+    public static final String PHOTO_IDENTITY_CHECK = "photoIdentityCheck";
+
+    public static final String TWO_ELEMENTS_CHECK = "twoElementsCheck";
+
+    // 中心通用版人像计费码
+    public static final String[] PHOTO_IDENTITY_CHARGE_CODE_NEW = {"00XX","5XXX", "01XX", "02XX"};
+
+    public static final String DECODE_TYPE_WEIZHONG = "WEIZHONG";
+
+    public static final String DECODE_TYPE_COMMON = "COMMON";
+
+    public static final String DECODE_TYPE_MD5 = "MD5";
+
+    public static final String DECODE_TYPE_SHA256 = "SHA256";
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/DecodeThreeElementRequestObject.java

@@ -0,0 +1,38 @@
+package info.aspirecn.iov.sjjh.supplier10000044.model;
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2019/9/29 15:04
+ * @version: V1.0
+ **/
+@Data
+@ToString
+public class DecodeThreeElementRequestObject {
+    /**接口名*/
+    private String api;
+    /**appkey*/
+    private String appKey;
+    /**密钥*/
+    private String appSecret;
+    /**被查询人对象*/
+    private DecodeThreeElementRequestData data;
+
+    @Data
+    @ToString(callSuper = true, includeFieldNames = true)
+    public static class DecodeThreeElementRequestData {
+        /**姓名*/
+        private String name;
+        /**身份证号*/
+        private String id_number;
+        /**手机号*/
+        private String mobile;
+        /**加密方式*/
+        private String encrypt;
+        /**sign*/
+        private String sign;
+    }
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/GetTokenResponseObject.java

@@ -0,0 +1,21 @@
+package info.aspirecn.iov.sjjh.supplier10000044.model;
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/7/7 17:19
+ * @version: V1.0
+ **/
+@Data
+@ToString
+public class GetTokenResponseObject {
+    private String retCode;
+    private String retMessage;
+    private String apiVersion;
+    private String accessToken;
+    private String expireSeconds;
+    private String timeStamp;
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/IdentityInfoResponseObject.java

@@ -0,0 +1,20 @@
+package info.aspirecn.iov.sjjh.supplier10000044.model;
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/7/8 13:04
+ * @version: V1.0
+ **/
+@Data
+@ToString
+public class IdentityInfoResponseObject {
+    private String apiVersion;
+    private String certToken;
+    private String resStr;
+    private String retCode;
+    private String retMessage;
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/PhotoIdentityParamObject.java

@@ -0,0 +1,54 @@
+package info.aspirecn.iov.sjjh.supplier10000044.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/7/8 11:20
+ * @version: V1.0
+ **/
+@Data
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhotoIdentityParamObject {
+    private String accessToken;
+    private AuthData authData;
+
+    @Data
+    @ToString
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class AuthData {
+        private Integer mode;
+        private IdInfo idInfo;
+        private String portrait;
+    }
+
+    @Data
+    @ToString
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class IdInfo {
+        private String idNum;
+        private String fullName;
+    }
+
+    public static PhotoIdentityParamObject getParamObject(String accessToken, String idCode, String name,
+                                                          String photo, Integer mode) {
+        IdInfo idInfo = new IdInfo(idCode, name);
+        AuthData authData = new AuthData(mode, idInfo, photo);
+        return new PhotoIdentityParamObject(accessToken, authData);
+    }
+
+    public static PhotoIdentityParamObject getLogParamObject(String accessToken, String idCode, String name,
+                                                           Integer mode) {
+        IdInfo idInfo = new IdInfo(idCode, name);
+        AuthData authData = new AuthData(mode, idInfo, "base64");
+        return new PhotoIdentityParamObject(accessToken, authData);
+    }
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/PhotoIdentityRequestObject.java

@@ -0,0 +1,19 @@
+package info.aspirecn.iov.sjjh.supplier10000044.model;
+
+import lombok.Data;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/6/16 13:46
+ * @version: V1.0
+ **/
+@Data
+@ToString
+public class PhotoIdentityRequestObject extends TwoElementsRequestObject {
+    @NotNull(message = "参数名错误")
+    private String photo;
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/TwoElementsParamObject.java

@@ -0,0 +1,45 @@
+package info.aspirecn.iov.sjjh.supplier10000044.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/7/8 10:55
+ * @version: V1.0
+ **/
+@Data
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class TwoElementsParamObject {
+    private String accessToken;
+    private AuthData authData;
+
+    @Data
+    @ToString
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class AuthData {
+        private Integer mode;
+        private IdInfo idInfo;
+    }
+
+    @Data
+    @ToString
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class IdInfo {
+        private String idNum;
+        private String fullName;
+    }
+
+    public static TwoElementsParamObject getParamObject(String accessToken, String idCode, String name, Integer mode) {
+        IdInfo idInfo = new IdInfo(idCode, name);
+        AuthData authData = new AuthData(mode, idInfo);
+        return new TwoElementsParamObject(accessToken, authData);
+    }
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/TwoElementsRequestObject.java

@@ -0,0 +1,22 @@
+package info.aspirecn.iov.sjjh.supplier10000044.model;
+
+import lombok.Data;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/6/15 16:09
+ * @version: V1.0
+ **/
+@Data
+@ToString
+public class TwoElementsRequestObject {
+    @NotNull(message = "参数名错误")
+    private String name;
+    @NotNull(message = "参数名错误")
+    private String idCode;
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/service/ChannelService.java

@@ -0,0 +1,55 @@
+package info.aspirecn.iov.sjjh.supplier10000044.service;
+
+import info.aspirecn.iov.sjjh.commons.lang.ChannelTypeHandleResponseObject;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/7/7 15:50
+ * @version: V1.0
+ **/
+public interface ChannelService {
+    /**
+     * 二要素
+     *
+     * @param request
+     * @param customBody
+     * @param outTime
+     * @return
+     */
+    ChannelTypeHandleResponseObject twoElementsCheck(HttpServletRequest request, String customBody, int outTime);
+
+    /**
+     * 人像
+     *
+     * @param request
+     * @param customBody
+     * @param outTime
+     * @return
+     */
+    ChannelTypeHandleResponseObject photoIdentityCheck(HttpServletRequest request, String customBody, int outTime);
+
+    /**
+     * 二要素
+     *
+     * @param request
+     * @param customBody
+     * @param outTime
+     * @return
+     */
+    ChannelTypeHandleResponseObject twoElementsCheckNew(HttpServletRequest request, String customBody, int outTime, String decodeType);
+
+    /**
+     * 人像-返回同中心人像
+     *
+     * @param request
+     * @param customBody
+     * @param outTime
+     * @return
+     */
+    ChannelTypeHandleResponseObject photoIdentityCheckNew(HttpServletRequest request, String customBody, int outTime, String decodeType);
+
+    String queryAccessToken(int outTime);
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/service/ChannelServiceImpl.java

@@ -0,0 +1,963 @@
+package info.aspirecn.iov.sjjh.supplier10000044.service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import info.aspirecn.iov.sjjh.commons.lang.ChannelTypeHandleResponseObject;
+import info.aspirecn.iov.sjjh.commons.lang.Constant;
+import info.aspirecn.iov.sjjh.commons.lang.PatternTools;
+import info.aspirecn.iov.sjjh.supplier10000044.constant.SjjhConstant;
+import info.aspirecn.iov.sjjh.supplier10000044.model.*;
+import info.aspirecn.iov.sjjh.supplier10000044.util.DESedeUtil;
+import info.aspirecn.rdc.aspirecloud.node.except.utils.ErrorUtils;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/7/7 15:50
+ * @version: V1.0
+ **/
+@Service
+@Slf4j
+public class ChannelServiceImpl implements ChannelService {
+    @Value("${supplier.getTokenUrl}")
+    private String getTokenUrl;
+    @Value("${supplier.url}")
+    private String url;
+    @Value("${supplier.clientId}")
+    private String clientId;
+    @Value("${supplier.clientSecret}")
+    private String clientSecret;
+    @Value("${supplier.authMode-0x40}")
+    private Integer authMode40;
+    @Value("${supplier.authMode-0x42}")
+    private Integer authMode42;
+    @Value("${supplier.decryptKey}")
+    private String decryptKey;
+    @Value("${supplier.decodeApi}")
+    private String decodeApi;
+    @Value("${supplier.decodeUrl}")
+    private String decodeUrl;
+    @Value("${supplier.decodeAppKey}")
+    private String decodeAppKey;
+    @Value("${supplier.decodeAppSecret}")
+    private String decodeAppSecret;
+
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    private OkHttpClient okHttpClient = new OkHttpClient.Builder().build();
+
+    @Override
+    public ChannelTypeHandleResponseObject twoElementsCheck(HttpServletRequest request, String customBody, int outTime) {
+        ChannelTypeHandleResponseObject ret = new ChannelTypeHandleResponseObject();
+        ret.setIsCharge(Constant.INTERFACE_QUERY_NO_FEE);
+        String upstreamCode = "" + Constant.LOG_UPSTREAM_DEFAULT_RESPONSE_CODE;
+        request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+        String returnType = request.getHeader(Constant.CUSTOMER_RETURN_TYPE_PARA);
+        if (StringUtils.isBlank(returnType)) {
+            returnType = Constant.CUSTOMER_RETURN_ZW;
+        }
+        if (outTime <= SjjhConstant.PARA_ZERO) {
+            outTime = Constant.HTTPCLIENT_CONNECTTIMEOUT;
+        }
+        log.info("supplier10000044.twoElementsCheck---customBody={},outTime={}", customBody, outTime);
+        try {
+            TwoElementsRequestObject requestObject = objectMapper.readValue(customBody,
+                    TwoElementsRequestObject.class);
+            log.info("supplier10000044.twoElementsCheck---requestObject={}", requestObject);
+            // 参数校验
+            if (!validateRequestParams(ret, returnType, requestObject)) {
+                ret.setCode(Constant.SUCCESS);
+                request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+                return ret;
+            }
+            requestObject.setIdCode(requestObject.getIdCode().toUpperCase());
+            String accessToken = getAccessToken(outTime);
+            IdentityInfoResponseObject responseObject = getIdentityInfoResponseObject(requestObject, outTime, accessToken, ret);
+            if (responseObject != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4022)) {
+                accessToken = queryAccessToken(outTime);
+                responseObject = getIdentityInfoResponseObject(requestObject, outTime, accessToken, ret);
+            }
+            if (responseObject != null) {
+                upstreamCode = responseObject.getRetCode() + "-" + responseObject.getResStr();
+                ret.setCode(Constant.SUCCESS);
+                setTwoElementsCheck(ret, returnType, responseObject);
+            }
+        } catch (SocketTimeoutException ste) {
+            log.info("supplier10000044.twoElementsCheck接口-SocketTimeoutException：{}", ste);
+            ErrorUtils.captureException(ste);
+            ret.setCode(Constant.REQUEST_TIMEOUT);
+        } catch (Exception ioe) {
+            log.info("supplier10000044.twoElementsCheck接口-Exception：{}", ioe);
+            ErrorUtils.captureException(ioe);
+            ret.setCode(Constant.FAIL);
+        }
+        request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+        return ret;
+    }
+
+    private void setTwoElementsCheck(ChannelTypeHandleResponseObject ret, String returnType, IdentityInfoResponseObject responseObject) {
+        String responseCode = responseObject.getResStr();
+        boolean isCharge = responseCode != null
+                && ArrayUtils.contains(SjjhConstant.IDENTITY_CHARGE_CODE, responseCode);
+        if (isCharge) {
+            ret.setIsCharge(Constant.INTERFACE_QUERY_FEE);
+        }
+        if (Constant.CUSTOMER_RETURN_JK.equals(returnType)) {
+            if (responseObject.getRetCode() != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4002)) {
+                ret.setResultCode(Constant.JK_RETURN_CODE_INVALID_PARAMETER);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_0XXX)) {
+                // 身份信息有效
+                ret.setResultCode(Constant.JK_RETURN_CODE_1174);
+                ret.setResultBody(Constant.RETURN_MESSAGE_114);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_114);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_5XXX)) {
+                // 身份信息无效
+                ret.setResultCode(Constant.JK_RETURN_CODE_1175);
+                ret.setResultBody(Constant.RETURN_MESSAGE_115);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_115);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_6XXX)) {
+                // 身份信息有误
+                ret.setResultCode(Constant.JK_RETURN_CODE_1176);
+                ret.setResultBody(Constant.RETURN_MESSAGE_116);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_116);
+            } else {
+                // 查询错误
+                ret.setResultCode(Constant.JK_RETURN_CODE_OTHER_ERROR);
+                ret.setResultBody(Constant.OTHER_ERROR);
+                ret.setResultDesc(Constant.OTHER_ERROR);
+            }
+        } else {
+            if (responseObject.getRetCode() != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4002)) {
+                ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_0XXX)) {
+                // 身份信息有效
+                ret.setResultCode(Constant.ZW_RETURN_CODE_114);
+                ret.setResultBody(Constant.RETURN_MESSAGE_114);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_114);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_5XXX)) {
+                // 身份信息无效
+                ret.setResultCode(Constant.ZW_RETURN_CODE_115);
+                ret.setResultBody(Constant.RETURN_MESSAGE_115);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_115);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_6XXX)) {
+                // 身份信息有误
+                ret.setResultCode(Constant.ZW_RETURN_CODE_116);
+                ret.setResultBody(Constant.RETURN_MESSAGE_116);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_116);
+            } else {
+                // 查询错误
+                ret.setResultCode(Constant.OTHER_ERROR_CODE);
+                ret.setResultBody(Constant.OTHER_ERROR);
+                ret.setResultDesc(Constant.OTHER_ERROR);
+            }
+        }
+    }
+
+    private IdentityInfoResponseObject getIdentityInfoResponseObject(TwoElementsRequestObject requestObject, int outTime, String accessToken, ChannelTypeHandleResponseObject ret) {
+        TwoElementsParamObject paramObject = TwoElementsParamObject.getParamObject(accessToken, requestObject.getIdCode(), requestObject.getName(), authMode40);
+        log.info("supplier10000044.twoElementsCheck接口请求上游参数:{}", JSON.toJSONString(paramObject));
+        String responseContext = callService(paramObject, outTime, SjjhConstant.TWO_ELEMENTS_CHECK, ret);
+        log.info("supplier10000044.{}接口上游返回:{}", SjjhConstant.TWO_ELEMENTS_CHECK, responseContext);
+        if (StringUtils.isBlank(responseContext)) {
+            return null;
+        }
+        try {
+            IdentityInfoResponseObject responseObject = objectMapper.readValue(responseContext,
+                    IdentityInfoResponseObject.class);
+            return responseObject;
+        } catch (Exception e) {
+            log.info("supplier10000044.{}-getIdentityInfoResponseObject接口-Exception：{}", SjjhConstant.TWO_ELEMENTS_CHECK, e);
+            ErrorUtils.captureException(e);
+            ret.setCode(Constant.FAIL);
+            return null;
+        }
+    }
+
+    private IdentityInfoResponseObject getIdentityInfoResponseObject(PhotoIdentityRequestObject requestObject, int outTime, String accessToken, ChannelTypeHandleResponseObject ret) {
+        PhotoIdentityParamObject paramObject = PhotoIdentityParamObject.getParamObject(accessToken, requestObject.getIdCode(),
+                requestObject.getName(), requestObject.getPhoto(), authMode42);
+        PhotoIdentityParamObject logParamObject = PhotoIdentityParamObject.getLogParamObject(accessToken, requestObject.getIdCode(),
+                requestObject.getName(), authMode42);
+        log.info("supplier10000044.photoIdentityCheck接口请求上游参数:{}", JSON.toJSONString(logParamObject));
+//        String responseContext = callService(paramObject, outTime, SjjhConstant.PHOTO_IDENTITY_CHECK, ret);
+
+        // todo
+        String responseContext = "{\"retCode\":0,\"retMessage\":\"成功\",\"apiVersion\":\"3.3.0\",\"certToken\":\"98cec673-a969-462a-b154-47b56b887fcb\",\"resStr\":\"02XX\"}";
+        log.info("supplier10000044.{}接口上游返回:{}", SjjhConstant.PHOTO_IDENTITY_CHECK, responseContext);
+        if (StringUtils.isBlank(responseContext)) {
+            return null;
+        }
+        try {
+            IdentityInfoResponseObject responseObject = objectMapper.readValue(responseContext,
+                    IdentityInfoResponseObject.class);
+            return responseObject;
+        } catch (Exception e) {
+            log.info("supplier10000044.{}-getIdentityInfoResponseObject接口-Exception：{}", SjjhConstant.PHOTO_IDENTITY_CHECK, e);
+            ErrorUtils.captureException(e);
+            ret.setCode(Constant.FAIL);
+            return null;
+        }
+    }
+
+    private String callService(Object paramObject, int outTime, String method, ChannelTypeHandleResponseObject ret) {
+        try {
+            String jsonStr = objectMapper.writeValueAsString(paramObject);
+
+            MediaType mediaType = MediaType.parse(org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE);
+            RequestBody requestBody = RequestBody.create(mediaType, jsonStr);
+
+            Request okRequest = new Request.Builder().post(requestBody).url(url).build();
+            OkHttpClient client = okHttpClient.newBuilder()
+                    .connectTimeout(outTime, TimeUnit.MILLISECONDS)
+                    .readTimeout(outTime, TimeUnit.MILLISECONDS)
+                    .writeTimeout(outTime, TimeUnit.MILLISECONDS)
+                    .build();
+            Response response = client.newCall(okRequest).execute();
+            String responseContext = "";
+            if (response.body() != null) {
+                responseContext = response.body().string();
+            }
+            response.close();
+            return responseContext;
+        } catch (SocketTimeoutException ste) {
+            log.info("supplier10000044.{}接口-SocketTimeoutException：{}", method, ste);
+            ErrorUtils.captureException(ste);
+            ret.setCode(Constant.REQUEST_TIMEOUT);
+            return "";
+        } catch (Exception ioe) {
+            log.info("supplier10000044.{}接口-Exception：{}", method, ioe);
+            ErrorUtils.captureException(ioe);
+            ret.setCode(Constant.FAIL);
+            return "";
+        }
+    }
+
+    @Override
+    public ChannelTypeHandleResponseObject photoIdentityCheck(HttpServletRequest request, String customBody, int outTime) {
+        ChannelTypeHandleResponseObject ret = new ChannelTypeHandleResponseObject();
+        ret.setIsCharge(Constant.INTERFACE_QUERY_NO_FEE);
+        String upstreamCode = "" + Constant.LOG_UPSTREAM_DEFAULT_RESPONSE_CODE;
+        request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+        String returnType = request.getHeader(Constant.CUSTOMER_RETURN_TYPE_PARA);
+        if (StringUtils.isBlank(returnType)) {
+            returnType = Constant.CUSTOMER_RETURN_ZW;
+        }
+        if (outTime <= SjjhConstant.PARA_ZERO) {
+            outTime = Constant.HTTPCLIENT_CONNECTTIMEOUT;
+        }
+
+        try {
+            log.info("supplier10000044.photoIdentityCheck---customBody={},outTime={}", customBody, outTime);
+
+            JSONObject jsonObject = JSON.parseObject(customBody);
+            jsonObject.put("photo","图片base64");
+            request.setAttribute(Constant.CHANNEL_LOG_QUERY,
+                    Base64.encodeBase64String(jsonObject.toJSONString().getBytes(SjjhConstant.PARA_ENCODE)));
+
+            PhotoIdentityRequestObject requestObject = objectMapper.readValue(customBody,
+                    PhotoIdentityRequestObject.class);
+            // 参数校验
+            if (!validateRequestParams(ret, returnType, requestObject)) {
+                ret.setCode(Constant.SUCCESS);
+                request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+                return ret;
+            }
+            requestObject.setIdCode(requestObject.getIdCode().toUpperCase());
+            String accessToken = getAccessToken(outTime);
+            IdentityInfoResponseObject responseObject = getIdentityInfoResponseObject(requestObject, outTime, accessToken, ret);
+            if (responseObject != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4022)) {
+                accessToken = queryAccessToken(outTime);
+                responseObject = getIdentityInfoResponseObject(requestObject, outTime, accessToken, ret);
+            }
+
+            if (responseObject != null) {
+                upstreamCode = responseObject.getRetCode() + "-" + responseObject.getResStr();
+                ret.setCode(Constant.SUCCESS);
+                setPhotoIdentityCheck(ret, returnType, responseObject);
+            }
+        } catch (SocketTimeoutException ste) {
+            log.info("supplier10000044.photoIdentityCheck接口-SocketTimeoutException：{}", ste);
+            ErrorUtils.captureException(ste);
+            ret.setCode(Constant.REQUEST_TIMEOUT);
+        } catch (Exception ioe) {
+            log.info("supplier10000044.photoIdentityCheck接口-Exception：{}", ioe);
+            ErrorUtils.captureException(ioe);
+            ret.setCode(Constant.FAIL);
+        }
+        request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+        return ret;
+    }
+
+    private void setPhotoIdentityCheck(ChannelTypeHandleResponseObject ret, String returnType, IdentityInfoResponseObject responseObject) {
+        String responseCode = responseObject.getResStr();
+        boolean isCharge = responseCode != null
+                && ArrayUtils.contains(SjjhConstant.PHOTO_IDENTITY_CHARGE_CODE, responseCode);
+        if (isCharge) {
+            ret.setIsCharge(Constant.INTERFACE_QUERY_FEE);
+        }
+        if (Constant.CUSTOMER_RETURN_JK.equals(returnType)) {
+            if (responseObject.getRetCode() != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4002)) {
+                ret.setResultCode(Constant.JK_RETURN_CODE_INVALID_PARAMETER);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_00XX)) {
+                // 同一人
+                ret.setResultCode(Constant.JK_RETURN_CODE_1143);
+                ret.setResultBody(Constant.RETURN_MESSAGE_68);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_68);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_01XX)) {
+                // 非同一人
+                ret.setResultCode(Constant.JK_RETURN_CODE_1145);
+                ret.setResultBody(Constant.RETURN_MESSAGE_70);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_70);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_02XX)) {
+                // 疑似
+                ret.setResultCode(Constant.JK_RETURN_CODE_1144);
+                ret.setResultBody(Constant.RETURN_MESSAGE_69);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_69);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_5XXX)) {
+                // 身份信息无效
+                ret.setResultCode(Constant.JK_RETURN_CODE_1175);
+                ret.setResultBody(Constant.RETURN_MESSAGE_115);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_115);
+            } else if (responseCode != null && (responseCode.equals(SjjhConstant.RESPONSE_CODE_6XXX) || responseCode.equals(SjjhConstant.RESPONSE_CODE_0CXX))) {
+                // 身份信息有误
+                ret.setResultCode(Constant.JK_RETURN_CODE_1176);
+                ret.setResultBody(Constant.RETURN_MESSAGE_116);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_116);
+            } else if (responseCode != null && ArrayUtils.contains(SjjhConstant.PHOTO_BELOW_STANDARD, responseCode)) {
+                // 照片质量不合格
+                ret.setResultCode(Constant.JK_RETURN_CODE_1177);
+                ret.setResultBody(Constant.RETURN_MESSAGE_117);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_117);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_0DXX)) {
+                // 库中无照片
+                ret.setResultCode(Constant.JK_RETURN_CODE_1147);
+                ret.setResultBody(Constant.RETURN_MESSAGE_72);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_72);
+            } else {
+                // 查询错误
+                ret.setResultCode(Constant.JK_RETURN_CODE_OTHER_ERROR);
+                ret.setResultBody(Constant.OTHER_ERROR);
+                ret.setResultDesc(Constant.OTHER_ERROR);
+            }
+        } else {
+            if (responseObject.getRetCode() != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4002)) {
+                ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_00XX)) {
+                // 同一人
+                ret.setResultCode(Constant.ZW_RETURN_CODE_68);
+                ret.setResultBody(Constant.RETURN_MESSAGE_68);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_68);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_01XX)) {
+                // 非同一人
+                ret.setResultCode(Constant.ZW_RETURN_CODE_70);
+                ret.setResultBody(Constant.RETURN_MESSAGE_70);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_70);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_02XX)) {
+                // 疑似
+                ret.setResultCode(Constant.ZW_RETURN_CODE_69);
+                ret.setResultBody(Constant.RETURN_MESSAGE_69);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_69);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_5XXX)) {
+                // 身份信息无效
+                ret.setResultCode(Constant.ZW_RETURN_CODE_115);
+                ret.setResultBody(Constant.RETURN_MESSAGE_115);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_115);
+            } else if (responseCode != null && (responseCode.equals(SjjhConstant.RESPONSE_CODE_6XXX) || responseCode.equals(SjjhConstant.RESPONSE_CODE_0CXX))) {
+                // 身份信息有误
+                ret.setResultCode(Constant.ZW_RETURN_CODE_116);
+                ret.setResultBody(Constant.RETURN_MESSAGE_116);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_116);
+            } else if (responseCode != null && ArrayUtils.contains(SjjhConstant.PHOTO_BELOW_STANDARD, responseCode)) {
+                // 照片质量不合格
+                ret.setResultCode(Constant.ZW_RETURN_CODE_117);
+                ret.setResultBody(Constant.RETURN_MESSAGE_117);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_117);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_0DXX)) {
+                // 库中无照片
+                ret.setResultCode(Constant.ZW_RETURN_CODE_72);
+                ret.setResultBody(Constant.RETURN_MESSAGE_72);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_72);
+            } else {
+                // 查询错误
+                ret.setResultCode(Constant.OTHER_ERROR_CODE);
+                ret.setResultBody(Constant.OTHER_ERROR);
+                ret.setResultDesc(Constant.OTHER_ERROR);
+            }
+        }
+    }
+
+    private String getAccessToken(int outTime) {
+        String redisToken = stringRedisTemplate.opsForValue().get(SjjhConstant.REDIS_TOKEN_KEY);
+        String token;
+        if (StringUtils.isNotBlank(redisToken)) {
+            String[] redisTokenArray = redisToken.split("&&");
+            String accessTokenTimestamp = redisTokenArray[1];
+            if (System.currentTimeMillis() - Long.parseLong(accessTokenTimestamp) >= 7200000 ) {
+                // 超过2小时，重新获取token
+                token = queryAccessToken(outTime);
+                log.info("超过2小时，重新获取token");
+            } else {
+                // 从redis中获取token
+                token = redisTokenArray[0];
+                log.info("从redis中获取token");
+            }
+        } else {
+            // token不存在，获取token
+            token = queryAccessToken(outTime);
+            log.info("token不存在，获取token");
+        }
+
+        return token;
+    }
+
+    public String queryAccessToken(int outTime) {
+        StringBuilder tokenUrl = new StringBuilder(getTokenUrl);
+        tokenUrl.append("?clientId=").append(clientId);
+        tokenUrl.append("&clientSecret=").append(clientSecret);
+        Request request = new Request.Builder()
+                .url(tokenUrl.toString())
+                .build();
+        OkHttpClient client = okHttpClient.newBuilder()
+                .connectTimeout(outTime, TimeUnit.MILLISECONDS)
+                .readTimeout(outTime, TimeUnit.MILLISECONDS)
+                .writeTimeout(outTime, TimeUnit.MILLISECONDS)
+                .build();
+
+        String responseContext = "";
+        try {
+            Response response = client.newCall(request).execute();
+            if (response.body() != null) {
+                responseContext = response.body().string();
+            }
+        } catch (IOException e) {
+            log.info("supplier10000044.getAccessToken调用接口异常-Exception：{}", e);
+            ErrorUtils.captureException(e);
+            return null;
+        }
+        log.info("supplier10000044.getAccessToken返回结果:{}", responseContext);
+        GetTokenResponseObject responseObject = JSONObject.toJavaObject(
+                JSON.parseObject(responseContext), GetTokenResponseObject.class);
+        if (responseObject != null && responseObject.getRetCode().equals(SjjhConstant.RET_CODE_0)) {
+            String token = responseObject.getAccessToken() + "&&" + System.currentTimeMillis();
+            stringRedisTemplate.opsForValue().set(SjjhConstant.REDIS_TOKEN_KEY, token, 2, TimeUnit.HOURS);
+            return responseObject.getAccessToken();
+        } else {
+            return null;
+        }
+    }
+
+    private boolean validateRequestParams(ChannelTypeHandleResponseObject ret, String returnType,
+                                          TwoElementsRequestObject requestObject) {
+        if (!validateParamNullValue(requestObject)) {
+            if (Constant.CUSTOMER_RETURN_ZW.equals(returnType)) {
+                ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                ret.setResultBody(Constant.PARAMETER_NAME_ERROR);
+                ret.setResultDesc(Constant.PARAMETER_NAME_ERROR);
+            } else {
+                ret.setResultCode(Constant.JK_RETURN_CODE_INVALID_PARAMETER);
+                ret.setResultBody(Constant.PARAMETER_NAME_ERROR);
+                ret.setResultDesc(Constant.PARAMETER_NAME_ERROR);
+            }
+            return false;
+        } else if (StringUtils.isBlank(requestObject.getName()) ||
+                !PatternTools.checkResult(Constant.PATTERN_CN_NAME_REGEX, requestObject.getName())) {
+            if (Constant.CUSTOMER_RETURN_ZW.equals(returnType)) {
+                ret.setResultCode(Constant.NAME_FORMAT_ERROR_CODE);
+                ret.setResultDesc(Constant.NAME_FORMAT_ERROR);
+                ret.setResultBody(Constant.NAME_FORMAT_ERROR);
+            } else {
+                ret.setResultCode(Constant.JK_NAME_FORMAT_ERROR_CODE);
+                ret.setResultDesc(Constant.JK_NAME_FORMAT_ERROR);
+                ret.setResultBody(Constant.JK_NAME_FORMAT_ERROR);
+            }
+            return false;
+        } else if (StringUtils.isBlank(requestObject.getIdCode())
+                || !PatternTools.checkResult(Constant.PATTERN_SPECIAL_ID_NUMBER_REGEX, requestObject.getIdCode())) {
+            if (Constant.CUSTOMER_RETURN_ZW.equals(returnType)) {
+                ret.setResultCode(Constant.IDCODE_FORMAT_ERROR_CODE);
+                ret.setResultDesc(Constant.IDCODE_FORMAT_ERROR);
+                ret.setResultBody(Constant.IDCODE_FORMAT_ERROR);
+            } else {
+                ret.setResultCode(Constant.JK_IDCODE_FORMAT_ERROR_CODE);
+                ret.setResultDesc(Constant.JK_IDCODE_FORMAT_ERROR);
+                ret.setResultBody(Constant.JK_IDCODE_FORMAT_ERROR);
+            }
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    private boolean validateParamNullValue(Object jsonResolveObject) {
+        ValidatorFactory vf = Validation.buildDefaultValidatorFactory();
+        Validator validator = vf.getValidator();
+        Set<ConstraintViolation<Object>> set = validator.validate(jsonResolveObject);
+        for (ConstraintViolation<Object> con : set) {
+            if (StringUtils.isNotBlank(con.getMessage())) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public ChannelTypeHandleResponseObject twoElementsCheckNew(HttpServletRequest request, String customBody, int outTime, String decodeType) {
+        ChannelTypeHandleResponseObject ret = new ChannelTypeHandleResponseObject();
+        ret.setIsCharge(Constant.INTERFACE_QUERY_NO_FEE);
+        String upstreamCode = "" + Constant.LOG_UPSTREAM_DEFAULT_RESPONSE_CODE;
+        request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+        String returnType = request.getHeader(Constant.CUSTOMER_RETURN_TYPE_PARA);
+        if (StringUtils.isBlank(returnType)) {
+            returnType = Constant.CUSTOMER_RETURN_ZW;
+        }
+        if (outTime <= SjjhConstant.PARA_ZERO) {
+            outTime = Constant.HTTPCLIENT_CONNECTTIMEOUT;
+        }
+        log.info("supplier10000044.twoElementsCheckNew---customBody={},outTime={}", customBody, outTime);
+        if (!decodeType.equals(SjjhConstant.DECODE_TYPE_COMMON)) {
+            customBody = decodeParams(ret, returnType, customBody, decodeType);
+            if (StringUtils.isBlank(customBody)) {
+                ret.setCode(Constant.SUCCESS);
+                request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+                return ret;
+            }
+        }
+        try {
+            TwoElementsRequestObject requestObject = objectMapper.readValue(customBody,
+                    TwoElementsRequestObject.class);
+            log.info("supplier10000044.twoElementsCheckNew---requestObject={}", requestObject);
+            // 参数校验
+            if (!validateRequestParams(ret, returnType, requestObject)) {
+                ret.setCode(Constant.SUCCESS);
+                request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+                return ret;
+            }
+            requestObject.setIdCode(requestObject.getIdCode().toUpperCase());
+            String accessToken = getAccessToken(outTime);
+            IdentityInfoResponseObject responseObject = getIdentityInfoResponseObject(requestObject, outTime, accessToken, ret);
+            if (responseObject != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4022)) {
+                accessToken = queryAccessToken(outTime);
+                responseObject = getIdentityInfoResponseObject(requestObject, outTime, accessToken, ret);
+            }
+
+            if (responseObject != null) {
+                upstreamCode = responseObject.getRetCode() + "-" + responseObject.getResStr();
+                ret.setCode(Constant.SUCCESS);
+                setTwoElementsCheckNew(ret, returnType, responseObject);
+            }
+        } catch (SocketTimeoutException ste) {
+            log.info("supplier10000044.twoElementsCheckNew接口-SocketTimeoutException：{}", ste);
+            ErrorUtils.captureException(ste);
+            ret.setCode(Constant.REQUEST_TIMEOUT);
+        } catch (Exception ioe) {
+            log.info("supplier10000044.twoElementsCheckNew接口-Exception：{}", ioe);
+            ErrorUtils.captureException(ioe);
+            ret.setCode(Constant.FAIL);
+        }
+        request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+        return ret;
+    }
+
+    private void setTwoElementsCheckNew(ChannelTypeHandleResponseObject ret, String returnType, IdentityInfoResponseObject responseObject) {
+        String responseCode = responseObject.getResStr();
+        boolean isCharge = responseCode != null
+                && ArrayUtils.contains(SjjhConstant.IDENTITY_CHARGE_CODE, responseCode);
+        if (isCharge) {
+            ret.setIsCharge(Constant.INTERFACE_QUERY_FEE);
+        }
+        if (Constant.CUSTOMER_RETURN_JK.equals(returnType)) {
+            if ((responseObject.getRetCode() != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4002))
+                    || (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_6XXX))) {
+                ret.setResultCode(Constant.JK_RETURN_CODE_INVALID_PARAMETER);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_0XXX)) {
+                // 身份信息有效
+                ret.setResultCode(Constant.JK_RETURN_CODE_MATCH);
+                ret.setResultBody(Constant.MATCH);
+                ret.setResultDesc(Constant.MATCH);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_5XXX)) {
+                // 身份信息无效
+                ret.setResultCode(Constant.JK_RETURN_CODE_NO_MATCH);
+                ret.setResultBody(Constant.UN_MATCH);
+                ret.setResultDesc(Constant.UN_MATCH);
+            } else {
+                // 查询错误
+                ret.setResultCode(Constant.JK_RETURN_CODE_OTHER_ERROR);
+                ret.setResultBody(Constant.OTHER_ERROR);
+                ret.setResultDesc(Constant.OTHER_ERROR);
+            }
+        } else {
+            if ((responseObject.getRetCode() != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4002))
+                    || (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_6XXX))) {
+                ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_0XXX)) {
+                // 身份信息有效
+                ret.setResultCode(Constant.MATCH_CODE);
+                ret.setResultBody(Constant.MATCH);
+                ret.setResultDesc(Constant.MATCH);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_5XXX)) {
+                // 身份信息无效
+                ret.setResultCode(Constant.UN_MATCH_CODE);
+                ret.setResultBody(Constant.UN_MATCH);
+                ret.setResultDesc(Constant.UN_MATCH);
+            } else {
+                // 查询错误
+                ret.setResultCode(Constant.OTHER_ERROR_CODE);
+                ret.setResultBody(Constant.OTHER_ERROR);
+                ret.setResultDesc(Constant.OTHER_ERROR);
+            }
+        }
+    }
+
+    @Override
+    public ChannelTypeHandleResponseObject photoIdentityCheckNew(HttpServletRequest request, String customBody, int outTime, String decodeType) {
+        ChannelTypeHandleResponseObject ret = new ChannelTypeHandleResponseObject();
+        ret.setIsCharge(Constant.INTERFACE_QUERY_NO_FEE);
+        String upstreamCode = "" + Constant.LOG_UPSTREAM_DEFAULT_RESPONSE_CODE;
+        request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+        String returnType = request.getHeader(Constant.CUSTOMER_RETURN_TYPE_PARA);
+        if (StringUtils.isBlank(returnType)) {
+            returnType = Constant.CUSTOMER_RETURN_ZW;
+        }
+        if (outTime <= SjjhConstant.PARA_ZERO) {
+            outTime = Constant.HTTPCLIENT_CONNECTTIMEOUT;
+        }
+
+        // 用于解密失败时参数的输出
+        log.info("supplier10000044.photoIdentityCheckNew---customBody={},outTime={}", customBody, outTime);
+        if (!decodeType.equals(SjjhConstant.DECODE_TYPE_COMMON)) {
+            customBody = decodeParams(ret, returnType, customBody, decodeType);
+            if (StringUtils.isBlank(customBody)) {
+                ret.setCode(Constant.SUCCESS);
+                request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+
+                return ret;
+            }
+        }
+
+        try {
+            JSONObject jsonObject = JSON.parseObject(customBody);
+            jsonObject.put("photo","图片base64");
+            request.setAttribute(Constant.CHANNEL_LOG_QUERY,
+                    Base64.encodeBase64String(jsonObject.toJSONString().getBytes(SjjhConstant.PARA_ENCODE)));
+            jsonObject = null;
+            PhotoIdentityRequestObject requestObject = objectMapper.readValue(customBody,
+                    PhotoIdentityRequestObject.class);
+            customBody = null;
+            // 参数校验
+            if (!validateRequestParams(ret, returnType, requestObject)) {
+                ret.setCode(Constant.SUCCESS);
+                request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+                return ret;
+            }
+            requestObject.setIdCode(requestObject.getIdCode().toUpperCase());
+            String accessToken = getAccessToken(outTime);
+            IdentityInfoResponseObject responseObject = getIdentityInfoResponseObject(requestObject, outTime, accessToken, ret);
+            if (responseObject != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4022)) {
+                accessToken = queryAccessToken(outTime);
+                responseObject = getIdentityInfoResponseObject(requestObject, outTime, accessToken, ret);
+            }
+
+            if (responseObject != null) {
+                upstreamCode = responseObject.getRetCode() + "-" + responseObject.getResStr();
+                ret.setCode(Constant.SUCCESS);
+                setPhotoIdentityCheckNew(ret, returnType, responseObject);
+            }
+        } catch (SocketTimeoutException ste) {
+            log.info("supplier10000044.photoIdentityCheckNew接口-SocketTimeoutException：{}", ste);
+            ErrorUtils.captureException(ste);
+            ret.setCode(Constant.REQUEST_TIMEOUT);
+        } catch (Exception ioe) {
+            log.info("supplier10000044.photoIdentityCheckNew接口-Exception：{}", ioe);
+            ErrorUtils.captureException(ioe);
+            ret.setCode(Constant.FAIL);
+        }
+        request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+        return ret;
+    }
+
+    private void setPhotoIdentityCheckNew(ChannelTypeHandleResponseObject ret, String returnType, IdentityInfoResponseObject responseObject) {
+        String responseCode = responseObject.getResStr();
+        // 中心源-照片质量不合格不计费，因此大白的照片质量不合格也做成不计费
+        boolean isCharge = responseCode != null
+                && ArrayUtils.contains(SjjhConstant.PHOTO_IDENTITY_CHARGE_CODE_NEW, responseCode);
+        if (isCharge) {
+            ret.setIsCharge(Constant.INTERFACE_QUERY_FEE);
+        }
+
+        JSONObject resultObject = new JSONObject();
+        resultObject.put("verificationScore", "");
+
+        if (Constant.CUSTOMER_RETURN_JK.equals(returnType)) {
+            if (responseObject.getRetCode() != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4002)) {
+                ret.setResultCode(Constant.JK_RETURN_CODE_INVALID_PARAMETER);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_00XX)) {
+                // 同一人
+                ret.setResultCode(Constant.JK_RETURN_CODE_1143);
+                resultObject.put("message", Constant.RETURN_MESSAGE_68);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_01XX)) {
+                // 非同一人
+                ret.setResultCode(Constant.JK_RETURN_CODE_1145);
+                resultObject.put("message", Constant.RETURN_MESSAGE_70);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_02XX)) {
+                // 疑似
+                ret.setResultCode(Constant.JK_RETURN_CODE_1144);
+                resultObject.put("message", Constant.RETURN_MESSAGE_69);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_5XXX)) {
+                // 身份信息无效
+                ret.setResultCode(Constant.JK_RETURN_CODE_1146);
+                resultObject.put("message", Constant.RETURN_MESSAGE_71);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else if (responseCode != null && (responseCode.equals(SjjhConstant.RESPONSE_CODE_6XXX) || responseCode.equals(SjjhConstant.RESPONSE_CODE_0CXX))) {
+                // 身份信息有误
+                ret.setResultCode(Constant.JK_RETURN_CODE_INVALID_PARAMETER);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+            } else if (responseCode != null && ArrayUtils.contains(SjjhConstant.PHOTO_BELOW_STANDARD, responseCode)) {
+                // 照片质量不合格
+                ret.setResultCode(Constant.JK_RETURN_CODE_1149);
+                resultObject.put("message", Constant.RETURN_MESSAGE_74);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_0DXX)) {
+                // 库中无照片
+                // 修改日期：2020-11-11
+                // 修改原因：开发时上游文档没有“库中无照片”的说明，客户需要将库中无照片与照片检测失败两个message区分开，返回码为1147
+                ret.setResultCode(Constant.JK_RETURN_CODE_1147);
+                resultObject.put("message", Constant.RETURN_MESSAGE_72);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else {
+                // 查询错误
+                ret.setResultCode(Constant.JK_RETURN_CODE_OTHER_ERROR);
+                ret.setResultBody(Constant.OTHER_ERROR);
+                ret.setResultDesc(Constant.OTHER_ERROR);
+            }
+        } else {
+            if (responseObject.getRetCode() != null && responseObject.getRetCode().equals(SjjhConstant.RESPONSE_CODE_4002)) {
+                ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_00XX)) {
+                // 同一人
+                ret.setResultCode(Constant.ZW_RETURN_CODE_68);
+                resultObject.put("message", Constant.RETURN_MESSAGE_68);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_01XX)) {
+                // 非同一人
+                ret.setResultCode(Constant.ZW_RETURN_CODE_70);
+                resultObject.put("message", Constant.RETURN_MESSAGE_70);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_02XX)) {
+                // 疑似
+                ret.setResultCode(Constant.ZW_RETURN_CODE_69);
+                resultObject.put("message", Constant.RETURN_MESSAGE_69);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_5XXX)) {
+                // 身份信息无效
+                ret.setResultCode(Constant.ZW_RETURN_CODE_71);
+                resultObject.put("message", Constant.RETURN_MESSAGE_71);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else if (responseCode != null && (responseCode.equals(SjjhConstant.RESPONSE_CODE_6XXX) || responseCode.equals(SjjhConstant.RESPONSE_CODE_0CXX))) {
+                // 身份信息有误
+                ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+            } else if (responseCode != null && ArrayUtils.contains(SjjhConstant.PHOTO_BELOW_STANDARD, responseCode)) {
+                // 照片质量不合格
+                ret.setResultCode(Constant.ZW_RETURN_CODE_74);
+                resultObject.put("message", Constant.RETURN_MESSAGE_74);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else if (responseCode != null && responseCode.equals(SjjhConstant.RESPONSE_CODE_0DXX)) {
+                // 库中无照片
+                // 修改日期：2020-11-11
+                // 修改原因：开发时上游文档没有“库中无照片”的说明，客户需要将库中无照片与照片检测失败两个message区分开，卓望返回码72
+                ret.setResultCode(Constant.ZW_RETURN_CODE_72);
+                resultObject.put("message", Constant.RETURN_MESSAGE_72);
+                ret.setResultBody(resultObject.toJSONString());
+                ret.setResultDesc(resultObject.toJSONString());
+            } else {
+                // 查询错误
+                ret.setResultCode(Constant.OTHER_ERROR_CODE);
+                ret.setResultBody(Constant.OTHER_ERROR);
+                ret.setResultDesc(Constant.OTHER_ERROR);
+            }
+        }
+    }
+
+    private String decodeParams(ChannelTypeHandleResponseObject ret, String returnType, String customBody, String decodeType) {
+        JSONObject requestParamObject = JSONObject.parseObject(customBody);
+        if (decodeType.equals(SjjhConstant.DECODE_TYPE_WEIZHONG)) {
+            if (requestParamObject.get("params") == null) {
+                if (Constant.CUSTOMER_RETURN_ZW.equals(returnType)) {
+                    ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                    ret.setResultBody(Constant.INVALID_PARAMETER);
+                    ret.setResultDesc(Constant.INVALID_PARAMETER);
+                } else {
+                    ret.setResultCode(Constant.JK_RETURN_CODE_INVALID_PARAMETER);
+                    ret.setResultBody(Constant.INVALID_PARAMETER);
+                    ret.setResultDesc(Constant.INVALID_PARAMETER);
+                }
+                return "";
+            }
+            customBody = DESedeUtil.decryptMode(requestParamObject.getString("params"), decryptKey);
+            if (StringUtils.isBlank(customBody)) {
+                if (Constant.CUSTOMER_RETURN_ZW.equals(returnType)) {
+                    ret.setResultCode(Constant.ZW_RETURN_CODE_133);
+                } else {
+                    ret.setResultCode(Constant.JK_RETURN_CODE_9931);
+                }
+                ret.setResultBody(Constant.RETURN_MESSAGE_133);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_133);
+                return "";
+            }
+            return customBody;
+        }
+
+        if (decodeType.equals(SjjhConstant.DECODE_TYPE_MD5) || decodeType.equals(SjjhConstant.DECODE_TYPE_SHA256)) {
+            if (requestParamObject.get("idCode") == null || requestParamObject.get("name") == null) {
+                if (Constant.CUSTOMER_RETURN_ZW.equals(returnType)) {
+                    ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                } else {
+                    ret.setResultCode(Constant.JK_RETURN_CODE_INVALID_PARAMETER);
+                }
+                ret.setResultBody(Constant.PARAMETER_NAME_ERROR);
+                ret.setResultDesc(Constant.PARAMETER_NAME_ERROR);
+                return "";
+            }
+
+            if (StringUtils.isBlank(requestParamObject.getString("idCode"))
+                || StringUtils.isBlank(requestParamObject.getString("name"))
+                || (decodeType.equals(SjjhConstant.DECODE_TYPE_MD5)
+                    && (requestParamObject.getString("idCode").length() != 32
+                        || requestParamObject.getString("name").length() != 32))
+                || (decodeType.equals(SjjhConstant.DECODE_TYPE_SHA256)
+                    && (requestParamObject.getString("idCode").length() != 64
+                        || requestParamObject.getString("name").length() != 64))) {
+
+                if (Constant.CUSTOMER_RETURN_ZW.equals(returnType)) {
+                    ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                } else {
+                    ret.setResultCode(Constant.JK_RETURN_CODE_INVALID_PARAMETER);
+
+                }
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+                return "";
+            }
+
+            requestParamObject = getDecodeIdCard(requestParamObject, 10000, decodeType);
+            if (StringUtils.isBlank(requestParamObject.getString("idCode")) || StringUtils.isBlank(requestParamObject.getString("name"))) {
+                if (Constant.CUSTOMER_RETURN_ZW.equals(returnType)) {
+                    ret.setResultCode(Constant.ZW_RETURN_CODE_134);
+                } else {
+                    ret.setResultCode(Constant.JK_RETURN_CODE_9932);
+                }
+                ret.setResultBody(Constant.RETURN_MESSAGE_134);
+                ret.setResultDesc(Constant.RETURN_MESSAGE_134);
+                return "";
+            } else {
+                customBody = JSON.toJSONString(requestParamObject);
+                return customBody;
+            }
+        }
+        return customBody;
+    }
+
+    private JSONObject getDecodeIdCard(JSONObject requestParamObject, Integer outTime, String decodeType) {
+        DecodeThreeElementRequestObject.DecodeThreeElementRequestData dataObject = new DecodeThreeElementRequestObject.DecodeThreeElementRequestData();
+        dataObject.setId_number(requestParamObject.getString("idCode"));
+        dataObject.setName(requestParamObject.getString("name"));
+        dataObject.setEncrypt(decodeType);
+        DecodeThreeElementRequestObject requestObject = new DecodeThreeElementRequestObject();
+        requestObject.setApi(decodeApi);
+        requestObject.setAppKey(decodeAppKey);
+        requestObject.setAppSecret(decodeAppSecret);
+        requestObject.setData(dataObject);
+
+        MediaType mediaType = MediaType.parse("application/json; charset=utf-8");
+        RequestBody requestBody = RequestBody.create(mediaType, JSON.toJSONString(requestObject));
+        Request okHttpRequest = new Request.Builder()
+                .post(requestBody)
+                .url(decodeUrl)
+                .build();
+        OkHttpClient decodeClient = new OkHttpClient.Builder()
+                .connectTimeout(outTime, TimeUnit.MILLISECONDS)
+                .readTimeout(outTime, TimeUnit.MILLISECONDS)
+                .writeTimeout(outTime, TimeUnit.MILLISECONDS)
+                .build();
+        try {
+            Response decodeResponse = decodeClient.newCall(okHttpRequest).execute();
+            String decodeResponseContext = "";
+            if (decodeResponse.body() != null) {
+                decodeResponseContext = decodeResponse.body().string();
+            }
+            log.info("supplier100000044.scmDecodeIdCode接口decodeResponseContext={}", decodeResponseContext);
+            JSONObject decodeResponseObject = JSON.parseObject(decodeResponseContext);
+            if (decodeResponseObject != null && decodeResponseObject.getString("code").equals("200") && decodeResponseObject.getString("data").equals("1")) {
+                JSONObject msg = JSON.parseObject(JSON.toJSONString(decodeResponseObject.get("msg")));
+                requestParamObject.put("idCode", msg.getString("idcard"));
+                requestParamObject.put("name", msg.getString("name"));
+                return requestParamObject;
+            } else {
+                return null;
+            }
+        } catch (SocketTimeoutException ste) {
+            ErrorUtils.captureException(ste);
+            log.info("supplier100000044.getDecodeIdCard接口SocketTimeoutException={}", ste);
+            return null;
+        } catch (Exception e) {
+            ErrorUtils.captureException(e);
+            log.info("supplier100000044.decodeIdCode接口Exception={}", e);
+            return null;
+        }
+    }
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/task/TokenTask.java

@@ -0,0 +1,41 @@
+package info.aspirecn.iov.sjjh.supplier10000044.task;
+
+import info.aspirecn.iov.sjjh.supplier10000044.constant.SjjhConstant;
+import info.aspirecn.iov.sjjh.supplier10000044.service.ChannelService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xusonglin
+ * @version V1.0
+ **/
+@Component
+@Slf4j
+public class TokenTask {
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    ChannelService channelService;
+
+    @Scheduled(cron = "0 0/10 * * * ?")
+    public void tokenTask() {
+        String redisToken = stringRedisTemplate.opsForValue().get(SjjhConstant.REDIS_TOKEN_KEY);
+        if (StringUtils.isNotBlank(redisToken)) {
+            String[] redisTokenArray = redisToken.split("&&");
+            String accessTokenTimestamp = redisTokenArray[1];
+            if (System.currentTimeMillis() - Long.parseLong(accessTokenTimestamp) >= 6300000) {
+                String token = channelService.queryAccessToken(10000);
+                log.info("supplier10000044.tokenTask-token即将过期,间隔{}，重新获取token：{}", System.currentTimeMillis() - Long.parseLong(accessTokenTimestamp), token);
+            } else {
+                log.info("supplier10000044.tokenTask-还在有效期内,token间隔毫秒：{}", System.currentTimeMillis() - Long.parseLong(accessTokenTimestamp));
+            }
+        } else {
+            String token = channelService.queryAccessToken(10000);
+            log.info("supplier10000044.tokenTask-token不存在，重新获取token：{}", token);
+        }
+    }
+}

src/main/java/info/aspirecn/iov/sjjh/supplier10000044/util/DESedeUtil.java

@@ -0,0 +1,107 @@
+package info.aspirecn.iov.sjjh.supplier10000044.util;
+
+import lombok.extern.slf4j.Slf4j;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.UnsupportedEncodingException;
+
+@Slf4j
+public class DESedeUtil {
+    //定义加密算法，有DES、DESede(即3DES)、Blowfish
+    private static final String Algorithm = "DESede";
+
+    /**
+     * 加密方法
+     *
+     * @param src 源数据的字节数组
+     * @return
+     */
+    public static String encryptMode(String src, String key) {
+        try {
+            log.info("开始加密");
+            SecretKey deskey = new SecretKeySpec(build3DesKey(key), Algorithm);    //生成密钥
+            Cipher c1 = Cipher.getInstance(Algorithm);    //实例化负责加密/解密的Cipher工具类
+            c1.init(Cipher.ENCRYPT_MODE, deskey);    //初始化为加密模式
+            return byteToHexString(c1.doFinal(src.getBytes()));
+
+        } catch (Exception e) {
+            log.error("加密失败:src={},key={}", src,key,e);
+        }
+        return "";
+    }
+
+
+
+    /**
+     * 解密函数
+     *
+     * @param src 密文的字节数组
+     * @return
+     */
+    public static String decryptMode(String src, String key) {
+        String result="";
+        try {
+            log.info("开始解密");
+            byte[] srcArray = hexStringToBytes(src);
+            SecretKey deskey = new SecretKeySpec(build3DesKey(key), Algorithm);
+            Cipher c1 = Cipher.getInstance(Algorithm);
+            c1.init(Cipher.DECRYPT_MODE, deskey); //初始化为解密模式
+            result= new String(c1.doFinal(srcArray));
+        } catch (Exception e) {
+            log.error("解密失败:src={},key={}", src,key,e);
+        }
+        return result;
+    }
+
+    public static String byteToHexString(byte[] b) {
+        String a = "";
+
+        for(int i = 0; i < b.length; ++i) {
+            String hex = Integer.toHexString(b[i] & 255);
+            if(hex.length() == 1) {
+                hex = '0' + hex;
+            }
+
+            a = a + hex;
+        }
+
+        return a;
+    }
+
+    public static byte[] build3DesKey(String keyStr) throws UnsupportedEncodingException {
+        byte[] key = new byte[24];    //声明一个24位的字节数组，默认里面都是0
+        byte[] temp = keyStr.getBytes("UTF-8");    //将字符串转成字节数组
+        if (key.length > temp.length) {
+            //如果temp不够24位，则拷贝temp数组整个长度的内容到key数组中
+            System.arraycopy(temp, 0, key, 0, temp.length);
+        } else {
+            //如果temp大于24位，则拷贝temp数组24个长度的内容到key数组中
+            System.arraycopy(temp, 0, key, 0, key.length);
+        }
+        return key;
+    }
+
+    public static byte[] hexStringToBytes(String hexString) {
+        if (hexString != null && !hexString.equals("")) {
+            hexString = hexString.toUpperCase();
+            int length = hexString.length() / 2;
+            char[] hexChars = hexString.toCharArray();
+            byte[] d = new byte[length];
+
+            for (int i = 0; i < length; ++i) {
+                int pos = i * 2;
+                d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
+            }
+            return d;
+        } else {
+            return null;
+        }
+    }
+
+    static byte charToByte(char c) {
+        return (byte) "0123456789ABCDEF".indexOf(c);
+    }
+
+}

src/main/resources/config/application-test.yml

@@ -0,0 +1,87 @@
+server:
+  tomcat:
+    accesslog:
+      buffered: false
+      enabled: true
+      pattern: '{"DateTime":"%{yyyy-MM-dd''T''HH:mm:ss.SSSZZ}t","ClientIP":"%a","Method":"%m","URI":"%U","RequestProtocol":"%H","ResponseCode":%s,
+                "ResponseTime":%D,"UserAgent":"%{user-agent}i","X-Forwarded-For":"%{x-forwarded-for}r","X-User-IP":"%{X-User-IP}i","traceId":"%{x-b3-traceid}i","id":"%{x-b3-spanid}r",
+                "parentId":"%{x-b3-parentspanid}i","ApplicationName":"${spring.application.name}","MG-IsCharge":%{isCharge}r,
+                "MG-ChannelId":%{channelId}i,"MG-CustomBody":"%{x-requestQuery}r","MG-ResultBody":"%{resultBody}o",
+                "MG-ResponseCode":%{respnoseCode}r,"MG-Upstream-ResponseCode":"%{upResponseCode}r","MG-SellingPrice":%{price}i,"req_type":"%{req_type}r","MG-ProductId":%{productId}i,"MG-UserId":%{userid}i}'
+      prefix: access_${HOSTNAME}_${spring.application.name}_${server.port}
+      directory: ${logging.path}
+  servlet:
+    context-path: /
+
+spring:
+  sleuth:
+    sampler:
+      probability: 1
+    web:
+      additional-skip-pattern: /api/v2/spans
+  zipkin:
+    base-url: http://127.0.0.1:${server.port}
+
+  mvc:
+    favicon:
+      enabled: false
+
+#management
+management:
+  endpoints:
+    enabled-by-default: true
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    shutdown:
+      enabled: true
+
+#logging
+logging:
+  path: /apps/var/jakarta/logs
+  level:
+    root: INFO
+    red:
+      microcloud: DEBUG
+  config: classpath:config/logback-spring.xml
+  file: ${logging.path}/catalina_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.out
+
+#error logging
+#sleuth logging
+rdc:
+  logging:
+    error-file: ${logging.path}/error_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.log
+    sleuth-file: ${logging.path}/sleuth_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.log
+
+#eureka
+eureka:
+  instance:
+    prefer-ip-address: true
+    instance-id: ${spring.cloud.client.ipaddress}:${server.port}
+    metadata-map:
+      management:
+        port: ${management.server.port}
+    health-check-url: http://${spring.cloud.client.ipaddress}:${management.server.port}${eureka.instance.health-check-url-path}
+    health-check-url-path: /actuator/health
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8888/eureka
+
+#custom
+supplier:
+  getTokenUrl: https://api.dabby.cn/v2/api/getaccesstoken
+  url: https://api.dabby.cn/v2/api/simpauth
+  clientId: 9318a53b7a6d4df9
+  clientSecret: 30443e8c-7b96-4f3e-a63f-890ebc74e69f
+  authMode-0x40: 64
+  authMode-0x42: 66
+  decryptKey: JK568FG2823
+  decodeApi: CMCC_3RD_DECRYPT
+  decodeUrl: http://jkxy.h11.site/gateway?api=credit.sec.data
+  decodeAppKey: JIAO_KE
+  decodeAppSecret: D78C393359BF128715C65D91C67051478A4DFC13
+swagger:
+  show: true

src/main/resources/config/banner.txt

@@ -0,0 +1,3 @@
+*******************************************************************************
+	 @project.artifactId@  (version:@project.version@)
+*******************************************************************************

src/main/resources/config/bootstrap.yml

@@ -0,0 +1,27 @@
+spring:
+  application:
+    name: '@project.artifactId@'
+  banner:
+    location: classpath:config/banner.txt
+  profiles:
+    active: test
+  cloud:
+    config:
+      discovery:
+        enabled: false
+      uri: http://10.8.18.157:32533
+      label: trunk
+      name: ${spring.application.name}
+      profile: ${spring.profiles.active}
+
+server:
+  port: 25107
+management:
+  server:
+    port: 35107
+
+info:
+  name: '@project.description@'
+  version: '@project.version@'
+
+

src/main/resources/config/logback-spring.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
+	<include
+		resource="org/springframework/boot/logging/logback/console-appender.xml" />
+
+	<property name="LOG_FILE"
+		value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}" />		
+	<springProperty scope="context" name="LOG_PATH" source="logging.path" defaultValue="/apps/var/jakarta/logs" />
+	<springProperty scope="context" name="application_name" source="spring.application.name" defaultValue="test-servicenode-supplier-2" />
+	<springProperty scope="context" name="sleuth_file" source="rdc.logging.sleuth-file" defaultValue="${LOG_PATH}/sleuth/sleuth.log" />
+	<springProperty scope="context" name="error_file" source="rdc.logging.error-file" defaultValue="${LOG_PATH}/error/error.log" />
+
+	<include resource="info/aspirecn/rdc/aspirecloud/node/except/xml/defaults.xml" />
+	<include resource="info/aspirecn/rdc/aspirecloud/node/brave/xml/defaults.xml" />
+
+	<appender name="TIME_FILE"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<encoder>
+			<pattern>${FILE_LOG_PATTERN}</pattern>
+		</encoder>
+		<file>${LOG_FILE}</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+			<maxHistory>8</maxHistory>
+			<timeBasedFileNamingAndTriggeringPolicy
+				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+	</appender>
+	
+	<root level="INFO">
+		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="TIME_FILE" />
+	</root>
+</configuration>