扫码王业务代码

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/compiler.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="pluss-dao-bundle" />
-        <module name="pluss-manage-page" />
-        <module name="code-generator" />
-        <module name="pluss-common-bundle" />
-        <module name="pluss-wap-page" />
-        <module name="pluss-api-page" />
-        <module name="pluss-model-bundle" />
-        <module name="pluss-service-bundle" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>

.idea/encodings.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/code-generator/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/code-generator/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-api-page/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-api-page/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-common-bundle/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-common-bundle/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-dao-bundle/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-dao-bundle/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-manage-page/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-model-bundle/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-model-bundle/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-service-bundle/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-service-bundle/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-wap-page/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-wap-page/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pluss-wap-page/src/main/webapp" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>

.idea/jarRepositories.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-  </component>
-</project>

.idea/kotlinc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.6.21" />
-  </component>
-</project>

.idea/misc.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>

.idea/uiDesigner.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

hs_err_pid107788.log

@@ -1,570 +0,0 @@
-#
-# There is insufficient memory for the Java Runtime Environment to continue.
-# Native memory allocation (mmap) failed to map 65536 bytes for Failed to commit metaspace.
-# Possible reasons:
-#   The system is out of physical RAM or swap space
-#   The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
-# Possible solutions:
-#   Reduce memory load on the system
-#   Increase physical memory or swap space
-#   Check if swap backing store is full
-#   Decrease Java heap size (-Xmx/-Xms)
-#   Decrease number of Java threads
-#   Decrease Java thread stack sizes (-Xss)
-#   Set larger code cache with -XX:ReservedCodeCacheSize=
-#   JVM is running with Zero Based Compressed Oops mode in which the Java heap is
-#     placed in the first 32GB address space. The Java Heap base address is the
-#     maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress
-#     to set the Java Heap base and to place the Java Heap above 32GB virtual address.
-# This output file may be truncated or incomplete.
-#
-#  Out of Memory Error (virtualSpaceNode.cpp:110), pid=107788, tid=209716
-#
-# JRE version: OpenJDK Runtime Environment JBR-17.0.6+10-829.5-jcef (17.0.6+10) (build 17.0.6+10-b829.5)
-# Java VM: OpenJDK 64-Bit Server VM JBR-17.0.6+10-829.5-jcef (17.0.6+10-b829.5, mixed mode, tiered, compressed oops, compressed class ptrs, g1 gc, windows-amd64)
-# No core dump will be written. Minidumps are not enabled by default on client versions of Windows
-#
-
----------------  S U M M A R Y ------------
-
-Command Line: git4idea.http.GitAskPassApp Username for 'https://gitee.com': 
-
-Host: Intel(R) Core(TM) i5-2320 CPU @ 3.00GHz, 4 cores, 15G,  Windows 10 , 64 bit Build 19041 (10.0.19041.1566)
-Time: Thu May  4 14:42:44 2023  Windows 10 , 64 bit Build 19041 (10.0.19041.1566) elapsed time: 0.444908 seconds (0d 0h 0m 0s)
-
----------------  T H R E A D  ---------------
-
-Current thread (0x000002df6282a0c0):  JavaThread "main" [_thread_in_vm, id=209716, stack(0x000000f2b5c00000,0x000000f2b5d00000)]
-
-Stack: [0x000000f2b5c00000,0x000000f2b5d00000]
-Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-V  [jvm.dll+0x683b4a]
-V  [jvm.dll+0x842654]
-V  [jvm.dll+0x843dfe]
-V  [jvm.dll+0x844463]
-V  [jvm.dll+0x249b75]
-V  [jvm.dll+0x83e6ab]
-V  [jvm.dll+0x627fa6]
-V  [jvm.dll+0x62800a]
-V  [jvm.dll+0x62a81a]
-V  [jvm.dll+0x628946]
-V  [jvm.dll+0x639749]
-V  [jvm.dll+0x632a54]
-V  [jvm.dll+0x384bd1]
-C  0x000002df6ecfc727
-
-Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
-j  sun.security.provider.SHA2$SHA256.<init>()V+0 java.base@17.0.6
-v  ~StubRoutines::call_stub
-j  jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Ljava/lang/reflect/Constructor;[Ljava/lang/Object;)Ljava/lang/Object;+0 java.base@17.0.6
-j  jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance([Ljava/lang/Object;)Ljava/lang/Object;+118 java.base@17.0.6
-j  jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance([Ljava/lang/Object;)Ljava/lang/Object;+5 java.base@17.0.6
-j  java.lang.reflect.Constructor.newInstanceWithCaller([Ljava/lang/Object;ZLjava/lang/Class;)Ljava/lang/Object;+65 java.base@17.0.6
-j  java.lang.reflect.Constructor.newInstance([Ljava/lang/Object;)Ljava/lang/Object;+30 java.base@17.0.6
-j  java.security.Provider$Service.newInstanceOf()Ljava/lang/Object;+9 java.base@17.0.6
-j  java.security.Provider$Service.newInstanceUtil(Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object;+5 java.base@17.0.6
-j  java.security.Provider$Service.newInstance(Ljava/lang/Object;)Ljava/lang/Object;+227 java.base@17.0.6
-j  sun.security.jca.GetInstance.getInstance(Ljava/security/Provider$Service;Ljava/lang/Class;)Lsun/security/jca/GetInstance$Instance;+2 java.base@17.0.6
-j  sun.security.jca.GetInstance.getInstance(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;)Lsun/security/jca/GetInstance$Instance;+7 java.base@17.0.6
-j  java.security.MessageDigest.getInstance(Ljava/lang/String;Ljava/lang/String;)Ljava/security/MessageDigest;+34 java.base@17.0.6
-j  sun.security.provider.HashDrbg.initEngine()V+7 java.base@17.0.6
-j  sun.security.provider.AbstractDrbg.instantiateIfNecessary([B)V+46 java.base@17.0.6
-j  sun.security.provider.AbstractDrbg.engineNextBytes([BLjava/security/SecureRandomParameters;)V+162 java.base@17.0.6
-j  sun.security.provider.AbstractDrbg.engineNextBytes([B)V+11 java.base@17.0.6
-j  sun.security.provider.AbstractDrbg$SeederHolder.lambda$static$0(Lsun/security/provider/HashDrbg;IIIZ)[B+23 java.base@17.0.6
-j  sun.security.provider.AbstractDrbg$SeederHolder$$Lambda$23+0x00000008000d3390.getEntropy(IIIZ)[B+9 java.base@17.0.6
-j  sun.security.provider.AbstractDrbg.getEntropyInput(IIIZ)[B+99 java.base@17.0.6
-j  sun.security.provider.AbstractDrbg.getEntropyInput(Z)[B+14 java.base@17.0.6
-j  sun.security.provider.AbstractDrbg.instantiateIfNecessary([B)V+16 java.base@17.0.6
-j  sun.security.provider.AbstractDrbg.engineNextBytes([BLjava/security/SecureRandomParameters;)V+162 java.base@17.0.6
-j  sun.security.provider.AbstractDrbg.engineNextBytes([B)V+11 java.base@17.0.6
-j  sun.security.provider.DRBG.engineNextBytes([B)V+5 java.base@17.0.6
-j  java.security.SecureRandom.nextBytes([B)V+12 java.base@17.0.6
-j  java.security.SecureRandom.next(I)I+17 java.base@17.0.6
-j  java.util.Random.nextInt()I+3 java.base@17.0.6
-j  sun.security.ssl.SSLContextImpl.engineInit([Ljavax/net/ssl/KeyManager;[Ljavax/net/ssl/TrustManager;Ljava/security/SecureRandom;)V+105 java.base@17.0.6
-j  javax.net.ssl.SSLContext.init([Ljavax/net/ssl/KeyManager;[Ljavax/net/ssl/TrustManager;Ljava/security/SecureRandom;)V+7 java.base@17.0.6
-j  externalApp.ExternalAppUtil.sendIdeRequest(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)LexternalApp/ExternalAppUtil$Result;+45
-j  git4idea.http.GitAskPassApp.main([Ljava/lang/String;)V+37
-v  ~StubRoutines::call_stub
-
----------------  P R O C E S S  ---------------
-
-Threads class SMR info:
-_java_thread_list=0x000002df7f6029a0, length=12, elements={
-0x000002df6282a0c0, 0x000002df7f442610, 0x000002df7f4435c0, 0x000002df7eb6e830,
-0x000002df7f46e420, 0x000002df7f46edd0, 0x000002df7f470ba0, 0x000002df7f471880,
-0x000002df7f473190, 0x000002df7f473a90, 0x000002df7f600de0, 0x000002df7f6092e0
-}
-
-Java Threads: ( => current thread )
-=>0x000002df6282a0c0 JavaThread "main" [_thread_in_vm, id=209716, stack(0x000000f2b5c00000,0x000000f2b5d00000)]
-  0x000002df7f442610 JavaThread "Reference Handler" daemon [_thread_blocked, id=210680, stack(0x000000f2b6300000,0x000000f2b6400000)]
-  0x000002df7f4435c0 JavaThread "Finalizer" daemon [_thread_blocked, id=208916, stack(0x000000f2b6400000,0x000000f2b6500000)]
-  0x000002df7eb6e830 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=209628, stack(0x000000f2b6500000,0x000000f2b6600000)]
-  0x000002df7f46e420 JavaThread "Attach Listener" daemon [_thread_blocked, id=205888, stack(0x000000f2b6600000,0x000000f2b6700000)]
-  0x000002df7f46edd0 JavaThread "Service Thread" daemon [_thread_blocked, id=204684, stack(0x000000f2b6700000,0x000000f2b6800000)]
-  0x000002df7f470ba0 JavaThread "Monitor Deflation Thread" daemon [_thread_blocked, id=209912, stack(0x000000f2b6800000,0x000000f2b6900000)]
-  0x000002df7f471880 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=70340, stack(0x000000f2b6900000,0x000000f2b6a00000)]
-  0x000002df7f473190 JavaThread "C1 CompilerThread0" daemon [_thread_blocked, id=207768, stack(0x000000f2b6a00000,0x000000f2b6b00000)]
-  0x000002df7f473a90 JavaThread "Sweeper thread" daemon [_thread_blocked, id=209956, stack(0x000000f2b6b00000,0x000000f2b6c00000)]
-  0x000002df7f600de0 JavaThread "Notification Thread" daemon [_thread_blocked, id=209992, stack(0x000000f2b6c00000,0x000000f2b6d00000)]
-  0x000002df7f6092e0 JavaThread "Common-Cleaner" daemon [_thread_blocked, id=208312, stack(0x000000f2b6e00000,0x000000f2b6f00000)]
-
-Other Threads:
-  0x000002df7f420900 VMThread "VM Thread" [stack: 0x000000f2b6200000,0x000000f2b6300000] [id=205864]
-  0x000002df7f562940 WatcherThread [stack: 0x000000f2b6d00000,0x000000f2b6e00000] [id=75868]
-  0x000002df628960b0 GCTaskThread "GC Thread#0" [stack: 0x000000f2b5d00000,0x000000f2b5e00000] [id=210836]
-  0x000002df628a6df0 ConcurrentGCThread "G1 Main Marker" [stack: 0x000000f2b5e00000,0x000000f2b5f00000] [id=209024]
-  0x000002df628a7800 ConcurrentGCThread "G1 Conc#0" [stack: 0x000000f2b5f00000,0x000000f2b6000000] [id=100408]
-  0x000002df7e9f44e0 ConcurrentGCThread "G1 Refine#0" [stack: 0x000000f2b6000000,0x000000f2b6100000] [id=210492]
-  0x000002df628ef4e0 ConcurrentGCThread "G1 Service" [stack: 0x000000f2b6100000,0x000000f2b6200000] [id=209896]
-
-Threads with active compile tasks:
-
-VM state: not at safepoint (normal execution)
-
-VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
-[0x000002df62823380] Metaspace_lock - owner thread: 0x000002df6282a0c0
-
-Heap address: 0x0000000702000000, size: 4064 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
-
-CDS archive(s) not mapped
-Compressed class space mapped at: 0x0000000800000000-0x0000000840000000, reserved size: 1073741824
-Narrow klass base: 0x0000000800000000, Narrow klass shift: 0, Narrow klass range: 0x40000000
-
-GC Precious Log:
- CPUs: 4 total, 4 available
- Memory: 16255M
- Large Page Support: Disabled
- NUMA Support: Disabled
- Compressed Oops: Enabled (Zero based)
- Heap Region Size: 2M
- Heap Min Capacity: 8M
- Heap Initial Capacity: 254M
- Heap Max Capacity: 4064M
- Pre-touch: Disabled
- Parallel Workers: 4
- Concurrent Workers: 1
- Concurrent Refinement Workers: 4
- Periodic GC: Disabled
-
-Heap:
- garbage-first heap   total 260096K, used 2048K [0x0000000702000000, 0x0000000800000000)
-  region size 2048K, 3 young (6144K), 0 survivors (0K)
- Metaspace       used 9986K, committed 10112K, reserved 1064960K
-  class space    used 938K, committed 1024K, reserved 1048576K
-
-Heap Regions: E=young(eden), S=young(survivor), O=old, HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, OA=open archive, CA=closed archive, TAMS=top-at-mark-start (previous, next)
-|   0|0x0000000702000000, 0x0000000702000000, 0x0000000702200000|  0%| F|  |TAMS 0x0000000702000000, 0x0000000702000000| Untracked 
-|   1|0x0000000702200000, 0x0000000702200000, 0x0000000702400000|  0%| F|  |TAMS 0x0000000702200000, 0x0000000702200000| Untracked 
-|   2|0x0000000702400000, 0x0000000702400000, 0x0000000702600000|  0%| F|  |TAMS 0x0000000702400000, 0x0000000702400000| Untracked 
-|   3|0x0000000702600000, 0x0000000702600000, 0x0000000702800000|  0%| F|  |TAMS 0x0000000702600000, 0x0000000702600000| Untracked 
-|   4|0x0000000702800000, 0x0000000702800000, 0x0000000702a00000|  0%| F|  |TAMS 0x0000000702800000, 0x0000000702800000| Untracked 
-|   5|0x0000000702a00000, 0x0000000702a00000, 0x0000000702c00000|  0%| F|  |TAMS 0x0000000702a00000, 0x0000000702a00000| Untracked 
-|   6|0x0000000702c00000, 0x0000000702c00000, 0x0000000702e00000|  0%| F|  |TAMS 0x0000000702c00000, 0x0000000702c00000| Untracked 
-|   7|0x0000000702e00000, 0x0000000702e00000, 0x0000000703000000|  0%| F|  |TAMS 0x0000000702e00000, 0x0000000702e00000| Untracked 
-|   8|0x0000000703000000, 0x0000000703000000, 0x0000000703200000|  0%| F|  |TAMS 0x0000000703000000, 0x0000000703000000| Untracked 
-|   9|0x0000000703200000, 0x0000000703200000, 0x0000000703400000|  0%| F|  |TAMS 0x0000000703200000, 0x0000000703200000| Untracked 
-|  10|0x0000000703400000, 0x0000000703400000, 0x0000000703600000|  0%| F|  |TAMS 0x0000000703400000, 0x0000000703400000| Untracked 
-|  11|0x0000000703600000, 0x0000000703600000, 0x0000000703800000|  0%| F|  |TAMS 0x0000000703600000, 0x0000000703600000| Untracked 
-|  12|0x0000000703800000, 0x0000000703800000, 0x0000000703a00000|  0%| F|  |TAMS 0x0000000703800000, 0x0000000703800000| Untracked 
-|  13|0x0000000703a00000, 0x0000000703a00000, 0x0000000703c00000|  0%| F|  |TAMS 0x0000000703a00000, 0x0000000703a00000| Untracked 
-|  14|0x0000000703c00000, 0x0000000703c00000, 0x0000000703e00000|  0%| F|  |TAMS 0x0000000703c00000, 0x0000000703c00000| Untracked 
-|  15|0x0000000703e00000, 0x0000000703e00000, 0x0000000704000000|  0%| F|  |TAMS 0x0000000703e00000, 0x0000000703e00000| Untracked 
-|  16|0x0000000704000000, 0x0000000704000000, 0x0000000704200000|  0%| F|  |TAMS 0x0000000704000000, 0x0000000704000000| Untracked 
-|  17|0x0000000704200000, 0x0000000704200000, 0x0000000704400000|  0%| F|  |TAMS 0x0000000704200000, 0x0000000704200000| Untracked 
-|  18|0x0000000704400000, 0x0000000704400000, 0x0000000704600000|  0%| F|  |TAMS 0x0000000704400000, 0x0000000704400000| Untracked 
-|  19|0x0000000704600000, 0x0000000704600000, 0x0000000704800000|  0%| F|  |TAMS 0x0000000704600000, 0x0000000704600000| Untracked 
-|  20|0x0000000704800000, 0x0000000704800000, 0x0000000704a00000|  0%| F|  |TAMS 0x0000000704800000, 0x0000000704800000| Untracked 
-|  21|0x0000000704a00000, 0x0000000704a00000, 0x0000000704c00000|  0%| F|  |TAMS 0x0000000704a00000, 0x0000000704a00000| Untracked 
-|  22|0x0000000704c00000, 0x0000000704c00000, 0x0000000704e00000|  0%| F|  |TAMS 0x0000000704c00000, 0x0000000704c00000| Untracked 
-|  23|0x0000000704e00000, 0x0000000704e00000, 0x0000000705000000|  0%| F|  |TAMS 0x0000000704e00000, 0x0000000704e00000| Untracked 
-|  24|0x0000000705000000, 0x0000000705000000, 0x0000000705200000|  0%| F|  |TAMS 0x0000000705000000, 0x0000000705000000| Untracked 
-|  25|0x0000000705200000, 0x0000000705200000, 0x0000000705400000|  0%| F|  |TAMS 0x0000000705200000, 0x0000000705200000| Untracked 
-|  26|0x0000000705400000, 0x0000000705400000, 0x0000000705600000|  0%| F|  |TAMS 0x0000000705400000, 0x0000000705400000| Untracked 
-|  27|0x0000000705600000, 0x0000000705600000, 0x0000000705800000|  0%| F|  |TAMS 0x0000000705600000, 0x0000000705600000| Untracked 
-|  28|0x0000000705800000, 0x0000000705800000, 0x0000000705a00000|  0%| F|  |TAMS 0x0000000705800000, 0x0000000705800000| Untracked 
-|  29|0x0000000705a00000, 0x0000000705a00000, 0x0000000705c00000|  0%| F|  |TAMS 0x0000000705a00000, 0x0000000705a00000| Untracked 
-|  30|0x0000000705c00000, 0x0000000705c00000, 0x0000000705e00000|  0%| F|  |TAMS 0x0000000705c00000, 0x0000000705c00000| Untracked 
-|  31|0x0000000705e00000, 0x0000000705e00000, 0x0000000706000000|  0%| F|  |TAMS 0x0000000705e00000, 0x0000000705e00000| Untracked 
-|  32|0x0000000706000000, 0x0000000706000000, 0x0000000706200000|  0%| F|  |TAMS 0x0000000706000000, 0x0000000706000000| Untracked 
-|  33|0x0000000706200000, 0x0000000706200000, 0x0000000706400000|  0%| F|  |TAMS 0x0000000706200000, 0x0000000706200000| Untracked 
-|  34|0x0000000706400000, 0x0000000706400000, 0x0000000706600000|  0%| F|  |TAMS 0x0000000706400000, 0x0000000706400000| Untracked 
-|  35|0x0000000706600000, 0x0000000706600000, 0x0000000706800000|  0%| F|  |TAMS 0x0000000706600000, 0x0000000706600000| Untracked 
-|  36|0x0000000706800000, 0x0000000706800000, 0x0000000706a00000|  0%| F|  |TAMS 0x0000000706800000, 0x0000000706800000| Untracked 
-|  37|0x0000000706a00000, 0x0000000706a00000, 0x0000000706c00000|  0%| F|  |TAMS 0x0000000706a00000, 0x0000000706a00000| Untracked 
-|  38|0x0000000706c00000, 0x0000000706c00000, 0x0000000706e00000|  0%| F|  |TAMS 0x0000000706c00000, 0x0000000706c00000| Untracked 
-|  39|0x0000000706e00000, 0x0000000706e00000, 0x0000000707000000|  0%| F|  |TAMS 0x0000000706e00000, 0x0000000706e00000| Untracked 
-|  40|0x0000000707000000, 0x0000000707000000, 0x0000000707200000|  0%| F|  |TAMS 0x0000000707000000, 0x0000000707000000| Untracked 
-|  41|0x0000000707200000, 0x0000000707200000, 0x0000000707400000|  0%| F|  |TAMS 0x0000000707200000, 0x0000000707200000| Untracked 
-|  42|0x0000000707400000, 0x0000000707400000, 0x0000000707600000|  0%| F|  |TAMS 0x0000000707400000, 0x0000000707400000| Untracked 
-|  43|0x0000000707600000, 0x0000000707600000, 0x0000000707800000|  0%| F|  |TAMS 0x0000000707600000, 0x0000000707600000| Untracked 
-|  44|0x0000000707800000, 0x0000000707800000, 0x0000000707a00000|  0%| F|  |TAMS 0x0000000707800000, 0x0000000707800000| Untracked 
-|  45|0x0000000707a00000, 0x0000000707a00000, 0x0000000707c00000|  0%| F|  |TAMS 0x0000000707a00000, 0x0000000707a00000| Untracked 
-|  46|0x0000000707c00000, 0x0000000707c00000, 0x0000000707e00000|  0%| F|  |TAMS 0x0000000707c00000, 0x0000000707c00000| Untracked 
-|  47|0x0000000707e00000, 0x0000000707e00000, 0x0000000708000000|  0%| F|  |TAMS 0x0000000707e00000, 0x0000000707e00000| Untracked 
-|  48|0x0000000708000000, 0x0000000708000000, 0x0000000708200000|  0%| F|  |TAMS 0x0000000708000000, 0x0000000708000000| Untracked 
-|  49|0x0000000708200000, 0x0000000708200000, 0x0000000708400000|  0%| F|  |TAMS 0x0000000708200000, 0x0000000708200000| Untracked 
-|  50|0x0000000708400000, 0x0000000708400000, 0x0000000708600000|  0%| F|  |TAMS 0x0000000708400000, 0x0000000708400000| Untracked 
-|  51|0x0000000708600000, 0x0000000708600000, 0x0000000708800000|  0%| F|  |TAMS 0x0000000708600000, 0x0000000708600000| Untracked 
-|  52|0x0000000708800000, 0x0000000708800000, 0x0000000708a00000|  0%| F|  |TAMS 0x0000000708800000, 0x0000000708800000| Untracked 
-|  53|0x0000000708a00000, 0x0000000708a00000, 0x0000000708c00000|  0%| F|  |TAMS 0x0000000708a00000, 0x0000000708a00000| Untracked 
-|  54|0x0000000708c00000, 0x0000000708c00000, 0x0000000708e00000|  0%| F|  |TAMS 0x0000000708c00000, 0x0000000708c00000| Untracked 
-|  55|0x0000000708e00000, 0x0000000708e00000, 0x0000000709000000|  0%| F|  |TAMS 0x0000000708e00000, 0x0000000708e00000| Untracked 
-|  56|0x0000000709000000, 0x0000000709000000, 0x0000000709200000|  0%| F|  |TAMS 0x0000000709000000, 0x0000000709000000| Untracked 
-|  57|0x0000000709200000, 0x0000000709200000, 0x0000000709400000|  0%| F|  |TAMS 0x0000000709200000, 0x0000000709200000| Untracked 
-|  58|0x0000000709400000, 0x0000000709400000, 0x0000000709600000|  0%| F|  |TAMS 0x0000000709400000, 0x0000000709400000| Untracked 
-|  59|0x0000000709600000, 0x0000000709600000, 0x0000000709800000|  0%| F|  |TAMS 0x0000000709600000, 0x0000000709600000| Untracked 
-|  60|0x0000000709800000, 0x0000000709800000, 0x0000000709a00000|  0%| F|  |TAMS 0x0000000709800000, 0x0000000709800000| Untracked 
-|  61|0x0000000709a00000, 0x0000000709a00000, 0x0000000709c00000|  0%| F|  |TAMS 0x0000000709a00000, 0x0000000709a00000| Untracked 
-|  62|0x0000000709c00000, 0x0000000709c00000, 0x0000000709e00000|  0%| F|  |TAMS 0x0000000709c00000, 0x0000000709c00000| Untracked 
-|  63|0x0000000709e00000, 0x0000000709e00000, 0x000000070a000000|  0%| F|  |TAMS 0x0000000709e00000, 0x0000000709e00000| Untracked 
-|  64|0x000000070a000000, 0x000000070a000000, 0x000000070a200000|  0%| F|  |TAMS 0x000000070a000000, 0x000000070a000000| Untracked 
-|  65|0x000000070a200000, 0x000000070a200000, 0x000000070a400000|  0%| F|  |TAMS 0x000000070a200000, 0x000000070a200000| Untracked 
-|  66|0x000000070a400000, 0x000000070a400000, 0x000000070a600000|  0%| F|  |TAMS 0x000000070a400000, 0x000000070a400000| Untracked 
-|  67|0x000000070a600000, 0x000000070a600000, 0x000000070a800000|  0%| F|  |TAMS 0x000000070a600000, 0x000000070a600000| Untracked 
-|  68|0x000000070a800000, 0x000000070a800000, 0x000000070aa00000|  0%| F|  |TAMS 0x000000070a800000, 0x000000070a800000| Untracked 
-|  69|0x000000070aa00000, 0x000000070aa00000, 0x000000070ac00000|  0%| F|  |TAMS 0x000000070aa00000, 0x000000070aa00000| Untracked 
-|  70|0x000000070ac00000, 0x000000070ac00000, 0x000000070ae00000|  0%| F|  |TAMS 0x000000070ac00000, 0x000000070ac00000| Untracked 
-|  71|0x000000070ae00000, 0x000000070ae00000, 0x000000070b000000|  0%| F|  |TAMS 0x000000070ae00000, 0x000000070ae00000| Untracked 
-|  72|0x000000070b000000, 0x000000070b000000, 0x000000070b200000|  0%| F|  |TAMS 0x000000070b000000, 0x000000070b000000| Untracked 
-|  73|0x000000070b200000, 0x000000070b200000, 0x000000070b400000|  0%| F|  |TAMS 0x000000070b200000, 0x000000070b200000| Untracked 
-|  74|0x000000070b400000, 0x000000070b400000, 0x000000070b600000|  0%| F|  |TAMS 0x000000070b400000, 0x000000070b400000| Untracked 
-|  75|0x000000070b600000, 0x000000070b600000, 0x000000070b800000|  0%| F|  |TAMS 0x000000070b600000, 0x000000070b600000| Untracked 
-|  76|0x000000070b800000, 0x000000070b800000, 0x000000070ba00000|  0%| F|  |TAMS 0x000000070b800000, 0x000000070b800000| Untracked 
-|  77|0x000000070ba00000, 0x000000070ba00000, 0x000000070bc00000|  0%| F|  |TAMS 0x000000070ba00000, 0x000000070ba00000| Untracked 
-|  78|0x000000070bc00000, 0x000000070bc00000, 0x000000070be00000|  0%| F|  |TAMS 0x000000070bc00000, 0x000000070bc00000| Untracked 
-|  79|0x000000070be00000, 0x000000070be00000, 0x000000070c000000|  0%| F|  |TAMS 0x000000070be00000, 0x000000070be00000| Untracked 
-|  80|0x000000070c000000, 0x000000070c000000, 0x000000070c200000|  0%| F|  |TAMS 0x000000070c000000, 0x000000070c000000| Untracked 
-|  81|0x000000070c200000, 0x000000070c200000, 0x000000070c400000|  0%| F|  |TAMS 0x000000070c200000, 0x000000070c200000| Untracked 
-|  82|0x000000070c400000, 0x000000070c400000, 0x000000070c600000|  0%| F|  |TAMS 0x000000070c400000, 0x000000070c400000| Untracked 
-|  83|0x000000070c600000, 0x000000070c600000, 0x000000070c800000|  0%| F|  |TAMS 0x000000070c600000, 0x000000070c600000| Untracked 
-|  84|0x000000070c800000, 0x000000070c800000, 0x000000070ca00000|  0%| F|  |TAMS 0x000000070c800000, 0x000000070c800000| Untracked 
-|  85|0x000000070ca00000, 0x000000070ca00000, 0x000000070cc00000|  0%| F|  |TAMS 0x000000070ca00000, 0x000000070ca00000| Untracked 
-|  86|0x000000070cc00000, 0x000000070cc00000, 0x000000070ce00000|  0%| F|  |TAMS 0x000000070cc00000, 0x000000070cc00000| Untracked 
-|  87|0x000000070ce00000, 0x000000070ce00000, 0x000000070d000000|  0%| F|  |TAMS 0x000000070ce00000, 0x000000070ce00000| Untracked 
-|  88|0x000000070d000000, 0x000000070d000000, 0x000000070d200000|  0%| F|  |TAMS 0x000000070d000000, 0x000000070d000000| Untracked 
-|  89|0x000000070d200000, 0x000000070d200000, 0x000000070d400000|  0%| F|  |TAMS 0x000000070d200000, 0x000000070d200000| Untracked 
-|  90|0x000000070d400000, 0x000000070d400000, 0x000000070d600000|  0%| F|  |TAMS 0x000000070d400000, 0x000000070d400000| Untracked 
-|  91|0x000000070d600000, 0x000000070d600000, 0x000000070d800000|  0%| F|  |TAMS 0x000000070d600000, 0x000000070d600000| Untracked 
-|  92|0x000000070d800000, 0x000000070d800000, 0x000000070da00000|  0%| F|  |TAMS 0x000000070d800000, 0x000000070d800000| Untracked 
-|  93|0x000000070da00000, 0x000000070da00000, 0x000000070dc00000|  0%| F|  |TAMS 0x000000070da00000, 0x000000070da00000| Untracked 
-|  94|0x000000070dc00000, 0x000000070dc00000, 0x000000070de00000|  0%| F|  |TAMS 0x000000070dc00000, 0x000000070dc00000| Untracked 
-|  95|0x000000070de00000, 0x000000070de00000, 0x000000070e000000|  0%| F|  |TAMS 0x000000070de00000, 0x000000070de00000| Untracked 
-|  96|0x000000070e000000, 0x000000070e000000, 0x000000070e200000|  0%| F|  |TAMS 0x000000070e000000, 0x000000070e000000| Untracked 
-|  97|0x000000070e200000, 0x000000070e200000, 0x000000070e400000|  0%| F|  |TAMS 0x000000070e200000, 0x000000070e200000| Untracked 
-|  98|0x000000070e400000, 0x000000070e400000, 0x000000070e600000|  0%| F|  |TAMS 0x000000070e400000, 0x000000070e400000| Untracked 
-|  99|0x000000070e600000, 0x000000070e600000, 0x000000070e800000|  0%| F|  |TAMS 0x000000070e600000, 0x000000070e600000| Untracked 
-| 100|0x000000070e800000, 0x000000070e800000, 0x000000070ea00000|  0%| F|  |TAMS 0x000000070e800000, 0x000000070e800000| Untracked 
-| 101|0x000000070ea00000, 0x000000070ea00000, 0x000000070ec00000|  0%| F|  |TAMS 0x000000070ea00000, 0x000000070ea00000| Untracked 
-| 102|0x000000070ec00000, 0x000000070ec00000, 0x000000070ee00000|  0%| F|  |TAMS 0x000000070ec00000, 0x000000070ec00000| Untracked 
-| 103|0x000000070ee00000, 0x000000070ee00000, 0x000000070f000000|  0%| F|  |TAMS 0x000000070ee00000, 0x000000070ee00000| Untracked 
-| 104|0x000000070f000000, 0x000000070f000000, 0x000000070f200000|  0%| F|  |TAMS 0x000000070f000000, 0x000000070f000000| Untracked 
-| 105|0x000000070f200000, 0x000000070f200000, 0x000000070f400000|  0%| F|  |TAMS 0x000000070f200000, 0x000000070f200000| Untracked 
-| 106|0x000000070f400000, 0x000000070f400000, 0x000000070f600000|  0%| F|  |TAMS 0x000000070f400000, 0x000000070f400000| Untracked 
-| 107|0x000000070f600000, 0x000000070f600000, 0x000000070f800000|  0%| F|  |TAMS 0x000000070f600000, 0x000000070f600000| Untracked 
-| 108|0x000000070f800000, 0x000000070f800000, 0x000000070fa00000|  0%| F|  |TAMS 0x000000070f800000, 0x000000070f800000| Untracked 
-| 109|0x000000070fa00000, 0x000000070fa00000, 0x000000070fc00000|  0%| F|  |TAMS 0x000000070fa00000, 0x000000070fa00000| Untracked 
-| 110|0x000000070fc00000, 0x000000070fc00000, 0x000000070fe00000|  0%| F|  |TAMS 0x000000070fc00000, 0x000000070fc00000| Untracked 
-| 111|0x000000070fe00000, 0x000000070fe00000, 0x0000000710000000|  0%| F|  |TAMS 0x000000070fe00000, 0x000000070fe00000| Untracked 
-| 112|0x0000000710000000, 0x0000000710000000, 0x0000000710200000|  0%| F|  |TAMS 0x0000000710000000, 0x0000000710000000| Untracked 
-| 113|0x0000000710200000, 0x0000000710200000, 0x0000000710400000|  0%| F|  |TAMS 0x0000000710200000, 0x0000000710200000| Untracked 
-| 114|0x0000000710400000, 0x0000000710400000, 0x0000000710600000|  0%| F|  |TAMS 0x0000000710400000, 0x0000000710400000| Untracked 
-| 115|0x0000000710600000, 0x0000000710600000, 0x0000000710800000|  0%| F|  |TAMS 0x0000000710600000, 0x0000000710600000| Untracked 
-| 116|0x0000000710800000, 0x0000000710800000, 0x0000000710a00000|  0%| F|  |TAMS 0x0000000710800000, 0x0000000710800000| Untracked 
-| 117|0x0000000710a00000, 0x0000000710a00000, 0x0000000710c00000|  0%| F|  |TAMS 0x0000000710a00000, 0x0000000710a00000| Untracked 
-| 118|0x0000000710c00000, 0x0000000710c00000, 0x0000000710e00000|  0%| F|  |TAMS 0x0000000710c00000, 0x0000000710c00000| Untracked 
-| 119|0x0000000710e00000, 0x0000000710e00000, 0x0000000711000000|  0%| F|  |TAMS 0x0000000710e00000, 0x0000000710e00000| Untracked 
-| 120|0x0000000711000000, 0x0000000711000000, 0x0000000711200000|  0%| F|  |TAMS 0x0000000711000000, 0x0000000711000000| Untracked 
-| 121|0x0000000711200000, 0x0000000711200000, 0x0000000711400000|  0%| F|  |TAMS 0x0000000711200000, 0x0000000711200000| Untracked 
-| 122|0x0000000711400000, 0x0000000711400000, 0x0000000711600000|  0%| F|  |TAMS 0x0000000711400000, 0x0000000711400000| Untracked 
-| 123|0x0000000711600000, 0x0000000711600000, 0x0000000711800000|  0%| F|  |TAMS 0x0000000711600000, 0x0000000711600000| Untracked 
-| 124|0x0000000711800000, 0x00000007118f64d8, 0x0000000711a00000| 48%| E|  |TAMS 0x0000000711800000, 0x0000000711800000| Complete 
-| 125|0x0000000711a00000, 0x0000000711c00000, 0x0000000711c00000|100%| E|CS|TAMS 0x0000000711a00000, 0x0000000711a00000| Complete 
-| 126|0x0000000711c00000, 0x0000000711e00000, 0x0000000711e00000|100%| E|  |TAMS 0x0000000711c00000, 0x0000000711c00000| Complete 
-
-Card table byte_map: [0x000002df775d0000,0x000002df77dc0000] _byte_map_base: 0x000002df73dc0000
-
-Marking Bits (Prev, Next): (CMBitMap*) 0x000002df628966c0, (CMBitMap*) 0x000002df62896700
- Prev Bits: [0x000002df785b0000, 0x000002df7c530000)
- Next Bits: [0x000002df00000000, 0x000002df03f80000)
-
-Polling page: 0x000002df62600000
-
-Metaspace:
-
-Usage:
-  Non-class:      8.84 MB used.
-      Class:    938.70 KB used.
-       Both:      9.75 MB used.
-
-Virtual space:
-  Non-class space:       16.00 MB reserved,       8.88 MB ( 55%) committed,  2 nodes.
-      Class space:        1.00 GB reserved,       1.00 MB ( <1%) committed,  1 nodes.
-             Both:        1.02 GB reserved,       9.88 MB ( <1%) committed. 
-
-Chunk freelists:
-   Non-Class:  2.96 MB
-       Class:  3.03 MB
-        Both:  5.99 MB
-
-MaxMetaspaceSize: unlimited
-CompressedClassSpaceSize: 1.00 GB
-Initial GC threshold: 21.00 MB
-Current GC threshold: 21.00 MB
-CDS: off
-MetaspaceReclaimPolicy: balanced
- - commit_granule_bytes: 65536.
- - commit_granule_words: 8192.
- - virtual_space_node_default_size: 1048576.
- - enlarge_chunks_in_place: 1.
- - new_chunks_are_fully_committed: 0.
- - uncommit_free_chunks: 1.
- - use_allocation_guard: 0.
- - handle_deallocations: 1.
-
-
-Internal statistics:
-
-num_allocs_failed_limit: 0.
-num_arena_births: 28.
-num_arena_deaths: 0.
-num_vsnodes_births: 3.
-num_vsnodes_deaths: 0.
-num_space_committed: 158.
-num_space_uncommitted: 0.
-num_chunks_returned_to_freelist: 0.
-num_chunks_taken_from_freelist: 64.
-num_chunk_merges: 0.
-num_chunk_splits: 33.
-num_chunks_enlarged: 20.
-num_purges: 0.
-num_inconsistent_stats: 0.
-
-CodeHeap 'non-profiled nmethods': size=120000Kb used=124Kb max_used=124Kb free=119875Kb
- bounds [0x000002df6f290000, 0x000002df6f500000, 0x000002df767c0000]
-CodeHeap 'profiled nmethods': size=120000Kb used=696Kb max_used=696Kb free=119303Kb
- bounds [0x000002df677c0000, 0x000002df67a30000, 0x000002df6ecf0000]
-CodeHeap 'non-nmethods': size=5760Kb used=1145Kb max_used=1160Kb free=4614Kb
- bounds [0x000002df6ecf0000, 0x000002df6ef60000, 0x000002df6f290000]
- total_blobs=911 nmethods=477 adapters=347
- compilation: enabled
-              stopped_count=0, restarted_count=0
- full_count=0
-
-Compilation events (20 events):
-Event: 0.435 Thread 0x000002df7f473190 nmethod 465 0x000002df67865a90 code [0x000002df67865c40, 0x000002df67865f28]
-Event: 0.435 Thread 0x000002df7f473190  470       3       java.nio.CharBuffer::position (6 bytes)
-Event: 0.435 Thread 0x000002df7f471880 nmethod 473 0x000002df6f2ae990 code [0x000002df6f2aeb00, 0x000002df6f2aeb78]
-Event: 0.435 Thread 0x000002df7f473190 nmethod 470 0x000002df67866090 code [0x000002df67866240, 0x000002df678663e8]
-Event: 0.435 Thread 0x000002df7f473190  466       3       sun.nio.fs.WindowsPathParser::parse (384 bytes)
-Event: 0.438 Thread 0x000002df7f473190 nmethod 466 0x000002df67866490 code [0x000002df67866ba0, 0x000002df6786a9a8]
-Event: 0.438 Thread 0x000002df7f473190  476       3       java.lang.invoke.MethodType$ConcurrentWeakInternSet::expungeStaleElements (27 bytes)
-Event: 0.439 Thread 0x000002df7f473190 nmethod 476 0x000002df6786c010 code [0x000002df6786c1e0, 0x000002df6786c6d8]
-Event: 0.439 Thread 0x000002df7f473190  471       3       java.nio.CharBuffer::hasArray (20 bytes)
-Event: 0.439 Thread 0x000002df7f473190 nmethod 471 0x000002df6786c890 code [0x000002df6786ca20, 0x000002df6786cbd8]
-Event: 0.439 Thread 0x000002df7f473190  472       3       java.lang.System$2::decodeASCII (11 bytes)
-Event: 0.439 Thread 0x000002df7f473190 nmethod 472 0x000002df6786cc90 code [0x000002df6786ce20, 0x000002df6786cf68]
-Event: 0.439 Thread 0x000002df7f473190  467       3       sun.nio.fs.WindowsPathParser::isLetter (30 bytes)
-Event: 0.439 Thread 0x000002df7f473190 nmethod 467 0x000002df6786d010 code [0x000002df6786d1a0, 0x000002df6786d398]
-Event: 0.439 Thread 0x000002df7f473190  468       3       sun.nio.fs.WindowsPathParser$Result::<init> (20 bytes)
-Event: 0.439 Thread 0x000002df7f473190 nmethod 468 0x000002df6786d410 code [0x000002df6786d5c0, 0x000002df6786d858]
-Event: 0.439 Thread 0x000002df7f473190  469       3       sun.nio.fs.WindowsDirectoryStream$WindowsDirectoryIterator::isSelfOrParent (24 bytes)
-Event: 0.439 Thread 0x000002df7f473190 nmethod 469 0x000002df6786d910 code [0x000002df6786dac0, 0x000002df6786dcf8]
-Event: 0.439 Thread 0x000002df7f473190  474       3       java.nio.charset.CoderResult::isError (14 bytes)
-Event: 0.440 Thread 0x000002df7f473190 nmethod 474 0x000002df6786de10 code [0x000002df6786dfa0, 0x000002df6786e118]
-
-GC Heap History (0 events):
-No events
-
-Dll operation events (1 events):
-Event: 0.017 Loaded shared library D:\IntelliJ IDEA 2023.1\jbr\bin\java.dll
-
-Deoptimization events (0 events):
-No events
-
-Classes unloaded (0 events):
-No events
-
-Classes redefined (0 events):
-No events
-
-Internal exceptions (9 events):
-Event: 0.292 Thread 0x000002df6282a0c0 Exception <a 'sun/nio/fs/WindowsException'{0x0000000711b26990}> (0x0000000711b26990) 
-thrown [s\src\hotspot\share\prims\jni.cpp, line 517]
-Event: 0.310 Thread 0x000002df6282a0c0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000711b51bd0}: 'int java.lang.invoke.DirectMethodHandle$Holder.invokeStaticInit(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)'> (0x0000000711b51bd0) 
-thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 771]
-Event: 0.312 Thread 0x000002df6282a0c0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000711b5caa0}: 'java.lang.Object java.lang.invoke.DirectMethodHandle$Holder.invokeInterface(java.lang.Object, java.lang.Object)'> (0x0000000711b5caa0) 
-thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 771]
-Event: 0.312 Thread 0x000002df6282a0c0 Exception <a 'java/lang/IncompatibleClassChangeError'{0x0000000711b603c0}: Found class java.lang.Object, but interface was expected> (0x0000000711b603c0) 
-thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 838]
-Event: 0.313 Thread 0x000002df6282a0c0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000711b63770}: 'void java.lang.invoke.DirectMethodHandle$Holder.invokeStatic(java.lang.Object, java.lang.Object)'> (0x0000000711b63770) 
-thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 771]
-Event: 0.313 Thread 0x000002df6282a0c0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000711b67088}: 'void java.lang.invoke.DirectMethodHandle$Holder.invokeStaticInit(java.lang.Object, java.lang.Object)'> (0x0000000711b67088) 
-thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 771]
-Event: 0.315 Thread 0x000002df6282a0c0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000711b6d9c0}: 'int java.lang.invoke.DirectMethodHandle$Holder.invokeStaticInit(java.lang.Object, java.lang.Object)'> (0x0000000711b6d9c0) 
-thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 771]
-Event: 0.358 Thread 0x000002df6282a0c0 Exception <a 'java/lang/NoSuchMethodError'{0x00000007118541d0}: 'java.lang.Object java.lang.invoke.DirectMethodHandle$Holder.invokeStaticInit(java.lang.Object, int, int, int, int)'> (0x00000007118541d0) 
-thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 771]
-Event: 0.436 Thread 0x000002df6282a0c0 Exception <a 'java/lang/NoSuchMethodError'{0x00000007118e9910}: 'java.lang.Object java.lang.invoke.DirectMethodHandle$Holder.invokeStaticInit(java.lang.Object, java.lang.Object, int, int, int, int)'> (0x00000007118e9910) 
-thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 771]
-
-VM Operations (6 events):
-Event: 0.156 Executing VM operation: HandshakeAllThreads
-Event: 0.156 Executing VM operation: HandshakeAllThreads done
-Event: 0.174 Executing VM operation: HandshakeAllThreads
-Event: 0.175 Executing VM operation: HandshakeAllThreads done
-Event: 0.377 Executing VM operation: HandshakeAllThreads
-Event: 0.377 Executing VM operation: HandshakeAllThreads done
-
-Events (20 events):
-Event: 0.379 loading class java/net/InetAddress$NameService done
-Event: 0.379 loading class java/net/InetAddress$PlatformNameService done
-Event: 0.379 loading class java/net/Inet4Address
-Event: 0.379 loading class java/net/Inet4Address done
-Event: 0.379 loading class java/net/Inet6Address
-Event: 0.379 loading class java/net/Inet6Address done
-Event: 0.379 loading class java/net/Inet6Address$Inet6AddressHolder
-Event: 0.379 loading class java/net/Inet6Address$Inet6AddressHolder done
-Event: 0.379 loading class java/net/DefaultInterface
-Event: 0.379 loading class java/net/DefaultInterface done
-Event: 0.396 loading class java/net/NetworkInterface$1
-Event: 0.396 loading class java/net/NetworkInterface$1 done
-Event: 0.422 loading class java/nio/file/Files$AcceptAllFilter
-Event: 0.422 loading class java/nio/file/Files$AcceptAllFilter done
-Event: 0.440 loading class sun/security/provider/AbstractDrbg$NonceProvider
-Event: 0.440 loading class sun/security/provider/AbstractDrbg$NonceProvider done
-Event: 0.440 loading class sun/security/provider/SHA2$SHA256
-Event: 0.440 loading class sun/security/provider/SHA2
-Event: 0.440 loading class sun/security/provider/SHA2 done
-Event: 0.440 loading class sun/security/provider/SHA2$SHA256 done
-
-
-Dynamic libraries:
-0x00007ff7bf8d0000 - 0x00007ff7bf8da000 	D:\IntelliJ IDEA 2023.1\jbr\bin\java.exe
-0x00007ffd31ed0000 - 0x00007ffd320c5000 	C:\Windows\SYSTEM32\ntdll.dll
-0x00007ffd31700000 - 0x00007ffd317be000 	C:\Windows\System32\KERNEL32.DLL
-0x00007ffd2f620000 - 0x00007ffd2f8e8000 	C:\Windows\System32\KERNELBASE.dll
-0x00007ffd2fd20000 - 0x00007ffd2fe20000 	C:\Windows\System32\ucrtbase.dll
-0x00007ffd1dce0000 - 0x00007ffd1dcf7000 	D:\IntelliJ IDEA 2023.1\jbr\bin\jli.dll
-0x00007ffd2b4b0000 - 0x00007ffd2b4cb000 	D:\IntelliJ IDEA 2023.1\jbr\bin\VCRUNTIME140.dll
-0x00007ffd31540000 - 0x00007ffd316e0000 	C:\Windows\System32\USER32.dll
-0x00007ffd2fca0000 - 0x00007ffd2fcc2000 	C:\Windows\System32\win32u.dll
-0x00007ffd30610000 - 0x00007ffd3063b000 	C:\Windows\System32\GDI32.dll
-0x00007ffd2fe20000 - 0x00007ffd2ff2b000 	C:\Windows\System32\gdi32full.dll
-0x00007ffd1b570000 - 0x00007ffd1b80a000 	C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
-0x00007ffd2fa30000 - 0x00007ffd2facd000 	C:\Windows\System32\msvcp_win.dll
-0x00007ffd300b0000 - 0x00007ffd3014e000 	C:\Windows\System32\msvcrt.dll
-0x00007ffd30420000 - 0x00007ffd30450000 	C:\Windows\System32\IMM32.DLL
-0x00007ffd2b400000 - 0x00007ffd2b40c000 	D:\IntelliJ IDEA 2023.1\jbr\bin\vcruntime140_1.dll
-0x00007ffd1b290000 - 0x00007ffd1b31d000 	D:\IntelliJ IDEA 2023.1\jbr\bin\msvcp140.dll
-0x00007ffd08da0000 - 0x00007ffd09a0d000 	D:\IntelliJ IDEA 2023.1\jbr\bin\server\jvm.dll
-0x00007ffd30150000 - 0x00007ffd301fe000 	C:\Windows\System32\ADVAPI32.dll
-0x00007ffd30f00000 - 0x00007ffd30f9c000 	C:\Windows\System32\sechost.dll
-0x00007ffd30fa0000 - 0x00007ffd310c5000 	C:\Windows\System32\RPCRT4.dll
-0x00007ffd1b9e0000 - 0x00007ffd1b9e9000 	C:\Windows\SYSTEM32\WSOCK32.dll
-0x00007ffd21110000 - 0x00007ffd21137000 	C:\Windows\SYSTEM32\WINMM.dll
-0x00007ffd218e0000 - 0x00007ffd218ea000 	C:\Windows\SYSTEM32\VERSION.dll
-0x00007ffd30640000 - 0x00007ffd306ab000 	C:\Windows\System32\WS2_32.dll
-0x00007ffd2d520000 - 0x00007ffd2d532000 	C:\Windows\SYSTEM32\kernel.appcore.dll
-0x00007ffd2acb0000 - 0x00007ffd2acba000 	D:\IntelliJ IDEA 2023.1\jbr\bin\jimage.dll
-0x00007ffd214d0000 - 0x00007ffd216b4000 	C:\Windows\SYSTEM32\DBGHELP.DLL
-0x00007ffd212c0000 - 0x00007ffd212ec000 	C:\Windows\SYSTEM32\dbgcore.DLL
-0x00007ffd2f9a0000 - 0x00007ffd2fa22000 	C:\Windows\System32\bcryptPrimitives.dll
-0x00007ffd1dcb0000 - 0x00007ffd1dcd5000 	D:\IntelliJ IDEA 2023.1\jbr\bin\java.dll
-0x00007ffd1cc40000 - 0x00007ffd1cc58000 	D:\IntelliJ IDEA 2023.1\jbr\bin\zip.dll
-0x00007ffd30720000 - 0x00007ffd30e64000 	C:\Windows\System32\SHELL32.dll
-0x00007ffd2d720000 - 0x00007ffd2deb4000 	C:\Windows\SYSTEM32\windows.storage.dll
-0x00007ffd31940000 - 0x00007ffd31c94000 	C:\Windows\System32\combase.dll
-0x00007ffd2ef80000 - 0x00007ffd2efac000 	C:\Windows\SYSTEM32\Wldp.dll
-0x00007ffd31ca0000 - 0x00007ffd31d4d000 	C:\Windows\System32\SHCORE.dll
-0x00007ffd303c0000 - 0x00007ffd30415000 	C:\Windows\System32\shlwapi.dll
-0x00007ffd2f530000 - 0x00007ffd2f54f000 	C:\Windows\SYSTEM32\profapi.dll
-0x00007ffd1cc20000 - 0x00007ffd1cc39000 	D:\IntelliJ IDEA 2023.1\jbr\bin\net.dll
-0x00007ffd2aa30000 - 0x00007ffd2ab39000 	C:\Windows\SYSTEM32\WINHTTP.dll
-0x00007ffd2ece0000 - 0x00007ffd2ed4a000 	C:\Windows\system32\mswsock.dll
-0x00007ffd1cae0000 - 0x00007ffd1caf6000 	D:\IntelliJ IDEA 2023.1\jbr\bin\nio.dll
-0x00007ffd1b240000 - 0x00007ffd1b24e000 	D:\IntelliJ IDEA 2023.1\jbr\bin\sunmscapi.dll
-0x00007ffd2fb40000 - 0x00007ffd2fc96000 	C:\Windows\System32\CRYPT32.dll
-0x00007ffd2eff0000 - 0x00007ffd2f017000 	C:\Windows\SYSTEM32\ncrypt.dll
-0x00007ffd2efb0000 - 0x00007ffd2efeb000 	C:\Windows\SYSTEM32\NTASN1.dll
-0x00007ffd2eee0000 - 0x00007ffd2eef8000 	C:\Windows\SYSTEM32\CRYPTSP.dll
-0x00007ffd2e660000 - 0x00007ffd2e694000 	C:\Windows\system32\rsaenh.dll
-0x00007ffd2f5f0000 - 0x00007ffd2f617000 	C:\Windows\System32\bcrypt.dll
-0x00007ffd2f4f0000 - 0x00007ffd2f51e000 	C:\Windows\SYSTEM32\USERENV.dll
-0x00007ffd2eed0000 - 0x00007ffd2eedc000 	C:\Windows\SYSTEM32\CRYPTBASE.dll
-0x00007ffd2e9d0000 - 0x00007ffd2ea0b000 	C:\Windows\SYSTEM32\IPHLPAPI.DLL
-0x00007ffd30280000 - 0x00007ffd30288000 	C:\Windows\System32\NSI.dll
-0x00007ffd2a590000 - 0x00007ffd2a5a7000 	C:\Windows\SYSTEM32\dhcpcsvc6.DLL
-0x00007ffd2a520000 - 0x00007ffd2a53d000 	C:\Windows\SYSTEM32\dhcpcsvc.DLL
-0x00007ffd2ea10000 - 0x00007ffd2eada000 	C:\Windows\SYSTEM32\DNSAPI.dll
-
-dbghelp: loaded successfully - version: 4.0.5 - missing functions: none
-symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;D:\IntelliJ IDEA 2023.1\jbr\bin;C:\Windows\SYSTEM32;C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e;D:\IntelliJ IDEA 2023.1\jbr\bin\server
-
-VM Arguments:
-java_command: git4idea.http.GitAskPassApp Username for 'https://gitee.com': 
-java_class_path (initial): D:/IntelliJ IDEA 2023.1/plugins/vcs-git/lib/git4idea-rt.jar;D:/IntelliJ IDEA 2023.1/lib/externalProcess-rt.jar
-Launcher Type: SUN_STANDARD
-
-[Global flags]
-     intx CICompilerCount                          = 3                                         {product} {ergonomic}
-     uint ConcGCThreads                            = 1                                         {product} {ergonomic}
-     uint G1ConcRefinementThreads                  = 4                                         {product} {ergonomic}
-   size_t G1HeapRegionSize                         = 2097152                                   {product} {ergonomic}
-    uintx GCDrainStackTargetSize                   = 64                                        {product} {ergonomic}
-   size_t InitialHeapSize                          = 266338304                                 {product} {ergonomic}
-   size_t MarkStackSize                            = 4194304                                   {product} {ergonomic}
-   size_t MaxHeapSize                              = 4261412864                                {product} {ergonomic}
-   size_t MaxNewSize                               = 2556428288                                {product} {ergonomic}
-   size_t MinHeapDeltaBytes                        = 2097152                                   {product} {ergonomic}
-   size_t MinHeapSize                              = 8388608                                   {product} {ergonomic}
-    uintx NonNMethodCodeHeapSize                   = 5832780                                {pd product} {ergonomic}
-    uintx NonProfiledCodeHeapSize                  = 122912730                              {pd product} {ergonomic}
-    uintx ProfiledCodeHeapSize                     = 122912730                              {pd product} {ergonomic}
-    uintx ReservedCodeCacheSize                    = 251658240                              {pd product} {ergonomic}
-     bool SegmentedCodeCache                       = true                                      {product} {ergonomic}
-   size_t SoftMaxHeapSize                          = 4261412864                             {manageable} {ergonomic}
-     bool UseCompressedClassPointers               = true                           {product lp64_product} {ergonomic}
-     bool UseCompressedOops                        = true                           {product lp64_product} {ergonomic}
-     bool UseG1GC                                  = true                                      {product} {ergonomic}
-     bool UseLargePagesIndividualAllocation        = false                                  {pd product} {ergonomic}
-
-Logging:
-Log output configuration:
- #0: stdout all=warning uptime,level,tags
- #1: stderr all=off uptime,level,tags
-
-Environment Variables:
-JAVA_HOME=D:\jdk
-CLASSPATH=.;D:\jdk\lib;D:\jdk\lib\tools.jar
-PATH=E:\git\mingw64\libexec\git-core;E:\git\mingw64\libexec\git-core;E:\git\mingw64\bin;E:\git\usr\bin;C:\Users\Administrator\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;D:\jdk\bin;D:\apache-maven-3.8.8\bin;E:\git\usr\bin;E:\xshell;E:\xshell\xftp;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps
-USERNAME=Administrator
-DISPLAY=:0.0
-LC_ALL=en_US.UTF-8
-TERM=xterm-256color
-TMPDIR=C:\Users\ADMINI~1\AppData\Local\Temp
-OS=Windows_NT
-PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 42 Stepping 7, GenuineIntel
-TMP=C:\Users\ADMINI~1\AppData\Local\Temp
-TEMP=C:\Users\ADMINI~1\AppData\Local\Temp
-
-
-
----------------  S Y S T E M  ---------------
-
-OS:
- Windows 10 , 64 bit Build 19041 (10.0.19041.1566)
-OS uptime: 10 days 0:48 hours
-
-CPU: total 4 (initial active 4) (4 cores per cpu, 1 threads per core) family 6 model 42 stepping 7 microcode 0x2f, cx8, cmov, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, tsc, tscinvbit, avx, aes, clmul, vzeroupper, clflush
-
-Memory: 4k page, system-wide physical 16255M (1597M free)
-TotalPageFile size 22884M (AvailPageFile size 1M)
-current process WorkingSet (physical memory assigned to process): 47M, peak: 47M
-current process commit charge ("private bytes"): 334M, peak: 334M
-
-vm_info: OpenJDK 64-Bit Server VM (17.0.6+10-b829.5) for windows-amd64 JRE (17.0.6+10-b829.5), built on 2023-02-24 by "builduser" with MS VC++ 16.10 / 16.11 (VS2019)
-
-END.

pluss-api-page/src/assembly/assembly.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
-        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd
- ">
-    <id>release</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>src/assembly</directory>
-            <outputDirectory>.</outputDirectory>
-            <includes>
-                <include>*.sh</include>
-                <include>*.bat</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/resources</directory>
-            <outputDirectory>.</outputDirectory>
-            <includes>
-                <include>*.yml</include>
-                <!--<include>application.yml</include>-->
-            </includes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <!-- 将scope为runtime的依赖包打包到lib目录下。 -->
-        <dependencySet>
-            <useProjectArtifact>true</useProjectArtifact>
-            <outputDirectory>libs</outputDirectory>
-            <scope>runtime</scope>
-        </dependencySet>
-    </dependencySets>
-
-</assembly>

pluss-api-page/src/assembly/startup.bat

@@ -1,5 +0,0 @@
-@echo off
-setLocal enableDelayedExpansion
-set cp=.
-FOR %%i IN ("%~dp0libs\*.jar") DO set cp=!cp!;%%~fsi
-start "bidservice" java -cp %cp% Shell

pluss-api-page/src/assembly/startup.sh

@@ -1,10 +0,0 @@
-#!/bin/bash --login
-shopt -s expand_aliases
-
-baseDir=$(cd "$(dirname "$0")"; pwd)
-cp=.
-for file in $baseDir/libs/*.jar
-do
-   cp=$cp:$file
-done
-java  -cp $cp com.goodcoupons.GoodCoupons >>stdout.out 2>&1 &

pluss-api-page/src/main/java/cn/pluss/platform/controller/BannerController.java

@@ -49,21 +49,6 @@ public class BannerController {
         List<Banner> banners = bannerService.queryBannerList(queryBanner);
         return ResultGenerator.genSuccessResult(banners);
     }
-    @PostMapping("/queryCarousel")
-    @ApiOperation(tags = {"页面-首页"}, value = "查询所有的轮播图", notes = "查询所有的轮播图", httpMethod = "POST")
-    public Result<List<Banner>> queryCarousel(@RequestBody Banner banner) {
-        if (banner == null) {
-            return ResultGenerator.genFailResult("参数错误！");
-        }
-        if (banner.getType() == null || StringUtil.isEmpty(banner.getType())) {
-            return ResultGenerator.genFailResult("查询参数错误！");
-        }
-
-        Banner queryBanner = new Banner();
-        queryBanner.setType(banner.getType());
-        List<Banner> banners = bannerService.queryBannerList(queryBanner);
-        return ResultGenerator.genSuccessResult(banners);
-    }
 
     @DeleteMapping("/{id}")
     @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")

pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java

@@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Objects;
-
 /**
  * @author djh
  * 简介富文本内容
@@ -32,13 +30,6 @@ public class IntroduceController {
         }
 
         AppGuide entity = appGuideService.getByCode(code);
-        if (!"SHTGKT".equals(code)){
+        return ResultGenerator.genSuccessResult(entity == null? "": entity.getContent());
-            return ResultGenerator.genSuccessResult(entity == null ? "" : entity.getContent());
-        }
-        if (Objects.equals(entity.getType(), "1")) {
-            return ResultGenerator.genSuccessResult(entity == null ? "" : entity.getContent());
-        }else {
-            return ResultGenerator.genFailResult("");
-        }
     }
 }

pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBaseInfoController.java

@@ -12,7 +12,6 @@ import cn.pluss.platform.dto.BusinessLicenseDTO;
 import cn.pluss.platform.dto.ImgDTO;
 import cn.pluss.platform.dto.MerchantBaseInfoDTO;
 import cn.pluss.platform.entity.*;
-import cn.pluss.platform.exception.MsgException;
 import cn.pluss.platform.mapper.MerchantImageMapper;
 import cn.pluss.platform.mapper.MerchantRateMapper;
 import cn.pluss.platform.merchant.MerchantBaseInfoService;
@@ -173,9 +172,6 @@ public class MerchantBaseInfoController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "MerchantBaseInfoDTO", value = "MerchantBaseInfoDTO实例", paramType = "body", dataType = "MerchantBaseInfoDTO", required = true)})
     public Result<?> saveMerchantBaseInfoV2(@RequestBody MerchantBaseInfoDTO merchantBaseInfoDTO) {
-        if (merchantBaseInfoDTO.getAlias().length() < 4 || merchantBaseInfoDTO.getAlias().length() > 18){
-            MsgException.check(true,"请输入4-18位商户简称");
-        }
         try {
             merchantBaseInfoService.saveMerchantBaseInfo(merchantBaseInfoDTO);
             return ResultGenerator.genSuccessResult("保存成功");

pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java

@@ -1,6 +1,5 @@
 package cn.pluss.platform.controller;
 
-import cn.hutool.json.JSONUtil;
 import cn.pluss.platform.IdCardService;
 import cn.pluss.platform.annotation.OpLog;
 import cn.pluss.platform.api.PageInfo;
@@ -12,7 +11,6 @@ import cn.pluss.platform.deviceStock.DeviceStockService;
 import cn.pluss.platform.dto.*;
 import cn.pluss.platform.entity.*;
 import cn.pluss.platform.exception.MsgException;
-import cn.pluss.platform.klk.service.LklPayService;
 import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
 import cn.pluss.platform.mapper.MerchantOrderVOMapper;
 import cn.pluss.platform.memberOrder.MemberOrderService;
@@ -23,16 +21,10 @@ import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
 import cn.pluss.platform.merchantOrder.MerchantOrderService;
 import cn.pluss.platform.notice.NoticeService;
 import cn.pluss.platform.pay.PayService;
-import cn.pluss.platform.pos.BasePosReq;
-import cn.pluss.platform.pos.PosPay;
-import cn.pluss.platform.pos.PosTradeQueryReq;
-import cn.pluss.platform.pos.ReturnFundsReq;
 import cn.pluss.platform.ryx.pay.RyxPayService;
 import cn.pluss.platform.sxf.pay.SxfPayService;
 import cn.pluss.platform.user.impl.GeneralPushUtil;
 import cn.pluss.platform.userApp.UserAppService;
-import cn.pluss.platform.util.BeanUtils;
-import cn.pluss.platform.util.IpUtils;
 import cn.pluss.platform.util.StringUtil;
 import cn.pluss.platform.util.TokenUtil;
 import cn.pluss.platform.vo.MemberScanVO;
@@ -59,7 +51,6 @@ import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import static cn.hutool.poi.excel.sax.AttributeName.r;
 import static cn.hutool.poi.excel.sax.AttributeName.s;
 
 @Slf4j
@@ -92,11 +83,6 @@ public class MerchantOrderController {
     @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
     private PayService ysPayOldService;
 
-
-
-    @Setter(onMethod_ = {@Autowired, @Qualifier("lkLPayService")})
-    private PayService lklPayService;
-
     // 微信支付无法确认支付结果状态
     private String[] wechatPayNotSureResult = new String[]{"SYSTEMERROR", "USERPAYING", "BANKERROR"};
 
@@ -403,7 +389,7 @@ public class MerchantOrderController {
     @ApiOperation(value = "会员充值", notes = "APP扫码-会员充值", httpMethod = "GET")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "MemberRechargeDTO", value = "MemberRechargeDTO", paramType = "MemberRechargeDTO", dataType = "MemberRechargeDTO", required = true)})
-    public Result<Map<String, Object>> memberRecharge(@RequestBody MemberRechargeDTO memberRechargeDTO) {
+    public Result<Map<String, Object>> memberRecharge(@RequestBody MemberRechargeDTO memberRechargeDTO, HttpServletRequest request) {
 
         try {
             UserApp userApp = userAppService.queryUserAppByToken();
@@ -413,7 +399,7 @@ public class MerchantOrderController {
             memberRechargeDTO.setMerchantCode(userApp.getMerchantCode());
             memberRechargeDTO.setUserId(String.valueOf(userApp.getUserId()));
             memberRechargeDTO.setUserName(userApp.getUserName());
-            return merchantOrderService.toMemberRecharge(memberRechargeDTO);
+            return merchantOrderService.toMemberRecharge(memberRechargeDTO, request);
         }catch (Exception e){
             e.printStackTrace();
             MsgException.throwException(e.getMessage());
@@ -432,8 +418,7 @@ public class MerchantOrderController {
     @ApiOperation(tags = {"页面-收款"}, value = "扫码支付", notes = "扫码支付", httpMethod = "POST")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "MerchantOrderVo", value = "扫码支付需要传递的参数实例", paramType = "body", dataType = "MerchantOrderVo", required = true)})
-    public Result<Object> scanPay(HttpServletRequest request, @RequestBody MerChantOrderDTO merchantOrderDTO) {
+    public Result<Object> scanPay(@RequestBody MerChantOrderDTO merchantOrderDTO, HttpServletRequest req) {
-        log.info("scanPay>>>>>>>>>>>>{}", JSONUtil.toJsonStr(merchantOrderDTO));
         UserApp tokenUa = userAppService.queryUserAppByToken();
         merchantOrderDTO.setMerchantCode(tokenUa.getMerchantCode());
         //校验金额
@@ -441,7 +426,7 @@ public class MerchantOrderController {
             MsgException.throwException("金额异常");
         }
         try {
-            return merchantOrderService.toActivePay(merchantOrderDTO, IpUtils.getIpAddr(request));
+            return merchantOrderService.toActivePay(merchantOrderDTO, req);
         } catch (Exception e){
             e.printStackTrace();
             return ResultGenerator.genFailResult(e.getMessage());
@@ -449,26 +434,15 @@ public class MerchantOrderController {
     }
     /**
      * 博实结pos机反扫支付
-     * @param
+     * @param merchantOrderDTO
      * @return
      */
     @PostMapping("/posScanPay")
-    public JSONObject posScanPay(HttpServletRequest request,@RequestBody BasePosReq req)throws Exception{
+    public Result<Object> posScanPay(@RequestBody MerChantOrderDTO merchantOrderDTO, HttpServletRequest request) {
         //首先验签
-        verify(req.getTimestamp(), req.getRequestId(), req.getAppId(), req.getToken(),
+        verify(merchantOrderDTO.getTimestamp(), merchantOrderDTO.getRequestId(), merchantOrderDTO.getAppId(), merchantOrderDTO.getToken());
-                req.getReqData());
-        //拆分参数
-        PosPay posPay = JSONObject.parseObject(req.getReqData(), PosPay.class);
-        MerChantOrderDTO merchantOrderDTO = new MerChantOrderDTO();
-        merchantOrderDTO.setSn(posPay.getSn());
-        merchantOrderDTO.setMercOrderNo(posPay.getMercOrderNo());
-        merchantOrderDTO.setType(posPay.getType());
-        merchantOrderDTO.setAuthCode(posPay.getAuthCode());
-        merchantOrderDTO.setRemark(posPay.getRemark());
-        merchantOrderDTO.setConsumeFee(Double.valueOf(posPay.getConsumeFee()));
-
         //通过后查询商户信息
-        DeviceStock deviceStock = deviceStockService.checkBind(posPay.getSn());
+        DeviceStock deviceStock = deviceStockService.checkBind(merchantOrderDTO.getSn());
         MerchantBaseInfo merchantBaseInfoById = merchantBaseInfoService.getMerchantBaseInfoById(Integer.valueOf(deviceStock.getActMercId()));
         MsgException.checkNull(merchantBaseInfoById, "找不到商户");
         merchantOrderDTO.setMerchantCode(merchantBaseInfoById.getMerchantCode());
@@ -478,74 +452,19 @@ public class MerchantOrderController {
         }
         //进行支付操作
         try {
-            Result<Object> activePay = merchantOrderService.toActivePay(merchantOrderDTO,IpUtils.getIpAddr(request));
+            Result<Object> activePay = merchantOrderService.toActivePay(merchantOrderDTO, request);
             String result = activePay.toString();
             JSONObject jsonData = JSONObject.parseObject(result);
             Object orderNumber = jsonData.getJSONObject("data").get("orderNumber");
-            String data = jsonData.getJSONObject("data").get("data").toString();
-            JSONObject jsonDataInfo = JSONObject.parseObject(data);
-
             HashMap<String, Object> map = new HashMap<>();
             map.put("orderNumber", orderNumber);
-            map.put("consumeFee", jsonDataInfo.get("consumeFee"));
+            return ResultGenerator.genSuccessResult(map);
-            map.put("mercOrderNo", posPay.getMercOrderNo());
-            map.put("remark", posPay.getRemark());
-            map.put("status", jsonDataInfo.get("status"));
-            return ResultGenerator.genSuccessJsonPos(map, req.getAppId(), req.getRequestId());
         } catch (Exception e){
             e.printStackTrace();
-            return ResultGenerator.genFailJsonPos(e.getMessage(), req.getAppId(), req.getRequestId());
+            return ResultGenerator.genFailResult(e.getMessage());
         }
     }
 
-
-    @PostMapping(value = "orderList")
-    public Object posTradeQuery(HttpServletRequest request, @RequestBody BasePosReq req)throws Exception{
-        verify(req.getTimestamp(),req.getRequestId(),req.getAppId(),req.getToken(), req.getReqData());
-
-        PosTradeQueryReq tradeQueryReq=JSONObject.parseObject(req.getReqData(),PosTradeQueryReq.class);
-        DeviceStock deviceStock = deviceStockService.checkBind(tradeQueryReq.getSn());
-        MsgException.checkNull(deviceStock,"不存在的设备信息");
-        MerchantBaseInfo merchantBaseInfoById = merchantBaseInfoService.getMerchantBaseInfoById(Integer.valueOf(deviceStock.getActMercId()));
-        MsgException.checkNull(merchantBaseInfoById, "该设备对应的商户信息不存在");
-        return merchantOrderService.posTradeQuery(req.getRequestId(),merchantBaseInfoById.getMerchantCode(),tradeQueryReq.getDate(),tradeQueryReq.getType(),tradeQueryReq.getPage(),tradeQueryReq.getSize());
-    }
-
-
-
-
-
-
-
-
-
-    @PostMapping(value = "orderRefund")
-    public Object posReturn(HttpServletRequest request,@RequestBody BasePosReq req){
-
-        verify(req.getTimestamp(),req.getRequestId(),req.getAppId(),req.getToken());
-
-        ReturnFundsReq returnFundsReq=JSONObject.parseObject(req.getReqData(),ReturnFundsReq.class);
-        DeviceStock deviceStock = deviceStockService.checkBind(returnFundsReq.getSn());
-        MsgException.checkNull(deviceStock,"不存在的设备信息");
-        MerchantBaseInfo merchantBaseInfoById = merchantBaseInfoService.getMerchantBaseInfoById(Integer.valueOf(deviceStock.getActMercId()));
-        MsgException.checkNull(merchantBaseInfoById, "该设备对应的商户信息不存在");
-
-        return merchantOrderService.posReturnFunds(req.getRequestId(),returnFundsReq.getOrderNumber(),returnFundsReq.getRemark(),"pos",null);
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
     /**
      * 主扫会员支付
      * @param memberScanPayDTO
@@ -850,10 +769,6 @@ public class MerchantOrderController {
                 case 4:
                     result = ysPayOldService.tradeQuery(order,channel.getMerchantId());
                     break;
-                case 5:
-                    result=lklPayService.tradeQuery(order,channel.getMerchantId());
-                    break;
-
             }
 
             if(result != null){
@@ -866,21 +781,23 @@ public class MerchantOrderController {
         }
         return ResultGenerator.genSuccessResult("获取成功",order);
     }
-    @PostMapping("/posTradeQueryNumber")
+    @GetMapping("/pos/tradeQuery/{orderNumber}")
-    public JSONObject posTradeQuery(@RequestBody BasePosReq req) throws Exception {
+    @ApiOperation(value = "pos交易订单支付结果查询", notes = "交易订单支付结果查询", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "查询的orderNumber", paramType = "orderNumber", required = true, dataType = "String")})
+    public Result<Object> posTradeQuery(@PathVariable String orderNumber, String timestamp,
+                                        String requestId, String token, String appId) throws Exception {
         //首先验签
-        verify(req.getTimestamp(), req.getRequestId(), req.getAppId(), req.getToken(),
+        verify(timestamp, requestId, appId, token);
-                req.getReqData());
-        PosPay posPay = JSONObject.parseObject(req.getReqData(), PosPay.class);
         // 校验参数是否完整
-        if (StringUtil.isEmpty(posPay.getOrderNumber())) {
+        if (StringUtil.isEmpty(orderNumber)) {
-            return ResultGenerator.genFailJsonPos("无订单号", req.getAppId(), req.getReqData());
+            return ResultGenerator.genFailResult("无订单号");
         }
         QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>()
-                .eq("orderNumber", posPay.getOrderNumber());
+                .eq("orderNumber",orderNumber);
         MerchantOrder order = merchantOrderService.getOne(queryWrapper);
         if(order == null){
-            return ResultGenerator.genFailJsonPos("订单数据异常", req.getAppId(), req.getReqData());
+            return ResultGenerator.genFailResult("订单数据异常");
         }
         MerchantOrderPosVO orderPosVO = new MerchantOrderPosVO();
         //支付成功
@@ -888,10 +805,7 @@ public class MerchantOrderController {
             orderPosVO.setConsumeFee(order.getConsumeFee());
             orderPosVO.setStatus(order.getStatus());
             orderPosVO.setPayTypeCode(order.getPayTypeCode());
-            orderPosVO.setOrderNumber(order.getOrderNumber());
+            return ResultGenerator.genSuccessResult("获取成功",orderPosVO);
-            orderPosVO.setMercOrderNo(order.getMercOrderNo());
-            orderPosVO.setTransTime(String.valueOf(order.getTransDt()));
-            return ResultGenerator.genSuccessJsonPos(orderPosVO, req.getAppId(), req.getRequestId());
         }
         String aisleSwitch = order.getAisleSwitch();
         MerchantChannelStatus channel = null;
@@ -915,8 +829,6 @@ public class MerchantOrderController {
                 case 4:
                     result = ysPayOldService.tradeQuery(order,channel.getMerchantId());
                     break;
-                case 5:
-                    result = lklPayService.tradeQuery(order,channel.getMerchantId());
             }
 
             if(result != null){
@@ -929,11 +841,8 @@ public class MerchantOrderController {
             orderPosVO.setConsumeFee(order.getConsumeFee());
             orderPosVO.setStatus(order.getStatus());
             orderPosVO.setPayTypeCode(order.getPayTypeCode());
-            orderPosVO.setOrderNumber(order.getOrderNumber());
-            orderPosVO.setMercOrderNo(order.getMercOrderNo());
-            orderPosVO.setTransTime(String.valueOf(order.getTransDt()));
         }
-        return ResultGenerator.genSuccessJsonPos(orderPosVO, req.getAppId(), req.getRequestId());
+        return ResultGenerator.genSuccessResult("获取成功", orderPosVO);
     }
 
     @GetMapping("/closeOrder")
@@ -1394,31 +1303,6 @@ public class MerchantOrderController {
         return ResultGenerator.genSuccessResult(couponList);
     }
 
-    /**
-     * 加上参数的签名
-     * @param timestamp
-     * @param requestId
-     * @param appId
-     * @param token
-     * @param reqData
-     * @throws Exception
-     */
-    public void verify(String timestamp, String requestId, String appId,
-                       String token, String reqData)throws Exception{
-        //首先验证签
-        Map<String, String> tokenMap = TokenUtil.getToken(timestamp, requestId, appId, reqData);
-        boolean sign = tokenMap.get("TOKEN").equals(token);
-        System.out.println(token);
-        MsgException.check(!sign,"签名错误");
-    }
-
-    /**
-     * 不加参数的签名
-     * @param timestamp
-     * @param requestId
-     * @param appId
-     * @param token
-     */
     public void verify(String timestamp, String requestId, String appId,
                        String token){
         //首先验证签

pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java

@@ -263,7 +263,9 @@ public class UserAppController {
     @RequestBody @Valid CertificationDTO certificationDTO) {
     if (Pattern.matches("^[1-9]\\d{5}(?:18|19|20)\\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\\d|30|31)\\d{3}[\\dXx]$",
       certificationDTO.getCertnum())){
+      System.out.println("身份证无误");
     } else {
+      System.out.println("身份证有误");
       return ResultGenerator.genFailResult("身份证号码错误");
     }
     try {

pluss-api-page/src/main/java/cn/pluss/platform/controller/access/AccessController.java

@@ -0,0 +1,208 @@
+package cn.pluss.platform.controller.access;
+
+import cn.pluss.platform.access.AccessService;
+import cn.pluss.platform.access.domain.CodeEnum;
+import cn.pluss.platform.access.domain.ReqEntity;
+import cn.pluss.platform.access.domain.RespEntity;
+import cn.pluss.platform.access.exception.AccessException;
+import cn.pluss.platform.access.service.AccessBizService;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("/access")
+@RestController
+public class AccessController {
+
+    @Autowired
+    private AccessService accessService;
+
+    @Autowired
+    private AccessBizService accessBizService;
+
+    @PostMapping("/storeInfoByDeviceNo")
+    public RespEntity machineStoreInfo(@RequestBody ReqEntity reqEntity) {
+        String requestId = reqEntity.getRequestId();
+        JSONObject reqData = reqEntity.initJSONData();
+        RespEntity result;
+
+        String deviceNo = reqData.getString("deviceNo");
+        if (deviceNo == null) {
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.PARAM_ERROR, null, requestId);
+            accessService.addSign(result);
+            return result;
+        }
+
+        Object bizResult = accessBizService.machineStoreInfo(deviceNo);
+        result = new RespEntity(reqEntity.getOrgId(), CodeEnum.SUCCESS, bizResult, requestId);
+
+        accessService.addSign(result);
+        return result;
+    }
+
+    @PostMapping("/scanPay")
+    public RespEntity scanPay(@RequestBody ReqEntity reqEntity) {
+        String requestId = reqEntity.getRequestId();
+        JSONObject reqData = reqEntity.initJSONData();
+        RespEntity result;
+
+        String deviceNo = reqData.getString("deviceNo");
+        if (deviceNo == null) {
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.PARAM_ERROR, null, requestId);
+            accessService.addSign(result);
+            return result;
+        }
+
+        try {
+            Object bizResult = accessBizService.scanPay(reqData);
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.SUCCESS, bizResult, requestId);
+
+            accessService.addSign(result);
+            return result;
+        } catch (AccessException e) {
+            result = new RespEntity(reqEntity.getOrgId(), e.getCode(), null, requestId, e.getMessage());
+            accessService.addSign(result);
+            return result;
+        }
+
+    }
+
+    @PostMapping("/orderStatus")
+    public RespEntity orderStatus(@RequestBody ReqEntity reqEntity) {
+        String requestId = reqEntity.getRequestId();
+        JSONObject reqData = reqEntity.initJSONData();
+        RespEntity result;
+
+        String deviceNo = reqData.getString("deviceNo");
+        if (deviceNo == null) {
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.PARAM_ERROR, null, requestId);
+            accessService.addSign(result);
+            return result;
+        }
+
+        String orderNumber = reqData.getString("orderNumber");
+        String mercOrderNo = reqData.getString("mercOrderNo");
+
+        try {
+            Object bizResult = accessBizService.orderStatus(orderNumber, mercOrderNo);
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.SUCCESS, bizResult, requestId);
+
+            accessService.addSign(result);
+            return result;
+        } catch (AccessException e) {
+            result = new RespEntity(reqEntity.getOrgId(), e.getCode(), null, requestId, e.getMessage());
+            accessService.addSign(result);
+            return result;
+        }
+
+    }
+
+    @PostMapping("/orderRefund")
+    public RespEntity orderRefund(@RequestBody ReqEntity reqEntity) {
+        String requestId = reqEntity.getRequestId();
+        JSONObject reqData = reqEntity.initJSONData();
+        RespEntity result;
+
+        String deviceNo = reqData.getString("deviceNo");
+        if (deviceNo == null) {
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.PARAM_ERROR, null, requestId);
+            accessService.addSign(result);
+            return result;
+        }
+
+        try {
+            Object bizResult = accessBizService.refund(reqData);
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.SUCCESS, bizResult, requestId);
+
+            accessService.addSign(result);
+            return result;
+        } catch (AccessException e) {
+            result = new RespEntity(reqEntity.getOrgId(), e.getCode(), null, requestId, e.getMessage());
+            accessService.addSign(result);
+            return result;
+        }
+
+    }
+
+    @PostMapping("/orderRefundList")
+    public RespEntity orderRefundList(@RequestBody ReqEntity reqEntity) {
+        String requestId = reqEntity.getRequestId();
+        JSONObject reqData = reqEntity.initJSONData();
+        RespEntity result;
+
+        String deviceNo = reqData.getString("deviceNo");
+        if (deviceNo == null) {
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.PARAM_ERROR, null, requestId);
+            accessService.addSign(result);
+            return result;
+        }
+
+        try {
+            Object bizResult = accessBizService.refundList(reqData);
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.SUCCESS, bizResult, requestId);
+
+            accessService.addSign(result);
+            return result;
+        } catch (AccessException e) {
+            result = new RespEntity(reqEntity.getOrgId(), e.getCode(), null, requestId, e.getMessage());
+            accessService.addSign(result);
+            return result;
+        }
+
+    }
+
+    @PostMapping("/orderList")
+    public RespEntity orderList(@RequestBody ReqEntity reqEntity) {
+        String requestId = reqEntity.getRequestId();
+        JSONObject reqData = reqEntity.initJSONData();
+        RespEntity result;
+
+        String deviceNo = reqData.getString("deviceNo");
+        if (deviceNo == null) {
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.PARAM_ERROR, null, requestId);
+            accessService.addSign(result);
+            return result;
+        }
+
+        try {
+            Object bizResult = accessBizService.orderList(reqData);
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.SUCCESS, bizResult, requestId);
+
+            accessService.addSign(result);
+            return result;
+        } catch (AccessException e) {
+            result = new RespEntity(reqEntity.getOrgId(), e.getCode(), null, requestId, e.getMessage());
+            accessService.addSign(result);
+            return result;
+        }
+    }
+
+    @PostMapping("/dataAnalysis")
+    public RespEntity dataAnalysis(@RequestBody ReqEntity reqEntity) {
+        String requestId = reqEntity.getRequestId();
+        JSONObject reqData = reqEntity.initJSONData();
+        RespEntity result;
+
+        String deviceNo = reqData.getString("deviceNo");
+        if (deviceNo == null) {
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.PARAM_ERROR, null, requestId);
+            accessService.addSign(result);
+            return result;
+        }
+
+        try {
+            Object bizResult = accessBizService.dataAnalysis(reqData);
+            result = new RespEntity(reqEntity.getOrgId(), CodeEnum.SUCCESS, bizResult, requestId);
+
+            accessService.addSign(result);
+            return result;
+        } catch (AccessException e) {
+            result = new RespEntity(reqEntity.getOrgId(), e.getCode(), null, requestId, e.getMessage());
+            accessService.addSign(result);
+            return result;
+        }
+    }
+}

pluss-api-page/src/main/java/cn/pluss/platform/controller/device/DeviceStockController.java

@@ -95,23 +95,4 @@ public class DeviceStockController{
         dsService.bindDevcieV2(dto);
         return ResultGenerator.genSuccessResult("绑定成功",null);
     }
-    @PostMapping("/bindtablecode")
-    public Result<Object> bindTableCode(@RequestBody DeviceStockDTO dto){
-        dsService.bindTableCode(dto);
-        return ResultGenerator.genSuccessResult("绑定成功",null);
-    }
-
-
-    /**
-     * 验证桌码
-     * @param code
-     * @return
-     */
-    @GetMapping("/checkNum")
-    public Result<Object> checkNum(String code){
-        dsService.checkDevice(code);
-        return ResultGenerator.genSuccessResult();
-    }
-
-
 }

pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * @author DJH
@@ -36,9 +35,7 @@ public class MerchantCashPlaceController {
     @PostMapping
     public Result<Object> add(@RequestBody MerchantCashPlace merchantCashPlace) {
         //判定字符位数
-        if (Objects.equals(merchantCashPlace.getAddress(), null) || Objects.equals(merchantCashPlace.getName(), null)){
+        size(merchantCashPlace.getAddress());
-            throw new MsgException("地址或收银点名称不能为空");
-        }
         size(merchantCashPlace.getName());
         cashPlaceService.saveOrUpdate(merchantCashPlace);
         return ResultGenerator.genSuccessResult("保存成功", merchantCashPlace);

pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxController.java

@@ -198,19 +198,19 @@ public class WxController {
 //        ysServiceV3.req(ReqMethod.Reporting, bizContentMap);
 //    }
 //
-//    @PostMapping("/appIdAddOrUpdate")
+    @PostMapping("/appIdAddOrUpdate")
-//    public void appIdAddOrUpdate(){
+    public void appIdAddOrUpdate(){
-//        JSONObject bizContentMap = new JSONObject();
+        JSONObject bizContentMap = new JSONObject();
-//        bizContentMap.put("channelId", "CUPS_WECHAT");
+        bizContentMap.put("channelId", "CUPS_WECHAT");
-//        bizContentMap.put("mercId", "QRY230511483159");
+        bizContentMap.put("mercId", "QRY230511483159");
-//        bizContentMap.put("appletId", "wxc2bb94c0ddda1032");
+        bizContentMap.put("appletId", "wxc2bb94c0ddda1032");
-//        ysServiceV3.req(ReqMethod.appIdAddOrUpdate, bizContentMap);
+        ysServiceV3.req(ReqMethod.appIdAddOrUpdate, bizContentMap);
-//    }
+    }
 
-//    @PostMapping("/auditResult")
+    @PostMapping("/auditResult")
-//    public void test(String sysFlowId){
+    public void test(String sysFlowId){
-//        ysAuditServiceV3.result(sysFlowId);
+        ysAuditServiceV3.result(sysFlowId);
-//    }
+    }
 
     /**
      * 获取公众号权限

pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java

@@ -3,11 +3,9 @@ package cn.pluss.platform.controller.merchant.callback;
 import cn.hutool.crypto.symmetric.DES;
 import cn.pluss.platform.channel.MerchantAuditService;
 import cn.pluss.platform.channel.ys.YSAuditServiceV3;
-import cn.pluss.platform.entity.MerchantChannelStatus;
 import cn.pluss.platform.entity.RyxAccessModel;
 import cn.pluss.platform.klk.service.impl.LaKalaInterfaceImpl;
 import cn.pluss.platform.ryx.RyxService;
-import cn.pluss.platform.sxf.audit.LklMerAuditServiceImpl;
 import cn.pluss.platform.ys.impl.v20210929.YsConfigV2;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -46,9 +44,6 @@ public class AuditCallbackController {
     @Setter(onMethod_ = {@Autowired})
     private MerchantAuditService ysAuditServiceExtensionV2;
 
-    @Setter(onMethod_ = {@Autowired})
-    private LklMerAuditServiceImpl lklMerAuditService;
-
     @Autowired
     private RyxService ryxService;
 
@@ -93,34 +88,19 @@ public class AuditCallbackController {
         log.info("云商服V3进件接口回调参数：{}，",result.toJSONString());
         executorService.execute(() -> {
             try {
-                ysAuditServiceV3.callback(result,4);
+                ysAuditServiceV3.callback(result);
             } catch (Exception e) {
                 e.printStackTrace();
             }
         });
         return "success";
     }
-    @PostMapping("/ysV3D1")
-    public String ysAuditCallbackV3D1(@RequestBody JSONObject result) throws Exception {
-        log.info("云商服V3进件接口回调参数：{}，",result.toJSONString());
-        executorService.execute(() -> {
-            try {
-                ysAuditServiceV3.callback(result,6);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        });
-        return "success";
-    }
-
-
-
     @PostMapping("/ysSignV3")
     public String ysSignV3(@RequestBody JSONObject result) throws Exception {
         log.info("云商服V3签约接口回调参数：{}，",result.toJSONString());
         executorService.execute(() -> {
             try {
-                ysAuditServiceV3.callback(result,4);
+                ysAuditServiceV3.callback(result);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -165,14 +145,7 @@ public class AuditCallbackController {
     LaKalaInterfaceImpl laKalaInterface;
     @PostMapping("lklCallBack")
     public String lklCallBack(@RequestBody Map<String, Object> map) throws Exception {
-       return lklMerAuditService.merchantAuditCallback(map);
+       String str ="data -> hplFXwPU1gbHYwraQM/fKEcoIkBfHD07VSH99OnKTZk9HJRFAvZyOm9nsdeSi8t/UdGPn+LXldrjZ7wiY+F5MzGlIdEma7agKZyHJ+UO6CrDJfYFMwlPUOgO+Pq5ljg6QOdZBxBLEHkRMkQnC/CTv9vQnPDqeCv4MvAbHJspADGRRPvmjxtzf0J4OQgP3hj9+ZqH+btsuX+W+YZRXRMYL+uOQkSJhMUv31hc9MAC/1Sp0C9cBcHKxr+idS+0CCjvD8WzLbXv2QuOSQccIKQw+Je8RMeuKs8f64MibCkf+RkilTCVCEd5apL1MkhYJZoUVzqPXmDBLjaJgr987X1wBAzQMS8+F34Vl/BonKPuJ4RRwdE/M3WJ+ZfM2WiLawpU7ZqUQdVY2bwJO801TcmFCswLoz2qxHHsBsjXtQPqMOj3pw3Kvz3WH3oWmcFRZjHKIbDSy9Jh2STEFRbvVWarjksBVjXkcbletDtOtY0T8XCdiiNoQNlVNj5kH5QkAWmt";
+       return laKalaInterface.tuoKeCallBack(map);
     }
-
-
-    @GetMapping("queryMerchantChannelStatus")
-    public MerchantChannelStatus queryMerchantChannelStatus(String customerNo, String externalCustomerNo ) throws Exception {
-        return lklMerAuditService.queryMerchantChannelStatus(customerNo, externalCustomerNo);
-    }
-
-
 }

pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderDetailController.java

@@ -121,8 +121,8 @@ public class MercOrderDetailController {
      * 查看物流信息（快递鸟）
      */
     @GetMapping("/logistic")
-    public Result<Object> logistic(@RequestParam String orderNo)throws Exception{
+    public Result<Object> logistic(@RequestParam String expressNo)throws Exception{
-        JSONObject expressInfo = mercOrderExpressService.getExpressInfo(orderNo);
+        JSONObject expressInfo = mercOrderExpressService.getExpressInfo(expressNo);
         if (expressInfo.isEmpty()){
             return ResultGenerator.genFailResult("无法查询快递信息");
         }else {

pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java

@@ -1,5 +1,9 @@
 package cn.pluss.platform.interceptor;
 
+import cn.pluss.platform.access.AccessService;
+import cn.pluss.platform.access.domain.CodeEnum;
+import cn.pluss.platform.access.domain.ReqEntity;
+import cn.pluss.platform.access.domain.RespEntity;
 import cn.pluss.platform.api.Result;
 import cn.pluss.platform.api.ResultCode;
 import cn.pluss.platform.constants.CommonError;
@@ -10,14 +14,20 @@ import cn.pluss.platform.merchant.MerchantStaffConnService;
 import cn.pluss.platform.userApp.UserAppService;
 import cn.pluss.platform.userInfo.UserInfoService;
 import cn.pluss.platform.util.ComUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,6 +45,9 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter {
     @Resource
     private MerchantStaffConnService staffConnService;
 
+    @Autowired
+    private AccessService accessService;
+
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String requestUri = request.getRequestURI();
@@ -67,14 +80,6 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter {
         limitUri.add("/api/questionsAnswers");
         limitUri.add("/api/helpVideo");
         limitUri.add("/api/systemConfig/updateSystemVersion");
-        limitUri.add("/api/lkl/querySubMerInfo");
-        limitUri.add("/api/lkl/lklCallBack");
-        limitUri.add("/api/lkl/queryMerchantChannelStatus");
-        limitUri.add("/api/auditCallback/tradeCallBack");
-        limitUri.add("/api/merchantOrder/posTradeQuery");
-        limitUri.add("/api/merchantOrder/posTradeQueryNumber");
-        limitUri.add("/api/device/stock/checkNum");
-        limitUri.add("/api/device/stock/bindtablecode");
         boolean passFlag = limitUri.stream().anyMatch(s -> s.equals(requestUri) || requestUri.startsWith(s));
         if (passFlag) {
             return true;
@@ -83,6 +88,46 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter {
         String contentType = request.getContentType();
 
 
+        if (contentType != null
+                && contentType.contains("application/json")
+                && requestUri.startsWith("/api/access")) {
+            StringBuilder responseStrBuilder = new StringBuilder();
+            InputStream is = request.getInputStream();
+            BufferedReader streamReader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
+            String inputStr;
+            while ((inputStr = streamReader.readLine()) != null) {
+                responseStrBuilder.append(inputStr);
+            }
+
+            ReqEntity reqEntity;
+            try {
+                reqEntity = JSON.toJavaObject(JSON.parseObject(responseStrBuilder.toString()), ReqEntity.class);
+            } catch (Exception e) {
+                RespEntity entity = new RespEntity(null, CodeEnum.PARAM_ERROR, null, null);
+                ComUtil.responseResult(response, entity);
+                return false;
+            }
+
+            if (reqEntity == null || reqEntity.getOrgId() == null) {
+                RespEntity entity = new RespEntity(null, CodeEnum.ORG_ID_NOT_FOUND, null, null);
+                ComUtil.responseResult(response, entity);
+                return false;
+            }
+
+            boolean signCheck = accessService.checkSign(reqEntity);
+
+            // 操作
+            if (signCheck) {
+                return true;
+            } else {
+                RespEntity entity = new RespEntity(reqEntity.getOrgId(), CodeEnum.SIGN_ERROR, null, reqEntity.getRequestId());
+                accessService.addSign(entity);
+                ComUtil.responseResult(response, entity);
+                return false;
+            }
+        }
+
+
         synchronized (this) {
             String requestToken = request.getHeader("token");
             // 登录账号

pluss-api-page/src/main/resources/application-prod.yml

@@ -1,5 +1,6 @@
 spring:
   datasource:
+#    url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
     url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: prodCZGmysqlroot@123

pluss-api-page/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   profiles:
     ###  将一些固定的配置放到下级文件夹下的yml文件中
     include: common, ryx, ys
-    active: prod
+    active: dev
   mvc:
     view:
       prefix: /WEB-INF/jsp/

pluss-common-bundle/src/main/java/cn/pluss/platform/api/ResultGenerator.java

@@ -77,22 +77,4 @@ public class ResultGenerator {
         result.put("data",data);
         return result;
     }
-    public static JSONObject genSuccessJsonPos(Object data, String appId, String requestId) {
-        JSONObject result = new JSONObject();
-        result.put("code","0000");
-        result.put("msg","操作成功");
-        result.put("appId", appId);
-        result.put("requestId", requestId);
-        result.put("respData", data);
-        return result;
-    }
-    public static JSONObject genFailJsonPos(String msg, String appId, String requestId) {
-        JSONObject result = new JSONObject();
-        result.put("code","400");
-        result.put("msg", msg);
-        result.put("appId", appId);
-        result.put("requestId", requestId);
-        return result;
-    }
-
 }

pluss-common-bundle/src/main/java/cn/pluss/platform/util/BASE64.java

@@ -1,396 +0,0 @@
-package cn.pluss.platform.util;
-
-import org.apache.tomcat.util.codec.binary.Base64;
-import sun.misc.BASE64Encoder;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-public class BASE64 {
-
-    static private final int     BASELENGTH           = 128;
-    static private final int     LOOKUPLENGTH         = 64;
-    static private final int     TWENTYFOURBITGROUP   = 24;
-    static private final int     EIGHTBIT             = 8;
-    static private final int     SIXTEENBIT           = 16;
-    static private final int     FOURBYTE             = 4;
-    static private final int     SIGN                 = -128;
-    static private final char    PAD                  = '=';
-    static private final boolean fDebug               = false;
-    static final private byte[]  base64Alphabet       = new byte[BASELENGTH];
-    static final private char[]  lookUpBase64Alphabet = new char[LOOKUPLENGTH];
-
-    static {
-        for (int i = 0; i < BASELENGTH; ++i) {
-            base64Alphabet[i] = -1;
-        }
-        for (int i = 'Z'; i >= 'A'; i--) {
-            base64Alphabet[i] = (byte) (i - 'A');
-        }
-        for (int i = 'z'; i >= 'a'; i--) {
-            base64Alphabet[i] = (byte) (i - 'a' + 26);
-        }
-
-        for (int i = '9'; i >= '0'; i--) {
-            base64Alphabet[i] = (byte) (i - '0' + 52);
-        }
-
-        base64Alphabet['+'] = 62;
-        base64Alphabet['/'] = 63;
-
-        for (int i = 0; i <= 25; i++) {
-            lookUpBase64Alphabet[i] = (char) ('A' + i);
-        }
-
-        for (int i = 26, j = 0; i <= 51; i++, j++) {
-            lookUpBase64Alphabet[i] = (char) ('a' + j);
-        }
-
-        for (int i = 52, j = 0; i <= 61; i++, j++) {
-            lookUpBase64Alphabet[i] = (char) ('0' + j);
-        }
-        lookUpBase64Alphabet[62] = (char) '+';
-        lookUpBase64Alphabet[63] = (char) '/';
-
-    }
-
-
-
-
-    /**
-     * 将本地图片进行Base64位编码
-     *
-     * @param imgUrl 图片的url路径，如D:\\photo\\1.png
-     *
-     * @return
-     */
-    public static String encodeImgageToBase64(File imageFile) {
-        // 将图片文件转化为字节数组字符串，并对其进行Base64编码处理
-        // 其进行Base64编码处理
-        byte[] data = null;
-        // 读取图片字节数组
-        try {
-            InputStream in = new FileInputStream(imageFile);
-            data = new byte[in.available()];
-            in.read(data);
-            in.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        // 对字节数组Base64编码
-        BASE64Encoder encoder = new BASE64Encoder();
-        // 返回Base64编码过的字节数组字符串
-        return encoder.encode(data);
-
-    }
-
-
-    private static boolean isWhiteSpace(char octect) {
-        return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
-    }
-
-    private static boolean isPad(char octect) {
-        return (octect == PAD);
-    }
-
-    private static boolean isData(char octect) {
-        return (octect < BASELENGTH && base64Alphabet[octect] != -1);
-    }
-
-    /**
-     * Encodes hex octects into Base64
-     *
-     * @param binaryData Array containing binaryData
-     * @return Encoded Base64 array
-     */
-    public static String encode(byte[] binaryData) {
-
-        if (binaryData == null) {
-            return null;
-        }
-
-        int lengthDataBits = binaryData.length * EIGHTBIT;
-        if (lengthDataBits == 0) {
-            return "";
-        }
-
-        int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
-        int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
-        int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
-        char encodedData[] = null;
-
-        encodedData = new char[numberQuartet * 4];
-
-        byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
-
-        int encodedIndex = 0;
-        int dataIndex = 0;
-        if (fDebug) {
-            System.out.println("number of triplets = " + numberTriplets);
-        }
-
-        for (int i = 0; i < numberTriplets; i++) {
-            b1 = binaryData[dataIndex++];
-            b2 = binaryData[dataIndex++];
-            b3 = binaryData[dataIndex++];
-
-            if (fDebug) {
-                System.out.println("b1= " + b1 + ", b2= " + b2 + ", b3= " + b3);
-            }
-
-            l = (byte) (b2 & 0x0f);
-            k = (byte) (b1 & 0x03);
-
-            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
-            byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
-            byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
-
-            if (fDebug) {
-                System.out.println("val2 = " + val2);
-                System.out.println("k4   = " + (k << 4));
-                System.out.println("vak  = " + (val2 | (k << 4)));
-            }
-
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
-        }
-
-        // form integral number of 6-bit groups
-        if (fewerThan24bits == EIGHTBIT) {
-            b1 = binaryData[dataIndex];
-            k = (byte) (b1 & 0x03);
-            if (fDebug) {
-                System.out.println("b1=" + b1);
-                System.out.println("b1<<2 = " + (b1 >> 2));
-            }
-            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
-            encodedData[encodedIndex++] = PAD;
-            encodedData[encodedIndex++] = PAD;
-        } else if (fewerThan24bits == SIXTEENBIT) {
-            b1 = binaryData[dataIndex];
-            b2 = binaryData[dataIndex + 1];
-            l = (byte) (b2 & 0x0f);
-            k = (byte) (b1 & 0x03);
-
-            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
-            byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
-
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
-            encodedData[encodedIndex++] = PAD;
-        }
-
-        return new String(encodedData);
-    }
-
-    /**
-     * Decodes Base64 data into octects
-     *
-     * @param encoded string containing Base64 data
-     * @return Array containind decoded data.
-     */
-    public static byte[] decode(String encoded) {
-
-        if (encoded == null) {
-            return null;
-        }
-
-        char[] base64Data = encoded.toCharArray();
-        // remove white spaces
-        int len = removeWhiteSpace(base64Data);
-
-        if (len % FOURBYTE != 0) {
-            return null;//should be divisible by four
-        }
-
-        int numberQuadruple = (len / FOURBYTE);
-
-        if (numberQuadruple == 0) {
-            return new byte[0];
-        }
-
-        byte decodedData[] = null;
-        byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
-        char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
-
-        int i = 0;
-        int encodedIndex = 0;
-        int dataIndex = 0;
-        decodedData = new byte[(numberQuadruple) * 3];
-
-        for (; i < numberQuadruple - 1; i++) {
-
-            if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))
-                    || !isData((d3 = base64Data[dataIndex++]))
-                    || !isData((d4 = base64Data[dataIndex++]))) {
-                return null;
-            }//if found "no data" just return null
-
-            b1 = base64Alphabet[d1];
-            b2 = base64Alphabet[d2];
-            b3 = base64Alphabet[d3];
-            b4 = base64Alphabet[d4];
-
-            decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
-            decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
-            decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
-        }
-
-        if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) {
-            return null;//if found "no data" just return null
-        }
-
-        b1 = base64Alphabet[d1];
-        b2 = base64Alphabet[d2];
-
-        d3 = base64Data[dataIndex++];
-        d4 = base64Data[dataIndex++];
-        if (!isData((d3)) || !isData((d4))) {//Check if they are PAD characters
-            if (isPad(d3) && isPad(d4)) {
-                if ((b2 & 0xf) != 0)//last 4 bits should be zero
-                {
-                    return null;
-                }
-                byte[] tmp = new byte[i * 3 + 1];
-                System.arraycopy(decodedData, 0, tmp, 0, i * 3);
-                tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
-                return tmp;
-            } else if (!isPad(d3) && isPad(d4)) {
-                b3 = base64Alphabet[d3];
-                if ((b3 & 0x3) != 0)//last 2 bits should be zero
-                {
-                    return null;
-                }
-                byte[] tmp = new byte[i * 3 + 2];
-                System.arraycopy(decodedData, 0, tmp, 0, i * 3);
-                tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
-                tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
-                return tmp;
-            } else {
-                return null;
-            }
-        } else { //No PAD e.g 3cQl
-            b3 = base64Alphabet[d3];
-            b4 = base64Alphabet[d4];
-            decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
-            decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
-            decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
-
-        }
-
-        return decodedData;
-    }
-
-    /**
-     * remove WhiteSpace from MIME containing encoded Base64 data.
-     *
-     * @param data  the byte array of base64 data (with WS)
-     * @return      the new length
-     */
-    private static int removeWhiteSpace(char[] data) {
-        if (data == null) {
-            return 0;
-        }
-
-        // count characters that's not whitespace
-        int newSize = 0;
-        int len = data.length;
-        for (int i = 0; i < len; i++) {
-            if (!isWhiteSpace(data[i])) {
-                data[newSize++] = data[i];
-            }
-        }
-        return newSize;
-    }
-
-
-    /**
-     *
-     * 功能描述：Base64加密（将byte[]转换成字符串）  方法。
-     * <P/>
-     * 创建时间：2017-02-14
-     * <P/>
-     * 创建人： 董耀明
-     *
-     * @param data byte[]类型 要加密的数据
-     *
-     * @return String类型 加密后结果
-     *
-     */
-    public static String encryptBASE64(byte[] data)
-    {
-        return Base64.encodeBase64String(data);
-        //return (new BASE64Encoder()).encodeBuffer(data);
-    }
-
-
-    /**
-     *
-     * 功能描述：Base64加密（将byte[]转换成字符串）  方法。
-     * <P/>
-     * 创建时间：2017-02-14
-     * <P/>
-     * 创建人： 董耀明
-     *
-     * @param data String类型 要加密的数据
-     *
-     * @return String类型 加密后结果
-     *
-     */
-    public static String encryptBASE64(String data)
-    {
-        try {
-            //return (new BASE64Encoder()).encodeBuffer(data.getBytes("UTF-8"));
-            return Base64.encodeBase64String(data.getBytes("UTF-8"));
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /**
-     *
-     * 功能描述：Base64加密（将byte[]转换成字符串）  方法。
-     * <P/>
-     * 创建时间：2017-02-14
-     * <P/>
-     * 创建人： 董耀明
-     *
-     * @param data String类型 要加密的数据
-     *
-     * @param encode String类型 编码类型
-     *
-     * @return String类型 加密后结果
-     *
-     */
-    public static String encryptBASE64(String data,String encode)
-    {
-
-        try
-        {
-            if (encode == null || "".equals(encode))
-            {
-
-                return Base64.encodeBase64String(data.getBytes());
-
-            } else
-            {
-                return Base64.encodeBase64String(data.getBytes(encode));
-            }
-
-        } catch (UnsupportedEncodingException e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-}
-

pluss-common-bundle/src/main/java/cn/pluss/platform/util/ComUtil.java

@@ -139,7 +139,7 @@ public class ComUtil {
 	public static boolean equalsIgnoreCase(String str1, String str2) {
 		return str1 != null ? str1.equalsIgnoreCase(str2) : str2 == null;
 	}
-	
+
 	public static String getIpAddress(HttpServletRequest request) {
 		String ip = request.getHeader("x-forwarded-for");
 		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
@@ -165,7 +165,7 @@ public class ComUtil {
 		return ip;
 	}
 
-	public static void responseResult(HttpServletResponse response, Result result) {
+	public static void responseResult(HttpServletResponse response, Object result) {
 		response.setCharacterEncoding("UTF-8");
 		response.setHeader(HttpHeaders.CONTENT_TYPE, "application/json;charset=UTF-8");
 		response.setStatus(200);

pluss-common-bundle/src/main/java/cn/pluss/platform/util/DateUtils.java

@@ -610,35 +610,8 @@ public class DateUtils {
 		int hours = (int) ((date2.getTime() - date1.getTime()) / (1000*3600));
 		return Math.abs(hours);
 	}
-	private final static SimpleDateFormat sdfTimes = new SimpleDateFormat("yyyyMMddHHmmss");
-	private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-
-	public static String getSdfTimes() {
-		return sdfTimes.format(new Date());
-	}
-
-	public static Date convertDate(String date) {
-		try {
-			return  sdf.parse(date);
-		} catch (ParseException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public static String convertString(String str){
-		StringBuilder stringBuilder=new StringBuilder();
-		stringBuilder.append(str.substring(0,4));
-		stringBuilder.append("-");
-		stringBuilder.append(str.substring(4,6));
-		stringBuilder.append("-");
-		stringBuilder.append(str.substring(6,8));
-		return stringBuilder.toString();
-	}
 
 	public static void main(String[] args) throws ParseException {
-
-
-		System.out.println(DateUtils.convertString("20380306"));
 		//List<String> last6Months = getLast6Months();
 //		List<String> last6Months = new ArrayList<>();
 //		last6Months.add("2019-11");

pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilAndroid.java

@@ -114,7 +114,7 @@ public class MobV2PushUtilAndroid {
             PushMessage pushMessage = new PushMessage();
             pushDTO.setPushMessage(pushMessage);
             //此格式的透传消息由 unipush 做了特殊处理，会自动展示通知栏。开发者也可自定义其它格式，在客户端自己处理。
-            //pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"银收客到账1万元\"}");
+            //pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"快银到账1万元\"}");
 
             //pushMessage.setTransmission("{title:" + title + ", content:" + content  + ext);
 

pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilIOS.java

@@ -37,9 +37,9 @@ import java.util.Map;
 @Slf4j
 public class MobV2PushUtilIOS {
 
-    public static final String appKey = "9f5Nw6Bvb982HvsN3sG1y5";
+    public static final String appKey = "QwyHsKpc0I9BQMk9Xysx74";
-    public static final String appId = "jzSkfM0Wsk8uSDL2zwGu07 ";
+    public static final String appId = "yuBG87yWEt6SXrwBSSvjy1 ";
-    public static final String masterSecret = "rKk62FdLE486boNJHWBPb1";
+        public static final String masterSecret = "PpidsIbMSs7EQddDMHAh81";
 
     public String getToken() throws IOException, NoSuchAlgorithmException {
 
@@ -111,7 +111,7 @@ public class MobV2PushUtilIOS {
             PushMessage pushMessage = new PushMessage();
             pushDTO.setPushMessage(pushMessage);
             //此格式的透传消息由 unipush 做了特殊处理，会自动展示通知栏。开发者也可自定义其它格式，在客户端自己处理。
-            //pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"银收客到账1万元\"}");
+            //pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"快银到账1万元\"}");
 
             //pushMessage.setTransmission("{title:" + title + ", content:" + content  + ext);
 

pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncrypt.java

@@ -1,402 +0,0 @@
-package cn.pluss.platform.util;
-
-import com.alipay.api.internal.util.codec.Base64;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import java.security.InvalidKeyException;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.interfaces.RSAPublicKey;
-
-import static cn.hutool.crypto.KeyUtil.getKeyPair;
-import static cn.pluss.platform.util.RSASignature.signVerify;
-import static cn.pluss.platform.util.RSAUtil.*;
-
-/**
- *  @author: zph
- *  @Date: 2020/7/10 15:28
- *  @Description: RSA加密解密工具类
- */
-public class RSAEncrypt {
-    /**
-     * 字节数据转字符串专用集合
-     */
-    private static final char[] HEX_CHAR = { '0', '1', '2', '3', '4', '5', '6',
-            '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-
-
-    // FTP服务器hostname
-    public static String HOST = "";
-
-    // FTP服务器端口
-//    public static Integer PORT = ;
-
-    // FTP登录账号
-    public static String USERNAME = "";
-
-    // FTP登录密码
-    public static String PASSWORD = "";
-
-    // FTP上传路径
-    public static String  INVOICE_BASE_PATH = "";
-    /**
-     * 随机生成密钥对
-     */
-//    public static void genKeyPair() {
-//        // KeyPairGenerator类用于生成公钥和私钥对，基于RSA算法生成对象
-//        KeyPairGenerator keyPairGen = null;
-//        try {
-//            keyPairGen = KeyPairGenerator.getInstance("RSA");
-//        } catch (NoSuchAlgorithmException e) {
-//            // TODO Auto-generated catch block
-//            e.printStackTrace();
-//        }
-//        // 初始化密钥对生成器，密钥大小为96-1024位
-//        keyPairGen.initialize(1024,new SecureRandom());
-//        // 生成一个密钥对，保存在keyPair中
-//        KeyPair keyPair = keyPairGen.generateKeyPair();
-//        // 得到私钥
-//        RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate();
-//        // 得到公钥
-//        RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic();
-//        try {
-//            // 得到公钥字符串
-//            String publicKeyString = BASE64.encode(publicKey.getEncoded());
-//            // 得到私钥字符串
-//            String privateKeyString = BASE64.encode(privateKey.getEncoded());
-//            System.err.println(publicKeyString);
-//            System.err.println(privateKeyString);
-//            // 将公密钥对写入到文件
-//            /*InputStream is = null;
-//            InputStream is1 = null;
-//            is = new ByteArrayInputStream(publicKeyString.getBytes());
-//            is1 = new ByteArrayInputStream(privateKeyString.getBytes());
-//            FTPClient ftpClient = new FTPClient();
-//            ftpClient.connect(HOST);
-//            ftpClient.login(USERNAME,PASSWORD);
-//            ftpClient.changeWorkingDirectory(INVOICE_BASE_PATH);
-//            ftpClient.setFileType(FTPClient.LOCAL_FILE_TYPE);
-//            ftpClient.storeFile(new String("publicKey.keystore".getBytes(),"iso-8859-1"),is);
-//            ftpClient.storeFile(new String("privateKey.keystore".getBytes(),"iso-8859-1"),is1);
-//            is.close();
-//            is1.close();*/
-//            //FileWriter pubfw = new FileWriter(filePath + "/publicKey.keystore");
-//            //FileWriter prifw = new FileWriter(filePath + "/privateKey.keystore");
-//            /*BufferedWriter pubbw = new BufferedWriter(pubfw);
-//            BufferedWriter pribw = new BufferedWriter(prifw);
-//            pubbw.write(publicKeyString);
-//            pribw.write(privateKeyString);
-//            pubbw.flush();
-//            pubbw.close();
-//            pubfw.close();
-//            pribw.flush();
-//            pribw.close();
-//            prifw.close();*/
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    /**
-//     * 从文件中输入流中加载公钥
-//     *
-//     * @param
-//     *
-//     * @throws Exception
-//     *             加载公钥时产生的异常
-//     */
-//    public static String loadPublicKeyByFile() throws Exception {
-//        try {
-//            FTPClient ftpClient = new FTPClient();
-//            ftpClient.connect(HOST);
-//            ftpClient.login(USERNAME,PASSWORD);
-//            ftpClient.changeWorkingDirectory(INVOICE_BASE_PATH);
-//            InputStream is = ftpClient.retrieveFileStream("publicKey.keystore");
-//            BufferedReader br = new BufferedReader(new InputStreamReader(is,"UTF-8"));
-//            String readLine = null;
-//            StringBuilder sb = new StringBuilder();
-//            while ((readLine = br.readLine()) != null) {
-//                sb.append(readLine);
-//            }
-//            br.close();
-//            return sb.toString();
-//        } catch (IOException e) {
-//            throw new Exception("公钥数据流读取错误");
-//        } catch (NullPointerException e) {
-//            throw new Exception("公钥输入流为空");
-//        }
-//    }
-//
-//    /**
-//     * 从字符串中加载公钥
-//     *
-//     * @param publicKeyStr
-//     *            公钥数据字符串
-//     * @throws Exception
-//     *             加载公钥时产生的异常
-//     */
-//    public static RSAPublicKey loadPublicKeyByStr(String publicKeyStr)
-//            throws Exception {
-//        try {
-//            byte[] buffer = BASE64.decode(publicKeyStr);
-//            KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-//            X509EncodedKeySpec keySpec = new X509EncodedKeySpec(buffer);
-//            return (RSAPublicKey) keyFactory.generatePublic(keySpec);
-//        } catch (NoSuchAlgorithmException e) {
-//            throw new Exception("无此算法");
-//        } catch (InvalidKeySpecException e) {
-//            throw new Exception("公钥非法");
-//        } catch (NullPointerException e) {
-//            throw new Exception("公钥数据为空");
-//        }
-//    }
-//
-//    /**
-//     * 从文件中加载私钥
-//     *
-//     * @param
-//     *
-//     * @return 是否成功
-//     * @throws Exception
-//     */
-//    public static String loadPrivateKeyByFile() throws Exception {
-//        try {
-//            FTPClient ftpClient = new FTPClient();
-//            ftpClient.connect(HOST);
-//            ftpClient.login(USERNAME,PASSWORD);
-//            ftpClient.changeWorkingDirectory(INVOICE_BASE_PATH);
-//            InputStream is = ftpClient.retrieveFileStream("privateKey.keystore");
-//            BufferedReader br = new BufferedReader(new InputStreamReader(is,"UTF-8"));
-//            String readLine = null;
-//            StringBuilder sb = new StringBuilder();
-//            while ((readLine = br.readLine()) != null) {
-//                sb.append(readLine);
-//            }
-//            br.close();
-//            return sb.toString();
-//        } catch (IOException e) {
-//            throw new Exception("私钥数据读取错误");
-//        } catch (NullPointerException e) {
-//            throw new Exception("私钥输入流为空");
-//        }
-//    }
-//
-//    public static RSAPrivateKey loadPrivateKeyByStr(String privateKeyStr)
-//            throws Exception {
-//        try {
-//            byte[] buffer = BASE64.decode(privateKeyStr);
-//            PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(buffer);
-//            KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-//            return (RSAPrivateKey) keyFactory.generatePrivate(keySpec);
-//        } catch (NoSuchAlgorithmException e) {
-//            throw new Exception("无此算法");
-//        } catch (InvalidKeySpecException e) {
-//            throw new Exception("私钥非法");
-//        } catch (NullPointerException e) {
-//            throw new Exception("私钥数据为空");
-//        }
-//    }
-
-    /**
-     * 公钥加密过程
-     *
-     * @param publicKey
-     *            公钥
-     * @param plainTextData
-     *            明文数据
-     * @return
-     * @throws Exception
-     *             加密过程中的异常信息
-     */
-    public static byte[] encrypt(RSAPublicKey publicKey, byte[] plainTextData)
-            throws Exception {
-        if (publicKey == null) {
-            throw new Exception("加密公钥为空, 请设置");
-        }
-        Cipher cipher = null;
-        try {
-            // 使用默认RSA
-            cipher = Cipher.getInstance("RSA");
-            // cipher= Cipher.getInstance("RSA", new BouncyCastleProvider());
-            cipher.init(Cipher.ENCRYPT_MODE, publicKey);
-            byte[] output = cipher.doFinal(plainTextData);
-            return output;
-        } catch (NoSuchAlgorithmException e) {
-            throw new Exception("无此加密算法");
-        } catch (NoSuchPaddingException e) {
-            e.printStackTrace();
-            return null;
-        } catch (InvalidKeyException e) {
-            throw new Exception("加密公钥非法,请检查");
-        } catch (IllegalBlockSizeException e) {
-            throw new Exception("明文长度非法");
-        } catch (BadPaddingException e) {
-            throw new Exception("明文数据已损坏");
-        }
-    }
-
-    /**
-     * 私钥加密过程
-     *
-     * @param privateKey
-     *            私钥
-     * @param plainTextData
-     *            明文数据
-     * @return
-     * @throws Exception
-     *             加密过程中的异常信息
-     */
-    public static byte[] encrypt(RSAPrivateKey privateKey, byte[] plainTextData)
-            throws Exception {
-        if (privateKey == null) {
-            throw new Exception("加密私钥为空, 请设置");
-        }
-        Cipher cipher = null;
-        try {
-            // 使用默认RSA
-            cipher = Cipher.getInstance("RSA");
-            cipher.init(Cipher.ENCRYPT_MODE, privateKey);
-            byte[] output = cipher.doFinal(plainTextData);
-            return output;
-        } catch (NoSuchAlgorithmException e) {
-            throw new Exception("无此加密算法");
-        } catch (NoSuchPaddingException e) {
-            e.printStackTrace();
-            return null;
-        } catch (InvalidKeyException e) {
-            throw new Exception("加密私钥非法,请检查");
-        } catch (IllegalBlockSizeException e) {
-            throw new Exception("明文长度非法");
-        } catch (BadPaddingException e) {
-            throw new Exception("明文数据已损坏");
-        }
-    }
-
-    /**
-     * 私钥解密过程
-     *
-     * @param privateKey
-     *            私钥
-     * @param cipherData
-     *            密文数据
-     * @return 明文
-     * @throws Exception
-     *             解密过程中的异常信息
-     */
-    public static byte[] decrypt(RSAPrivateKey privateKey, byte[] cipherData)
-            throws Exception {
-        if (privateKey == null) {
-            throw new Exception("解密私钥为空, 请设置");
-        }
-        Cipher cipher = null;
-        try {
-            // 使用默认RSA
-            cipher = Cipher.getInstance("RSA");
-            // cipher= Cipher.getInstance("RSA", new BouncyCastleProvider());
-            cipher.init(Cipher.DECRYPT_MODE, privateKey);
-            byte[] output = cipher.doFinal(cipherData);
-            return output;
-        } catch (NoSuchAlgorithmException e) {
-            throw new Exception("无此解密算法");
-        } catch (NoSuchPaddingException e) {
-            e.printStackTrace();
-            return null;
-        } catch (InvalidKeyException e) {
-            throw new Exception("解密私钥非法,请检查");
-        } catch (IllegalBlockSizeException e) {
-            throw new Exception("密文长度非法");
-        } catch (BadPaddingException e) {
-            throw new Exception("密文数据已损坏");
-        }
-    }
-
-    /**
-     * 公钥解密过程
-     *
-     * @param publicKey
-     *            公钥
-     * @param cipherData
-     *            密文数据
-     * @return 明文
-     * @throws Exception
-     *             解密过程中的异常信息
-     */
-    public static byte[] decrypt(RSAPublicKey publicKey, byte[] cipherData)
-            throws Exception {
-        if (publicKey == null) {
-            throw new Exception("解密公钥为空, 请设置");
-        }
-        Cipher cipher = null;
-        try {
-            // 使用默认RSA
-            cipher = Cipher.getInstance("RSA");
-            // cipher= Cipher.getInstance("RSA", new BouncyCastleProvider());
-            cipher.init(Cipher.DECRYPT_MODE, publicKey);
-            byte[] output = cipher.doFinal(cipherData);
-            return output;
-        } catch (NoSuchAlgorithmException e) {
-            throw new Exception("无此解密算法");
-        } catch (NoSuchPaddingException e) {
-            e.printStackTrace();
-            return null;
-        } catch (InvalidKeyException e) {
-            throw new Exception("解密公钥非法,请检查");
-        } catch (IllegalBlockSizeException e) {
-            throw new Exception("密文长度非法");
-        } catch (BadPaddingException e) {
-            throw new Exception("密文数据已损坏");
-        }
-    }
-
-    /**
-     * 字节数据转十六进制字符串
-     *
-     * @param data
-     *            输入数据
-     * @return 十六进制内容
-     */
-    public static String byteArrayToString(byte[] data) {
-        StringBuilder stringBuilder = new StringBuilder();
-        for (int i = 0; i < data.length; i++) {
-            // 取出字节的高四位 作为索引得到相应的十六进制标识符 注意无符号右移
-            stringBuilder.append(HEX_CHAR[(data[i] & 0xf0) >>> 4]);
-            // 取出字节的低四位 作为索引得到相应的十六进制标识符
-            stringBuilder.append(HEX_CHAR[(data[i] & 0x0f)]);
-            if (i < data.length - 1) {
-                stringBuilder.append(' ');
-            }
-        }
-        return stringBuilder.toString();
-    }
-        public static void main(String[] args) {
-        try {
-            // 生成密钥对
-
-//            String privateKey = new String(Base64.encodeBase64(keyPair.getPrivate().getEncoded()));
-//            String publicKey = new String(Base64.encodeBase64(keyPair.getPublic().getEncoded()));
-
-            // RSA加密
-            String data = "{\"ordNo\":\"2017031601582703488262843972\",\"mno\":\"399190513665034\"}";
-            System.out.println(data);
-//            String encryptData = encrypt(data, getPublicKey(publicKey));
-//            System.out.println("加密后内容:" + encryptData);
-            // RSA解密
-//            String decryptData = decrypt(encryptData, getPrivateKey(privateKey));
-//            System.out.println("解密后内容:" + decryptData);
-
-            // RSA签名
-            String sign = RSASignature.sign(data, CERT);
-            System.out.println(sign);
-            // RSA验签
-            boolean result = signVerify(data, PUBLIC_KEY, sign);
-            System.out.print("验签结果:" + result);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.out.print("加解密异常");
-        }
-    }
-}

pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncryptUtil.java

@@ -15,73 +15,40 @@ public class RSAEncryptUtil {
 	private static final String CIPHER_PROVIDER = "SunJCE";
 	private static final String TRANSFORMATION_PKCS1Paddiing = "RSA/ECB/PKCS1Padding";
 	private static final String RSA_PKCS1_OAEP_PADDING = "RSA/ECB/OAEPWITHSHA-1ANDMGF1PADDING";
-
+	
 	private static final String CHAR_ENCODING = "UTF-8";// 固定值，无须修改
-//	private static final String CERT ="-----BEGIN CERTIFICATE-----\r\n" +
+	private static final String CERT ="-----BEGIN CERTIFICATE-----\r\n" + 
-//			"MIID3DCCAsSgAwIBAgIUTz/ylkJ1ui0tgyC8gYf7PhjSLf4wDQYJKoZIhvcNAQEL\r\n" +
+			"MIID3DCCAsSgAwIBAgIUTz/ylkJ1ui0tgyC8gYf7PhjSLf4wDQYJKoZIhvcNAQEL\r\n" + 
-//			"BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\r\n" +
+			"BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\r\n" + 
-//			"FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\r\n" +
+			"FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\r\n" + 
-//			"Q0EwHhcNMTkwOTE5MDYzOTI4WhcNMjQwOTE3MDYzOTI4WjBuMRgwFgYDVQQDDA9U\r\n" +
+			"Q0EwHhcNMTkwOTE5MDYzOTI4WhcNMjQwOTE3MDYzOTI4WjBuMRgwFgYDVQQDDA9U\r\n" + 
-//			"ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl\r\n" +
+			"ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl\r\n" + 
-//			"bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGDAJDTjERMA8GA1UEBwwIU2hlblpo\r\n" +
+			"bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGDAJDTjERMA8GA1UEBwwIU2hlblpo\r\n" + 
-//			"ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgVuNIZDy2F7UYQw7+\r\n" +
+			"ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgVuNIZDy2F7UYQw7+\r\n" + 
-//			"QjkWSBLbAimkhZ6Qa6jhquZvUruD1/YpKbtghk/ecxrSDpC8Pqsjl/QjrmkTPWv7\r\n" +
+			"QjkWSBLbAimkhZ6Qa6jhquZvUruD1/YpKbtghk/ecxrSDpC8Pqsjl/QjrmkTPWv7\r\n" + 
-//			"vNihoAMftuR/nAusmBrTkNlzxEBVvRpf4JRsIHg73wUi5zUJkZn7eAZ7kHVa0zow\r\n" +
+			"vNihoAMftuR/nAusmBrTkNlzxEBVvRpf4JRsIHg73wUi5zUJkZn7eAZ7kHVa0zow\r\n" + 
-//			"qflsl7w29guTvqUPP1P1+gH+xD3b3fCM1uRINDDqTyFff6p1hM7Fn9wnapKDmcO7\r\n" +
+			"qflsl7w29guTvqUPP1P1+gH+xD3b3fCM1uRINDDqTyFff6p1hM7Fn9wnapKDmcO7\r\n" + 
-//			"57QkL8VGNAWknVkBpMYiAmK2R7DlPW5zUleO9M30koNYSIRVwgHiS2Kutd1/gvW7\r\n" +
+			"57QkL8VGNAWknVkBpMYiAmK2R7DlPW5zUleO9M30koNYSIRVwgHiS2Kutd1/gvW7\r\n" + 
-//			"g5oC+nDLSgQkwgUoonrXzo1bUkE05icf92v89hDVccaXKzVjGgMP407s88++amNV\r\n" +
+			"g5oC+nDLSgQkwgUoonrXzo1bUkE05icf92v89hDVccaXKzVjGgMP407s88++amNV\r\n" + 
-//			"5J65AgMBAAGjgYEwfzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DBlBgNVHR8EXjBc\r\n" +
+			"5J65AgMBAAGjgYEwfzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DBlBgNVHR8EXjBc\r\n" + 
-//			"MFqgWKBWhlRodHRwOi8vZXZjYS5pdHJ1cy5jb20uY24vcHVibGljL2l0cnVzY3Js\r\n" +
+			"MFqgWKBWhlRodHRwOi8vZXZjYS5pdHJ1cy5jb20uY24vcHVibGljL2l0cnVzY3Js\r\n" + 
-//			"P0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFEMzk3NTQ5ODQ2QzAxQzNFOEVCRDIwDQYJ\r\n" +
+			"P0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFEMzk3NTQ5ODQ2QzAxQzNFOEVCRDIwDQYJ\r\n" + 
-//			"KoZIhvcNAQELBQADggEBAABTz0NLnc0bn7InEDVuYMEebEzZv3BxhHVdnzX6R0gQ\r\n" +
+			"KoZIhvcNAQELBQADggEBAABTz0NLnc0bn7InEDVuYMEebEzZv3BxhHVdnzX6R0gQ\r\n" + 
-//			"Ug0QifHdAtbh/qL10E4FjVACyWOOWgPoX/9I1BZjfxddzQgbUib3XybloR6eE0z3\r\n" +
+			"Ug0QifHdAtbh/qL10E4FjVACyWOOWgPoX/9I1BZjfxddzQgbUib3XybloR6eE0z3\r\n" + 
-//			"WUh/B88cCM3GsJU4btaxY0qpTkEjEcqP7K+4ZrJyfCItAfxWqYh6sllGbFVvRSYa\r\n" +
+			"WUh/B88cCM3GsJU4btaxY0qpTkEjEcqP7K+4ZrJyfCItAfxWqYh6sllGbFVvRSYa\r\n" + 
-//			"brlEI+lbdlNVnshrRNegtFZIJ40O8aSpNA/2R0+5lEKPeYiQUO4qYbCE3lkPpY9S\r\n" +
+			"brlEI+lbdlNVnshrRNegtFZIJ40O8aSpNA/2R0+5lEKPeYiQUO4qYbCE3lkPpY9S\r\n" + 
-//			"p0SMyX0UmB9SIwOFAX+BX3KJ6GBKh+zqSmd0hm4NtbCNRmEG9gYQPl845FdYizKJ\r\n" +
+			"p0SMyX0UmB9SIwOFAX+BX3KJ6GBKh+zqSmd0hm4NtbCNRmEG9gYQPl845FdYizKJ\r\n" + 
-//			"RIk+gkdXBduIpO3/ZkzED/PYMOj/hhJdLNByPe78Ipo=\r\n" +
+			"RIk+gkdXBduIpO3/ZkzED/PYMOj/hhJdLNByPe78Ipo=\r\n" + 
-//			"-----END CERTIFICATE-----";
-//	private static final String PUBLIC_KEY ="-----BEGIN PUBLIC KEY-----\r\n" +
-//			"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArjSigZVVYy1LzeKmjrJY\r\n" +
-//			"TVh1pS2mYa07hcXOH0vDGBFp8XY1HlJTedTDmYL9pBH/q6PSAf/mvQrXjEbOgFoa\r\n" +
-//			"ro2qEr+SLIze47hxXdZKtgHOKdX6XmjJ9zc1VgB1xHGL339fyOsAz9+lYy1aBClw\r\n" +
-//			"eInkruUBHSudF38dQY43UtHjLoXnrX+CiQCofTqcjbfjVgl/MKcsF6XVajkZ/yOa\r\n" +
-//			"I3kOaQ+YAxB45lAn8vt7rK+VvdkwEf/A1U0+jxwChpdzNlTGMy9qpIWQiILA1Z4+\r\n" +
-//			"9PtWq/3EYxGPKJyxG0PCSGT495v/rAbnYHDt37E4PqslBYBskYLlmQOIh4oltVMX\r\n" +
-//			"wwIDAQAB\r\n" +
-//			"-----END PUBLIC KEY-----";
-	private static final String PUBLIC_KEY ="-----BEGIN PUBLIC KEY-----\\r\\n"+
-		"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCA\r\n" +
-		"QEAkXVO04QyRKrCHYxkHjvuWlr0adiFAyDO8yEg5pl9PvIsVsdOd/KElnPlPheIg01rDJFtYv\r\n" +
-		"CavCbYXaIWv1IcNRBtkIP5UERtbRyfuJCO1F/GyybHcnv6amW5Q1xn4cu/IeKV4VzWnDepntJL\r\n" +
-		"bVaBAtw6OSMWBLnk2EuPGa6zNRjvHzdRaZvmAoYu+FZvJLw6oIeeDkR1pGty3CQgnuIe25pQeJ\r\n" +
-		"cAuOWyvC1+ZKvnRbSaS6Hfi8s5mxCQrEiiHEKXHA/rfPp/bDEwqJzA2e/hdnybIII9bcjjqx3l\r\n" +
-		"+9XG5jGHsa7trMedPaeJc96OQUJPm62l9rGG0OZc9+MlsVIskwIDAQAB\r\n"+
-		"-----END PUBLIC KEY-----";
-	private static final String CERT = "-----BEGIN CERTIFICATE-----\r\n"+
-			"MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgE\r\n" +
-			"AAoIBAQCRdU7ThDJEqsIdjGQeO+5aWvRp2IUDIM7zISDmmX0+8ixWx0538oSWc+U+F4iDTW\r\n" +
-			"sMkW1i8Jq8Jthdoha/Uhw1EG2Qg/lQRG1tHJ+4kI7UX8bLJsdye/pqZblDXGfhy78h4pXhX\r\n" +
-			"NacN6me0kttVoEC3Do5IxYEueTYS48ZrrM1GO8fN1Fpm+YChi74Vm8kvDqgh54ORHWka3Lc\r\n" +
-			"JCCe4h7bmlB4lwC45bK8LX5kq+dFtJpLod+LyzmbEJCsSKIcQpccD+t8+n9sMTConMDZ7+F2\r\n" +
-			"fJsggj1tyOOrHeX71cbmMYexru2sx509p4lz3o5BQk+braX2sYbQ5lz34yWxUiyTAgMBAAEC\r\n" +
-			"ggEAfDRYB+L07Y+Fy6dqgiqYn8zUsWDySzaDoDXkmyPrP4mY9MyhI2kRcEssL7X2mm/L/eJc\r\n" +
-			"LkTXS9w7mtBibiHV9jW96M3YYILdkXMEq5u8anoSDLxjSE23CY0tAejwx2ysG2oYo2Qb2S7qh\r\n" +
-			"rR5NbbM2L1mdg2Qqp51W4BBhCOZ4LbNQxPOptPz0hJZAzwzPocmOXM0zP20nBA/Sm/IcjVOcr\r\n" +
-			"HLHYljFxaGg2SvLRlFN9BvnCCGheEy5NvYN/jqPl4cUxoH7S8rzYF/P7xzESha/oaiIStGrpm\r\n" +
-			"SirsyFQI+Wl1I9I9FymUvTPsdlr6YcJ8QuZrxf3Y+0s/gxwSU28Uc4QKBgQDBWedvCPnS5T/\r\n" +
-			"20Y+aZ1wUVAyA1gKQpYzM8Q+5BefaH+Oxpo01wfRWBeFM0oA2w0xaFJuD16lNDOri8qJKNGYoi\r\n" +
-			"HgiRJ/i39ueYZDYuwnSVgLoqwT6cv4wzSvGOOkY0ljXsuOqB8djRSgmNceHoUKmzMOXFfySsAla\r\n" +
-			"RsNsPTyOwwKBgQDAlsdcWPaZ9vhkGzTd2VtQvBX34FOQQajlEClD9PAJYdgNc5DKmd6Vzuh8wE2\r\n" +
-			"5IdWJVBPdNF1j91ZJwcmTeZx5xQd2HLRcZlvoijsNuKPv2ctycVRBZug1ebQWrODC71s8goYHyYd\r\n" +
-			"/ytKf70E4pbzMwdBpkCT9PHVxcG/uhHKt8QKBgQCF6MsllnTXgBity3OGf2FBXviN3ipGnbGHWs\r\n" +
-			"kF3rY11nIu3mfcPGkJjub7+qn7w4TEupL+W8WQbIrdBSgq9mFuXx28tgR574o+Bdp4kAl8WD+Jf\r\n" +
-			"rBi+HNdvys7DL07iKspMGcGon6QHRxyYjq/j4sG1Lf9kqervCmuEWZVN5ASWwKBgDHHx4hLRpLNj6\r\n" +
-			"7wiV2+zSe1Nkh4J6FmF23+G2yBZ3pFXD892/NCipJWhSmZ2307DaMNpITNAEbSq+8stBn2mUewchl\r\n" +
-			"JmiU4IBGfiVwmmdlphnjyakDthKAt8SrbTM2WaRLe+h4RLYEOwBqvEUC/NmoGvwRKSgVbF1BXK9ePT\r\n" +
-			"MVBAoGALyeHwCwOVM6F+CpeHLIvJSni2LmbCyzxxnRdcrMHhxtJWUx0eQTdLqIkVydssphlMDopRR\r\n" +
-			"0FBFdpA/sqo2f39YjAKoaLm01FymxliPcf8tbXQhqDdD8qmQgb58vV5wSh4fCn3mx5y2D/Vwkq3vk\r\n" +
-			"Z0BfEzRREXiOpdJhZdUCG1V8=\r\n"+
 			"-----END CERTIFICATE-----";
+	private static final String PUBLIC_KEY ="-----BEGIN PUBLIC KEY-----\r\n" + 
+			"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArjSigZVVYy1LzeKmjrJY\r\n" + 
+			"TVh1pS2mYa07hcXOH0vDGBFp8XY1HlJTedTDmYL9pBH/q6PSAf/mvQrXjEbOgFoa\r\n" + 
+			"ro2qEr+SLIze47hxXdZKtgHOKdX6XmjJ9zc1VgB1xHGL339fyOsAz9+lYy1aBClw\r\n" + 
+			"eInkruUBHSudF38dQY43UtHjLoXnrX+CiQCofTqcjbfjVgl/MKcsF6XVajkZ/yOa\r\n" + 
+			"I3kOaQ+YAxB45lAn8vt7rK+VvdkwEf/A1U0+jxwChpdzNlTGMy9qpIWQiILA1Z4+\r\n" + 
+			"9PtWq/3EYxGPKJyxG0PCSGT495v/rAbnYHDt37E4PqslBYBskYLlmQOIh4oltVMX\r\n" + 
+			"wwIDAQAB\r\n" + 
+			"-----END PUBLIC KEY-----";
 
 	/**
 	 * 数据加密方法
@@ -118,7 +85,7 @@ public class RSAEncryptUtil {
 		System.out.println(publicKey);
 		return encodeBase64(encryptPkcs1padding(publicKey, Content.getBytes(CHAR_ENCODING)));
 	}
-
+	
 	public static String rsaEncrypt(String Content,String ras) throws Exception {
 		X509Certificate certificate = X509Certificate.getInstance(PUBLIC_KEY.getBytes());
 		PublicKey publicKey = certificate.getPublicKey();
@@ -127,8 +94,4 @@ public class RSAEncryptUtil {
 		ci.init(Cipher.ENCRYPT_MODE, publicKey);
 		return encodeBase64(ci.doFinal(Content.getBytes(CHAR_ENCODING)));
 	}
-
-	public static void main(String[] args)throws Exception {
-		System.out.println(rsaEncrypt("orgId=67290416"));
-	}
 }

pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSASignature.java

@@ -1,248 +0,0 @@
-package cn.pluss.platform.util;
-
-import java.lang.reflect.Field;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *  @author: zph
- *  @Date: 2020/7/10 15:29
- *  @Description: RSA签名验签类
- */
-public class RSASignature{
-
-    /**
-     * 签名算法
-     */
-    public static final String SIGN_ALGORITHMS = "SHA1WithRSA";
-
-    /**
-     * RSA签名
-     * @param content 待签名数据
-     * @param privateKey 商户私钥
-     * @param encode 字符集编码
-     * @return 签名值
-     */
-    public static String sign(String content, String privateKey, String encode)
-    {
-        try
-        {
-            PKCS8EncodedKeySpec priPKCS8    = new PKCS8EncodedKeySpec( BASE64.decode(privateKey) );
-
-            KeyFactory keyf                 = KeyFactory.getInstance("RSA");
-            PrivateKey priKey               = keyf.generatePrivate(priPKCS8);
-
-            java.security.Signature signature = java.security.Signature.getInstance(SIGN_ALGORITHMS);
-
-            signature.initSign(priKey);
-            signature.update( content.getBytes(encode));
-
-            byte[] signed = signature.sign();
-
-            return BASE64.encode(signed);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    /**
-     * 根据 content 和 私钥  生成签名
-     * @param content  按字典顺序排序的内容
-     * @param privateKey  ftp上保存的私钥
-     * @return
-     */
-    public static String sign(String content, String privateKey)
-    {
-        try
-        {
-            PKCS8EncodedKeySpec priPKCS8    = new PKCS8EncodedKeySpec( BASE64.decode(privateKey) );
-            KeyFactory keyf = KeyFactory.getInstance("RSA");
-            PrivateKey priKey = keyf.generatePrivate(priPKCS8);
-            java.security.Signature signature = java.security.Signature.getInstance(SIGN_ALGORITHMS);
-            signature.initSign(priKey);
-            signature.update( content.getBytes());
-            byte[] signed = signature.sign();
-            return BASE64.encode(signed);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * RSA验签名检查
-     * @param content 待签名数据
-     * @param sign 签名值
-     * @param publicKey 分配给开发商公钥
-     * @param encode 字符集编码
-     * @return 布尔值
-     */
-    public static boolean doCheck(String content, String sign, String publicKey,String encode)
-    {
-        try
-        {
-            KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-            byte[] encodedKey = BASE64.decode(publicKey);
-            PublicKey pubKey = keyFactory.generatePublic(new X509EncodedKeySpec(encodedKey));
-
-
-            java.security.Signature signature = java.security.Signature
-                    .getInstance(SIGN_ALGORITHMS);
-
-            signature.initVerify(pubKey);
-            signature.update( content.getBytes(encode) );
-
-            boolean bverify = signature.verify( BASE64.decode(sign) );
-            return bverify;
-
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-        return false;
-    }
-
-    /**
-     * RSA验签名检查
-     * @param content 待签名数据
-     * @param sign 签名值
-     * @param publicKey 分配给开发商公钥
-     * @return 布尔值
-     */
-    public static boolean doCheck(String content, String sign, String publicKey)
-    {
-        try
-        {
-            KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-            byte[] encodedKey = BASE64.decode(publicKey);
-            if (encodedKey==null){
-                return false;
-            }
-            PublicKey pubKey = keyFactory.generatePublic(new X509EncodedKeySpec(encodedKey));
-
-            // 用私钥对信息生成数字签名
-            java.security.Signature signature = java.security.Signature
-                    .getInstance(SIGN_ALGORITHMS);
-
-            signature.initVerify(pubKey);
-            signature.update( content.getBytes() );
-            // 验证方法  返回true则为比对成功
-            boolean bverify = signature.verify( BASE64.decode(sign) );
-            return bverify;
-
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-        return false;
-    }
-
-
-    /**
-     * 对象转HashMap
-     * @param obj
-     * @return
-     */
-    public static Map<String, Object> objectToMap(Object obj) {
-        if (obj == null) {
-            return null;
-        }
-
-        Map<String, Object> map = new HashMap<String, Object>();
-        try {
-            Field[] declaredFields = obj.getClass().getDeclaredFields();
-            for (Field field : declaredFields) {
-                field.setAccessible(true);
-                map.put(field.getName(), field.get(obj));
-            }
-        } catch (Exception e) {
-
-        }
-
-        return map;
-    }
-
-    /**
-     *  @author: zph
-     *  @Date: 2020/7/14 17:45
-     *  @Description: 将签名的参数内容按参数名的字典顺序进行排序，并拼接为字符串
-     */
-    public static String getContent(Map<String,Object> map){
-        //得到第三方签名 第三方会把sign也放在json里，故转map的时候需要把sign删除
-        map.remove("sign");
-        map.entrySet().removeIf(entry -> entry.getValue() == null);
-        // 将签名的参数内容按参数名的字典顺序进行排序，并拼接为字符串
-        StringBuilder sb = new StringBuilder();
-        map.entrySet().stream().sorted(Comparator.comparing(Map.Entry::getKey)).forEach(entry ->
-                sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&")
-        );
-        return sb.toString().substring(0, sb.length() - 1);
-    }
-
-    /**
-     * 签名方法
-     * 因为很多处都需要用，特地封装一下，方便调用
-     * @param paramStr   按字典顺序拼接过的字符串
-     * @param publicKey  从数据库查询出来的第三方公钥
-     * @param sign  第三方签名
-     * @return
-     */
-    public static boolean signVerify(String paramStr,String publicKey,String sign){
-        System.err.println(paramStr);
-        try {
-            //String privateSign = RSASignature.sign(paramStr, RSAEncrypt.loadPrivateKeyByFile());
-            // 使用公钥进行验签
-            boolean result = RSASignature.doCheck(paramStr, sign, publicKey);
-            if (result){
-                return true;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-//    public static void main(String[] args) {
-//        try {
-//            // 生成密钥对
-//            KeyPair keyPair = getKeyPair();
-//            String privateKey = new String(Base64.encodeBase64(keyPair.getPrivate().getEncoded()));
-//            String publicKey = new String(Base64.encodeBase64(keyPair.getPublic().getEncoded()));
-//            System.out.println("私钥:" + privateKey);
-//            System.out.println("公钥:" + publicKey);
-//            // RSA加密
-//            String data = "待加密的文字内容";
-//            String encryptData = encrypt(data, getPublicKey(publicKey));
-//            System.out.println("加密后内容:" + encryptData);
-//            // RSA解密
-//            String decryptData = decrypt(encryptData, getPrivateKey(privateKey));
-//            System.out.println("解密后内容:" + decryptData);
-//
-//            // RSA签名
-//            String sign = sign(data, getPrivateKey(privateKey));
-//            // RSA验签
-//            boolean result = verify(data, getPublicKey(publicKey), sign);
-//            System.out.print("验签结果:" + result);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            System.out.print("加解密异常");
-//        }
-//    }
-
-
-}

pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAUtil.java

@@ -1,211 +0,0 @@
-package cn.pluss.platform.util;
-
-
-import org.apache.tomcat.util.codec.binary.Base64;
-
-import javax.crypto.Cipher;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-/**
- * @author admin
- * @date 2021/4/28 15:02
- */
-public class RSAUtil {
-
-    public static String RSA_ALGORITHM = "SHA1WithRSA";
-    public static String UTF8 = "UTF-8";
-
-    public static final String PUBLIC_KEY ="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKjak6oTfMxO3hWZ8CnMgUxDXHtsHQLZf4GgxzbjVYIN93UtuycdHypfUEh18s8sWwHRvBfeJ4mG0QbLazMphUY7ju9ox/qyB+tmJtZO5fCUi1StnSh17fJRw2kBlD9dKtBBKHJw0PXC/d6ATRtbbbFerzgLtUz70SvUxooUQHtQIDAQAB";
-    public static final String CERT ="MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIqNqTqhN8zE7eFZnwKcyBTENce2wdAtl/gaDHNuNVgg33dS27Jx0fKl9QSHXyzyxbAdG8F94niYbRBstrMymFRjuO72jH+rIH62Ym1k7l8JSLVK2dKHXt8lHDaQGUP10q0EEocnDQ9cL93oBNG1ttsV6vOAu1TPvRK9TGihRAe1AgMBAAECgYBmI8KCl0DkcrSOsRvYuC2DqZWf8el1B3eFjeZp3e/zVOCIPYv6Q5ArWg6DVSxjnWEA0KSagqvGjU+xkQMqnXzPcPMhsIS+1wyR/pP+pwiatO2ioHaQpEqHg9eXhxrgA477/xuKVw9zl5GNqaIgd++2NDXnqLh0Y6OR73f0OB5eDQJBAPihEm+UWLOam/Q/k2+k4Lm2dvxJTBur1fslBiJpgMhgcz/PlwRwpL7aPD0AuPv0NqLouuoTiKpq9icnUv12tgsCQQCOqTANw0IErCHUNdinjXewmG3ui1j9XgM41rSn5ZeTrPL4GhZc2zbS/pZT4PBKUL6NLGkfPHmw4rOmNL/Xc5E/AkBqAwQBX5eSvVHSC2mqKPtJNGv3lqlFAzfyJg8/jQzEY5vAkZsq4Xzdg+A7gptdkvvY6rMIK9wSDhl3CGVyfbORAkA1N+g1OiHmnFACWhP4bU25EyPvWQxZeDi7e1zpRTzGWj5JT3IIMb7B9zcdE0yQbI6pG2gbvvOmiOt7lTH7raEBAkBas2gugvR3f0aGqQcqMpyM627pyRppQ2h58/7KBylP3oR2BReqMUcXeiJ8TuBXzbRXpeVQ0DWOva5CWZJmBMdz";
-
-    /**
-     * 创建公钥私钥
-     *
-     * @return
-     * @throws Exception
-     */
-    public static KeyStore createKeys() throws Exception {
-        KeyPairGenerator keyPairGeno = KeyPairGenerator.getInstance(RSA_ALGORITHM);
-        keyPairGeno.initialize(1024);
-        KeyPair keyPair = keyPairGeno.generateKeyPair();
-
-        RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic();
-        RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate();
-
-        KeyStore keyStore = new KeyStore();
-        keyStore.setPublicKey(Base64.encodeBase64String(publicKey.getEncoded()));
-        keyStore.setPrivateKey(Base64.encodeBase64String(privateKey.getEncoded()));
-        return keyStore;
-    }
-
-    /**
-     * 获取公钥对象
-     *
-     * @param pubKeyData
-     * @return
-     * @throws Exception
-     */
-    public static RSAPublicKey getPublicKey(byte[] pubKeyData) throws Exception {
-        X509EncodedKeySpec keySpec = new X509EncodedKeySpec(pubKeyData);
-        KeyFactory keyFactory = KeyFactory.getInstance(RSA_ALGORITHM);
-        return (RSAPublicKey) keyFactory.generatePublic(keySpec);
-    }
-
-    /**
-     * 获取公钥对象
-     *
-     * @param pubKey 公钥
-     * @return
-     * @throws Exception
-     */
-    public static RSAPublicKey getPublicKey(String pubKey) throws Exception {
-        return getPublicKey(Base64.decodeBase64(pubKey));
-    }
-
-    /**
-     * 获取私钥对象
-     *
-     * @param priKey
-     *            私钥
-     * @return
-     * @throws Exception
-     */
-    public static RSAPrivateKey getPrivateKey(String priKey) throws Exception {
-        return getPrivateKey(Base64.decodeBase64(priKey));
-    }
-
-    /**
-     * 通过私钥byte[]将公钥还原，适用于RSA算法
-     *
-     * @param keyBytes
-     * @return
-     * @throws Exception
-     */
-    public static RSAPrivateKey getPrivateKey(byte[] keyBytes) throws Exception {
-        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes);
-        KeyFactory keyFactory = KeyFactory.getInstance(RSA_ALGORITHM);
-        return (RSAPrivateKey) keyFactory.generatePrivate(keySpec);
-
-    }
-
-    public static String encryptByPublicKey(String data, String publicKey) throws Exception {
-        return encryptByPublicKey(data, getPublicKey(publicKey));
-    }
-
-    /**
-     * 公钥加密
-     *
-     * @param data
-     * @param publicKey
-     * @return
-     * @throws Exception
-     */
-    public static String encryptByPublicKey(String data, RSAPublicKey publicKey) throws Exception {
-        Cipher cipher = Cipher.getInstance(RSA_ALGORITHM);
-        cipher.init(Cipher.ENCRYPT_MODE, publicKey);
-        byte[] bytes = cipher.doFinal(data.getBytes(UTF8));
-        return Base64.encodeBase64String(bytes);
-    }
-
-    public static String decryptByPublicKey(String data, String rsaPublicKey) throws Exception {
-        return decryptByPublicKey(data, getPublicKey(rsaPublicKey));
-    }
-
-    /**
-     * 公钥解密
-     *
-     * @param data
-     * @param rsaPublicKey
-     * @return
-     * @throws Exception
-     */
-    public static String decryptByPublicKey(String data, RSAPublicKey rsaPublicKey) throws Exception {
-        Cipher cipher = Cipher.getInstance(RSA_ALGORITHM);
-        cipher.init(Cipher.DECRYPT_MODE, rsaPublicKey);
-        byte[] inputData = Base64.decodeBase64(data);
-        byte[] bytes = cipher.doFinal(inputData);
-        return new String(bytes, UTF8);
-    }
-
-    public static String encryptByPrivateKey(String data, String privateKey) throws Exception {
-        return encryptByPrivateKey(data, getPrivateKey(privateKey));
-    }
-
-    /**
-     * 私钥加密
-     *
-     * @param data
-     * @param privateKey
-     * @return
-     * @throws Exception
-     */
-    public static String encryptByPrivateKey(String data, RSAPrivateKey privateKey) throws Exception {
-        Cipher cipher = Cipher.getInstance(RSA_ALGORITHM);
-        cipher.init(Cipher.ENCRYPT_MODE, privateKey);
-        byte[] bytes = cipher.doFinal(data.getBytes(UTF8));
-        return Base64.encodeBase64String(bytes);
-    }
-
-    public static String decryptByPrivateKey(String data, String privateKey) throws Exception {
-        return decryptByPrivateKey(data, getPrivateKey(privateKey));
-    }
-
-    /**
-     * 私钥解密
-     *
-     * @param data
-     * @param privateKey
-     * @return
-     * @throws Exception
-     */
-    public static String decryptByPrivateKey(String data, RSAPrivateKey privateKey) throws Exception {
-        Cipher cipher = Cipher.getInstance(RSA_ALGORITHM);
-        cipher.init(Cipher.DECRYPT_MODE, privateKey);
-        byte[] inputData = Base64.decodeBase64(data);
-        byte[] bytes = cipher.doFinal(inputData);
-        return new String(bytes, UTF8);
-    }
-
-
-    public static class KeyStore {
-        private String publicKey;
-        private String privateKey;
-
-        public String getPublicKey() {
-            return publicKey;
-        }
-
-        public void setPublicKey(String publicKey) {
-            this.publicKey = publicKey;
-        }
-
-        public String getPrivateKey() {
-            return privateKey;
-        }
-
-        public void setPrivateKey(String privateKey) {
-            this.privateKey = privateKey;
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        //KeyStore keyPair = RSAUtil.createKeys();
-//        String publickey=keyPair.getPublicKey();
-//        String privateKey=keyPair.getPrivateKey();
-        System.out.println("公钥：" + PUBLIC_KEY);
-        System.out.println("私钥：" + CERT);
-        String encode=RSAUtil.encryptByPublicKey("1111",PUBLIC_KEY);
-        System.out.println("加密数据："+encode);
-        System.out.println("解密数据:"+RSAUtil.decryptByPrivateKey(encode,CERT));
-
-
-//        String privateKey="MIICdAIBADANBgkqhkiG9w0BAQEFAASCAl4wggJaAgEAAoGBAJ81T1tVomxy1ncvqUxP3hAhLf+1Iajaan2j3J3NcwVvI9Mr96wgqg3D4mWQ3ngjRySHf1d7L5wcf4LNgox88ePjTF0i1rsneRsNnYIwt4NCAvDairM6LuRMrcneulVD7q7aoOzjSl4PcRUQbmyRou1LGykEzmbj/bK7aPE/gmMJAgMBAAECgYBRkhTIrQV9HxF3G3pYWQtjpDxXKUzHoLCzEsO0LlFiVWE7julkzY+TYeubMjBpyVloA+xgvALWr1s9f2IF7PZZh3eJO8YrIQCPhz3uX8m/3Yt+t7yu/Ju0EtdwVC9CYcoBx9MaxaPAmviy8Fmt8rFTX5v3AKB1NrydBgkF1j3tSQJBAMvLSYBH8bqd3bN+pajdaqzbA+8hpsyxITEj5fk8lsc34nwiDq7xp9Z2CLDG8FSmRZEUBTaXt6OnFWYSrTl56dcCQQDH/hsJGwwI/8UfV+RmnDTrQGGiXIJUzKKgAJ47GNfeAlNJELYYqtIi5Dj/LMggBWg2F1/ZEwko/q5E3mLkKz4fAkAhIGlRNeCgQhsQm0yYV22IrY1FKMYxTbWkhD5UtjmYJohlPy/91gA/Ry6AdcYJLIHwZD24sw7Bxl4fGngX+K4/Aj8CV/f5I1gAwv6MX3tNuIbmOtrqDCt60usU9OzlxGTDNUPEl22K3HWZ8xK36s5tkaKm/58f7BkvYcypAfImulsCQBRkLBcHXyGhbH0gfjQT9lfWSMBbv3oKfDlrxLDKb0eZr7AtBTDqfubq52yh1cH4kvzkn8eLBVnBTcdKi48gMM0=";
-//        System.out.println("解密数据:"+RSAUtil.decryptByPrivateKey("fy1w9GHsrpwJzs4RW2KSZhB8gU4B2gJ3Gc1yLi5Hi0aniDiWYF95VwgNw3tjLzuDIEzoCEUDUphxK2rVmWZl4ORU3ooS+57TLhN5xb/WuhEo9RmKwm6CJHUUKxms3RoRUHk6r9hOhA4Irdqp2V/fIWQUlwp0HWytUqx912D53fs=",privateKey));
-    }
-}

pluss-common-bundle/src/main/java/cn/pluss/platform/util/SnowFlakeUtil.java

@@ -1,23 +0,0 @@
-package cn.pluss.platform.util;
-
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @author Exrickx
- */
-@Slf4j
-public class SnowFlakeUtil {
-
-    /**
-     * 派号器workid：0~31
-     * 机房datacenterid：0~31
-     */
-    private static Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-
-    public static Long nextId() {
-        return snowflake.nextId();
-    }
-}
-

pluss-common-bundle/src/main/java/cn/pluss/platform/util/TokenUtil.java

@@ -1,6 +1,4 @@
 package cn.pluss.platform.util;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -13,8 +11,6 @@ import javax.crypto.spec.SecretKeySpec;
 import java.security.SecureRandom;
 import java.util.*;
 
-import static cn.pluss.platform.util.RSAUtil.encryptByPublicKey;
-
 /**
  * AES加密工具类
  *
@@ -31,7 +27,7 @@ public class TokenUtil {
     private static final String APP_SECRET = "2022bsjZF544GAH";
     //sn
     private static final String SN = "BSJQG01YJ0001";
-    public static final String PUBLIC_KEY ="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKjak6oTfMxO3hWZ8CnMgUxDXHtsHQLZf4GgxzbjVYIN93UtuycdHypfUEh18s8sWwHRvBfeJ4mG0QbLazMphUY7ju9ox/qyB+tmJtZO5fCUi1StnSh17fJRw2kBlD9dKtBBKHJw0PXC/d6ATRtbbbFerzgLtUz70SvUxooUQHtQIDAQAB";
+
     /**
      * 获取TOKEN值
      * @param timestamp 时间戳，13位
@@ -60,62 +56,14 @@ public class TokenUtil {
         finalMap.put("TOKEN", MD5Util.md5(token + APP_SECRET).toUpperCase());
         return finalMap;
     }
-    public static Map<String, String> getToken(String timestamp, String requestId, String appId, String reqData)throws Exception {
-        System.out.println(appId);
-        System.out.println(reqData);
-        SortedMap<String, Object> map = new TreeMap();
-        map.put("appId", appId);
-        map.put("timestamp", timestamp);
-        map.put("requestId", requestId);
-        map.put("reqData",convertObject(JSONObject.parseObject(reqData,Map.class)));
-        String encode= convertMap(map);
-        Map<String, String> finalMap = new HashMap<>();
-        finalMap.put("ENCODE",encode);
 
-        String t=encode.concat(APP_SECRET);
+    public static void main(String[] args) {
-        finalMap.put("TOKEN", MD5Util.md5(t).toUpperCase());
-        return finalMap;
-    }
-
-
-    public static  String convertObject(Map<String,Object> map){
-        String[] sortedKeys = map.keySet().toArray(new String[]{});
-        Arrays.sort(sortedKeys);// 排序请求参数
-        StringBuilder s2 = new StringBuilder();
-        s2.append("{");
-        for (String key : sortedKeys) {
-            s2.append("\"").append(key).append("\"").append(":").append("\"").append(map.get(key)).append("\"").append(",");
-        }
-        s2.deleteCharAt(s2.length() - 1);
-        s2.append("}");
-        return s2.toString();
-    }
-
-
-    public static  String convertMap(Map<String,Object> map){
-        String[] sortedKeys = map.keySet().toArray(new String[]{});
-        Arrays.sort(sortedKeys);// 排序请求参数
-        StringBuilder s2 = new StringBuilder();
-        for (String key : sortedKeys) {
-            s2.append(key).append(map.get(key));
-        }
-        return s2.toString();
-    }
-
-
-
-    public static void main(String[] args) throws Exception{
         String s = String.valueOf(System.currentTimeMillis());
         System.out.println(s);
         String s1 = UUID.randomUUID().toString();
         System.out.println(s1);
-        String param = "{\"orderNumber\":\"LKL_Z_20230612170005985\"}";
+        Map<String, String> token = getToken(s, s1,APP_SECRET);
-        Map<String, String> token = getToken(s,s1 , APP_ID,param);
         System.out.println(token);
-
-        System.out.println("");
-
-
     }
 
 }

pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java

@@ -132,7 +132,7 @@ public class YtCreateOrder implements Serializable {
 
 
     public YtCreateOrder() {
-        this.senderName = "银收客客服部";
+        this.senderName = "快银收银客服部";
         this.senderProvinceName = "陕西省";
         this.senderCityName = "西安市";
         this.senderCountyName = "未央区";

pluss-common-bundle/src/main/resources/config/application-common.yml

@@ -85,8 +85,8 @@ spring:
 
   rabbitmq:
     username: admin
-    password: admin
+    password: CZGmysqlroot@123
-    host: 127.0.0.1
+    host: 192.168.1.114
     port: 5672
 
 
@@ -161,49 +161,6 @@ getui:
 express:
   USERID: 1778214
   APIKEY: 63e75d64-e8fd-4dcc-93fa-17dc710cdf04
-#lkl:
-#  privateKey: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIcHuPuAbeKgueevtuy4RdMCH/xhLFKniVAhgZb2BfQiSDP0moBF2DiISdTq2A2KvEDol2DQBaAslDFAERkyTDIrZl9iB6xiGUmS/pZULy/k6Q6uED01JDeJLomxh6Cxk7QYlJO0tBpM4Xxahs9h7k0j55ZTV9HPZnLGVaUqyEF5AgMBAAECgYAmugRHvXHGiapH1JF2GvOLrRRXYddAbWRoYvOzxCO4/QwQOpsFJwL4U745HpGQcLXFN/ASiBbU9XQbG/DLdS182qAjvdZVJOA2e3H3LhpY3D8ec3webO+0nGk6e4oWGG1efJLM88Nb0FtQiQ0E6z17Paw5AGvxMVBPbL5SoQfq8QJBANHQmvFkAWlBL2XTLPUXaj+NAJzolE90ctAquxfDcTtfEXv0JitC5bwTg87uNl7n4PUTmtMDIkse+D5vQ2CIF78CQQCkwOIMzedKtWhOEbdGxiz1Y/jkuA8yF7HREeC7X2Av0z2Gi3yltoJd0s6zLn+6zowQp1O/5U6ifrYCIObWlTTHAkA0WOZ/eWL8vr2zmvdpgtkIWAaiH0j5deU7WJ3rNODoXjS/h0+KlZs5zGijVT2Nei7fFnAXW33P3j8zXJEj4XCDAkAcrG0rKVLNz9C9dZveN3NvqdyRge8zGqiZ6HCia7ED4dHdbr1c4ezCg4Px72/PhU8fPt/2j+Qlp8PpjuxeAE3VAkBqUiVV9XZptFEXa/77rgHP3SWrC3TcrrS5jtNTGfA4VISV95YXnZzWjYfpgs2WoxdAXjsrM5TB7L3V4um4o6Dp
-#  appid: OP00000657  #接入方唯一编号
-#  mchSerialNo: 01887665511e #证书序列号
-#  merchantNo: 8221210594300JY #商户号
-#  vposId: 491612871013605376 #vpos_id
-#  termNo: A0073841 #终端号
-#  apiUrl: https://s2.lakala.com/
-#  privateKeyPath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\api_private_key.pem
-#  certificatePath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\lkl-apigw-v1.cer
-#  returncatePath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\lkl-apigw-v1.cer
-#  callBackUrl: https://p40312246f.goho.co/wap/notify/lklCallBack
-#  pubKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHB7j7gG3ioLnnr7bsuEXTAh/8YSxSp4lQIYGW9gX0Ikgz9JqARdg4iEnU6tgNirxA6Jdg0AWgLJQxQBEZMkwyK2ZfYgesYhlJkv6WVC8v5OkOrhA9NSQ3iS6JsYegsZO0GJSTtLQaTOF8WobPYe5NI+eWU1fRz2ZyxlWlKshBeQIDAQAB
-
-lkl:
-  privateKey: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIcHuPuAbeKgueevtuy4RdMCH/xhLFKniVAhgZb2BfQiSDP0moBF2DiISdTq2A2KvEDol2DQBaAslDFAERkyTDIrZl9iB6xiGUmS/pZULy/k6Q6uED01JDeJLomxh6Cxk7QYlJO0tBpM4Xxahs9h7k0j55ZTV9HPZnLGVaUqyEF5AgMBAAECgYAmugRHvXHGiapH1JF2GvOLrRRXYddAbWRoYvOzxCO4/QwQOpsFJwL4U745HpGQcLXFN/ASiBbU9XQbG/DLdS182qAjvdZVJOA2e3H3LhpY3D8ec3webO+0nGk6e4oWGG1efJLM88Nb0FtQiQ0E6z17Paw5AGvxMVBPbL5SoQfq8QJBANHQmvFkAWlBL2XTLPUXaj+NAJzolE90ctAquxfDcTtfEXv0JitC5bwTg87uNl7n4PUTmtMDIkse+D5vQ2CIF78CQQCkwOIMzedKtWhOEbdGxiz1Y/jkuA8yF7HREeC7X2Av0z2Gi3yltoJd0s6zLn+6zowQp1O/5U6ifrYCIObWlTTHAkA0WOZ/eWL8vr2zmvdpgtkIWAaiH0j5deU7WJ3rNODoXjS/h0+KlZs5zGijVT2Nei7fFnAXW33P3j8zXJEj4XCDAkAcrG0rKVLNz9C9dZveN3NvqdyRge8zGqiZ6HCia7ED4dHdbr1c4ezCg4Px72/PhU8fPt/2j+Qlp8PpjuxeAE3VAkBqUiVV9XZptFEXa/77rgHP3SWrC3TcrrS5jtNTGfA4VISV95YXnZzWjYfpgs2WoxdAXjsrM5TB7L3V4um4o6Dp
-  appid: OP00000657  #接入方唯一编号
-  mchSerialNo: 01887665511e #证书序列号
-  merchantNo: 8221210594300JY #商户号
-  vposId: 491612871013605376 #vpos_id
-  termNo: A0073841 #终端号
-  apiUrl: https://s2.lakala.com/
-  privateKeyPath: /mnt/docker/project/czg/.key/api_private_key.pem
-  certificatePath: /mnt/docker/project/czg/.key/lkl-apigw-v1.cer
-  returncatePath: /mnt/docker/project/czg/.key/lkl-apigw-v1.cer
-  callBackUrl: https://ky.sxczgkj.cn/wap/notify/lklCallBack
-  pubKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHB7j7gG3ioLnnr7bsuEXTAh/8YSxSp4lQIYGW9gX0Ikgz9JqARdg4iEnU6tgNirxA6Jdg0AWgLJQxQBEZMkwyK2ZfYgesYhlJkv6WVC8v5OkOrhA9NSQ3iS6JsYegsZO0GJSTtLQaTOF8WobPYe5NI+eWU1fRz2ZyxlWlKshBeQIDAQAB
-
-
-#lkl:
-#  privateKey: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIcHuPuAbeKgueevtuy4RdMCH/xhLFKniVAhgZb2BfQiSDP0moBF2DiISdTq2A2KvEDol2DQBaAslDFAERkyTDIrZl9iB6xiGUmS/pZULy/k6Q6uED01JDeJLomxh6Cxk7QYlJO0tBpM4Xxahs9h7k0j55ZTV9HPZnLGVaUqyEF5AgMBAAECgYAmugRHvXHGiapH1JF2GvOLrRRXYddAbWRoYvOzxCO4/QwQOpsFJwL4U745HpGQcLXFN/ASiBbU9XQbG/DLdS182qAjvdZVJOA2e3H3LhpY3D8ec3webO+0nGk6e4oWGG1efJLM88Nb0FtQiQ0E6z17Paw5AGvxMVBPbL5SoQfq8QJBANHQmvFkAWlBL2XTLPUXaj+NAJzolE90ctAquxfDcTtfEXv0JitC5bwTg87uNl7n4PUTmtMDIkse+D5vQ2CIF78CQQCkwOIMzedKtWhOEbdGxiz1Y/jkuA8yF7HREeC7X2Av0z2Gi3yltoJd0s6zLn+6zowQp1O/5U6ifrYCIObWlTTHAkA0WOZ/eWL8vr2zmvdpgtkIWAaiH0j5deU7WJ3rNODoXjS/h0+KlZs5zGijVT2Nei7fFnAXW33P3j8zXJEj4XCDAkAcrG0rKVLNz9C9dZveN3NvqdyRge8zGqiZ6HCia7ED4dHdbr1c4ezCg4Px72/PhU8fPt/2j+Qlp8PpjuxeAE3VAkBqUiVV9XZptFEXa/77rgHP3SWrC3TcrrS5jtNTGfA4VISV95YXnZzWjYfpgs2WoxdAXjsrM5TB7L3V4um4o6Dp
-#  appid: OP00000462  #接入方唯一编号
-#  mchSerialNo: 00dfba8194c41b84cf #证书序列号
-#  merchantNo: 8221210594300JY #商户号
-#  vposId: 491612871013605376 #vpos_id
-#  termNo: A0073841 #终端号
-#  apiUrl: https://test.wsmsd.cn/sit/
-#  privateKeyPath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\OP00000003_private_key.pem
-#  certificatePath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\OP00000003_cert.cer
-#  returncatePath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\lkl-apigw-v1.cer
-#  callBackUrl: https://p40312246f.goho.co/api/auditCallback/tradeCallBack
-#  pubKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHB7j7gG3ioLnnr7bsuEXTAh/8YSxSp4lQIYGW9gX0Ikgz9JqARdg4iEnU6tgNirxA6Jdg0AWgLJQxQBEZMkwyK2ZfYgesYhlJkv6WVC8v5OkOrhA9NSQ3iS6JsYegsZO0GJSTtLQaTOF8WobPYe5NI+eWU1fRz2ZyxlWlKshBeQIDAQAB
-
 
 
 

pluss-common-bundle/src/main/resources/config/application-lkl.yml

@@ -0,0 +1,11 @@
+lkl:
+  private_key: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDvDBZyHUDndAGxrIcsCV2njhNO3vCEZotTaWYSYwtDvkcAb1EjsBFabXZaKigpqFXk5XXNI3NIHP9M8XKzIgGvc65NpLAfRjVql8JiTvLyYd1gIUcOXMInabu+oX7dQSI1mS8XzqaoVRhDZQWhXcJW9bxMulgnzvk0Ggw07AjGF7si+hP/Va8SJmN7EJwfQq6TpSxR+WdIHpbWdhZ+NHwitnQwAJTLBFvfk28INM39G7XOsXdVLfsooFdglVTOHpNuRiQAj9gShCCNrpGsNQxDiJIxE43qRsNsRwigyo6DPJk/klgDJa417E2wgP8VrwiXparO4FMzOGK15quuoD7DAgMBAAECggEBANhmWOt1EAx3OBFf3f4/fEjylQgRSiqRqg8Ymw6KGuh4mE4Md6eW/B6geUOmZjVP7nIIR1wte28M0REWgn8nid8LGf+v1sB5DmIwgAf+8G/7qCwd8/VMg3aqgQtRp0ckb5OV2Mv0h2pbnltkWHR8LDIMwymyh5uCApbn/aTrCAZKNXcPOyAn9tM8Bu3FHk3Pf24Er3SN+bnGxgpzDrFjsDSHjDFT9UMIc2WdA3tuMv9X3DDn0bRCsHnsIw3WrwY6HQ8mumdbURk+2Ey3eRFfMYxyS96kOgBC2hqZOlDwVPAKTPtS4hoq+cQ0sRaJQ4T0UALJrBVHa+EESgRaTvrXqAECgYEA+WKmy9hcvp6IWZlk9Q1JZ+dgIVxrO65zylK2FnD1/vcTx2JMn73WKtQb6vdvTuk+Ruv9hY9PEsf7S8gHSTTmzHOUgo5x0F8yCxXFnfji2juoUnDdpkjtQK5KySDcpQb5kcCJWEVi9v+zObM0Zr1Nu5/NreE8EqUl3+7MtHOu1TMCgYEA9WM9P6m4frHPW7h4gs/GISA9LuOdtjLvAtgCK4cW2mhtGNAMttD8zOBQrRuafcbFAyU9de6nhGwetOhkW9YSV+xRNa7HWTeIRgXJuJBrluq5e1QGTIwZU/GujpNaR4Qiu0B8TodM/FME7htsyxjmCwEfT6SDYlkeMzTbMa9Q0DECgYBqsR/2+dvD2YMwAgZFKKgNAdoIq8dcwyfamUQ5mZ5EtGQL2yw48zibHh/LiIxgUD1Kjk/qQgNsX45NP4iOc0mCkrgomtRqdy+rumbPTNmQ0BEVJCBPscd+8pIgNiTvnWpMRvj7gMP0NDTzLI3wnnCRIq8WAtR2jZ0Ejt+ZHBziLQKBgQDibEe/zqNmhDuJrpXEXmO7fTv3YB/OVwEj5p1Z/LSho2nHU3Hn3r7lbLYEhUvwctCnLl2fzC7Wic1rsGOqOcWDS5NDrZpUQGGF+yE/JEOiZcPwgH+vcjaMtp0TAfRzuQEzNzV8YGwxB4mtC7E/ViIuVULHAk4ZGZI8PbFkDxjKgQKBgG8jEuLTI1tsP3kyaF3jAylnw7SkBc4gfe9knsYlw44YlrDSKr8AOp/zSgwvMYvqT+fygaJ3yf9uIBdrIilqCHKXccZ9uA/bT5JfIi6jbg3EoE9YhB0+1aGAS1O2dBvUiD8tJ+BjAT4OB0UDpmM6QsFLQgFyXgvDnzr/o+hQJelW
+  appid: OP00000462  #接入方唯一编号
+  mchSerialNo: 00dfba8194c41b84cf #证书序列号
+  merchantNo: 8221210594300JY #商户号
+  vposId: 491612871013605376 #vpos_id
+  termNo: A0073841 #终端号
+  apiUrl: https://test.wsmsd.cn/
+  privateKeyPath: "classpath:lakalaConf/OP00000003_private_key.pem"
+  certificatePath: "classpath:lakalaConf/OP00000003_cert"
+

pluss-common-bundle/src/main/resources/config/application-ys.yml

@@ -11,10 +11,9 @@ ys:
   otherDomain: https://commonapi.ysepay.com/gateway.do
   ## 代理商编号
   agentNo: 801521000002WJW
-  ## 交易发起方编号
+  ## 交易发起方编号 武汉融商创银科技有限公司
   srcMerchantNo: 826521773920170
 
-
   ## 私钥用于签名，对应的公钥给到银盛
   priKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDky8v1JlxCfZM0e0p7rkZq/hpa3yHjsF3aJaE5rBt0+x5G7MnHX1AIgi9jJzG3Z8QnEPUVutVClVbRZ3k9hZChlm6T9Miv4IhyvE4kPGJEXRi2q2r7nHyUeGve3TC4jXvELy0muS30BWRyczM/f2x13/uzjxeCM1eMnI5+jxfdg8aaYS2NpCydgObtEvKQRpx6YoF+F7eIF8DNvbYyoRNzM/+NsmquDmgK7Ad1qNK7gqYSmfXHUys7F97Sd/NxfegaiBMapepruUvQSlcQkYXJprM9cBGQuWx/iK8kQ+yYfmOI0OWX8pBwYWut7rR/ritujAdKtIpg14XVxRLnop6dAgMBAAECggEASjJA6TZQcwuQIlPdOrCwi1/uIgv8TH9UYDsVxsMmgFAzaGK/qNUi+i9luKzsNYMEHHsmT66wHBCb//qjWa0n0w8auwaF0mtpNHQWjy+52luqeQqr/f6oc+l9ad+nPiI7wcpexREGcv0QrwDm3K+w96T0Vi2QPRvzR1k56Jb08VN+kpAXb3g7X++il0Ql2lKFM8NySI0utnHAFMH7erJqNc4KeKmr2fJYw23ldBUOxmU6oWEIGwO+KiysfNlmzu3JspYE/eQfKX5aaEKaDbPVGF5Dje5e1SlJ1x9sTAfhOPeh83canoRN61aAI5mEKu04li5LLscBZfW6li2sVVJi7QKBgQD6qPgPc9NOusBvYP02NPdARBswCoafA86QHftPtWpyza67/M2c3X7dd+EnOU1Q+9p2Wj+L64M2KnC1JB+RUrVDBhs4e+yZ3Gly8rD+OUt1kWdJTaK3hJyKAnKtbL9yE90CEwMxLEH0XnYTmC8GhYYXGbOS2ZsqzQJaGUaYel3kTwKBgQDpq5Z00hb8EcPF6l34aL+FL9nAxlASXbYJql/UkD8PdhIkoxezkox/UI5jeF+RXbQ+VfuZQa6HfUrBQOcHTmp9o4cInDqoN/DSjvqV3v8Cnjs/PuF+kxFMDJdYPsjkps4IqR24l8nypPCdPHRjCaRnyfOyc1AteB1jYxDxkUmXUwKBgDOu7V76SeKc3RraC7vGlgiZQmXYdcOJ3GiY1f2scWN0h4fZa2fhv8vYcQNObGO7WmM23o1yJR7hB1ZCOYQUYq2ML8aovrNG4DNEWTxCAg4eygYyTM+8Ny65rH2Xw6247MQFuY3FC2BgrcYChge5NlnDAeTQm47qsIZ1WboM2Rk/AoGBAIuT1kSjtd0OE34mV8lpcHVzNsQi8XN3DKTLY4DKRRDMO1wtG5xFPq1SBiu+nH9tlJvjqm1KQaFnIv868IV5vrybsK5g+9y9xZlQlLhvQq5irAtEWVfNK3jc0I6CumdyiAG+WyWHbbcF9UBG+1KpUM46YNpIbS0r4Yobg+R4H5hHAoGBAOCZOg2VFPiluOPWzIcILb6nYvZyPhZP4pzz7WyzBht2SoHcD70cduCQpcuAXbj5JY59gUfNxURCDxQDNW2x8cQs6Hxme1kVg5kZNJAaclfb7Jx+ZqsYk4ua0NqxOtyfhRmYXVaTVKDFNt8CmwoiKYse4VDC/E3yKgha0UdcE+co
   ## 签名公钥，由银盛提供
@@ -29,7 +28,7 @@ ys:
   ## 代理商编号
   agentNoV2: 801521000002WJW
   ## 进件私钥v2
-  priKeyV2: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBK  gwggSkAgEAAoIBAQDky8v1JlxCfZM0e0p7rkZq/hpa3yHjsF3aJaE5rBt0+x5G7MnHX1AIgi9jJzG3Z8QnEPUVutVClVbRZ3k9hZChlm6T9Miv4IhyvE4kPGJEXRi2q2r7nHyUeGve3TC4jXvELy0muS30BWRyczM/f2x13/uzjxeCM1eMnI5+jxfdg8aaYS2NpCydgObtEvKQRpx6YoF+F7eIF8DNvbYyoRNzM/+NsmquDmgK7Ad1qNK7gqYSmfXHUys7F97Sd/NxfegaiBMapepruUvQSlcQkYXJprM9cBGQuWx/iK8kQ+yYfmOI0OWX8pBwYWut7rR/ritujAdKtIpg14XVxRLnop6dAgMBAAECggEASjJA6TZQcwuQIlPdOrCwi1/uIgv8TH9UYDsVxsMmgFAzaGK/qNUi+i9luKzsNYMEHHsmT66wHBCb//qjWa0n0w8auwaF0mtpNHQWjy+52luqeQqr/f6oc+l9ad+nPiI7wcpexREGcv0QrwDm3K+w96T0Vi2QPRvzR1k56Jb08VN+kpAXb3g7X++il0Ql2lKFM8NySI0utnHAFMH7erJqNc4KeKmr2fJYw23ldBUOxmU6oWEIGwO+KiysfNlmzu3JspYE/eQfKX5aaEKaDbPVGF5Dje5e1SlJ1x9sTAfhOPeh83canoRN61aAI5mEKu04li5LLscBZfW6li2sVVJi7QKBgQD6qPgPc9NOusBvYP02NPdARBswCoafA86QHftPtWpyza67/M2c3X7dd+EnOU1Q+9p2Wj+L64M2KnC1JB+RUrVDBhs4e+yZ3Gly8rD+OUt1kWdJTaK3hJyKAnKtbL9yE90CEwMxLEH0XnYTmC8GhYYXGbOS2ZsqzQJaGUaYel3kTwKBgQDpq5Z00hb8EcPF6l34aL+FL9nAxlASXbYJql/UkD8PdhIkoxezkox/UI5jeF+RXbQ+VfuZQa6HfUrBQOcHTmp9o4cInDqoN/DSjvqV3v8Cnjs/PuF+kxFMDJdYPsjkps4IqR24l8nypPCdPHRjCaRnyfOyc1AteB1jYxDxkUmXUwKBgDOu7V76SeKc3RraC7vGlgiZQmXYdcOJ3GiY1f2scWN0h4fZa2fhv8vYcQNObGO7WmM23o1yJR7hB1ZCOYQUYq2ML8aovrNG4DNEWTxCAg4eygYyTM+8Ny65rH2Xw6247MQFuY3FC2BgrcYChge5NlnDAeTQm47qsIZ1WboM2Rk/AoGBAIuT1kSjtd0OE34mV8lpcHVzNsQi8XN3DKTLY4DKRRDMO1wtG5xFPq1SBiu+nH9tlJvjqm1KQaFnIv868IV5vrybsK5g+9y9xZlQlLhvQq5irAtEWVfNK3jc0I6CumdyiAG+WyWHbbcF9UBG+1KpUM46YNpIbS0r4Yobg+R4H5hHAoGBAOCZOg2VFPiluOPWzIcILb6nYvZyPhZP4pzz7WyzBht2SoHcD70cduCQpcuAXbj5JY59gUfNxURCDxQDNW2x8cQs6Hxme1kVg5kZNJAaclfb7Jx+ZqsYk4ua0NqxOtyfhRmYXVaTVKDFNt8CmwoiKYse4VDC/E3yKgha0UdcE+co
+  priKeyV2: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDky8v1JlxCfZM0e0p7rkZq/hpa3yHjsF3aJaE5rBt0+x5G7MnHX1AIgi9jJzG3Z8QnEPUVutVClVbRZ3k9hZChlm6T9Miv4IhyvE4kPGJEXRi2q2r7nHyUeGve3TC4jXvELy0muS30BWRyczM/f2x13/uzjxeCM1eMnI5+jxfdg8aaYS2NpCydgObtEvKQRpx6YoF+F7eIF8DNvbYyoRNzM/+NsmquDmgK7Ad1qNK7gqYSmfXHUys7F97Sd/NxfegaiBMapepruUvQSlcQkYXJprM9cBGQuWx/iK8kQ+yYfmOI0OWX8pBwYWut7rR/ritujAdKtIpg14XVxRLnop6dAgMBAAECggEASjJA6TZQcwuQIlPdOrCwi1/uIgv8TH9UYDsVxsMmgFAzaGK/qNUi+i9luKzsNYMEHHsmT66wHBCb//qjWa0n0w8auwaF0mtpNHQWjy+52luqeQqr/f6oc+l9ad+nPiI7wcpexREGcv0QrwDm3K+w96T0Vi2QPRvzR1k56Jb08VN+kpAXb3g7X++il0Ql2lKFM8NySI0utnHAFMH7erJqNc4KeKmr2fJYw23ldBUOxmU6oWEIGwO+KiysfNlmzu3JspYE/eQfKX5aaEKaDbPVGF5Dje5e1SlJ1x9sTAfhOPeh83canoRN61aAI5mEKu04li5LLscBZfW6li2sVVJi7QKBgQD6qPgPc9NOusBvYP02NPdARBswCoafA86QHftPtWpyza67/M2c3X7dd+EnOU1Q+9p2Wj+L64M2KnC1JB+RUrVDBhs4e+yZ3Gly8rD+OUt1kWdJTaK3hJyKAnKtbL9yE90CEwMxLEH0XnYTmC8GhYYXGbOS2ZsqzQJaGUaYel3kTwKBgQDpq5Z00hb8EcPF6l34aL+FL9nAxlASXbYJql/UkD8PdhIkoxezkox/UI5jeF+RXbQ+VfuZQa6HfUrBQOcHTmp9o4cInDqoN/DSjvqV3v8Cnjs/PuF+kxFMDJdYPsjkps4IqR24l8nypPCdPHRjCaRnyfOyc1AteB1jYxDxkUmXUwKBgDOu7V76SeKc3RraC7vGlgiZQmXYdcOJ3GiY1f2scWN0h4fZa2fhv8vYcQNObGO7WmM23o1yJR7hB1ZCOYQUYq2ML8aovrNG4DNEWTxCAg4eygYyTM+8Ny65rH2Xw6247MQFuY3FC2BgrcYChge5NlnDAeTQm47qsIZ1WboM2Rk/AoGBAIuT1kSjtd0OE34mV8lpcHVzNsQi8XN3DKTLY4DKRRDMO1wtG5xFPq1SBiu+nH9tlJvjqm1KQaFnIv868IV5vrybsK5g+9y9xZlQlLhvQq5irAtEWVfNK3jc0I6CumdyiAG+WyWHbbcF9UBG+1KpUM46YNpIbS0r4Yobg+R4H5hHAoGBAOCZOg2VFPiluOPWzIcILb6nYvZyPhZP4pzz7WyzBht2SoHcD70cduCQpcuAXbj5JY59gUfNxURCDxQDNW2x8cQs6Hxme1kVg5kZNJAaclfb7Jx+ZqsYk4ua0NqxOtyfhRmYXVaTVKDFNt8CmwoiKYse4VDC/E3yKgha0UdcE+co
     ## 进件公钥v2
   pubKeyV2: MIGfMA0GCSGqSIb3DQEBAQUAA4GNADCBiQKBgQC7SPkmIUf2auwkgbVchMyfeCDgICuA1GKrSwRbDI24UMVhzDgcIxCUmFG5/DfcPJz0d3oV9Ggkd4/7NmteRvmNnOOGNOnmR6AGEKafDpL1mAdpndmpkAZ0f6OVo3Py5JDg2wt8d+u3dF0AFWwd2rrrqscWvxJVB55DnuZfXl2CyQIDAQAB
     ## 加密密钥
@@ -43,13 +42,6 @@ ys:
     sybPubKey:
       # 银盛公钥
     payPubKey:
-  #D1相关配置
-  agentNoD1: 801521000002UUS
-  srcMerchantNoD1: 826521673920090
-  ## 进件私钥v2(D1)
-  priKeyV2D1: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD2J82Gg79Tk8HZ9Zl7EOeLwvUn41c4ktUg6jveIhYLhT/PW5hpPAtgKXd9BvhtpfXhzbK6U9UURKhBgFIkQ+oIJQNfbB/F2jdVK9ke3IYi0/TXHMnY63x43qxciLeAOt+LxdhHn6ZImV4MsRkPjF/zLsaJrPOPWbc2m4T1yvinfzkrxhZaWn1dj4+IdyO3tA/juXCjydQqKR2kSqJlo6gdT9N3RIJ+ETda2UUahZyYXBfjyxFQEaOXthm6krZH1zBHs510Og6bQJQHjMmTskkslWvj38qPDfsuC4tq0Hgbu3LcyiX9vGYzQoGOaGhDEiNPObdDlOuh5gn0slRmg+PxAgMBAAECggEAJRvrCBRki50C5HD6Kmtp/M/vVYwYYhcAum2ViO9qk2ILNJ+CYpsCvASEVvzuBtm2L8xq3Vw2C1AubXGC8KSsa33o/EG4qIM1REnP+a8VKbr6dlOIuoMFyNMI+QpDX7mAafnxmRqgXuGAJDmupYFsFaU/mRHRxhKoZDsd2FA5HEbuDI9SJp86keE72NHsxyqfDIZyIk3Z8k7HZY2wg3FW+YaOKQBHVA9JYvhfZMeaQ1ymrA0IAqWpUqjLkqAa2Qa6xUsbj+QhvrkBCE48i8duamXKDSOaLfkqTb8IyxOM9eTsFwLVGEuZQrkhrLxdrg5aBPvu81pIJME6SgrquJJ84QKBgQD/MAFLiWU0wDJ4Hqf2jKa5vgrBmCqOsANBc079s8gDXM4zbsG/TjMHPDmiOGZxtDG8937twjYzRv9XpnqyITMArlhWWMhTOJ3r3CTVr/OISgeZKPGjfp+MbeDsOK4OggTVKZmNLx3nKiuc94IlTDOcz5qArVBTxKadWg56f1UGswKBgQD28G+haXxneMhRZozoHPjcfdgtDoZJaVa8XTXw8nvQala5ioU9yesbIAdtD/VR/eWwuMtO4rK1IFxtNZQ/MtSXwqlnKLf1xDJQPuj3kY5mC7H7sn4HGeFDP50VFnPgIaUnB5VwgyYFm8l19AW06OBjlnoBv0dnl1s5u+DgpzQcywKBgQCfeWSVzBtPR/1CTAYzcdqPoVAfg/S0jxK5yFHJAp0wXMMQKVszLq99CgoKcqyyyiV7LkBIXWJ50RipsgRjZZP2DP5vl7Q5LdyjFUR/tiG/PmRZNtkrj2ot3Ez/0rwTnPVgMUsgjB1n5Va0FYljvadTi/nGCIl2kCJ/m1QJAaIlOQKBgGV8TwRxS9ViiEEb+lDyhzxm488wpvPIvQLQ8/hAT65J5bZ/PV81etA9C5BA/Ltjs2A7siKLfJJ/6DxhxrlqdICiWeixjVkN9vePw0LrqTA7IjylELJuamuu2yntflXgvfUaYspIu/mWGufFEAtXodCL6TyKlhf21mEV28e4L+ydAoGAItgCUGbot95QNT1z+9QFN+18AvMnWCNvqanrC4qsk0phjYX9FFwfSCqWVeVm0Q0+2tUrRNcUEcbmlbQToBZq/hSu0nPcZIPvnNxLfW/NY7eVCXIcI5eNPjUIgbRCVMc6w5ukYMxPidOBuRXIt1iq2+iV20/FMbA58sY7AgOiaMw=
-  ## 进件公钥v2
-  pubKeyV2D1: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7SPkmIUf2auwkgbVchMyfeCDgICuA1GKrSwRbDI24UMVhzDgcIxCUmFG5/DfcPJz0d3oV9Ggkd4/7NmteRvmNnOOGNOnmR6AGEKafDpL1mAdpndmpkAZ0f6OVo3Py5JDg2wt8d+u3dF0AFWwd2rrrqscWvxJVB55DnuZfXl2CyQIDAQAB
 
 ys-extension:
   ## 进件URL前缀v2

pluss-common-bundle/src/main/resources/lakalaConf/api_cert.cer

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIGAYh2ZVEeMA0GCSqGSIb3DQEBBQUAMGAxFDASBgNVBAMM
-C0xBS0FMQS1MQU9QMQswCQYDVQQGEwJDTjEXMBUGA1UECgwOTGFrYWxhIENvLixM
-dGQxDzANBgNVBAsMBkxLTC1ZRjERMA8GA1UEBwwIc2hhbmdoYWkwHhcNMjMwNjAx
-MDk1ODUxWhcNMzMwNjAxMDk1ODUxWjBgMRQwEgYDVQQDDAtMQUtBTEEtTEFPUDEL
-MAkGA1UEBhMCQ04xFzAVBgNVBAoMDkxha2FsYSBDby4sTHRkMQ8wDQYDVQQLDAZM
-S0wtWUYxETAPBgNVBAcMCHNoYW5naGFpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAuX0oRVQqMatLl7U31D0S/HiW/ie/7/PpeHw2Y8Jmn2fbfeTKdNcQ
-6JjBvy069zeJ+NmngH4JNGJZp1CiDAPs76XOz9nGPE/k/dyJ3/VftY5gceZfm68z
-iHSmxxvY6WjllwVNiQrGqfWUix2L/dhE6hZszFhzbiBrDttFz9zcZf9gZaHvyUHj
-y202onhN/olrbsHAWc77zvLowMbMiTANjw/4cGvOpv0HL3l/1HsMIuLqJUazXpxC
-MbFndLaloIeUlZMehtNDv/xMELK7gImBKYLcFD2OUM6o9XdrLcIyrNujC7GqpFMy
-32S54Q8Wpku2vcuyphnUK0XbFKNWjlDbKQIDAQABo2AwXjAPBgNVHRMECDAGAQH/
-AgEAMB8GA1UdIwQYMBaAFNhKhTJ8euu/7alFJnM/CSKbJ3NeMB0GA1UdDgQWBBTY
-SoUyfHrrv+2pRSZzPwkimydzXjALBgNVHQ8EBAMCBsAwDQYJKoZIhvcNAQEFBQAD
-ggEBAIY2Y65MM6AB2Ajd6dITpCH19NaUrjA74PVzws0i1kdDui2ap0QlYWzDTvQ6
-WK5SgQ9DZ1t8qhbsm4/DD7j+Sqj6fNYDG9N7PLDOgFj7LShdFJXVn8Ak/FWBwxe2
-uM7uxg82p+wGxG/jtfI5VntOiRDTvrB4K7CdsLVjBM4ae/0UfuKceIw4mLCCT5hH
-CnnK0RNmxgfOksSJmC1F2NxzZw8wMQp2nqnQaIvNphndzFy9+EXpz7i7P3q89m/r
-CCnsI3f4pjm9wOaPMyPzIEc3yxHnTTMsAzHdccVzp02iR6qjquqYsKWjTfRr5Oa0
-dgLD9Ccfpcux0xAs5UKgSrXRNOw=
------END CERTIFICATE-----

pluss-common-bundle/src/main/resources/lakalaConf/api_private_key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC5fShFVCoxq0uX
-tTfUPRL8eJb+J7/v8+l4fDZjwmafZ9t95Mp01xDomMG/LTr3N4n42aeAfgk0Ylmn
-UKIMA+zvpc7P2cY8T+T93Inf9V+1jmBx5l+brzOIdKbHG9jpaOWXBU2JCsap9ZSL
-HYv92ETqFmzMWHNuIGsO20XP3Nxl/2Bloe/JQePLbTaieE3+iWtuwcBZzvvO8ujA
-xsyJMA2PD/hwa86m/QcveX/Uewwi4uolRrNenEIxsWd0tqWgh5SVkx6G00O//EwQ
-sruAiYEpgtwUPY5Qzqj1d2stwjKs26MLsaqkUzLfZLnhDxamS7a9y7KmGdQrRdsU
-o1aOUNspAgMBAAECggEAQ4rHdzdGhf+R7xQV2DrFBxoCIVnoEkAG69CPHZRUOgdf
-bWA6OIF3rrqxEiQuLIcUvoDC9Y7vWxvU+Y/q8eUcCceenyD1hlCxWZ9MtThsOXg2
-tkLk3ZPWeAHCGQ6S1atUrsFHkndSD+FUzbNcnnp53aN8yowKvDchxK8jpKUPvDO6
-nchVipK/KfuPeK2HLIeQcQCF+sOqeAHqnj3ygafvI/J6e5df72xo8cqSepas2/4S
-Racl6MbGvnuFWjU5L6AiYSG93EFSaQcz/wC4Na7H8iYjMbEnxyKHMOPOR8qVz2ud
-ZnAU3HXk1wnfwK7JBohyr9GjJtFZNBo3HB1LjAu6YQKBgQDpOYqm+ur+wwf/NHgN
-jj5GTiizyJTAsPq2ECUG993TpK3knhuDuCRESqbuC2DHbnF/6yMlJqUbOENZnUcc
-BRGZ6CowQqbxqwSOm9v/e8JixmO/G55YdII3cuGIDh16j1Y2UMtPYqoqvm4KsGud
-1EWYjlg3vZoCnwvZse5pYkpyhwKBgQDLmkBxMiUDypN1LKN7deKmMaplRQCBBUrQ
-bL4VjkqUaeTMLs6qznIz8Ab1n8+ceECEMMTxrzRYx3VktyPO5cQ5p8mTD78AL0wM
-ACjJVn0q6CmcljnXdLCG7agBCTw3cz1eziaDoPnyGyREfR6a1XDdTYcD3xi/uYCv
-tAQ6OT/AzwKBgQC+HIenYbYZAYYNRAnwkti0mpWXJ5QKFrnnmvVz3qzWDtEpILCx
-CHOXr3qvZFr5dk/SxCub5wqDS7Oq4wfKEV+to5BwUoSfTpaiYO5OLeXgenNonuzO
-kfprlJu/OjJRa3INSILSLU0lFqHA2NqAhz5MAwxqM4XNSTRxuhbrlJG3FQKBgQCK
-XlNrWnPTZsnd+S9FiXE2F0zBNCrKhEk66pwoVCKVSH4o0aq8ZD8y0u434ZsbsJHQ
-BMDjq3l82FkM0HXydy5rLH+OhUX+HyakhTsy0aeREGSvOV0n8vLBUCQ8SAV3fcb4
-dkuwaydShWWZchrpiSMCE10toWHVcoFlZ4bz9tI/+wKBgBPvXo3WZGDa5F8sGE9o
-AI8PnD9ihb28GFIzZ5ktpRw4SWrz99c1N7sGTMVQ9mvc2/+TY7pOOjddFD6TYcAx
-nctZv2puyuAQoN1/jgA08vS0F1k2EUerm3jS3KD5x2RQoany22ovq2vmi0yzNNqN
-iECVZI9IZLHftwXfvM+Q03fq
------END PRIVATE KEY-----

pluss-common-bundle/src/main/resources/lakalaConf/api_public_key.pem

@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuX0oRVQqMatLl7U31D0S
-/HiW/ie/7/PpeHw2Y8Jmn2fbfeTKdNcQ6JjBvy069zeJ+NmngH4JNGJZp1CiDAPs
-76XOz9nGPE/k/dyJ3/VftY5gceZfm68ziHSmxxvY6WjllwVNiQrGqfWUix2L/dhE
-6hZszFhzbiBrDttFz9zcZf9gZaHvyUHjy202onhN/olrbsHAWc77zvLowMbMiTAN
-jw/4cGvOpv0HL3l/1HsMIuLqJUazXpxCMbFndLaloIeUlZMehtNDv/xMELK7gImB
-KYLcFD2OUM6o9XdrLcIyrNujC7GqpFMy32S54Q8Wpku2vcuyphnUK0XbFKNWjlDb
-KQIDAQAB
------END PUBLIC KEY-----

pluss-common-bundle/src/main/resources/lakalaConf/lkl-apigw-v1.cer

@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIGAXUrc4b4MA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNVBAYT
-AkNOMRAwDgYDVQQIDAdCZWlKaW5nMRAwDgYDVQQHDAdCZWlKaW5nMRcwFQYDVQQK
-DA5MYWthbGEgQ28uLEx0ZDEqMCgGA1UEAwwhTGFrYWxhIE9yZ2FuaXphdGlvbiBW
-YWxpZGF0aW9uIENBMB4XDTIwMTAxNTA4NDk1MloXDTMwMTAxMzA4NDk1MlowZTEL
-MAkGA1UEBhMCQ04xEDAOBgNVBAgMB0JlaUppbmcxEDAOBgNVBAcMB0JlaUppbmcx
-FzAVBgNVBAoMDkxha2FsYSBDby4sTHRkMRkwFwYDVQQDDBBBUElHVy5MQUtBTEEu
-Q09NMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwAXZw9lupWcFXouC
-Nhm0DQT47Zf4KOIRF8rqT8Ps3pYzT8odROJ8rq4P+lciGrg29czpqrRM22yQktFr
-itvcM7JlE6jFbGH3rycnvGvhRYU/j1N9k0ozm8oVwmKX357/OtGzNivBECGSnU9L
-Bkp4Nm9M1K4cOwEuZ0xsQEthZjQYF0mDpnlWmVJL5i1Lq834atN2qrb/mzMHBNtD
-JnqRV7rPL39lKpe7LJiitsC2JuW1UbWZZU1NNwA/rz2d83C+KD1DLJ0+sMYY2Q3T
-OQ4BPAowDEwOH7XAXrHM/0kRm+ZeIFlwevEGIQWmMt1Ogz+AW4Iq0slINc4wOINK
-vH9tHwIDAQABo4HVMIHSMIGSBgNVHSMEgYowgYeAFCnH4DkZPR6CZxRn/kIqVsMo
-dJHpoWekZTBjMQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQmVpSmluZzEQMA4GA1UE
-BwwHQmVpSmluZzEXMBUGA1UECgwOTGFrYWxhIENvLixMdGQxFzAVBgNVBAMMDkxh
-a2FsYSBSb290IENBggYBaiUALIowHQYDVR0OBBYEFIya0Yc4OSBer55JLyA0AYe9
-m8mTMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUA
-A4IBAQCBEwOlk3mXigNv94Drn3dcaY2ml/y+8yNpAIuUhuBE00WFoqEX5lOatFy5
-fzdXuC12lBVQ8SjSm3aH7k2X0eXqDzkOHiur2ZBRKmJ++J4TeenuSUOjSIbQK/DT
-vxaqFUjYwFSVCyizpy7wfU4wKt+jOuFb9LyULJ9lkM1dV9Kh7Lmd9+nlJYYuPEPU
-LJkkVZqSALSiiJudXnTwlISjZTXEAkJpdIlMw+hvPTAkoG95B95M+OV/uLbItGK+
-qT4+RHWo8EbBDPQYo6J4QYHOxRlfMoGBMyrz6XDt7ELLmT7ld4aE02w6KQPfK3gq
-kLDT+/STozvaNmXzBJh7J6KqxJBH
------END CERTIFICATE-----

pluss-common-bundle/src/main/resources/lakalaConf/lkl-apigw-v2.cer

@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIGAXRTgcMnMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNVBAYT
-AkNOMRAwDgYDVQQIDAdCZWlKaW5nMRAwDgYDVQQHDAdCZWlKaW5nMRcwFQYDVQQK
-DA5MYWthbGEgQ28uLEx0ZDEqMCgGA1UEAwwhTGFrYWxhIE9yZ2FuaXphdGlvbiBW
-YWxpZGF0aW9uIENBMB4XDTIwMTAxMDA1MjQxNFoXDTMwMTAwODA1MjQxNFowZTEL
-MAkGA1UEBhMCQ04xEDAOBgNVBAgMB0JlaUppbmcxEDAOBgNVBAcMB0JlaUppbmcx
-FzAVBgNVBAoMDkxha2FsYSBDby4sTHRkMRkwFwYDVQQDDBBBUElHVy5MQUtBTEEu
-Q09NMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt1zHL54HiI8d2sLJ
-lwoQji3/ln0nsvfZ/XVpOjuB+1YR6/0LdxEDMC/hxI6iH2Rm5MjwWz3dmN/6BZeI
-gwGeTOWJUZFARo8UduKrlhC6gWMRpAiiGC8wA8stikc5gYB+UeFVZi/aJ0WN0cpP
-JYCvPBhxhMvhVDnd4hNohnR1L7k0ypuWg0YwGjC25FaNAEFBYP9EYUyCJjE//9Z7
-sMzHR9SJYCqqo6r9bOH9G6sWKuEp+osuAh+kJIxJMHfipw7w3tEcWG0hce9u/el4
-cYJtg8/PPMVoccKmeCzMvarr7jdKP4lenJbtwlgyfs+JgNu60KMUJH8RS72wC9NY
-uFz09wIDAQABo4HVMIHSMIGSBgNVHSMEgYowgYeAFCnH4DkZPR6CZxRn/kIqVsMo
-dJHpoWekZTBjMQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQmVpSmluZzEQMA4GA1UE
-BwwHQmVpSmluZzEXMBUGA1UECgwOTGFrYWxhIENvLixMdGQxFzAVBgNVBAMMDkxh
-a2FsYSBSb290IENBggYBaiUALIowHQYDVR0OBBYEFJ2Kx9YZfmWpkKFnC33C0r5D
-K3rFMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUA
-A4IBAQBZoeU0XyH9O0LGF9R+JyGwfU/O5amoB97VeM+5n9v2z8OCiIJ8eXVGKN9L
-tl9QkpTEanYwK30KkpHcJP1xfVkhPi/cCMgfTWQ5eKYC7Zm16zk7n4CP6IIgZIqm
-TVGsIGKk8RzWseyWPB3lfqMDR52V1tdA1S8lJ7a2Xnpt5M2jkDXoArl3SVSwCb4D
-AmThYhak48M++fUJNYII9JBGRdRGbfJ2GSFdPXgesUL2CwlReQwbW4GZkYGOg9LK
-CNPK6XShlNdvgPv0CCR08KCYRwC3HZ0y1F0NjaKzYdGNPrvOq9lA495ONZCvzYDo
-gmsu/kd6eqxTs/JwdaIYr4sCMg8Z
------END CERTIFICATE-----

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AccessChannelCipherCodeMapper.java

@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.pluss.platform.entity.AccessChannelCipherCode;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+public interface AccessChannelCipherCodeMapper extends BaseMapper<AccessChannelCipherCode> {
+
+    default AccessChannelCipherCode selectAllByOrgId(String orgId) {
+        LambdaQueryWrapper<AccessChannelCipherCode> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(AccessChannelCipherCode::getOrgId, orgId);
+
+        return selectOne(qWrapper);
+    }
+}

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppletStoreMapper.java

@@ -1,9 +0,0 @@
-package cn.pluss.platform.mapper;
-
-import cn.pluss.platform.entity.AppletStore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface AppletStoreMapper extends BaseMapper<AppletStore> {
-}

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppletStoreUserMapper.java

@@ -1,25 +0,0 @@
-package cn.pluss.platform.mapper;
-
-import cn.pluss.platform.entity.Account;
-import cn.pluss.platform.entity.AppletInfo;
-import cn.pluss.platform.entity.AppletStoreUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * @author lyf
- */
-@Mapper
-public interface AppletStoreUserMapper extends BaseMapper<AppletStoreUser> {
-
-    @Select("SELECT * FROM tb_pluss_applet_store_user WHERE userId = #{userId}")
-    List<AppletStoreUser> getAppletStoreByUser(@Param("userId") Integer userId);
-    @Select("SELECT * FROM tb_pluss_applet_store_user WHERE userId = #{userId} AND appleStoreId = #{appleStoreId}")
-    AppletStoreUser getAppletByUserStore(@Param("userId") Integer userId, @Param("appleStoreId") Integer appleStoreId);
-
-}

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardMapper.java

@@ -53,8 +53,6 @@ public interface IdCardMapper extends BaseMapper<IdCard> {
      */
     int selectAgentCount(@Param("certNo") String certNo, @Param("userId") String userId);
 
-    Integer getCountIdCard(@Param("certNo") String certNo);
-
     /**
      * 获取未关联结算信息的对私结算身份证信息
      *

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantBackLklMapper.java

@@ -1,9 +0,0 @@
-package cn.pluss.platform.mapper;
-
-import cn.pluss.platform.entity.MerchantBackLkl;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface MerchantBackLklMapper extends BaseMapper<MerchantBackLkl> {
-}

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelFeeMapper.java

@@ -1,9 +0,0 @@
-package cn.pluss.platform.mapper;
-
-import cn.pluss.platform.entity.MerchantChannelFee;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface MerchantChannelFeeMapper extends BaseMapper<MerchantChannelFee> {
-}

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java

@@ -5,6 +5,7 @@ import cn.pluss.platform.entity.UserProfit;
 import cn.pluss.platform.vo.*;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
@@ -22,6 +23,14 @@ import java.util.Map;
 @Mapper
 public interface MerchantOrderMapper extends BaseMapper<MerchantOrder> {
 
+	@Select("SELECT SUM(mro.refundAmt) refundFee FROM tb_pluss_merchant_order mo LEFT JOIN \n" +
+			"tb_pluss_merchant_refund_order mro ON (mo.orderNumber = mro.orderNumber OR mo.orderNumber = mro.refundNo)\n" +
+			"WHERE mo.snNo = #{snNo} AND mo.`status` = '1' AND mro.`status` = '1' " +
+			"AND mo.merchantCode = #{merchantCode} AND mro.refundTime LIKE CONCAT(#{date}, '%')")
+	BigDecimal selectRefundAmt(@Param("merchantCode") String merchantCode, @Param("snNo") String snNo, @Param("date") String date);
+
+	Page<MerchantOrder> page(IPage<MerchantOrder> page, @Param("map") Map<String, Object> map, @Param("statusList") List<String> statusList);
+
 	/**
 	 * 统计一些数值的合计值
 	 * @return .
@@ -37,43 +46,43 @@ public interface MerchantOrderMapper extends BaseMapper<MerchantOrder> {
     Integer queryMerchantOrderPageCount(Map map);
 
     void saveMerchantOrderBatch(List<MerchantOrder> merchantOrderList);
-    
+
     /**
      * 可提现总金额（提现规则  超过一个月的时间）推广
-     * @param 
+     * @param
      * @return
      */
 	Double sumMerchantAllowCashMoney(@Param(value = "memberCode") String memberCode);
-    
+
     /**
      * 不可提现总金额（提现规则 不超过一个月）推广
-     * @param 
+     * @param
      * @return
      */
 	Double sumMerchantNotAllowCashMoney(@Param(value = "memberCode") String memberCode);
-    
+
     /**
      * 今日分润 推广
      * @param merchantCode
      * @return
      */
 	Double sumNowDayShareMoney(@Param(value = "memberCode") String merchantCode);
-    
+
     /**
      * 累计总分润 推广
      * @return
      */
 	Double sumAllShareMoney(@Param(value = "memberCode") String memberCode);
 
-    
+
-    
+
     /**
-     * 供 商户推广- 交易明细 接口使用 
+     * 供 商户推广- 交易明细 接口使用
      * @param map
      * @return
      */
 	List<MerchantOrder> queryMerchantOrderPageApp(Map map);
-    
+
     /**
      * 供 商户推广- 交易明细 接口使用
      * @param map
@@ -82,23 +91,23 @@ public interface MerchantOrderMapper extends BaseMapper<MerchantOrder> {
 	Integer queryMerchantOrderPageCountApp(Map map);
 
     Integer queryMerchantOrderPageCountByTime(Map map);
-    
+
     Double queryMerchantOrdeFeeByTime(Map map);
 
 	List<MerchantOrder> queryMerchantOrderPageByTime(Map map);
-	
+
 	/**
 	 * 汇总流水（manage）
 	 */
 	SummaryOfWaterVO querySummaryOfWater(Map map);
-	
+
 	/**
 	 * 订单退款信息
 	 * @param map
 	 * @return
 	 */
 	List<MerchantOrder> queryMerchantOrderRefundPage(Map map);
-	
+
 	/**
 	 * 订单退款统计
 	 * @param map
@@ -107,111 +116,111 @@ public interface MerchantOrderMapper extends BaseMapper<MerchantOrder> {
 	Integer queryMerchantOrderRefundPageCount(Map map);
 
 	Double queryMerchantOrderShareMoney(Map map);
-	
+
 	/**
-	 * 
+	 *
-	 * queryOrderTask:(给wap端的定时任务使用的 暂定查3天内状态为5待支付的订单). <br/> 
+	 * queryOrderTask:(给wap端的定时任务使用的 暂定查3天内状态为5待支付的订单). <br/>
-	 * 
+	 *
-	 * @author Administrator 
+	 * @author Administrator
 	 * @param merchantOrder
-	 * @return 
+	 * @return
 	 * @since JDK 1.8
 	 */
 	List<MerchantOrder> queryOrderTask(MerchantOrder merchantOrder);
-	
+
 	/**
 	 * 7日交易数统计
-	 * @param s 
+	 * @param s
 	 */
 	List<OrderStatisticsVO> queryOrderStatistics(MerchantOrder s);
-	
+
 	/**
 	 * 支付通道统计
-	 * @param s 
+	 * @param s
 	 */
 	List<PayTypeStatisticsVO> queryPayTypeStatistics(MerchantOrder s);
-	
+
-	
+
 	Double queryMerchantOrderEnterFeeByTime(Map map);
-	
+
 	Double queryMerchantOrderShareMoneyByTime(Map map);
-	
+
 	/**
-	 * 
+	 *
-	 * queryMerchantOrderPageShuju:(最新统计订单方法). <br/> 
+	 * queryMerchantOrderPageShuju:(最新统计订单方法). <br/>
-	 * 
+	 *
-	 * @author Administrator 
+	 * @author Administrator
 	 * @param map
-	 * @return 
+	 * @return
 	 * @since JDK 1.8
 	 */
 	List<MerchantMangeOrderVO> queryMerchantOrderPageShuju(Map<String, Object> map);
 
 //	List<MerchantMangeOrderVO> queryMerchantOrderNoPageShuju(Map<String, Object> map);
-	
+
 	/**
-	 * 
+	 *
-	 * queryMerchantOrderPageCountShuju:(最新统计订单方法). <br/> 
+	 * queryMerchantOrderPageCountShuju:(最新统计订单方法). <br/>
-	 * 
+	 *
-	 * @author Administrator 
+	 * @author Administrator
 	 * @param map
-	 * @return 
+	 * @return
 	 * @since JDK 1.8
 	 */
 	Integer queryMerchantOrderPageCountShuju(Map<String, Object> map);
 
 //	Integer queryMerchantOrderNoPageCountShuju(Map<String, Object> map);
 	/**
-	 * 
+	 *
-	 * querySumEarnings:(统计总的收益 根据时间). <br/> 
+	 * querySumEarnings:(统计总的收益 根据时间). <br/>
-	 * 
+	 *
-	 * @author Administrator 
+	 * @author Administrator
 	 * @param map
-	 * @return 
+	 * @return
 	 * @since JDK 1.8
 	 */
 	List<MerchantMangeOrderVO> querySumEarnings(Map<String, Object> map);
-	
+
 	/**
-	 * 
+	 *
-	 * promoterSumCash:(推广员退关分润余额信息统计). <br/> 
+	 * promoterSumCash:(推广员退关分润余额信息统计). <br/>
-	 * 
+	 *
-	 * @author Administrator 
+	 * @author Administrator
 	 * @param userId
-	 * @return 
+	 * @return
 	 * @since JDK 1.8
 	 */
 	PromoterSumVO promoterSumCash(@Param(value = "userId") Long userId);
-	
+
-	
+
-	
+
 	/**
-	 * 
+	 *
-	 * PlatformSum:(统计平台大屏的门店数量 商户数量 交易总额 交易笔数 会员数量 推广员数量 推广分润总额 粉丝奖励总额 收益总计). <br/> 
+	 * PlatformSum:(统计平台大屏的门店数量 商户数量 交易总额 交易笔数 会员数量 推广员数量 推广分润总额 粉丝奖励总额 收益总计). <br/>
-	 * 
+	 *
-	 * @author Administrator 
+	 * @author Administrator
-	 * @return 
+	 * @return
 	 * @since JDK 1.8
 	 */
 	PlatformSumVO PlatformSum(@Param(value = "timeStatus") String timeStatus);
-	
+
 	/**
-	 * 
+	 *
-	 * sumConsumeFeebystoreId:(查询门店的今日流水 跟总流水). <br/> 
+	 * sumConsumeFeebystoreId:(查询门店的今日流水 跟总流水). <br/>
-	 * 
+	 *
-	 * @author Administrator 
+	 * @author Administrator
 	 * @param storeId
-	 * @return 
+	 * @return
 	 * @since JDK 1.8
 	 */
 	StoreVO sumConsumeFeebystoreId(String storeId);
-	
+
 	/**
-	 * 
+	 *
-	 * sumConsumeFeebystoreId:(查询商户的今日流水 跟总流水). <br/> 
+	 * sumConsumeFeebystoreId:(查询商户的今日流水 跟总流水). <br/>
-	 * 
+	 *
 	 * @author Administrator
-	 * @return 
+	 * @return
 	 * @since JDK 1.8
 	 */
 	StoreVO sumConsumeFeebymerchantCode(String merchantCode);
@@ -222,7 +231,7 @@ public interface MerchantOrderMapper extends BaseMapper<MerchantOrder> {
 	 * @return
 	 */
 	Double getOrderFeeSum1(Map<String, Object> orderMap);
-	
+
 	Double getToDayTransSum1(Map<String, Object> orderMap);
 
 	@Select("SELECT SUM(consumeFee) fee, status FROM tb_pluss_merchant_order ${ew.customSqlSegment}")

pluss-dao-bundle/src/main/resources/mapper/DeviceDetailMapper.xml

@@ -31,35 +31,20 @@
         ${ew.customSqlSegment}
     </select>
 
+<!--    <select id="selectListWithStockWithNoDetail" resultType="cn.pluss.platform.entity.DeviceDetail">-->
+<!--        SELECT dd.id, dd.code, dd.venderCode, dd.deviceLogo, dd.venderName, dd.venderModel,-->
+<!--               dd.aisleModel, dd.type, dd.groupNo, dd.size, dd.seq, dd.status, dd.createDt, dd.unitPrice,-->
+<!--               dd.wholesalePrice, dd.wholesaleMinNum, dd.introDesc, ds.specName typeDesc-->
+<!--        FROM tb_pluss_device_detail dd-->
+<!--                 LEFT JOIN tb_pluss_device_spec ds ON dd.type = ds.spec AND dd.`code` = ds.`code`-->
+<!--            ${ew.customSqlSegment}-->
+<!--    </select>-->
     <select id="selectListWithStockWithNoDetail" resultType="cn.pluss.platform.entity.DeviceDetail">
         SELECT dd.id, dd.code, dd.venderCode, dd.deviceLogo, dd.venderName, dd.venderModel,
                dd.aisleModel, dd.type, dd.groupNo, dd.size, dd.seq, dd.status, dd.createDt, dd.unitPrice,
                dd.wholesalePrice, dd.wholesaleMinNum, dd.introDesc, ds.specName typeDesc
         FROM tb_pluss_device_detail dd
-                 LEFT JOIN tb_pluss_device_spec ds ON dd.type = ds.spec AND dd.`code` = ds.`code`
+                 LEFT JOIN tb_pluss_device_spec ds ON  dd.`code` = ds.`code`
             ${ew.customSqlSegment}
     </select>
-<!--    <select id="selectListWithStockWithNoDetail" resultType="cn.pluss.platform.entity.DeviceDetail">-->
-<!--        SELECT dd.id,-->
-<!--               dd.code,-->
-<!--               dd.venderCode,-->
-<!--               dd.deviceLogo,-->
-<!--               dd.venderName,-->
-<!--               dd.venderModel,-->
-<!--               dd.aisleModel,-->
-<!--               dd.type,-->
-<!--               dd.groupNo,-->
-<!--               dd.size,-->
-<!--               dd.seq,-->
-<!--               dd.status,-->
-<!--               dd.createDt,-->
-<!--               dd.unitPrice,-->
-<!--               dd.wholesalePrice,-->
-<!--               dd.wholesaleMinNum,-->
-<!--               dd.introDesc,-->
-<!--               ds.specName typeDesc-->
-<!--        FROM tb_pluss_device_detail dd-->
-<!--                 LEFT JOIN tb_pluss_device_spec ds ON dd.`code` = ds.`code` GROUP BY dd.id-->
-<!--            ${ew.customSqlSegment}-->
-<!--    </select>-->
 </mapper>

pluss-dao-bundle/src/main/resources/mapper/IdCardMapper.xml

@@ -70,10 +70,4 @@
           AND ua.`userId` != #{userId}
           AND t1.`userType` = '01'
     </select>
-    <select id="getCountIdCard" resultType="java.lang.Integer">
-        SELECT count(`certNo`)
-        FROM tb_pluss_id_card
-        WHERE
-          `certNo` = #{certNo}
-    </select>
 </mapper>

pluss-dao-bundle/src/main/resources/mapper/MerchantOrder-sqlmap.xml

@@ -15,6 +15,51 @@
         </foreach>
     </insert>
 
+    <select id="page" resultType="cn.pluss.platform.entity.MerchantOrder">
+        SELECT
+        IFNULL(mro.orderNumber, mo.orderNumber) orderNumber, mo.merchantCode, mo.merchantName, mo.payTypeCode,
+        mo.thirdTransNo, mo.consumeFee, mo.createDt, mo.transDt, mo.staffCode, mo.staffName, mo.`status`,
+        mo.enterFee, mo.remark, mo.updateTime, mo.rate, mo.mercOrderNo, mo.isRecharge, mo.snNo, mo.cashPlaceId,
+        mo.settlementType, mo.drType, mro.refundAmt, mro.refundTime
+        FROM
+        tb_pluss_merchant_order mo
+        LEFT JOIN tb_pluss_merchant_refund_order mro ON mo.merchantCode = mro.merchantCode
+        AND (mo.orderNumber = mro.orderNumber OR mo.orderNumber = mro.refundNo) AND mo.`status` = '2'
+        <where>
+            <if test="map.merchantCode != null and map.merchantCode != ''">
+                AND mo.merchantCode = #{map.merchantCode}
+            </if>
+            <if test="map.snNo != null and map.snNo != ''">
+                AND mo.snNo = #{map.snNo}
+            </if>
+            <if test="map.createDate != null">
+                AND (
+                (mo.createDate LIKE CONCAT(#{map.createDate}, '%') AND mo.status = '1')
+                OR (mro.refundTime LIKE CONCAT(#{map.createDate}, '%') AND mo.status IN ('2', '6'))
+                )
+            </if>
+            <if test="map.startTime != null">
+                AND (
+                (mo.transTime &gt; #{map.startTime} AND mo.status = '1')
+                OR (mro.refundTime &gt; #{map.startTime} AND mo.status IN ('2', '6'))
+                )
+            </if>
+            <if test="map.endTime != null">
+                AND (
+                (mo.transTime &lt; #{map.endTime} AND mo.status = '1')
+                OR (mro.refundTime &lt; #{map.endTime} AND mo.status IN ('2', '6'))
+                )
+            </if>
+            <if test="statusList != null and statusList.size > 0">
+                AND mo.`status` IN
+                <foreach collection="statusList" item="item" close=")" separator="," open="(">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        ORDER BY mo.updateTime
+    </select>
+
     <select id="queryMerchantOrder"
             parameterType="cn.pluss.platform.entity.MerchantOrder"
             resultType="cn.pluss.platform.entity.MerchantOrder">

pluss-manage-page/src/main/java/cn/pluss/platform/ManageApplication.java

@@ -1,18 +1,13 @@
 package cn.pluss.platform;
 
-import cn.pluss.platform.klk.util.HtmlUtil;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
 @MapperScan("cn.pluss.platform.mapper")
@@ -31,12 +26,4 @@ public class ManageApplication extends SpringBootServletInitializer {
 		return builder.sources(ManageApplication.class);
 	}
 
-
-	@Bean
-	public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
-		return (args) -> {
-			logger.info("=========================启动完成==========================");
-			ctx.getBean(HtmlUtil.class).initHtml();
-		};
-	}
 }

pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/LoginController.java

@@ -42,11 +42,11 @@ public class LoginController {
     public Result<Object> jwtTest(HttpServletRequest request) {
         String token = request.getHeader("token");
         String userId = request.getHeader("userId");
-//
+
-//        if (!Objects.equals("244", userId)) {
+        if (!Objects.equals("244", userId)) {
-//            // 此处不能返回401, 不然会形成死循环
+            // 此处不能返回401, 不然会形成死循环
-//            throw new MsgException("未授权");
+            throw new MsgException("未授权");
-//        }
+        }
 
         Object tokenUserId = JwtUtils.get("uid", token);
         if (!Objects.equals(userId, tokenUserId.toString())) {
@@ -103,20 +103,20 @@ public class LoginController {
         userInfo.setLoginName(username);
         userInfo = uiService.getOne(new QueryWrapper<>(userInfo));
 
-//        String ipAddr = IpUtils.getIpAddr(request);
+        String ipAddr = IpUtils.getIpAddr(request);
-//        DescribeIpv4LocationResponse clientLocation = ipLocationService.getLocation(ipAddr);
+        DescribeIpv4LocationResponse clientLocation = ipLocationService.getLocation(ipAddr);
-//        String location = clientLocation.getCountry()
+        String location = clientLocation.getCountry()
-//                + "," + clientLocation.getProvince()
+                + "," + clientLocation.getProvince()
-//                + "," + clientLocation.getCity()
+                + "," + clientLocation.getCity()
-//                + "," + clientLocation.getCounty();
+                + "," + clientLocation.getCounty();
         if (userInfo == null) {
-            //wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, false);
+            wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, false);
             result.put("message", "用户名或者密码错误");
             return result;
         }
 
         if (!userInfo.getPassword().equals(MD5.create().digestHex(password, StandardCharsets.UTF_8))) {
-            //wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, false);
+            wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, false);
             result.put("message", "用户名或者密码错误");
             return result;
         }
@@ -126,7 +126,7 @@ public class LoginController {
         result.put("token", JwtUtils.getToken(userInfo));
         result.put("userId", userInfo.getId());
 
-        //wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, true);
+        wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, true);
         return result;
     }
 

pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java

@@ -395,7 +395,7 @@ public class MerchantStoreController extends BaseNoModelController {
 
 
     /**
-     * 手动进件后台发起
+     * 手动后台发起进件
      */
     @PassToken
     @GetMapping(value = "/manualMerchantIncom/{userId}/{id}/{merchantCode}")
@@ -462,12 +462,11 @@ public class MerchantStoreController extends BaseNoModelController {
         }
 
         Map<String, Object> result = new HashMap<>(2);
-        Integer channel =0;
         try {
             JSONObject params = new JSONObject();
             params.put("userId", ua.getUserId() + "");
             //ysAuditServiceV2.merchantAudit(ua.getUserId() + "", false);
-            ysAuditServiceV3.merchantAuditV3(String.valueOf(ua.getUserId()), false,channel); // userAppService.merchantAudit(params, "4");
+            ysAuditServiceV3.merchantAuditV3(String.valueOf(ua.getUserId()), false); // userAppService.merchantAudit(params, "4");
             result.put("code", "1");
             result.put("msg", "发起进件成功, 稍后查看进件状态");
             return result;

pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckTransOrderStatusJob.java

@@ -46,9 +46,6 @@ public class CheckTransOrderStatusJob {
     @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
     private PayService ysPayOldService;
 
-    @Setter(onMethod_ = {@Autowired, @Qualifier("lkLPayService")})
-    private PayService lklPayService;
-
     /**
      * 检查待确认订单状态定时任务 5秒执行一次
      */
@@ -119,9 +116,7 @@ public class CheckTransOrderStatusJob {
             //银盛
             }else if(channel.getChannel() == 4){
                 result = ysPayOldService.tradeQuery(order, channel.getMerchantId());
-            }else if(channel.getChannel()==5){
+            }else{
-                result=lklPayService.tradeQuery(order,channel.getMerchantId());
-            }else {
                 continue;
             }
             if(result != null){

pluss-manage-page/src/main/resources/application-dev.yml

@@ -1,16 +1,16 @@
 spring:
-  datasource:
-    druid:
-    url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true
-    username: root
-    password: CZGmysqlroot@123
-    driver-class-name: com.mysql.jdbc.Driver
 #  datasource:
 #    druid:
-#    url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true
 #    username: root
-#    password: prodCZGmysqlroot@123
+#    password: CZGmysqlroot@123
 #    driver-class-name: com.mysql.jdbc.Driver
+  datasource:
+    druid:
+    url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: prodCZGmysqlroot@123
+    driver-class-name: com.mysql.jdbc.Driver
 logging:
   config: classpath:log4j2-dev.xml
 

pluss-manage-page/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   profiles:
     include: common, ryx, ys
-    active: prod
+    active: dev
   servlet:
     multipart:
       max-file-size: 100MB
@@ -26,16 +26,11 @@ spring:
     scheduling:
       pool:
         size: 10
-  freemarker:
-    template-loader-path: classpath:/temp
-    allow-request-override: false
-    charset: utf-8
-    content-type: text/html
-    expose-request-attributes: true
 
 server:
   port: 8083
+  servlet:
+    context-path: /manage
   compression:
     enabled: true
     mime-types: application/json
-

pluss-manage-page/src/main/resources/temp/indexHTKWECHAT_PAY.html

@@ -1,462 +0,0 @@
-<html xmlns="http://www.w3.org/1999/html">
-<head>
-    <meta charset="UTF-8">
-    <style>
-        .alert-ti {
-            width: 100%;
-            margin: 0 auto;
-            margin-top: .5rem;
-            font-size: .7rem;
-            height: 7%;
-            font-weight: 600;
-            text-align: center;
-        }
-
-        .tb-title {
-            text-align: center;
-            font-weight: 800;
-            background: rgb(177, 178, 177);
-            font-size: 14px;
-        }
-
-        .ag-title {
-            text-align: center;
-            font-weight: 600;
-            padding-top: 32px;
-            padding-bottom: 16px;
-        }
-
-        body {
-            font-size: 14px;
-            font-family: Helvetica, Arial, "Hiragino Sans GB", "Microsoft Yahei", "微软雅黑", STHeiti, "华文细黑", sans-serif;
-            padding: 8px;
-        }
-
-        .feeWrite {
-            font-weight: 600;
-            text-decoration: underline;
-        }
-
-        .feeWrite2 {
-            font-weight: 600;
-            font-size: 16px;
-            text-decoration: underline;
-
-        }
-
-        b {
-            font-weight: 800;
-        }
-
-        .ag-content-content {
-            margin-bottom: 8px;
-        }
-
-        .ag-content-content-title {
-            display: block;
-            text-indent: 2em;
-        }
-
-        .ag-content-content-title-span {
-            text-indent: 2em;
-        }
-
-        table {
-            background: #000;
-            font-size: 11px;
-            width: 100%;
-            text-indent: 0;
-        }
-
-        table td {
-            background: white;
-            line-height: 20px;
-            height: 20px;
-        }
-
-        .table-title {
-            text-align: center;
-        }
-
-        .tb-con {
-            padding: 20px;
-            display: block;
-        }
-
-    </style>
-</head>
-<body>
-<div class="alert-as" style="width: 100%; height: auto">
-    <div class="alert-content">
-        <div class="ag-all">
-            <div class="ag-all-content">
-                <div style="width: 100%;" class="ag-img">
-                    <div class="ag-title">
-                        <b>特约商户支付服务合作协议</b>
-                    </div>
-                    <div class="ag-content">
-                        <div class="ag-content-content">
-                            <div class="ag-content-content-title" style="text-indent: 2em; ">
-                                《特约商户支付服务合作协议》（以下简称“本协议”）是拉卡拉支付股份有限公司（正文部分简称“乙方”）与您（是指接受拉卡拉支付服务的个人或公司法人及相关单位组织等，正文部分简称“甲方”）就“支付服务业务”服务（以下简称“本服务”）所订立的有效合约。
-                                您在使用本服务之前，请仔细阅读本协议（特别是以<b>粗体</b>标注的内容），<b>您在拉卡拉客户经理向您展示的本协议上签字，即表示您同意接受本协议的全部内容</b>。如果您不同意本协议的任意内容，或者无法准确理解相关条款，请不要签字。
-                            </div>
-                        </div>
-                        <div class="ag-content-content">
-                            <div style="text-indent: 2em; line-height: ">甲方：（特约商户）<span class="feeWrite">${customerName}</span>
-                            </div>
-                            <div style="text-indent: 2em; line-height: ">乙方：（支付机构）拉卡拉支付股份有限公司</div>
-                        </div>
-                        <div class="ag-content-content">
-                            <div class="ag-content-content-title"><b>第一条</b> 业务服务及费用：</div>
-                            <div class="ag-content-content-title-span">1．双方确认，乙方向甲方提供支付服务。</div>
-                            <div class="ag-content-content-title-span">
-                                2．甲方使用本服务将会产生相应的收单手续费（详见《拉卡拉商户注册登记表》），甲方也可通过APP查询收单手续费。
-                            </div>
-                            <div class="ag-content-content-title-span">
-                                3．乙方保留调整本协议项下的费用之权利，如本协议项下的费用调整，乙方将以公告方式在拉卡拉网站提示并予以公示，而无需另行通知甲方，调整后的费用标准在公告期届满之日起生效。若甲方在费用标准调整后继续使用本服务的，视为甲方接受费用标准的调整。若甲方不同意调整后的费用标准，应停止使用本服务并与乙方联系。
-                                <div class="ag-content-content">
-                                    <div class="ag-content-content-title"><b>第二条</b>
-                                        甲方如使用移动通讯受理终端（含内置Esim卡），甲方应向乙方另行支付运营服务费（详见《拉卡拉商户注册登记表》），运营服务包括终端网络维护，质量管理，应急响应等，服务期自终端入网之日起1年。甲方应自本协议生效之日起1个工作日内向乙方支付首年运营服务费，首年服务到期30日前向乙方支付次年运营服务费，以此类推。
-                                    </div>
-                                    <div class="ag-content-content-title-span"></div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第三条</b>
-                                            乙方应将甲方的交易资金在扣除本协议约定的手续费和其他款项后，在约定的结算周期（详见《拉卡拉商户注册登记表》）内，向甲方指定的结算账户划付资金，境外卡支付业务在3个工作日内划付资金。甲方可根据需求选择开通交易发生日结算，乙方审核通过后，将另行扣收相应的快速结算手续费<sup>1</sup>，具体以拉卡拉商户通APP展示的为准。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第四条</b>
-                                            甲方默认开通退货功能，当甲方发生退货、撤销、冲正交易情形时，乙方有权采用以下一或多种模式将退款资金扣除：（1）从甲方退款终端交易资金中直接扣除；（2）从甲方退款商户交易资金中直接扣除；（3）从甲方退货账户资金中直接扣除；（4）从甲方合作平台/集团商户退货账户资金中直接扣除。如甲方需关闭退货功能，甲方可拨打乙方客服电话95016关闭退货功能。
-                                        </div>
-                                        <div class="ag-content-content-title-span">
-                                            对甲方、合作平台/集团商户退货账户进行扣款后，甲方同意并授权乙方依据实际情况将甲方交易资金回充至相应退货账户。甲方因退货操作错误等原因造成的资金风险及损失由甲方承担。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第五条</b>
-                                            乙方应按国家法律法规履行支付机构相关责任与义务。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第六条</b>
-                                            乙方（含乙方分支机构、合作方,下同）为甲方提供的受理终端（包含收款码）仅限甲方在固定地区使用。
-                                            甲方应提供符合受理终端安装要求的场地条件，并妥善保管和使用，如因甲方管理或使用不当造成终端损坏或遗失的，甲方应按市场价向乙方赔偿，<b>赔付方式为现金、转账或授权乙方从甲方终端押金、交易资金等途径扣除。</b>
-                                            双方协议终止时，乙方有权收回放置在甲方的受理终端或关闭网络支付接口。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第七条</b>
-                                            受理终端收费标准由乙方与甲方另行约定。固定受理终端、移动受理终端、扫码受理终端数量及型号以拉卡拉客户端及拉卡拉商户通APP展示的数量及型号为准。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第八条</b>
-                                            甲方应准确填写附件《拉卡拉商户注册登记表》中的相关信息，当甲方的工商注册名称、主营业务、法定代表人或负责人、结算账户信息等重要信息发生变更时，甲方应通过乙方官方渠道方式告知乙方，乙方有权重新审核甲方支付业务受理资质。
-                                            当乙方认为甲方不再具备受理资质时，乙方有权单方面终止本协议。 甲方申请成为乙方特约商户，应主动如实提供经营资质材料及身份证明文件。
-                                            甲方应保证上述资料完整、真实、合法、有效。若身份证明文件存在有效期，应在有效期前主动向乙方提供新的证明文件，证明文件失效且经乙方提示仍无合理理由拒绝更新的，乙方有权对甲方采取交易限制措施或终止向甲方提供本协议项下相关的服务。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第九条</b>
-                                            甲方应当履行以下基本义务：
-                                            <div class="ag-content-content-title-span">
-                                                1．基于真实的商品或服务交易背景受理银行卡，并遵守相应银行卡品牌的受理要求，不得歧视和拒绝同一银行卡品牌的不同发卡银行的持卡人；
-                                            </div>
-                                            <div class="ag-content-content-title-span">
-                                                2．按规定使用受理终端（网络支付接口）和收单结算账户，不得利用其从事或协助他人从事非法活动；
-                                            </div>
-                                            <div class="ag-content-content-title-span">3．妥善处理交易数据信息、保存交易凭证，保障交易信息安全；
-                                            </div>
-                                            <div class="ag-content-content-title-span">
-                                                4．不得因持卡人使用银行卡而向持卡人收取或变相收取附加费用，或降低服务水平；
-                                            </div>
-                                            <div class="ag-content-content-title-span">
-                                                5．不得存储持卡人银行卡的磁道信息或芯片信息、验证码、有效期、密码等敏感信息；
-                                            </div>
-                                            <div class="ag-content-content-title-span">6．确保网络支付指令的真实性、准确性、合法性；</div>
-                                            <div class="ag-content-content-title-span">
-                                                7．仅在中华人民共和国境内（不包含香港特别行政区、澳门特别行政区及台湾地区）使用本支付服务。
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第十条 </b>
-                                            对经<b>查实</b>的交易差错或甲方需调整的账务，乙方负责按照中国银联或其他卡组织差错处理的有关规定进行相应处理。对有疑议的交易，乙方有权向甲方调单。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第十一条 </b>
-                                            甲方需保存所有交易的签购单及其他的交易证明材料，<b>保存期限自交易日起至少2年</b>，如因甲方资料保存不善造成的风险损失由甲方自行承担。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第十二条</b>
-                                            在出现交易纠纷、持卡人调退单或乙方有合理理由认定交易有可疑之处时，乙方有权查验甲方原始交易签购单及相关交易证明材料，并影印留存。
-                                            甲方应根据乙方要求提供真实的交易受理情况，对于乙方提出的调取交易证明材料的要求，甲方应自乙方通知之日（含）起3个工作日内提供有效交易证明材料。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第十三条</b>
-                                            <b>甲方发生以下情况时，乙方有权采取暂缓甲方全部或部分交易资金结算至少180天以上：</b>
-                                        </div>
-                                        <div class="ag-content-content-title-span"><b>1．发卡行发起调、退单；</b></div>
-                                        <div class="ag-content-content-title-span"><b>2．超出约定地理范围使用终端或终端位置无法监测的；</b>
-                                        </div>
-                                        <div class="ag-content-content-title-span">
-                                            <b>3．交易金额、时间、频率与甲方经营范围、规模不相符等异常情形；</b></div>
-                                        <div class="ag-content-content-title-span"><b>4．疑似虚假申请、银行卡套现、洗钱、欺诈、移机、留存或泄漏持卡人账户信息等风险事件；</b>
-                                        </div>
-                                        <div class="ag-content-content-title-span"><b>5．从事其他违反国家法律法规规定的犯罪、违法活动；</b>
-                                        </div>
-                                        <div class="ag-content-content-title-span"><b>6．乙方认为甲方调退单比例过高、交易纠纷比例过高或有合理理由认定交易存在可疑之处，或有合理根据怀疑甲方违反本协议的其他行为；</b>
-                                        </div>
-                                        <div class="ag-content-content-title-span"><b>7．被工商等管理部门吊销营业执照或行政许可等，从而丧失本协议所列经营资格的；</b>
-                                        </div>
-                                        <div class="ag-content-content-title-span"><b>8．将乙方支付接口用于非本协议约定业务或提供给本协议约定外的第三人使用。</b>
-                                        </div>
-                                        <div class="ag-content-content-title-span">
-                                            <b>甲方发生以上第2-8项情况时，乙方同时有权设置收款限额、暂停银行卡交易、收回受理终端、关闭网络支付接口、单方面无条件终止本协议等措施，由此带给乙方的相关损失和风险责任由甲方承担。
-                                                且乙方有权将甲方相关信息报送至中国银联或其他卡组织风险信息共享系统及中国支付清算协会风险信息共享系统，并向执法、监管部门、相关征信机构通报，发现甲方涉嫌电信网络新型违法犯罪的，乙方还有权立即向公安机关报告。</b>
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第十四条
-                                            发生以下情况时，乙方有权从甲方押金、保证金及交易资金中抵扣相应款项，如前述款项不足抵扣的，甲方应根据乙方要求补足差额资金。对因甲方原因造成的乙方垫款或损失，乙方有权向甲方追索。</b>
-                                            <div class="ag-content-content-title-span"><b>1．甲方发生退货、冲正、撤销交易；</b></div>
-                                            <div class="ag-content-content-title-span"><b>2．由于计算错误或其它原因导致乙方向甲方多支付的款项或其它经甲方确认的长款；</b>
-                                            </div>
-                                            <div class="ag-content-content-title-span">
-                                                <b>3．因甲方原因导致的发卡机构退单或卡组织追究乙方违约金；</b></div>
-                                            <div class="ag-content-content-title-span"><b>4．名义经营范围与实际情况不符而造成的本协议项下的费用差额补偿部分（补偿部分的时限为自发现日起前180天）；</b>
-                                            </div>
-                                            <div class="ag-content-content-title-span">
-                                                <b>5．甲方违反本协议约定，导致乙方先行垫付相关方赔偿还款的；</b></div>
-                                            <div class="ag-content-content-title-span"><b>6．其它应由甲方支付的款项。</b></div>
-                                            <div class="ag-content-content-title-span"><b>本条款不随双方协议终止而终止，乙方在法律规定的诉讼时效内，均有权就合作期间甲方因本条款给乙方造成的损失向甲方追索。</b>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第十五条</b>
-                                            乙方有权对甲方进行风险评级，如甲方风险等级较高，乙方对其开通的受理卡种和交易类型进行限制，并采取强化交易监测、设置交易限额、延迟结算、增加检查频率、建立特约商户风险准备金等风险管理措施。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第十六条</b>
-                                            乙方有权对甲方经营场所进行现场检查，如甲方无固定经营场所，乙方有权要求甲方定期上传经营影像或照片。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第十七条</b>
-                                            如甲方连续3个月未发生交易的，乙方有权重新核验甲方商户身份，如无法核实或核实后不再具备受理资质时，乙方有权单方面终止本协议；
-                                            <b>如甲方连续12个月未发生交易的，乙方有权单方面终止本协议。</b>
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第十八条
-                                            乙方除有权根据本协议及附件约定外，还有权根据中国人民银行、中国银联、境外卡组织、中国清算协会已发布的及后续发布的各类通知、要求、指导意见等规范性文件内容对甲方进行监督管理并采取必要措施。</b>
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第十九条 </b>甲方所有在线操作包括在乙方网站、业务系统、微信服务平台、APP等的操作和交易，甲方的登录账号和密码是乙方验证甲方身份的重要印签，甲方对此负有保密责任。
-                                            <b>凡使用甲方登录账号和密码进行的线上操作和交易均视为甲方亲自办理的有效委托，具有同书面委托同等的法律效力。
-                                                甲方对使用甲方登录账号和密码进行的所有线上操作及交易结果承担全部经济和法律责任，有证据证明系乙方原因导致甲方账号、密码泄露的情形除外。</b>
-                                        </div>
-
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第二十条
-                                            甲方同意并指定数据处理方（含其分支机构及总公司，详见《拉卡拉商户注册登记表》）为其提供数据处理服务，同意并授权数据处理方为终端布放与受理标识张贴、终端维护、商户培训、耗材配送、交易证明材料调取、对账目的收集、
-                                            存储并向乙方传送甲方通过线下或线上方式提供的入网信息（包括但不限于《拉卡拉商户注册登记表》中的信息、商户提交的电子版及纸质版资料以及监管部门要求的其他信息），同意并授权乙方将甲方金融信息（包括甲方企业名称、统一社会信用代码、法定代表人姓名及证件号码、经营地址、联系人姓名及证件号码、联系人手机号、联系人电子邮箱、结算账户信息、交易数据、入账信息、对账单明细数据，下同）提供给数据处理方，同意并授权数据处理方从乙方接收并处理前述甲方相关信息。
-                                            乙方已要求数据处理方按照国家法律法规规定对该等信息采取安全保护措施。若甲方不同意前述授权，甲方可拨打乙方客服电话95016，取消授权。</b>
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第二十一条
-                                            甲方同意并授权乙方直接或通过数据处理方接收并按以下方式使用甲方信息将甲方通过线下或线上方式提供的入网信息（包括但不限于《拉卡拉商户注册登记表》中的信息、商户提交的电子版及纸质版资料以及监管部门要求的其他信息）用于乙方支付业务特约商户入网审核、反洗钱管理、实名制管理、风控评估。
-                                            同时，甲方同意并授权乙方以加密传输方式将甲方信息共享给具备提供验证服务资质的第三方机构进行一致性比对并输出核验结果，同意并授权第三方机构使用甲方的信息用于验证服务并以加密传输的方式向乙方返回核验结果。</b>
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第二十二条
-                                            鉴于甲方结算账户所属银行会不定期开展商户手续费补贴等营销活动，甲方同意乙方推荐甲方参加结算行账户所属银行的营销活动，将甲方金融信息提供给甲方结算账户所属银行（包括该银行相关分支行），用于评估甲方是否符合活动要求，对营销活动期间相关数据进行风控管理、考核对账的目的，甲方同意并授权银行从乙方接收并处理前述甲方相关信息。乙方已要求银行按照国家法律法规规定对该等信息采取安全保护措施。若甲方不同意前述授权，甲方可拨打乙方客服电话95016，取消授权。</b>
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第二十三条</b>
-                                            乙方将对甲方金融信息严格保密，除本协议约定情形外，不会泄露或者非法向他人提供甲方金融信息。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第二十四条
-                                            本协议执行过程中，如中国人民银行、中国银联、境外卡组织等相关监管机构或行业组织的相关规定或乙方业务规则、市场政策发生变化，导致支付业务规则发生变化或者本协议项下的费用发生变化，乙方可以单方面调整相关条款约定。</b>
-                                        </div>
-                                        <div class="ag-content-content-title-span"><b>甲方理解并同意乙方采取在官方网站公告、电子服务渠道信息推送、邮件或短信通知等方式向甲方发起变更通知。如甲方不同意该变更后的内容，应停止使用乙方服务；
-                                            如甲方在获知或在合理时限内应当获知乙方变更通知后，仍继续使用乙方服务的，视为同意对协议涉及条款进行变更。</b></div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content-title"><b>第二十五条</b>
-                                            甲方可通过【拉卡拉商户通APP】或客服热线95016进行业务咨询、查账、投诉等操作。
-                                        </div>
-                                    </div>
-                                    <div class="ag-content-content">
-                                        <div class="ag-content-content">
-                                            <div class="ag-content-content-title"><b>第二十六条</b>
-                                                任何一方违反本协议约定，另一方有权要求在合理期限内纠正，要求赔偿因此遭受的直接经济损失。但<b>任何一方均无须向对方的间接损失、预期利益承担赔偿责任。</b>
-                                            </div>
-                                        </div>
-                                        <div class="ag-content-content">
-                                            <div class="ag-content-content-title"><b>第二十七条</b>
-                                                除本协议另有约定外，双方均有权根据业务需要单方解除或终止本协议，但应提前30天通知对方。
-                                            </div>
-                                        </div>
-                                        <div class="ag-content-content">
-                                            <div class="ag-content-content-title"><b>第二十八条</b> 通知</div>
-                                            <div class="ag-content-content-title-span">
-                                                1．甲方确认，其在《拉卡拉商户注册登记表》中指定的“联系人”、“联系地址”、“联系人电子邮箱”、“联系人电话”等联系信息可用于乙方处理本协议项下事务时向甲方履行通知、文件物品递送义务。
-                                                其中，“联系人”负责对本协议所涉事务的沟通、文件物品的签收、移交等事宜。乙方发送到甲方指定的“联系地址”、“联系人电子邮箱”即视为对甲方的有效送达。
-                                            </div>
-                                            <div class="ag-content-content-title-span">
-                                                2．甲方确认，其变更《拉卡拉商户注册登记表》中指定的联系信息时，应至少提前5个工作日以书面方式通知乙方。因甲方未及时通知导致乙方依照本协议约定联系信息履行通知、文件物品递送义务的，乙方的通知、文件物品（包括但不限于设备、文件及资料等）自发送之日起第3个工作日（含）视为乙方送达之日。</b></div>
-                                        </div>
-                                        <div class="ag-content-content">
-                                            <div class="ag-content-content-title"><b>第二十九条</b> 争议解决
-                                                <div class="ag-content-content-title-span">
-                                                    1．双方在履行本协议过程中发生的任何争议双方应首先协商解决，协商不成，任何一方可将该争议<b>提请上海国际经济贸易仲裁委员会按照该会仲裁规则进行仲裁。</b>
-                                                </div>
-                                                <div class="ag-content-content-title-span">
-                                                    2．由于计算错误或其它原因导致乙方向甲方多支付的款项或其它经甲方确认的长款。
-                                                </div>
-                                                <div class="ag-content-content-title-span">
-                                                    3．因甲方原因导致的发卡机构退单或卡组织追究乙方违约金。
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="ag-content-content">
-                                            <div class="ag-content-content-title"><b>第三十条</b> 协议生效</div>
-                                            <div class="ag-content-content-title-span">1. 本协议自甲方签字后生效，有效期为一年。
-                                                有效期届满后如双方无任何书面异议，本协议将自动延期，每次延期一年，依此类推。若甲乙任何一方对延期有异议，应于协议当次届满前一个月向对方书面提出异议。
-                                                甲乙双方过往签订的协议如与本协议有冲突以本协议为准。
-                                            </div>
-                                            <div class="ag-content-content-title-span">2.
-                                                本协议未尽事宜，双方可另行协商签订补充协议，本协议附件及补充协议是本协议不可分割的组成部分。
-                                            </div>
-                                            <b>
-                                                <div class="ag-content-content-title-span">3.
-                                                    本协议附件包括《银行卡支付业务服务条款》、《拉卡拉扫码支付业务条款》、《境外银行卡支付业务条款》、《互联网支付服务条款》及其子附件（《代付服务基本条款》、《互联网快捷支付服务基本条款》、
-                                                    《网银B2C/B2B支付服务基本条款》、《协议支付服务基本条款》、《第三方支付服务基本条款》）、《拉卡拉用户隐私政策》，上述附件由甲方登陆拉卡拉官方网站（www.lakala.com）查阅、下载并留存。
-                                                    上述附件内容与本协议约定冲突的，以本协议约定为准。
-                                                </div>
-                                                <div class="ag-content-content-title-span">4.
-                                                    本协议中，乙方遵照监管规范，按照最少必要原则收集、使用甲方的金融信息，用以向甲方提供服务、保障服务质量、保障甲方的账户和资金安全以及符合国家法律法规及监管规定要求，如果不同意，可能会影响服务的开通和部分服务的使用。
-                                                    更多关于用户金融信息保护的内容，请查阅《拉卡拉用户隐私政策》
-                                                </div>
-                                            </b>
-                                        </div>
-                                        <div class="ag-content-content">
-                                            <div class="ag-content-content-title">
-                                                <b>甲方声明：乙方已采取合理方式提请甲方注意本协议、附件及官方网站公示内容的条款，并详细说明；甲方在本协议上签字视为同意本协议、附件及官方网站公示内容的条款。</b>
-                                            </div>
-                                        </div>
-                                        <div class="ag-content-content">
-                                            <div class="ag-content-content-title">
-                                                <div class="table">
-                                                    <br/>
-                                                    <br/>
-                                                    <div class="table-title"><b>拉卡拉商户注册登记表</b></div>
-                                                    <br/>
-                                                    <br/>
-                                                    <div class="table-content">
-                                                        <table style="text-align: center" border="0"
-                                                               cellspacing="1"
-                                                               cellpadding="4">
-                                                            <tr colspan="4">
-                                                                <td colspan="4" class="tb-title"><b>执照信息</b></td>
-                                                            </tr>
-
-                                                            <tr style="width: 100%;">
-                                                                <td style=""><span class="td-con"> 营业执照号</span>
-                                                                </td>
-                                                                <td style="">${licenseNo}</td>
-                                                                <td style=""><span class="td-con"> 法人</span>
-                                                                </td>
-                                                                <td style="">${legalName}</td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td style="">执照名/商户名</td>
-                                                                <td style="">${licenseName}</td>
-                                                                <td style="">身份证号</td>
-                                                                <td style="">${identityNo}</td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td style="">所在区域</td>
-                                                                <td style="">${address}</td>
-                                                                <td style="">有效期</td>
-                                                                <td style="">${identityNoExpire}</td>
-
-                                                            </tr>
-                                                            <tr>
-                                                                <td style="">详细地址</td>
-                                                                <td colspan="3" style="">${receiveDetail}</td>
-                                                            </tr>
-                                                            <tr colspan="4">
-                                                                <td colspan="4" class="tb-title"><b>结算信息</b></td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td style="">入账户名</td>
-                                                                <td style="">${accountName}</td>
-                                                                <td style="}">身份证号</td>
-                                                                <td style="">${accountIdCard}</td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td style="">入款账号</td>
-                                                                <td style="">${accountNo}</td>
-                                                                <td style="">有效期</td>
-                                                                <td style="">${accountIdDtEnd}</td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td style="">开户行</td>
-                                                                <td colspan="3">${bankName}</td>
-                                                            </tr>
-                                                            <tr colspan="4">
-                                                                <td colspan="4" class="tb-title"><b>商户信息</b></td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td style="">签购单名称</td>
-                                                                <td style="">${licenseName}</td>
-                                                                <td style="">对账单邮箱</td>
-                                                                <td style="">${mail}</td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td style="">联系人</td>
-                                                                <td style="">${contactManName}</td>
-                                                                <td style="">商户类别</td>
-                                                                <td style="">${channelType}</td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td style="">手机号</td>
-                                                                <td style="">${phone}</td>
-                                                                <td style="">商户地址</td>
-                                                                <td style="">${receiveDetail}</td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td style="">数据处理方</td>
-                                                                <td colspan="3">${agencyName}</td>
-                                                            </tr>
-                                                        </table>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-</body>
-</html>

pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index.jsp

@@ -36,7 +36,7 @@
 <div class="layui-layout layui-layout-admin">
     <div class="layui-header">
         <div class="layui-logo">
-            银收客系统
+            快银系统
         </div>
         <ul class="layui-nav layui-layout-right">
             <li style="float: left">

pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index2.jsp

@@ -119,7 +119,7 @@
         <div class="layui-side layui-side-menu">
             <div class="layui-side-scroll">
                 <div class="layui-logo" lay-href="home/console.html">
-                    <span>银收客管理平台</span>
+                    <span>快银管理平台</span>
                 </div>
 
                 <div class="layui-side layui-bg-black">

pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/login.jsp

@@ -49,7 +49,7 @@
 </div>
 <!-- BEGIN LOGO -->
 <div class="logo">
-    <div>银收客平台</div>
+    <div>快银平台</div>
 </div>
 <!-- END LOGO -->
 <!-- BEGIN LOGIN -->

pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppList.jsp

@@ -571,7 +571,7 @@
                     minWidth: 160,
                     templet: '#extensionThirdStatus',
                     rowspan: 1,
-                    colspan: 4
+                    colspan: 3
                 }
                 , {
                     title: 'D1微信子商户号<hr/>支付宝子商户号',
@@ -671,17 +671,7 @@
                     templet: function (r) {
                         return thirdStatus(r.channelStatusList, r.ppStatus, r.ppThirdStatus, 4);
                     }
-                },
+                }
-                    {
-                        field: 'mcs4Status',
-                        title: '拉卡拉',
-                        align: "left",
-                        width: 190,
-                        rowspan: 1,
-                        templet: function (r) {
-                            return thirdStatus(r.channelStatusList, r.ppStatus, r.ppThirdStatus, 5);
-                        }
-                    }
                 ]
             ],
             done: function (index, layero) {

pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceMerchantBuyDTO.java

@@ -64,8 +64,8 @@ public class DeviceMerchantBuyDTO {
 
     public Map<String, String> convert(String orderNo) {
         Map<String, String> result = new HashMap<String, String>(16);
-        result.put("body", "银收客商品订单支付");
+        result.put("body", "快银收银商品订单支付");
-        result.put("subject", "银收客商品订单支付");
+        result.put("subject", "快银收银商品订单支付");
         result.put("outTradeNo", orderNo);
         result.put("totalAmount", orderAmount + "");
         return result;

pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java

@@ -56,6 +56,22 @@ public class MerChantOrderDTO {
      * @date: 2021/12/22 16:01
      */
     private String deviceNo;
+    /**
+     * timestamp时间戳（pos机）
+     */
+    private String timestamp;
+    /**
+     * 唯一识别码(pos机)
+     */
+    private String appId;
+    /**
+     * 签名（pos）
+     */
+    private String token;
+    /**
+     * 请求标识，用于唯一标识当前请求(pos,uuid)
+     */
+    private String requestId;
     /**
      * 设备号
      */

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AccessChannelCipherCode.java

@@ -0,0 +1,54 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * CREATE TABLE `tb_pluss_access_channel_cipher_code` (
+ *   `id` int(11) NOT NULL AUTO_INCREMENT,
+ *   `orgId` varchar(50) DEFAULT NULL COMMENT '机构号id',
+ *   `priKey` longtext COMMENT '私钥，用于返回（回调）数据签名；以及渠道数据解密',
+ *   `pubKey` longtext COMMENT '公钥加密，给到渠道接口数据加密',
+ *   `orgPubKey` longtext COMMENT '机构公钥',
+ *   `orgPriKey` longtext COMMENT '机构私钥，测试使用字段',
+ *   `createTime` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ *   PRIMARY KEY (`id`) USING BTREE,
+ *   KEY `uniq` (`orgId`) USING BTREE
+ * ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COMMENT='接入渠道秘钥表';
+ */
+@Setter
+@Getter
+public class AccessChannelCipherCode {
+
+    @TableId
+    private Long id;
+
+    private String orgId;
+
+    /**
+     * 平台私钥
+     */
+    private String priKey;
+
+    /**
+     * 平台公钥
+     */
+    private String pubKey;
+
+    /**
+     * 机构公钥
+     */
+    private String orgPubKey;
+
+    /**
+     * 机构私钥
+     */
+    private String orgPriKey;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+}

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppGuide.java

@@ -88,7 +88,5 @@ public class AppGuide implements Serializable {
      */
     @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
     private Date updateTimeEnd;
-    @TableField("type")
-    private String type;
 
 }

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppletStore.java

@@ -1,47 +0,0 @@
-package cn.pluss.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lyf
- */
-@Data
-@TableName("tb_pluss_applet_store")
-public class AppletStore {
-    private Integer id;
-    /**
-     * 店铺名称
-     */
-    private String storeName;
-    /**
-     * 图标
-     */
-    private String icon;
-    /**
-     * 排序
-     */
-    private Integer sort;
-    /**
-     * 0.不显示1.显示
-     */
-    private Integer type;
-    /**
-     * 小程序跳转地址
-     */
-    private String url;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "createTime", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     *小程序appId
-     */
-    private String appId;
-}

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppletStoreUser.java

@@ -1,25 +0,0 @@
-package cn.pluss.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lyf
- */
-
-@Data
-@TableName("tb_pluss_applet_store_user")
-public class AppletStoreUser {
-    private Integer id;
-    private Integer appleStoreId;
-    private Integer userId;
-    /**
-     * 创建时间
-     */
-    @TableField(value = "createTime", fill = FieldFill.INSERT)
-    private Date createTime;
-}

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBackLkl.java

@@ -1,44 +0,0 @@
-package cn.pluss.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@TableName("tb_pluss_merchant_back_lkl")
-public class MerchantBackLkl {
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-    @TableField("merchant_code")
-    private String merchantCode;
-    @TableField("merchant_id")
-    private String merchantId;
-    @TableField("channel")
-    private String channel;
-    @TableField("user_no")
-    private String userNo;
-    @TableField("customer_no")
-    private String customerNo;
-    @TableField("external_customer_no")
-    private String externalCustomerNo;
-    @TableField("term_nos")
-    private String termNos;
-    @TableField("agency_no")
-    private String agencyNo;
-    @TableField("active_no")
-    private String activeNo;
-    @TableField("contract_id")
-    private String contractId;
-    @TableField("core_term_ids")
-    private String coreTermIds;
-    @TableField("create_time")
-    private Date createTime;
-    @TableField("update_time")
-    private Date updateTime;
-
-}

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannelFee.java

@@ -1,37 +0,0 @@
-package cn.pluss.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.models.auth.In;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("tb_pluss_merchant_channel_fee")
-public class MerchantChannelFee implements Serializable {
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-    @TableField("merchant_code")
-    private String merchantCode;
-    @TableField("channel")
-    private Integer channel;
-    @TableField("fee_str")
-    private String  feeStr;
-    @TableField("create_time")
-    private Date createTime;
-    @TableField("update_time")
-    private Date updateTime;
-
-
-}

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannelStatus.java

@@ -349,7 +349,7 @@ public class MerchantChannelStatus {
         String status = merchantChannelStatus.getStatus();
         String thirdStatus = merchantChannelStatus.getThirdStatus();
 
-        if (MerchantChannelStatus.AUDIT_STATUS_REJECT.equals(status)||!MerchantChannelStatus.AUDIT_STATUS_EXAMINING.equals(status) || !AUDIT_THIRD_STATUS_WAITING.equals(thirdStatus)) {
+        if (!MerchantChannelStatus.AUDIT_STATUS_EXAMINING.equals(status) || !AUDIT_THIRD_STATUS_WAITING.equals(thirdStatus)) {
             MsgException.throwException("不符合商户审核条件");
         }
     }

pluss-model-bundle/src/main/java/cn/pluss/platform/pos/BasePosReq.java

@@ -1,33 +0,0 @@
-package cn.pluss.platform.pos;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class BasePosReq implements Serializable {
-    /**
-     * 请求标识，用于唯一标识当前请求(pos,uuid)
-     */
-    private String requestId;
-
-    /**
-     * 唯一识别码(pos机)
-     */
-    private String appId;
-
-    /**
-     * 签名（pos）
-     */
-    private String token;
-
-    /**
-     * 具体参数
-     */
-    private String reqData;
-
-   /**
-     * timestamp时间戳（pos机）
-     */
-    private String timestamp;
-}

pluss-model-bundle/src/main/java/cn/pluss/platform/pos/PosPay.java

@@ -1,39 +0,0 @@
-package cn.pluss.platform.pos;
-
-import lombok.Data;
-
-/**
- * @author lyf
- */
-@Data
-public class PosPay {
-
-    /**
-     * 设备号
-     */
-    private String sn;
-    /**
-     * 授权码
-     */
-    private String authCode;
-    /**
-     * 金额
-     */
-    private String consumeFee;
-    /**
-     * 付款类型（4）
-     */
-    private String type;
-    /**
-     * 下游订单号
-     */
-    private String mercOrderNo;
-    /**
-     *备注
-     */
-    private String remark;
-    /**
-     * 订单号
-     */
-    private String orderNumber;
-}

pluss-model-bundle/src/main/java/cn/pluss/platform/pos/PosTradeQueryReq.java

@@ -1,43 +0,0 @@
-package cn.pluss.platform.pos;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class PosTradeQueryReq implements Serializable {
-
-    /**
-     * 订单号
-     */
-    private String date;
-
-    /**
-     * 设备编号
-     */
-    private String sn;
-
-    /**
-     * 搜索类型
-     * 1：按日期检索
-     * 2：按照月份检索
-     */
-    private String type;
-
-    /**
-     * 页码
-     */
-    private Integer page;
-
-
-    /**
-     * 单页搜索条数
-     */
-    private Integer size;
-
-    public static void main(String[] args) throws JsonProcessingException {
-        System.out.println(new ObjectMapper().writeValueAsString(new PosTradeQueryReq()));
-    }
-}

pluss-model-bundle/src/main/java/cn/pluss/platform/pos/ReturnFundsReq.java

@@ -1,16 +0,0 @@
-package cn.pluss.platform.pos;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class ReturnFundsReq implements Serializable {
-
-
-    private String orderNumber;
-
-    private String sn;
-
-    private String remark;
-}

pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AppletStoreVO.java

@@ -1,36 +0,0 @@
-package cn.pluss.platform.vo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lyf
- */
-@Data
-public class AppletStoreVO {
-    private Integer id;
-    /**
-     * 店铺名称
-     */
-    private String storeName;
-    /**
-     * 图标
-     */
-    private String icon;
-
-    /**
-     * 小程序跳转地址
-     */
-    private String url;
-    /**
-     * 用户是否开通 0未开通 1已开通
-     */
-    private Integer isOpen = 0;
-    /**
-     *小程序appId
-     */
-    private String appId;
-}

pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceOperateInfoVO.java

@@ -32,7 +32,7 @@ public class DeviceOperateInfoVO extends DeviceOperateInfo {
     public String getDesc() {
         String type = this.getType();
         if(DeviceOperateType.IN.getCode().equals(type)){
-            this.desc = "银收客设备入库";
+            this.desc = "快银收银设备入库";
         }
         if(DeviceOperateType.TRANSFER.getCode().equals(type)){
             this.desc = this.getRemark();

pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferVO.java

@@ -50,7 +50,7 @@ public class DeviceTransferVO extends DeviceTransfer {
 
     public String getUserName() {
         if(StringUtil.isEmpty(this.userName)){
-            this.userName = "银收客";
+            this.userName = "快银收银";
         }
         return userName;
     }

pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderPosVO.java

@@ -22,16 +22,5 @@ public class MerchantOrderPosVO {
      * 交易状态 0:交易失败 1:交易成功 2：退款成功 3：退款失败 4：退款中 5:待付款  6部分退款 7:待确认
      */
     private String status;
-    /**
+
-     * 银收客订单号
-     */
-    private String orderNumber;
-    /**
-     * 	下游订单号
-     */
-    private String mercOrderNo;
-    /**
-     * 订单生成时间
-     */
-    private String transTime;
 }

pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java

@@ -0,0 +1,37 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.dto.BankInfoDTO;
+import cn.pluss.platform.entity.BankCard;
+import javax.annotation.Generated;
+
+@Generated(
+    value = "org.mapstruct.ap.MappingProcessor",
+    date = "2023-05-04T16:00:25+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_191 (Oracle Corporation)"
+)
+public class BankCardConverterImpl implements BankCardConverter {
+
+    @Override
+    public BankCard dto2Domain(BankInfoDTO bankInfoDTO) {
+        if ( bankInfoDTO == null ) {
+            return null;
+        }
+
+        BankCard bankCard = new BankCard();
+
+        bankCard.setUserId( bankInfoDTO.getUserId() );
+        bankCard.setBankCardNo( bankInfoDTO.getBankCardNo() );
+        bankCard.setBankName( bankInfoDTO.getBankName() );
+        bankCard.setBranchName( bankInfoDTO.getBranchName() );
+        bankCard.setAccountType( bankInfoDTO.getAccountType() );
+        bankCard.setContactLine( bankInfoDTO.getContactLine() );
+        bankCard.setBranchProvince( bankInfoDTO.getBranchProvince() );
+        bankCard.setBranchCity( bankInfoDTO.getBranchCity() );
+        bankCard.setBranchArea( bankInfoDTO.getBranchArea() );
+        bankCard.setBankAddressNo( bankInfoDTO.getBankAddressNo() );
+        bankCard.setPhone( bankInfoDTO.getPhone() );
+        bankCard.setImgUrl( bankInfoDTO.getImgUrl() );
+
+        return bankCard;
+    }
+}

pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java

@@ -0,0 +1,43 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.entity.MerchantImage;
+import javax.annotation.Generated;
+
+@Generated(
+    value = "org.mapstruct.ap.MappingProcessor",
+    date = "2023-05-04T16:00:25+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_191 (Oracle Corporation)"
+)
+public class ImgConverterImpl implements ImgConverter {
+
+    @Override
+    public MerchantImage imgCopy(MerchantImage merchantImage) {
+        if ( merchantImage == null ) {
+            return null;
+        }
+
+        MerchantImage merchantImage1 = new MerchantImage();
+
+        merchantImage1.setId( merchantImage.getId() );
+        merchantImage1.setMerchantCode( merchantImage.getMerchantCode() );
+        merchantImage1.setPhotoType( merchantImage.getPhotoType() );
+        merchantImage1.setPhotoUrl( merchantImage.getPhotoUrl() );
+        merchantImage1.setPicUrl( merchantImage.getPicUrl() );
+        merchantImage1.setPicUrl1( merchantImage.getPicUrl1() );
+        merchantImage1.setPicUrl2( merchantImage.getPicUrl2() );
+        merchantImage1.setPicUrl3( merchantImage.getPicUrl3() );
+        merchantImage1.setPicUrl6( merchantImage.getPicUrl6() );
+        merchantImage1.setPicUrl7( merchantImage.getPicUrl7() );
+        merchantImage1.setPicUrl8( merchantImage.getPicUrl8() );
+        merchantImage1.setPicUrl9( merchantImage.getPicUrl9() );
+        merchantImage1.setPicUrl999( merchantImage.getPicUrl999() );
+        merchantImage1.setPicUrl101( merchantImage.getPicUrl101() );
+        merchantImage1.setPicUrl102( merchantImage.getPicUrl102() );
+        merchantImage1.setPicUrl11( merchantImage.getPicUrl11() );
+        merchantImage1.setCreateDt( merchantImage.getCreateDt() );
+        merchantImage1.setUpdateDt( merchantImage.getUpdateDt() );
+        merchantImage1.setAisleSwitch( merchantImage.getAisleSwitch() );
+
+        return merchantImage1;
+    }
+}

pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java

@@ -0,0 +1,314 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.dto.MerchantBaseInfoDTO;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.vo.MerchantBaseInfoVO;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Generated;
+
+@Generated(
+    value = "org.mapstruct.ap.MappingProcessor",
+    date = "2023-05-04T16:00:26+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_191 (Oracle Corporation)"
+)
+public class MerchantBaseInfoConverterImpl implements MerchantBaseInfoConverter {
+
+    @Override
+    public MerchantBaseInfoDTO domain2dto(MerchantBaseInfo entity) {
+        if ( entity == null ) {
+            return null;
+        }
+
+        MerchantBaseInfoDTO merchantBaseInfoDTO = new MerchantBaseInfoDTO();
+
+        merchantBaseInfoDTO.setId( entity.getId() );
+        merchantBaseInfoDTO.setUserId( entity.getUserId() );
+        merchantBaseInfoDTO.setMerchantName( entity.getMerchantName() );
+        merchantBaseInfoDTO.setMerchantType( entity.getMerchantType() );
+        merchantBaseInfoDTO.setAlias( entity.getAlias() );
+        merchantBaseInfoDTO.setMcc( entity.getMcc() );
+        merchantBaseInfoDTO.setMccName( entity.getMccName() );
+        merchantBaseInfoDTO.setAliAccount( entity.getAliAccount() );
+        merchantBaseInfoDTO.setProductDesc( entity.getProductDesc() );
+        merchantBaseInfoDTO.setAddressNo( entity.getAddressNo() );
+        merchantBaseInfoDTO.setMerchantAddress( entity.getMerchantAddress() );
+        merchantBaseInfoDTO.setAddress( entity.getAddress() );
+        merchantBaseInfoDTO.setContactMobile( entity.getContactMobile() );
+        merchantBaseInfoDTO.setContactName( entity.getContactName() );
+        merchantBaseInfoDTO.setEmail( entity.getEmail() );
+        merchantBaseInfoDTO.setStoreHeadPic( entity.getStoreHeadPic() );
+        merchantBaseInfoDTO.setStoreInsidePic( entity.getStoreInsidePic() );
+        merchantBaseInfoDTO.setCashPic( entity.getCashPic() );
+        merchantBaseInfoDTO.setUserPhone( entity.getUserPhone() );
+
+        return merchantBaseInfoDTO;
+    }
+
+    @Override
+    public MerchantBaseInfoVO domain2VO(MerchantBaseInfo entity) {
+        if ( entity == null ) {
+            return null;
+        }
+
+        MerchantBaseInfoVO merchantBaseInfoVO = new MerchantBaseInfoVO();
+
+        merchantBaseInfoVO.setId( entity.getId() );
+        merchantBaseInfoVO.setBindingCode( entity.getBindingCode() );
+        merchantBaseInfoVO.setUserId( entity.getUserId() );
+        merchantBaseInfoVO.setAliAccount( entity.getAliAccount() );
+        merchantBaseInfoVO.setMerchantCode( entity.getMerchantCode() );
+        merchantBaseInfoVO.setMerchantName( entity.getMerchantName() );
+        merchantBaseInfoVO.setMerchantType( entity.getMerchantType() );
+        merchantBaseInfoVO.setProductDesc( entity.getProductDesc() );
+        merchantBaseInfoVO.setAliMcc( entity.getAliMcc() );
+        merchantBaseInfoVO.setMcc( entity.getMcc() );
+        merchantBaseInfoVO.setMccName( entity.getMccName() );
+        merchantBaseInfoVO.setAlias( entity.getAlias() );
+        merchantBaseInfoVO.setContactMobile( entity.getContactMobile() );
+        merchantBaseInfoVO.setContactName( entity.getContactName() );
+        merchantBaseInfoVO.setAddressNo( entity.getAddressNo() );
+        merchantBaseInfoVO.setProvince( entity.getProvince() );
+        merchantBaseInfoVO.setCity( entity.getCity() );
+        merchantBaseInfoVO.setDistrict( entity.getDistrict() );
+        merchantBaseInfoVO.setAddress( entity.getAddress() );
+        merchantBaseInfoVO.setEmail( entity.getEmail() );
+        merchantBaseInfoVO.setPrincipalMobile( entity.getPrincipalMobile() );
+        merchantBaseInfoVO.setPrincipalCertType( entity.getPrincipalCertType() );
+        merchantBaseInfoVO.setPrincipalCertNo( entity.getPrincipalCertNo() );
+        merchantBaseInfoVO.setPrincipalPerson( entity.getPrincipalPerson() );
+        merchantBaseInfoVO.setBussAuthName( entity.getBussAuthName() );
+        merchantBaseInfoVO.setBussAuthNum( entity.getBussAuthNum() );
+        merchantBaseInfoVO.setBussAuthAddress( entity.getBussAuthAddress() );
+        merchantBaseInfoVO.setBussAuthStartTime( entity.getBussAuthStartTime() );
+        merchantBaseInfoVO.setBussAuthEndTime( entity.getBussAuthEndTime() );
+        merchantBaseInfoVO.setAllowBankLarge( entity.getAllowBankLarge() );
+        merchantBaseInfoVO.setWxCertStatus( entity.getWxCertStatus() );
+        merchantBaseInfoVO.setCreateDt( entity.getCreateDt() );
+        merchantBaseInfoVO.setUpdateDt( entity.getUpdateDt() );
+        merchantBaseInfoVO.setBuslicType( entity.getBuslicType() );
+        merchantBaseInfoVO.setIsVoice( entity.getIsVoice() );
+        merchantBaseInfoVO.setIsPushWxMessage( entity.getIsPushWxMessage() );
+        merchantBaseInfoVO.setIsUnionPay( entity.getIsUnionPay() );
+        merchantBaseInfoVO.setMd5Key( entity.getMd5Key() );
+        merchantBaseInfoVO.setLimitPay( entity.getLimitPay() );
+        merchantBaseInfoVO.setSubAppId( entity.getSubAppId() );
+        merchantBaseInfoVO.setAppid( entity.getAppid() );
+        merchantBaseInfoVO.setStatus( entity.getStatus() );
+        merchantBaseInfoVO.setMerchantAddress( entity.getMerchantAddress() );
+        merchantBaseInfoVO.setStoreHeadPic( entity.getStoreHeadPic() );
+        merchantBaseInfoVO.setStoreInsidePic( entity.getStoreInsidePic() );
+        merchantBaseInfoVO.setCashPic( entity.getCashPic() );
+        merchantBaseInfoVO.setLiteralPic( entity.getLiteralPic() );
+        merchantBaseInfoVO.setWarrantyPic( entity.getWarrantyPic() );
+        merchantBaseInfoVO.setDealPic( entity.getDealPic() );
+        merchantBaseInfoVO.setAffilatePic( entity.getAffilatePic() );
+        merchantBaseInfoVO.setHandPic( entity.getHandPic() );
+        merchantBaseInfoVO.setMerchantAuditStatus( entity.getMerchantAuditStatus() );
+        merchantBaseInfoVO.setStartTime( entity.getStartTime() );
+        merchantBaseInfoVO.setEndTime( entity.getEndTime() );
+        merchantBaseInfoVO.setImgUrl( entity.getImgUrl() );
+        merchantBaseInfoVO.setLoginName( entity.getLoginName() );
+        merchantBaseInfoVO.setPassword( entity.getPassword() );
+        merchantBaseInfoVO.setLogo( entity.getLogo() );
+        merchantBaseInfoVO.setUserPhone( entity.getUserPhone() );
+        merchantBaseInfoVO.setUserName( entity.getUserName() );
+        merchantBaseInfoVO.setBusinessLicensePic( entity.getBusinessLicensePic() );
+        merchantBaseInfoVO.setLocation( entity.getLocation() );
+        merchantBaseInfoVO.setFirstTradeTime( entity.getFirstTradeTime() );
+        merchantBaseInfoVO.setLastTradeTime( entity.getLastTradeTime() );
+        merchantBaseInfoVO.setSplitFlag( entity.getSplitFlag() );
+        merchantBaseInfoVO.setValidFlag( entity.getValidFlag() );
+
+        return merchantBaseInfoVO;
+    }
+
+    @Override
+    public MerchantBaseInfo vo2domain(MerchantBaseInfoVO entity) {
+        if ( entity == null ) {
+            return null;
+        }
+
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+
+        merchantBaseInfo.setId( entity.getId() );
+        merchantBaseInfo.setBindingCode( entity.getBindingCode() );
+        merchantBaseInfo.setUserId( entity.getUserId() );
+        merchantBaseInfo.setAliAccount( entity.getAliAccount() );
+        merchantBaseInfo.setMerchantCode( entity.getMerchantCode() );
+        merchantBaseInfo.setMerchantName( entity.getMerchantName() );
+        merchantBaseInfo.setMerchantType( entity.getMerchantType() );
+        merchantBaseInfo.setProductDesc( entity.getProductDesc() );
+        merchantBaseInfo.setAliMcc( entity.getAliMcc() );
+        merchantBaseInfo.setMcc( entity.getMcc() );
+        merchantBaseInfo.setMccName( entity.getMccName() );
+        merchantBaseInfo.setAlias( entity.getAlias() );
+        merchantBaseInfo.setContactMobile( entity.getContactMobile() );
+        merchantBaseInfo.setContactName( entity.getContactName() );
+        merchantBaseInfo.setAddressNo( entity.getAddressNo() );
+        merchantBaseInfo.setProvince( entity.getProvince() );
+        merchantBaseInfo.setCity( entity.getCity() );
+        merchantBaseInfo.setDistrict( entity.getDistrict() );
+        merchantBaseInfo.setAddress( entity.getAddress() );
+        merchantBaseInfo.setEmail( entity.getEmail() );
+        merchantBaseInfo.setPrincipalMobile( entity.getPrincipalMobile() );
+        merchantBaseInfo.setPrincipalCertType( entity.getPrincipalCertType() );
+        merchantBaseInfo.setPrincipalCertNo( entity.getPrincipalCertNo() );
+        merchantBaseInfo.setPrincipalPerson( entity.getPrincipalPerson() );
+        merchantBaseInfo.setBussAuthName( entity.getBussAuthName() );
+        merchantBaseInfo.setBussAuthNum( entity.getBussAuthNum() );
+        merchantBaseInfo.setBussAuthAddress( entity.getBussAuthAddress() );
+        merchantBaseInfo.setBussAuthStartTime( entity.getBussAuthStartTime() );
+        merchantBaseInfo.setBussAuthEndTime( entity.getBussAuthEndTime() );
+        merchantBaseInfo.setAllowBankLarge( entity.getAllowBankLarge() );
+        merchantBaseInfo.setWxCertStatus( entity.getWxCertStatus() );
+        merchantBaseInfo.setCreateDt( entity.getCreateDt() );
+        merchantBaseInfo.setUpdateDt( entity.getUpdateDt() );
+        merchantBaseInfo.setBuslicType( entity.getBuslicType() );
+        merchantBaseInfo.setIsVoice( entity.getIsVoice() );
+        merchantBaseInfo.setIsPushWxMessage( entity.getIsPushWxMessage() );
+        merchantBaseInfo.setIsUnionPay( entity.getIsUnionPay() );
+        merchantBaseInfo.setMd5Key( entity.getMd5Key() );
+        merchantBaseInfo.setLimitPay( entity.getLimitPay() );
+        merchantBaseInfo.setSubAppId( entity.getSubAppId() );
+        merchantBaseInfo.setAppid( entity.getAppid() );
+        merchantBaseInfo.setStatus( entity.getStatus() );
+        merchantBaseInfo.setMerchantAddress( entity.getMerchantAddress() );
+        merchantBaseInfo.setStoreHeadPic( entity.getStoreHeadPic() );
+        merchantBaseInfo.setStoreInsidePic( entity.getStoreInsidePic() );
+        merchantBaseInfo.setCashPic( entity.getCashPic() );
+        merchantBaseInfo.setLiteralPic( entity.getLiteralPic() );
+        merchantBaseInfo.setWarrantyPic( entity.getWarrantyPic() );
+        merchantBaseInfo.setDealPic( entity.getDealPic() );
+        merchantBaseInfo.setAffilatePic( entity.getAffilatePic() );
+        merchantBaseInfo.setHandPic( entity.getHandPic() );
+        merchantBaseInfo.setMerchantAuditStatus( entity.getMerchantAuditStatus() );
+        merchantBaseInfo.setStartTime( entity.getStartTime() );
+        merchantBaseInfo.setEndTime( entity.getEndTime() );
+        merchantBaseInfo.setImgUrl( entity.getImgUrl() );
+        merchantBaseInfo.setLoginName( entity.getLoginName() );
+        merchantBaseInfo.setPassword( entity.getPassword() );
+        merchantBaseInfo.setLogo( entity.getLogo() );
+        merchantBaseInfo.setUserPhone( entity.getUserPhone() );
+        merchantBaseInfo.setUserName( entity.getUserName() );
+        merchantBaseInfo.setBusinessLicensePic( entity.getBusinessLicensePic() );
+        merchantBaseInfo.setLocation( entity.getLocation() );
+        merchantBaseInfo.setFirstTradeTime( entity.getFirstTradeTime() );
+        merchantBaseInfo.setLastTradeTime( entity.getLastTradeTime() );
+        merchantBaseInfo.setSplitFlag( entity.getSplitFlag() );
+        merchantBaseInfo.setValidFlag( entity.getValidFlag() );
+
+        return merchantBaseInfo;
+    }
+
+    @Override
+    public MerchantBaseInfo dto2Domain(MerchantBaseInfoDTO dto) {
+        if ( dto == null ) {
+            return null;
+        }
+
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+
+        merchantBaseInfo.setId( dto.getId() );
+        merchantBaseInfo.setUserId( dto.getUserId() );
+        merchantBaseInfo.setAliAccount( dto.getAliAccount() );
+        merchantBaseInfo.setMerchantName( dto.getMerchantName() );
+        merchantBaseInfo.setMerchantType( dto.getMerchantType() );
+        merchantBaseInfo.setProductDesc( dto.getProductDesc() );
+        merchantBaseInfo.setMcc( dto.getMcc() );
+        merchantBaseInfo.setMccName( dto.getMccName() );
+        merchantBaseInfo.setAlias( dto.getAlias() );
+        merchantBaseInfo.setContactMobile( dto.getContactMobile() );
+        merchantBaseInfo.setContactName( dto.getContactName() );
+        merchantBaseInfo.setAddressNo( dto.getAddressNo() );
+        merchantBaseInfo.setAddress( dto.getAddress() );
+        merchantBaseInfo.setEmail( dto.getEmail() );
+        merchantBaseInfo.setMerchantAddress( dto.getMerchantAddress() );
+        merchantBaseInfo.setStoreHeadPic( dto.getStoreHeadPic() );
+        merchantBaseInfo.setStoreInsidePic( dto.getStoreInsidePic() );
+        merchantBaseInfo.setCashPic( dto.getCashPic() );
+        merchantBaseInfo.setUserPhone( dto.getUserPhone() );
+
+        return merchantBaseInfo;
+    }
+
+    @Override
+    public MerchantStore baseInfo2StoreInfo(MerchantBaseInfo entity) {
+        if ( entity == null ) {
+            return null;
+        }
+
+        MerchantStore merchantStore = new MerchantStore();
+
+        merchantStore.setStoreName( entity.getAlias() );
+        merchantStore.setMerchantName( entity.getAlias() );
+        if ( entity.getId() != null ) {
+            merchantStore.setId( entity.getId().intValue() );
+        }
+        merchantStore.setMerchantCode( entity.getMerchantCode() );
+        merchantStore.setCreateDt( entity.getCreateDt() );
+        merchantStore.setStatus( entity.getStatus() );
+        merchantStore.setEmail( entity.getEmail() );
+        merchantStore.setStoreHeadPic( entity.getStoreHeadPic() );
+        merchantStore.setStoreInsidePic( entity.getStoreInsidePic() );
+        merchantStore.setCashPic( entity.getCashPic() );
+        merchantStore.setProductDesc( entity.getProductDesc() );
+        merchantStore.setMerchantType( entity.getMerchantType() );
+        merchantStore.setStartTime( entity.getStartTime() );
+        merchantStore.setEndTime( entity.getEndTime() );
+        merchantStore.setAlias( entity.getAlias() );
+
+        return merchantStore;
+    }
+
+    @Override
+    public UserApp baseInfo2UserApp(MerchantBaseInfo entity) {
+        if ( entity == null ) {
+            return null;
+        }
+
+        UserApp userApp = new UserApp();
+
+        userApp.setId( entity.getId() );
+        userApp.setLoginName( entity.getLoginName() );
+        if ( entity.getUserId() != null ) {
+            userApp.setUserId( Long.parseLong( entity.getUserId() ) );
+        }
+        userApp.setUserName( entity.getUserName() );
+        userApp.setLogo( entity.getLogo() );
+        userApp.setCreateDt( entity.getCreateDt() );
+        userApp.setUpdateDt( entity.getUpdateDt() );
+        if ( entity.getStatus() != null ) {
+            userApp.setStatus( Integer.parseInt( entity.getStatus() ) );
+        }
+        userApp.setMerchantCode( entity.getMerchantCode() );
+        userApp.setMerchantName( entity.getMerchantName() );
+        userApp.setContactName( entity.getContactName() );
+        userApp.setProductDesc( entity.getProductDesc() );
+        userApp.setBussAuthNum( entity.getBussAuthNum() );
+        userApp.setIsVoice( entity.getIsVoice() );
+        userApp.setIsUnionPay( entity.getIsUnionPay() );
+        userApp.setPassword( entity.getPassword() );
+        userApp.setMerchantType( entity.getMerchantType() );
+        userApp.setAlias( entity.getAlias() );
+        userApp.setMerchantAuditStatus( entity.getMerchantAuditStatus() );
+
+        return userApp;
+    }
+
+    @Override
+    public List<MerchantBaseInfoDTO> domain2dto(List<MerchantBaseInfo> entityList) {
+        if ( entityList == null ) {
+            return null;
+        }
+
+        List<MerchantBaseInfoDTO> list = new ArrayList<MerchantBaseInfoDTO>( entityList.size() );
+        for ( MerchantBaseInfo merchantBaseInfo : entityList ) {
+            list.add( domain2dto( merchantBaseInfo ) );
+        }
+
+        return list;
+    }
+}

pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java

@@ -0,0 +1,33 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.entity.MerchantCashPlace;
+import cn.pluss.platform.vo.MerchantCashPlaceVO;
+import javax.annotation.Generated;
+
+@Generated(
+    value = "org.mapstruct.ap.MappingProcessor",
+    date = "2023-05-04T16:00:25+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_191 (Oracle Corporation)"
+)
+public class MerchantCashPlaceConverterImpl implements MerchantCashPlaceConverter {
+
+    @Override
+    public MerchantCashPlaceVO entity2VO(MerchantCashPlace merchantCashPlace) {
+        if ( merchantCashPlace == null ) {
+            return null;
+        }
+
+        MerchantCashPlaceVO merchantCashPlaceVO = new MerchantCashPlaceVO();
+
+        merchantCashPlaceVO.setId( merchantCashPlace.getId() );
+        merchantCashPlaceVO.setUserId( merchantCashPlace.getUserId() );
+        merchantCashPlaceVO.setName( merchantCashPlace.getName() );
+        merchantCashPlaceVO.setCode( merchantCashPlace.getCode() );
+        merchantCashPlaceVO.setAddress( merchantCashPlace.getAddress() );
+        merchantCashPlaceVO.setRemark( merchantCashPlace.getRemark() );
+        merchantCashPlaceVO.setCreateTime( merchantCashPlace.getCreateTime() );
+        merchantCashPlaceVO.setUpdateTime( merchantCashPlace.getUpdateTime() );
+
+        return merchantCashPlaceVO;
+    }
+}

pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java

@@ -0,0 +1,30 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.dto.MerchantStaffDTO;
+import cn.pluss.platform.entity.UserInfo;
+import javax.annotation.Generated;
+
+@Generated(
+    value = "org.mapstruct.ap.MappingProcessor",
+    date = "2023-05-04T16:00:25+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_191 (Oracle Corporation)"
+)
+public class MerchantStaffConverterImpl implements MerchantStaffConverter {
+
+    @Override
+    public UserInfo toUserInfo(MerchantStaffDTO merchantStaffDTO) {
+        if ( merchantStaffDTO == null ) {
+            return null;
+        }
+
+        UserInfo userInfo = new UserInfo();
+
+        userInfo.setId( merchantStaffDTO.getUserId() );
+        userInfo.setLoginName( merchantStaffDTO.getLoginName() );
+        userInfo.setPhone( merchantStaffDTO.getPhone() );
+        userInfo.setPassword( merchantStaffDTO.getPassword() );
+        userInfo.setMerchantCode( merchantStaffDTO.getMerchantCode() );
+
+        return userInfo;
+    }
+}

pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java

@@ -0,0 +1,151 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import java.text.SimpleDateFormat;
+import javax.annotation.Generated;
+
+@Generated(
+    value = "org.mapstruct.ap.MappingProcessor",
+    date = "2023-05-04T16:00:25+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_191 (Oracle Corporation)"
+)
+public class UserAppConverterImpl implements UserAppConverter {
+
+    @Override
+    public void copyProperties(MerchantStore merchantStore, UserApp userApp) {
+        if ( merchantStore == null ) {
+            return;
+        }
+
+        if ( merchantStore.getId() != null ) {
+            userApp.setStoreId2( String.valueOf( merchantStore.getId() ) );
+        }
+        if ( merchantStore.getCreateDt() != null ) {
+            userApp.setCreateDt( merchantStore.getCreateDt() );
+        }
+        if ( merchantStore.getMerchantCode() != null ) {
+            userApp.setMerchantCode( merchantStore.getMerchantCode() );
+        }
+        if ( merchantStore.getMerchantName() != null ) {
+            userApp.setMerchantName( merchantStore.getMerchantName() );
+        }
+        if ( merchantStore.getStoreName() != null ) {
+            userApp.setStoreName( merchantStore.getStoreName() );
+        }
+        if ( merchantStore.getStoreId() != null ) {
+            userApp.setStoreId( merchantStore.getStoreId() );
+        }
+        if ( merchantStore.getProductDesc() != null ) {
+            userApp.setProductDesc( merchantStore.getProductDesc() );
+        }
+        if ( merchantStore.getPayEcdemicSwitch() != null ) {
+            userApp.setPayEcdemicSwitch( merchantStore.getPayEcdemicSwitch() );
+        }
+        if ( merchantStore.getIsMarket() != null ) {
+            userApp.setIsMarket( merchantStore.getIsMarket() );
+        }
+        if ( merchantStore.getMerchantType() != null ) {
+            userApp.setMerchantType( merchantStore.getMerchantType() );
+        }
+        if ( merchantStore.getAlias() != null ) {
+            userApp.setAlias( merchantStore.getAlias() );
+        }
+        if ( merchantStore.getMcsStatus() != null ) {
+            userApp.setMcsStatus( merchantStore.getMcsStatus() );
+        }
+    }
+
+    @Override
+    public void copyProperties(MerchantBaseInfo merchantBaseInfo, UserApp userApp) {
+        if ( merchantBaseInfo == null ) {
+            return;
+        }
+
+        if ( merchantBaseInfo.getAlias() != null ) {
+            userApp.setMerchantName( merchantBaseInfo.getAlias() );
+        }
+        if ( merchantBaseInfo.getId() != null ) {
+            userApp.setMercId( merchantBaseInfo.getId() );
+        }
+        if ( merchantBaseInfo.getLoginName() != null ) {
+            userApp.setLoginName( merchantBaseInfo.getLoginName() );
+        }
+        if ( merchantBaseInfo.getUserId() != null ) {
+            userApp.setUserId( Long.parseLong( merchantBaseInfo.getUserId() ) );
+        }
+        if ( merchantBaseInfo.getUserName() != null ) {
+            userApp.setUserName( merchantBaseInfo.getUserName() );
+        }
+        if ( merchantBaseInfo.getLogo() != null ) {
+            userApp.setLogo( merchantBaseInfo.getLogo() );
+        }
+        if ( merchantBaseInfo.getCreateDt() != null ) {
+            userApp.setCreateDt( merchantBaseInfo.getCreateDt() );
+        }
+        if ( merchantBaseInfo.getUpdateDt() != null ) {
+            userApp.setUpdateDt( merchantBaseInfo.getUpdateDt() );
+        }
+        if ( merchantBaseInfo.getMerchantCode() != null ) {
+            userApp.setMerchantCode( merchantBaseInfo.getMerchantCode() );
+        }
+        if ( merchantBaseInfo.getContactName() != null ) {
+            userApp.setContactName( merchantBaseInfo.getContactName() );
+        }
+        if ( merchantBaseInfo.getProductDesc() != null ) {
+            userApp.setProductDesc( merchantBaseInfo.getProductDesc() );
+        }
+        if ( merchantBaseInfo.getBussAuthNum() != null ) {
+            userApp.setBussAuthNum( merchantBaseInfo.getBussAuthNum() );
+        }
+        if ( merchantBaseInfo.getIsVoice() != null ) {
+            userApp.setIsVoice( merchantBaseInfo.getIsVoice() );
+        }
+        if ( merchantBaseInfo.getIsUnionPay() != null ) {
+            userApp.setIsUnionPay( merchantBaseInfo.getIsUnionPay() );
+        }
+        if ( merchantBaseInfo.getPassword() != null ) {
+            userApp.setPassword( merchantBaseInfo.getPassword() );
+        }
+        if ( merchantBaseInfo.getMerchantType() != null ) {
+            userApp.setMerchantType( merchantBaseInfo.getMerchantType() );
+        }
+        if ( merchantBaseInfo.getAlias() != null ) {
+            userApp.setAlias( merchantBaseInfo.getAlias() );
+        }
+        if ( merchantBaseInfo.getMerchantAuditStatus() != null ) {
+            userApp.setMerchantAuditStatus( merchantBaseInfo.getMerchantAuditStatus() );
+        }
+    }
+
+    @Override
+    public UserApp toUserApp(UserInfo userInfo) {
+        if ( userInfo == null ) {
+            return null;
+        }
+
+        UserApp userApp = new UserApp();
+
+        userApp.setCreateDt( userInfo.getCreateTime() );
+        userApp.setUserId( userInfo.getId() );
+        userApp.setLoginName( userInfo.getLoginName() );
+        userApp.setStatus( userInfo.getStatus() );
+        if ( userInfo.getParentId() != null ) {
+            userApp.setParentId( userInfo.getParentId().longValue() );
+        }
+        userApp.setPhone( userInfo.getPhone() );
+        userApp.setMerchantCode( userInfo.getMerchantCode() );
+        userApp.setStoreId( userInfo.getStoreId() );
+        userApp.setPassword( userInfo.getPassword() );
+        if ( userInfo.getUpdateTime() != null ) {
+            userApp.setUpdateTime( new SimpleDateFormat().format( userInfo.getUpdateTime() ) );
+        }
+        userApp.setPayPassword( userInfo.getPayPassword() );
+        userApp.setFaceCert( userInfo.getFaceCert() );
+        userApp.setFaceCompare( userInfo.getFaceCompare() );
+
+        return userApp;
+    }
+}

pluss-service-bundle/hs_err_pid5812.log

@@ -1,269 +0,0 @@
-#
-# A fatal error has been detected by the Java Runtime Environment:
-#
-#  Internal Error (javaCalls.cpp:51), pid=5812, tid=0x000000000000351c
-#  guarantee(thread->is_Java_thread()) failed: crucial check - the VM thread cannot and must not escape to Java code
-#
-# JRE version: Java(TM) SE Runtime Environment (8.0_191-b12) (build 1.8.0_191-b12)
-# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.191-b12 mixed mode windows-amd64 compressed oops)
-# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
-#
-# If you would like to submit a bug report, please visit:
-#   http://bugreport.java.com/bugreport/crash.jsp
-#
-
----------------  T H R E A D  ---------------
-
-Current thread (0x000000001c347800):  VMThread [stack: 0x000000001d3d0000,0x000000001d4d0000] [id=13596]
-
-Stack: [0x000000001d3d0000,0x000000001d4d0000]
-[error occurred during error reporting (printing stack bounds), id 0xc0000005]
-
-Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-
-VM_Operation (0x000000001de2f3e0): GetOrSetLocal, mode: safepoint, requested by thread 0x000000001c3bd800
-
-
----------------  P R O C E S S  ---------------
-
-Java Threads: ( => current thread )
-  0x0000000020201000 JavaThread "Log4j2-TF-5-Scheduled-1" daemon [_thread_blocked, id=1548, stack(0x0000000021020000,0x0000000021120000)]
-  0x000000001d810800 JavaThread "Service Thread" daemon [_thread_blocked, id=4332, stack(0x000000001e330000,0x000000001e430000)]
-  0x000000001d783000 JavaThread "C1 CompilerThread2" daemon [_thread_blocked, id=12680, stack(0x000000001e230000,0x000000001e330000)]
-  0x000000001d782800 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=6696, stack(0x000000001e130000,0x000000001e230000)]
-  0x000000001c3da800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=12008, stack(0x000000001e030000,0x000000001e130000)]
-  0x000000001c3cd800 JavaThread "JDWP Command Reader" daemon [_thread_in_native, id=1908, stack(0x000000001df30000,0x000000001e030000)]
-  0x000000001c3ca800 JavaThread "JDWP Event Helper Thread" daemon [_thread_blocked, id=8808, stack(0x000000001de30000,0x000000001df30000)]
-  0x000000001c3bd800 JavaThread "JDWP Transport Listener: dt_socket" daemon [_thread_blocked, id=14240, stack(0x000000001dd30000,0x000000001de30000)]
-  0x000000001c39d800 JavaThread "Attach Listener" daemon [_thread_blocked, id=2052, stack(0x000000001dc30000,0x000000001dd30000)]
-  0x000000001c39a800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=1496, stack(0x000000001db30000,0x000000001dc30000)]
-  0x000000001c373000 JavaThread "Finalizer" daemon [_thread_blocked, id=12924, stack(0x000000001d5d0000,0x000000001d6d0000)]
-  0x0000000002c4e800 JavaThread "Reference Handler" daemon [_thread_blocked, id=1312, stack(0x000000001d4d0000,0x000000001d5d0000)]
-  0x0000000002b59000 JavaThread "main" [_thread_blocked, id=11748, stack(0x0000000002a50000,0x0000000002b50000)]
-
-Other Threads:
-=>0x000000001c347800 VMThread [stack: 0x000000001d3d0000,0x000000001d4d0000] [id=13596]
-  0x000000001d8be000 WatcherThread [stack: 0x000000001e430000,0x000000001e530000] [id=13868]
-
-VM state:at safepoint (normal execution)
-
-VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
-[0x0000000002b55430] Threads_lock - owner thread: 0x000000001c347800
-
-Heap:
- PSYoungGen      total 75776K, used 32669K [0x000000076b580000, 0x0000000770a00000, 0x00000007c0000000)
-  eden space 65024K, 39% used [0x000000076b580000,0x000000076ceb27c0,0x000000076f500000)
-  from space 10752K, 63% used [0x000000076ff80000,0x0000000770634f60,0x0000000770a00000)
-  to   space 10752K, 0% used [0x000000076f500000,0x000000076f500000,0x000000076ff80000)
- ParOldGen       total 173568K, used 88K [0x00000006c2000000, 0x00000006cc980000, 0x000000076b580000)
-  object space 173568K, 0% used [0x00000006c2000000,0x00000006c2016010,0x00000006cc980000)
- Metaspace       used 18663K, capacity 18906K, committed 19200K, reserved 1067008K
-  class space    used 2216K, capacity 2293K, committed 2304K, reserved 1048576K
-
-Card table byte_map: [0x0000000012150000,0x0000000012950000] byte_map_base: 0x000000000eb40000
-
-Marking Bits: (ParMarkBitMap*) 0x000000005b433e30
- Begin Bits: [0x00000000132a0000, 0x0000000017220000)
- End Bits:   [0x0000000017220000, 0x000000001b1a0000)
-
-Polling page: 0x00000000009f0000
-
-CodeCache: size=245760Kb used=6265Kb max_used=6276Kb free=239494Kb
- bounds [0x0000000002d90000, 0x00000000033c0000, 0x0000000011d90000]
- total_blobs=2175 nmethods=1725 adapters=370
- compilation: enabled
-
-Compilation events (10 events):
-Event: 3.052 Thread 0x000000001d783000 nmethod 1721 0x00000000033ab3d0 code [0x00000000033ab620, 0x00000000033ac5f8]
-Event: 3.052 Thread 0x000000001d783000 1723       3       java.lang.Class::privateGetMethodRecursive (130 bytes)
-Event: 3.052 Thread 0x000000001d783000 nmethod 1723 0x00000000033aa450 code [0x00000000033aa660, 0x00000000033aaf98]
-Event: 3.052 Thread 0x000000001d783000 1722       3       java.lang.Class::getMethod0 (40 bytes)
-Event: 3.053 Thread 0x000000001d783000 nmethod 1722 0x00000000033a9e50 code [0x00000000033a9fe0, 0x00000000033aa2f8]
-Event: 3.080 Thread 0x000000001c3da800 nmethod 1720 0x00000000033b2210 code [0x00000000033b2420, 0x00000000033b37a8]
-Event: 3.273 Thread 0x000000001d783000 1725       3       java.lang.AbstractStringBuilder::append (50 bytes)
-Event: 3.273 Thread 0x000000001d783000 nmethod 1725 0x00000000033b15d0 code [0x00000000033b17a0, 0x00000000033b1ef8]
-Event: 3.273 Thread 0x000000001d783000 1726       3       java.lang.StringBuilder::append (8 bytes)
-Event: 3.273 Thread 0x000000001d783000 nmethod 1726 0x00000000033a96d0 code [0x00000000033a9840, 0x00000000033a99e8]
-
-GC Heap History (4 events):
-Event: 1.308 GC heap before
-{Heap before GC invocations=1 (full 0):
- PSYoungGen      total 75776K, used 65024K [0x000000076b580000, 0x0000000770a00000, 0x00000007c0000000)
-  eden space 65024K, 100% used [0x000000076b580000,0x000000076f500000,0x000000076f500000)
-  from space 10752K, 0% used [0x000000076ff80000,0x000000076ff80000,0x0000000770a00000)
-  to   space 10752K, 0% used [0x000000076f500000,0x000000076f500000,0x000000076ff80000)
- ParOldGen       total 173568K, used 0K [0x00000006c2000000, 0x00000006cc980000, 0x000000076b580000)
-  object space 173568K, 0% used [0x00000006c2000000,0x00000006c2000000,0x00000006cc980000)
- Metaspace       used 8261K, capacity 8462K, committed 8576K, reserved 1056768K
-  class space    used 1003K, capacity 1047K, committed 1152K, reserved 1048576K
-Event: 1.314 GC heap after
-Heap after GC invocations=1 (full 0):
- PSYoungGen      total 75776K, used 5856K [0x000000076b580000, 0x0000000770a00000, 0x00000007c0000000)
-  eden space 65024K, 0% used [0x000000076b580000,0x000000076b580000,0x000000076f500000)
-  from space 10752K, 54% used [0x000000076f500000,0x000000076fab8370,0x000000076ff80000)
-  to   space 10752K, 0% used [0x000000076ff80000,0x000000076ff80000,0x0000000770a00000)
- ParOldGen       total 173568K, used 8K [0x00000006c2000000, 0x00000006cc980000, 0x000000076b580000)
-  object space 173568K, 0% used [0x00000006c2000000,0x00000006c2002000,0x00000006cc980000)
- Metaspace       used 8261K, capacity 8462K, committed 8576K, reserved 1056768K
-  class space    used 1003K, capacity 1047K, committed 1152K, reserved 1048576K
-}
-Event: 2.481 GC heap before
-{Heap before GC invocations=2 (full 0):
- PSYoungGen      total 75776K, used 70880K [0x000000076b580000, 0x0000000770a00000, 0x00000007c0000000)
-  eden space 65024K, 100% used [0x000000076b580000,0x000000076f500000,0x000000076f500000)
-  from space 10752K, 54% used [0x000000076f500000,0x000000076fab8370,0x000000076ff80000)
-  to   space 10752K, 0% used [0x000000076ff80000,0x000000076ff80000,0x0000000770a00000)
- ParOldGen       total 173568K, used 8K [0x00000006c2000000, 0x00000006cc980000, 0x000000076b580000)
-  object space 173568K, 0% used [0x00000006c2000000,0x00000006c2002000,0x00000006cc980000)
- Metaspace       used 16634K, capacity 16904K, committed 17024K, reserved 1064960K
-  class space    used 1999K, capacity 2098K, committed 2176K, reserved 1048576K
-Event: 2.495 GC heap after
-Heap after GC invocations=2 (full 0):
- PSYoungGen      total 75776K, used 6867K [0x000000076b580000, 0x0000000770a00000, 0x00000007c0000000)
-  eden space 65024K, 0% used [0x000000076b580000,0x000000076b580000,0x000000076f500000)
-  from space 10752K, 63% used [0x000000076ff80000,0x0000000770634f60,0x0000000770a00000)
-  to   space 10752K, 0% used [0x000000076f500000,0x000000076f500000,0x000000076ff80000)
- ParOldGen       total 173568K, used 88K [0x00000006c2000000, 0x00000006cc980000, 0x000000076b580000)
-  object space 173568K, 0% used [0x00000006c2000000,0x00000006c2016010,0x00000006cc980000)
- Metaspace       used 16634K, capacity 16904K, committed 17024K, reserved 1064960K
-  class space    used 1999K, capacity 2098K, committed 2176K, reserved 1048576K
-}
-
-Deoptimization events (10 events):
-Event: 2.122 Thread 0x0000000002b59000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000302d28c method=java.util.jar.JarFile.getJarEntry(Ljava/lang/String;)Ljava/util/jar/JarEntry; @ 2
-Event: 2.122 Thread 0x0000000002b59000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000302d28c method=java.util.jar.JarFile.getJarEntry(Ljava/lang/String;)Ljava/util/jar/JarEntry; @ 2
-Event: 2.122 Thread 0x0000000002b59000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000302d28c method=java.util.jar.JarFile.getJarEntry(Ljava/lang/String;)Ljava/util/jar/JarEntry; @ 2
-Event: 2.196 Thread 0x0000000002b59000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000031edda0 method=java.lang.CharacterDataLatin1.digit(II)I @ 82
-Event: 2.270 Thread 0x0000000002b59000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000030b8a3c method=sun.misc.URLClassPath$FileLoader.getResource(Ljava/lang/String;Z)Lsun/misc/Resource; @ 139
-Event: 2.618 Thread 0x0000000002b59000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000031ddb2c method=java.lang.CharacterDataLatin1.digit(II)I @ 82
-Event: 2.830 Thread 0x0000000002b59000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000032ecc4c method=java.util.Arrays.equals([B[B)Z @ 12
-Event: 2.914 Thread 0x0000000002b59000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x000000000307157c method=sun.nio.cs.UTF_8$Decoder.decode([BII[C)I @ 30
-Event: 3.273 Thread 0x0000000002b59000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003073518 method=java.lang.AbstractStringBuilder.append(Ljava/lang/String;)Ljava/lang/AbstractStringBuilder; @ 1
-Event: 3.273 Thread 0x0000000002b59000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000002faee1c method=java.lang.AbstractStringBuilder.append(Ljava/lang/String;)Ljava/lang/AbstractStringBuilder; @ 1
-
-Classes redefined (6 events):
-Event: 103.687 Thread 0x000000001c347800 redefined class name=cn.pluss.platform.klk.service.LklPayService$1, count=1
-Event: 103.692 Thread 0x000000001c347800 redefined class name=cn.pluss.platform.klk.service.LklPayService, count=1
-Event: 140.095 Thread 0x000000001c347800 redefined class name=cn.pluss.platform.klk.service.LklPayService$1, count=2
-Event: 140.101 Thread 0x000000001c347800 redefined class name=cn.pluss.platform.klk.service.LklPayService, count=2
-Event: 172.684 Thread 0x000000001c347800 redefined class name=cn.pluss.platform.klk.service.LklPayService$1, count=3
-Event: 172.689 Thread 0x000000001c347800 redefined class name=cn.pluss.platform.klk.service.LklPayService, count=3
-
-Internal exceptions (10 events):
-Event: 0.859 Thread 0x0000000002b59000 Exception <a 'java/security/PrivilegedActionException'> (0x000000076cc56830) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u191\11896\hotspot\src\share\vm\prims\jvm.cpp, line 1435]
-Event: 0.860 Thread 0x0000000002b59000 Exception <a 'java/security/PrivilegedActionException'> (0x000000076cc56c28) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u191\11896\hotspot\src\share\vm\prims\jvm.cpp, line 1435]
-Event: 1.485 Thread 0x0000000002b59000 Exception <a 'java/lang/ArrayIndexOutOfBoundsException': 18> (0x000000076c1bd948) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u191\11896\hotspot\src\share\vm\interpreter\interpreterRuntime.cpp, line 366]
-Event: 1.486 Thread 0x0000000002b59000 Exception <a 'java/lang/ArrayIndexOutOfBoundsException': 110> (0x000000076c1c0118) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u191\11896\hotspot\src\share\vm\interpreter\interpreterRuntime.cpp, line 366]
-Event: 1.724 Thread 0x0000000002b59000 Exception <a 'java/lang/NoSuchMethodError': org.slf4j.impl.StaticMarkerBinder.getSingleton()Lorg/slf4j/impl/StaticMarkerBinder;> (0x000000076d0917c8) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u191\11896\hotspot\src\share\vm\interpreter
-Event: 2.174 Thread 0x0000000002b59000 Exception <a 'java/lang/NoSuchFieldError': method resolution failed> (0x000000076db79410) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u191\11896\hotspot\src\share\vm\prims\methodHandles.cpp, line 1167]
-Event: 2.177 Thread 0x0000000002b59000 Exception <a 'java/lang/NoSuchFieldError': method resolution failed> (0x000000076db87fe0) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u191\11896\hotspot\src\share\vm\prims\methodHandles.cpp, line 1167]
-Event: 2.830 Thread 0x0000000002b59000 Implicit null exception at 0x00000000032ecadd to 0x00000000032ecc39
-Event: 3.273 Thread 0x0000000002b59000 Implicit null exception at 0x0000000003073017 to 0x00000000030734fd
-Event: 3.273 Thread 0x0000000002b59000 Implicit null exception at 0x0000000002fae956 to 0x0000000002faee05
-
-Events (10 events):
-Event: 153.845 Executing VM operation: ChangeBreakpoints done
-Event: 153.848 Executing VM operation: ChangeBreakpoints
-Event: 153.849 Executing VM operation: ChangeBreakpoints done
-Event: 172.673 Executing VM operation: ChangeBreakpoints
-Event: 172.673 Executing VM operation: ChangeBreakpoints done
-Event: 172.676 Executing VM operation: RedefineClasses
-Event: 172.689 Executing VM operation: RedefineClasses done
-Event: 172.703 Executing VM operation: ChangeBreakpoints
-Event: 172.703 Executing VM operation: ChangeBreakpoints done
-Event: 172.730 Executing VM operation: GetOrSetLocal
-
-
-Dynamic libraries:
-0x00007ff6c21e0000 - 0x00007ff6c2217000 	D:\jdk\bin\java.exe
-0x00007ffd31ed0000 - 0x00007ffd320c5000 	C:\Windows\SYSTEM32\ntdll.dll
-0x00007ffd31700000 - 0x00007ffd317be000 	C:\Windows\System32\KERNEL32.DLL
-0x00007ffd2f620000 - 0x00007ffd2f8e8000 	C:\Windows\System32\KERNELBASE.dll
-0x00007ffd30150000 - 0x00007ffd301fe000 	C:\Windows\System32\ADVAPI32.dll
-0x00007ffd300b0000 - 0x00007ffd3014e000 	C:\Windows\System32\msvcrt.dll
-0x00007ffd30f00000 - 0x00007ffd30f9c000 	C:\Windows\System32\sechost.dll
-0x00007ffd30fa0000 - 0x00007ffd310c5000 	C:\Windows\System32\RPCRT4.dll
-0x00007ffd31540000 - 0x00007ffd316e0000 	C:\Windows\System32\USER32.dll
-0x00007ffd2fca0000 - 0x00007ffd2fcc2000 	C:\Windows\System32\win32u.dll
-0x00007ffd30610000 - 0x00007ffd3063b000 	C:\Windows\System32\GDI32.dll
-0x00007ffd2fe20000 - 0x00007ffd2ff2b000 	C:\Windows\System32\gdi32full.dll
-0x00007ffd2fa30000 - 0x00007ffd2facd000 	C:\Windows\System32\msvcp_win.dll
-0x00007ffd2fd20000 - 0x00007ffd2fe20000 	C:\Windows\System32\ucrtbase.dll
-0x00007ffd1b570000 - 0x00007ffd1b80a000 	C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
-0x00007ffd30420000 - 0x00007ffd30450000 	C:\Windows\System32\IMM32.DLL
-0x000000005b4c0000 - 0x000000005b592000 	D:\jdk\jre\bin\msvcr100.dll
-0x000000005ac10000 - 0x000000005b4b4000 	D:\jdk\jre\bin\server\jvm.dll
-0x00007ffd30600000 - 0x00007ffd30608000 	C:\Windows\System32\PSAPI.DLL
-0x00007ffd218e0000 - 0x00007ffd218ea000 	C:\Windows\SYSTEM32\VERSION.dll
-0x00007ffd21110000 - 0x00007ffd21137000 	C:\Windows\SYSTEM32\WINMM.dll
-0x00007ffd1b9e0000 - 0x00007ffd1b9e9000 	C:\Windows\SYSTEM32\WSOCK32.dll
-0x00007ffd30640000 - 0x00007ffd306ab000 	C:\Windows\System32\WS2_32.dll
-0x000000005ac00000 - 0x000000005ac0f000 	D:\jdk\jre\bin\verify.dll
-0x000000005abd0000 - 0x000000005abf9000 	D:\jdk\jre\bin\java.dll
-0x000000005ab30000 - 0x000000005ab65000 	D:\jdk\jre\bin\jdwp.dll
-0x000000005ab20000 - 0x000000005ab28000 	D:\jdk\jre\bin\npt.dll
-0x000000005aaf0000 - 0x000000005ab13000 	D:\jdk\jre\bin\instrument.dll
-0x000000005abb0000 - 0x000000005abc6000 	D:\jdk\jre\bin\zip.dll
-0x00007ffd30720000 - 0x00007ffd30e64000 	C:\Windows\System32\SHELL32.dll
-0x00007ffd2d720000 - 0x00007ffd2deb4000 	C:\Windows\SYSTEM32\windows.storage.dll
-0x00007ffd31940000 - 0x00007ffd31c94000 	C:\Windows\System32\combase.dll
-0x00007ffd2ef80000 - 0x00007ffd2efac000 	C:\Windows\SYSTEM32\Wldp.dll
-0x00007ffd31ca0000 - 0x00007ffd31d4d000 	C:\Windows\System32\SHCORE.dll
-0x00007ffd303c0000 - 0x00007ffd30415000 	C:\Windows\System32\shlwapi.dll
-0x00007ffd2f530000 - 0x00007ffd2f54f000 	C:\Windows\SYSTEM32\profapi.dll
-0x000000005aae0000 - 0x000000005aae9000 	D:\jdk\jre\bin\dt_socket.dll
-0x00007ffd2ece0000 - 0x00007ffd2ed4a000 	C:\Windows\system32\mswsock.dll
-0x000000005aad0000 - 0x000000005aadd000 	D:\jdk\jre\bin\management.dll
-0x000000005ab90000 - 0x000000005abaa000 	D:\jdk\jre\bin\net.dll
-0x00007ffd1a400000 - 0x00007ffd1a417000 	C:\Windows\system32\napinsp.dll
-0x00007ffd1a3e0000 - 0x00007ffd1a3fb000 	C:\Windows\system32\pnrpnsp.dll
-0x00007ffd1a3c0000 - 0x00007ffd1a3d5000 	C:\Windows\system32\wshbth.dll
-0x00007ffd2b3e0000 - 0x00007ffd2b3fd000 	C:\Windows\system32\NLAapi.dll
-0x00007ffd2e9d0000 - 0x00007ffd2ea0b000 	C:\Windows\SYSTEM32\IPHLPAPI.DLL
-0x00007ffd2ea10000 - 0x00007ffd2eada000 	C:\Windows\SYSTEM32\DNSAPI.dll
-0x00007ffd30280000 - 0x00007ffd30288000 	C:\Windows\System32\NSI.dll
-0x00007ffd1a3a0000 - 0x00007ffd1a3b2000 	C:\Windows\System32\winrnr.dll
-0x00007ffd2afd0000 - 0x00007ffd2afda000 	C:\Windows\System32\rasadhlp.dll
-0x00007ffd29910000 - 0x00007ffd2998f000 	C:\Windows\System32\fwpuclnt.dll
-0x00007ffd2f5f0000 - 0x00007ffd2f617000 	C:\Windows\System32\bcrypt.dll
-0x000000005ab70000 - 0x000000005ab81000 	D:\jdk\jre\bin\nio.dll
-0x00007ffd2eee0000 - 0x00007ffd2eef8000 	C:\Windows\SYSTEM32\CRYPTSP.dll
-0x00007ffd2e660000 - 0x00007ffd2e694000 	C:\Windows\system32\rsaenh.dll
-0x00007ffd2f4f0000 - 0x00007ffd2f51e000 	C:\Windows\SYSTEM32\USERENV.dll
-0x00007ffd2f9a0000 - 0x00007ffd2fa22000 	C:\Windows\System32\bcryptprimitives.dll
-0x00007ffd2eed0000 - 0x00007ffd2eedc000 	C:\Windows\SYSTEM32\CRYPTBASE.dll
-0x00007ffd2a590000 - 0x00007ffd2a5a7000 	C:\Windows\SYSTEM32\dhcpcsvc6.DLL
-0x00007ffd2a520000 - 0x00007ffd2a53d000 	C:\Windows\SYSTEM32\dhcpcsvc.DLL
-0x000000005aaa0000 - 0x000000005aac4000 	D:\jdk\jre\bin\sunec.dll
-0x000000005aa90000 - 0x000000005aa9b000 	D:\jdk\jre\bin\sunmscapi.dll
-0x00007ffd2fb40000 - 0x00007ffd2fc96000 	C:\Windows\System32\CRYPT32.dll
-
-VM Arguments:
-jvm_args: -agentlib:jdwp=transport=dt_socket,address=127.0.0.1:58312,suspend=y,server=n -ea -Didea.test.cyclic.buffer.size=1048576 -javaagent:C:\Users\Administrator\AppData\Local\JetBrains\IntelliJIdea2023.1\captureAgent\debugger-agent.jar -Dfile.encoding=UTF-8 
-java_command: com.intellij.rt.junit.JUnitStarter -ideVersion5 -junit4 cn.pluss.platform.klk.service.LklPayService,test1
-java_class_path (initial): D:\IntelliJ IDEA 2023.1\lib\idea_rt.jar;D:\IntelliJ IDEA 2023.1\plugins\junit\lib\junit5-rt.jar;D:\IntelliJ IDEA 2023.1\plugins\junit\lib\junit-rt.jar;D:\jdk\jre\lib\charsets.jar;D:\jdk\jre\lib\deploy.jar;D:\jdk\jre\lib\ext\access-bridge-64.jar;D:\jdk\jre\lib\ext\cldrdata.jar;D:\jdk\jre\lib\ext\dnsns.jar;D:\jdk\jre\lib\ext\jaccess.jar;D:\jdk\jre\lib\ext\jfxrt.jar;D:\jdk\jre\lib\ext\localedata.jar;D:\jdk\jre\lib\ext\nashorn.jar;D:\jdk\jre\lib\ext\sunec.jar;D:\jdk\jre\lib\ext\sunjce_provider.jar;D:\jdk\jre\lib\ext\sunmscapi.jar;D:\jdk\jre\lib\ext\sunpkcs11.jar;D:\jdk\jre\lib\ext\zipfs.jar;D:\jdk\jre\lib\javaws.jar;D:\jdk\jre\lib\jce.jar;D:\jdk\jre\lib\jfr.jar;D:\jdk\jre\lib\jfxswt.jar;D:\jdk\jre\lib\jsse.jar;D:\jdk\jre\lib\management-agent.jar;D:\jdk\jre\lib\plugin.jar;D:\jdk\jre\lib\resources.jar;D:\jdk\jre\lib\rt.jar;D:\project\chaozhanggui\pluss-service-bundle\target\classes;D:\project\chaozhanggui\pluss-dao-bundle\target\classes;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-boot-starter\3.3.2\mybatis-plus-boot-starter-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus\3.3.2\mybatis-plus-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-extension\3.3.2\mybatis-plus-extension-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-core\3.3.2\mybatis-plus-core-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\github\jsqlparser\jsqlparser\3.1\jsqlparser-3.1.jar;D:\apache-maven-3.8.8\repository\org\mybatis\mybatis-spring\2.0.4\mybatis-spring-2.0.4.jar;D:\apache-maven-3.8.8\repository\org\springframework\boot\spring-boot-autoconfigure\2.1.0.RELEASE\spring-boot-autoconfigure-2.1.0.RELEASE.jar;D:\apache-maven-3.8.8\repository\org\springframework\boot\spring-boot-starter-jdbc\2.1.0.RELEASE\spring-boot-starter-jdbc-2.1.0.RELEASE.jar;D:\apache-maven-3.8.8\repository\com\zaxxer\HikariCP\3.2.0\HikariCP-3.2.0.jar;D:\apache-maven-3.8.8\repository\org\springframework\spring-jdbc\5.1.2.RELEASE
-Launcher Type: SUN_STANDARD
-
-Environment Variables:
-JAVA_HOME=D:\jdk
-CLASSPATH=.;D:\jdk\lib;D:\jdk\lib\tools.jar
-PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\jdk\bin;D:\apache-maven-3.8.8\bin;E:\git\bin;E:\xshell\;E:\xshell\xftp\;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;
-USERNAME=Administrator
-OS=Windows_NT
-PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 42 Stepping 7, GenuineIntel
-
-
-
----------------  S Y S T E M  ---------------
-
-OS: Windows 10.0 , 64 bit Build 19041 (10.0.19041.1566)
-
-CPU:total 4 (initial active 4) (4 cores per cpu, 1 threads per core) family 6 model 42 stepping 7, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, aes, clmul, tsc, tscinvbit
-
-Memory: 4k page, physical 16645820k(8876808k free), swap 19660476k(10620968k free)
-
-vm_info: Java HotSpot(TM) 64-Bit Server VM (25.191-b12) for windows-amd64 JRE (1.8.0_191-b12), built on Oct  6 2018 09:29:03 by "java_re" with MS VC++ 10.0 (VS2010)
-
-time: Mon Apr 24 15:08:12 2023
-elapsed time: 172 seconds (0d 0h 2m 52s)
-

pluss-service-bundle/hs_err_pid79608.log

@@ -1,178 +0,0 @@
-#
-# There is insufficient memory for the Java Runtime Environment to continue.
-# Native memory allocation (malloc) failed to allocate 34192 bytes for Chunk::new
-# Possible reasons:
-#   The system is out of physical RAM or swap space
-#   In 32 bit mode, the process size limit was hit
-# Possible solutions:
-#   Reduce memory load on the system
-#   Increase physical memory or swap space
-#   Check if swap backing store is full
-#   Use 64 bit Java on a 64 bit OS
-#   Decrease Java heap size (-Xmx/-Xms)
-#   Decrease number of Java threads
-#   Decrease Java thread stack sizes (-Xss)
-#   Set larger code cache with -XX:ReservedCodeCacheSize=
-# This output file may be truncated or incomplete.
-#
-#  Out of Memory Error (allocation.cpp:390), pid=79608, tid=0x00000000000122e0
-#
-# JRE version: Java(TM) SE Runtime Environment (8.0_191-b12) (build 1.8.0_191-b12)
-# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.191-b12 mixed mode windows-amd64 compressed oops)
-# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
-#
-
----------------  T H R E A D  ---------------
-
-Current thread (0x0000000003528800):  JavaThread "main" [_thread_in_native, id=74464, stack(0x0000000003420000,0x0000000003520000)]
-
-Stack: [0x0000000003420000,0x0000000003520000]
-[error occurred during error reporting (printing stack bounds), id 0xc0000005]
-
-Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-
-Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
-j  java.lang.invoke.MethodHandle.<clinit>()V+16
-v  ~StubRoutines::call_stub
-
----------------  P R O C E S S  ---------------
-
-Java Threads: ( => current thread )
-  0x000000001cd1d000 JavaThread "C1 CompilerThread2" daemon [_thread_blocked, id=74396, stack(0x000000001e980000,0x000000001ea80000)]
-  0x000000001cd11000 JavaThread "C2 CompilerThread1" daemon [_thread_in_native, id=81192, stack(0x000000001e880000,0x000000001e980000)]
-  0x000000001cd0b000 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=81444, stack(0x000000001e780000,0x000000001e880000)]
-  0x000000001cd09800 JavaThread "Monitor Ctrl-Break" daemon [_thread_in_native, id=79884, stack(0x000000001e680000,0x000000001e780000)]
-  0x000000001ccf0000 JavaThread "Attach Listener" daemon [_thread_blocked, id=32944, stack(0x000000001e580000,0x000000001e680000)]
-  0x000000001cced800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=80224, stack(0x000000001e480000,0x000000001e580000)]
-  0x000000001ccb2800 JavaThread "Finalizer" daemon [_thread_blocked, id=79604, stack(0x000000001df20000,0x000000001e020000)]
-  0x000000000361e800 JavaThread "Reference Handler" daemon [_thread_blocked, id=65364, stack(0x000000001de20000,0x000000001df20000)]
-=>0x0000000003528800 JavaThread "main" [_thread_in_native, id=74464, stack(0x0000000003420000,0x0000000003520000)]
-
-Other Threads:
-  0x000000001cc88000 VMThread [stack: 0x000000001dd20000,0x000000001de20000] [id=79988]
-
-VM state:not at safepoint (normal execution)
-
-VM Mutex/Monitor currently owned by a thread: None
-
-Heap:
- PSYoungGen      total 75776K, used 3904K [0x000000076b580000, 0x0000000770a00000, 0x00000007c0000000)
-  eden space 65024K, 6% used [0x000000076b580000,0x000000076b9500e8,0x000000076f500000)
-  from space 10752K, 0% used [0x000000076ff80000,0x000000076ff80000,0x0000000770a00000)
-  to   space 10752K, 0% used [0x000000076f500000,0x000000076f500000,0x000000076ff80000)
- ParOldGen       total 173568K, used 0K [0x00000006c2000000, 0x00000006cc980000, 0x000000076b580000)
-  object space 173568K, 0% used [0x00000006c2000000,0x00000006c2000000,0x00000006cc980000)
- Metaspace       used 2879K, capacity 4494K, committed 4864K, reserved 1056768K
-  class space    used 312K, capacity 386K, committed 512K, reserved 1048576K
-
-Card table byte_map: [0x0000000012ae0000,0x00000000132e0000] byte_map_base: 0x000000000f4d0000
-
-Marking Bits: (ParMarkBitMap*) 0x000000005b433e30
- Begin Bits: [0x0000000013c30000, 0x0000000017bb0000)
- End Bits:   [0x0000000017bb0000, 0x000000001bb30000)
-
-Polling page: 0x0000000002f00000
-
-CodeCache: size=245760Kb used=1040Kb max_used=1054Kb free=244719Kb
- bounds [0x0000000003720000, 0x0000000003990000, 0x0000000012720000]
- total_blobs=240 nmethods=6 adapters=149
- compilation: enabled
-
-Compilation events (2 events):
-Event: 0.339 Thread 0x000000001cd1d000    2       3       java.lang.Math::min (11 bytes)
-Event: 0.339 Thread 0x000000001cd1d000 nmethod 2 0x000000000381fcd0 code [0x000000000381fe20, 0x000000000381ffb0]
-
-GC Heap History (0 events):
-No events
-
-Deoptimization events (0 events):
-No events
-
-Classes redefined (0 events):
-No events
-
-Internal exceptions (2 events):
-Event: 0.069 Thread 0x0000000003528800 Exception <a 'java/lang/NoSuchMethodError': Method sun.misc.Unsafe.defineClass(Ljava/lang/String;[BII)Ljava/lang/Class; name or signature does not match> (0x000000076b587cb0) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u191\11896\hotspot
-Event: 0.069 Thread 0x0000000003528800 Exception <a 'java/lang/NoSuchMethodError': Method sun.misc.Unsafe.prefetchRead(Ljava/lang/Object;J)V name or signature does not match> (0x000000076b587f98) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u191\11896\hotspot\src\share\vm\prim
-
-Events (10 events):
-Event: 0.338 loading class java/net/SocketAddress done
-Event: 0.338 loading class java/net/InetSocketAddress done
-Event: 0.338 loading class java/net/InetAddress
-Event: 0.338 loading class java/lang/invoke/MethodHandleImpl
-Event: 0.339 loading class java/net/InetAddress done
-Event: 0.339 loading class java/net/InetSocketAddress$InetSocketAddressHolder
-Event: 0.339 loading class java/net/InetSocketAddress$InetSocketAddressHolder done
-Event: 0.339 loading class sun/security/action/GetBooleanAction
-Event: 0.339 loading class sun/security/action/GetBooleanAction done
-Event: 0.339 loading class java/net/InetAddress$1
-
-
-Dynamic libraries:
-0x00007ff6c21e0000 - 0x00007ff6c2217000 	D:\jdk\bin\java.exe
-0x00007ffd31ed0000 - 0x00007ffd320c5000 	C:\Windows\SYSTEM32\ntdll.dll
-0x00007ffd31700000 - 0x00007ffd317be000 	C:\Windows\System32\KERNEL32.DLL
-0x00007ffd2f620000 - 0x00007ffd2f8e8000 	C:\Windows\System32\KERNELBASE.dll
-0x00007ffd30150000 - 0x00007ffd301fe000 	C:\Windows\System32\ADVAPI32.dll
-0x00007ffd300b0000 - 0x00007ffd3014e000 	C:\Windows\System32\msvcrt.dll
-0x00007ffd30f00000 - 0x00007ffd30f9c000 	C:\Windows\System32\sechost.dll
-0x00007ffd30fa0000 - 0x00007ffd310c5000 	C:\Windows\System32\RPCRT4.dll
-0x00007ffd31540000 - 0x00007ffd316e0000 	C:\Windows\System32\USER32.dll
-0x00007ffd2fca0000 - 0x00007ffd2fcc2000 	C:\Windows\System32\win32u.dll
-0x00007ffd30610000 - 0x00007ffd3063b000 	C:\Windows\System32\GDI32.dll
-0x00007ffd2fe20000 - 0x00007ffd2ff2b000 	C:\Windows\System32\gdi32full.dll
-0x00007ffd2fa30000 - 0x00007ffd2facd000 	C:\Windows\System32\msvcp_win.dll
-0x00007ffd2fd20000 - 0x00007ffd2fe20000 	C:\Windows\System32\ucrtbase.dll
-0x00007ffd1b570000 - 0x00007ffd1b80a000 	C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
-0x00007ffd30420000 - 0x00007ffd30450000 	C:\Windows\System32\IMM32.DLL
-0x000000005b4c0000 - 0x000000005b592000 	D:\jdk\jre\bin\msvcr100.dll
-0x000000005ac10000 - 0x000000005b4b4000 	D:\jdk\jre\bin\server\jvm.dll
-0x00007ffd30600000 - 0x00007ffd30608000 	C:\Windows\System32\PSAPI.DLL
-0x00007ffd1b9e0000 - 0x00007ffd1b9e9000 	C:\Windows\SYSTEM32\WSOCK32.dll
-0x00007ffd30640000 - 0x00007ffd306ab000 	C:\Windows\System32\WS2_32.dll
-0x00007ffd21110000 - 0x00007ffd21137000 	C:\Windows\SYSTEM32\WINMM.dll
-0x00007ffd218e0000 - 0x00007ffd218ea000 	C:\Windows\SYSTEM32\VERSION.dll
-0x000000005ac00000 - 0x000000005ac0f000 	D:\jdk\jre\bin\verify.dll
-0x000000005abd0000 - 0x000000005abf9000 	D:\jdk\jre\bin\java.dll
-0x000000005aaf0000 - 0x000000005ab13000 	D:\jdk\jre\bin\instrument.dll
-0x000000005abb0000 - 0x000000005abc6000 	D:\jdk\jre\bin\zip.dll
-0x00007ffd30720000 - 0x00007ffd30e64000 	C:\Windows\System32\SHELL32.dll
-0x00007ffd2d720000 - 0x00007ffd2deb4000 	C:\Windows\SYSTEM32\windows.storage.dll
-0x00007ffd31940000 - 0x00007ffd31c94000 	C:\Windows\System32\combase.dll
-0x00007ffd2ef80000 - 0x00007ffd2efac000 	C:\Windows\SYSTEM32\Wldp.dll
-0x00007ffd31ca0000 - 0x00007ffd31d4d000 	C:\Windows\System32\SHCORE.dll
-0x00007ffd303c0000 - 0x00007ffd30415000 	C:\Windows\System32\shlwapi.dll
-0x00007ffd2f530000 - 0x00007ffd2f54f000 	C:\Windows\SYSTEM32\profapi.dll
-0x00007ffd18210000 - 0x00007ffd1822a000 	D:\IntelliJ IDEA 2023.1\bin\breakgen64.dll
-0x000000005ab90000 - 0x000000005abaa000 	D:\jdk\jre\bin\net.dll
-0x00007ffd2ece0000 - 0x00007ffd2ed4a000 	C:\Windows\system32\mswsock.dll
-
-VM Arguments:
-jvm_args: -ea -Didea.test.cyclic.buffer.size=1048576 -javaagent:D:\IntelliJ IDEA 2023.1\lib\idea_rt.jar=51680:D:\IntelliJ IDEA 2023.1\bin -Dfile.encoding=UTF-8 
-java_command: com.intellij.rt.junit.JUnitStarter -ideVersion5 -junit4 cn.pluss.platform.klk.service.LklPayService
-java_class_path (initial): D:\IntelliJ IDEA 2023.1\lib\idea_rt.jar;D:\IntelliJ IDEA 2023.1\plugins\junit\lib\junit5-rt.jar;D:\IntelliJ IDEA 2023.1\plugins\junit\lib\junit-rt.jar;D:\jdk\jre\lib\charsets.jar;D:\jdk\jre\lib\deploy.jar;D:\jdk\jre\lib\ext\access-bridge-64.jar;D:\jdk\jre\lib\ext\cldrdata.jar;D:\jdk\jre\lib\ext\dnsns.jar;D:\jdk\jre\lib\ext\jaccess.jar;D:\jdk\jre\lib\ext\jfxrt.jar;D:\jdk\jre\lib\ext\localedata.jar;D:\jdk\jre\lib\ext\nashorn.jar;D:\jdk\jre\lib\ext\sunec.jar;D:\jdk\jre\lib\ext\sunjce_provider.jar;D:\jdk\jre\lib\ext\sunmscapi.jar;D:\jdk\jre\lib\ext\sunpkcs11.jar;D:\jdk\jre\lib\ext\zipfs.jar;D:\jdk\jre\lib\javaws.jar;D:\jdk\jre\lib\jce.jar;D:\jdk\jre\lib\jfr.jar;D:\jdk\jre\lib\jfxswt.jar;D:\jdk\jre\lib\jsse.jar;D:\jdk\jre\lib\management-agent.jar;D:\jdk\jre\lib\plugin.jar;D:\jdk\jre\lib\resources.jar;D:\jdk\jre\lib\rt.jar;D:\project\chaozhanggui\pluss-service-bundle\target\classes;D:\project\chaozhanggui\pluss-dao-bundle\target\classes;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-boot-starter\3.3.2\mybatis-plus-boot-starter-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus\3.3.2\mybatis-plus-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-extension\3.3.2\mybatis-plus-extension-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-core\3.3.2\mybatis-plus-core-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\github\jsqlparser\jsqlparser\3.1\jsqlparser-3.1.jar;D:\apache-maven-3.8.8\repository\org\mybatis\mybatis-spring\2.0.4\mybatis-spring-2.0.4.jar;D:\apache-maven-3.8.8\repository\org\springframework\boot\spring-boot-autoconfigure\2.1.0.RELEASE\spring-boot-autoconfigure-2.1.0.RELEASE.jar;D:\apache-maven-3.8.8\repository\org\springframework\boot\spring-boot-starter-jdbc\2.1.0.RELEASE\spring-boot-starter-jdbc-2.1.0.RELEASE.jar;D:\apache-maven-3.8.8\repository\com\zaxxer\HikariCP\3.2.0\HikariCP-3.2.0.jar;D:\apache-maven-3.8.8\repository\org\springframework\spring-jdbc\5.1.2.RELEASE
-Launcher Type: SUN_STANDARD
-
-Environment Variables:
-JAVA_HOME=D:\jdk
-CLASSPATH=.;D:\jdk\lib;D:\jdk\lib\tools.jar
-PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\jdk\bin;D:\apache-maven-3.8.8\bin;E:\git\bin;E:\xshell\;E:\xshell\xftp\;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;
-USERNAME=Administrator
-OS=Windows_NT
-PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 42 Stepping 7, GenuineIntel
-
-
-
----------------  S Y S T E M  ---------------
-
-OS: Windows 10.0 , 64 bit Build 19041 (10.0.19041.1566)
-
-CPU:total 4 (initial active 4) (4 cores per cpu, 1 threads per core) family 6 model 42 stepping 7, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, aes, clmul, tsc, tscinvbit
-
-Memory: 4k page, physical 16645820k(2539888k free), swap 23433272k(3064k free)
-
-vm_info: Java HotSpot(TM) 64-Bit Server VM (25.191-b12) for windows-amd64 JRE (1.8.0_191-b12), built on Oct  6 2018 09:29:03 by "java_re" with MS VC++ 10.0 (VS2010)
-
-time: Thu Apr 27 16:48:10 2023
-elapsed time: 0 seconds (0d 0h 0m 0s)
-

pluss-service-bundle/hs_err_pid80668.log

@@ -1,157 +0,0 @@
-#
-# There is insufficient memory for the Java Runtime Environment to continue.
-# Native memory allocation (malloc) failed to allocate 1048576 bytes for AllocateHeap
-# Possible reasons:
-#   The system is out of physical RAM or swap space
-#   In 32 bit mode, the process size limit was hit
-# Possible solutions:
-#   Reduce memory load on the system
-#   Increase physical memory or swap space
-#   Check if swap backing store is full
-#   Use 64 bit Java on a 64 bit OS
-#   Decrease Java heap size (-Xmx/-Xms)
-#   Decrease number of Java threads
-#   Decrease Java thread stack sizes (-Xss)
-#   Set larger code cache with -XX:ReservedCodeCacheSize=
-# This output file may be truncated or incomplete.
-#
-#  Out of Memory Error (memory/allocation.inline.hpp:61), pid=80668, tid=0x0000000000013a10
-#
-# JRE version:  (8.0_191-b12) (build )
-# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.191-b12 mixed mode windows-amd64 compressed oops)
-# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
-#
-
----------------  T H R E A D  ---------------
-
-Current thread (0x0000000002d09800):  JavaThread "Unknown thread" [_thread_in_vm, id=80400, stack(0x0000000002b20000,0x0000000002c20000)]
-
-Stack: [0x0000000002b20000,0x0000000002c20000]
-[error occurred during error reporting (printing stack bounds), id 0xc0000005]
-
-Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-
-
----------------  P R O C E S S  ---------------
-
-Java Threads: ( => current thread )
-
-Other Threads:
-
-=>0x0000000002d09800 (exited) JavaThread "Unknown thread" [_thread_in_vm, id=80400, stack(0x0000000002b20000,0x0000000002c20000)]
-
-VM state:not at safepoint (normal execution)
-
-VM Mutex/Monitor currently owned by a thread: None
-
-Heap:
- PSYoungGen      total 75776K, used 1300K [0x000000076b580000, 0x0000000770a00000, 0x00000007c0000000)
-  eden space 65024K, 2% used [0x000000076b580000,0x000000076b6c51f8,0x000000076f500000)
-  from space 10752K, 0% used [0x000000076ff80000,0x000000076ff80000,0x0000000770a00000)
-  to   space 10752K, 0% used [0x000000076f500000,0x000000076f500000,0x000000076ff80000)
- ParOldGen       total 173568K, used 0K [0x00000006c2000000, 0x00000006cc980000, 0x000000076b580000)
-  object space 173568K, 0% used [0x00000006c2000000,0x00000006c2000000,0x00000006cc980000)
- Metaspace       used 786K, capacity 4480K, committed 4480K, reserved 1056768K
-  class space    used 76K, capacity 384K, committed 384K, reserved 1048576K
-
-Card table byte_map: [0x0000000012330000,0x0000000012b30000] byte_map_base: 0x000000000ed20000
-
-Marking Bits: (ParMarkBitMap*) 0x000000005b433e30
- Begin Bits: [0x0000000013480000, 0x0000000017400000)
- End Bits:   [0x0000000017400000, 0x000000001b380000)
-
-Polling page: 0x0000000000ef0000
-
-CodeCache: size=245760Kb used=328Kb max_used=328Kb free=245431Kb
- bounds [0x0000000002f70000, 0x00000000031e0000, 0x0000000011f70000]
- total_blobs=58 nmethods=0 adapters=38
- compilation: enabled
-
-Compilation events (0 events):
-No events
-
-GC Heap History (0 events):
-No events
-
-Deoptimization events (0 events):
-No events
-
-Classes redefined (0 events):
-No events
-
-Internal exceptions (0 events):
-No events
-
-Events (10 events):
-Event: 0.046 loading class java/lang/Short
-Event: 0.046 loading class java/lang/Short done
-Event: 0.046 loading class java/lang/Integer
-Event: 0.046 loading class java/lang/Integer done
-Event: 0.046 loading class java/lang/Long
-Event: 0.046 loading class java/lang/Long done
-Event: 0.048 loading class java/lang/NullPointerException
-Event: 0.048 loading class java/lang/NullPointerException done
-Event: 0.048 loading class java/lang/ArithmeticException
-Event: 0.048 loading class java/lang/ArithmeticException done
-
-
-Dynamic libraries:
-0x00007ff6c21e0000 - 0x00007ff6c2217000 	D:\jdk\bin\java.exe
-0x00007ffd31ed0000 - 0x00007ffd320c5000 	C:\Windows\SYSTEM32\ntdll.dll
-0x00007ffd31700000 - 0x00007ffd317be000 	C:\Windows\System32\KERNEL32.DLL
-0x00007ffd2f620000 - 0x00007ffd2f8e8000 	C:\Windows\System32\KERNELBASE.dll
-0x00007ffd30150000 - 0x00007ffd301fe000 	C:\Windows\System32\ADVAPI32.dll
-0x00007ffd300b0000 - 0x00007ffd3014e000 	C:\Windows\System32\msvcrt.dll
-0x00007ffd30f00000 - 0x00007ffd30f9c000 	C:\Windows\System32\sechost.dll
-0x00007ffd30fa0000 - 0x00007ffd310c5000 	C:\Windows\System32\RPCRT4.dll
-0x00007ffd31540000 - 0x00007ffd316e0000 	C:\Windows\System32\USER32.dll
-0x00007ffd2fca0000 - 0x00007ffd2fcc2000 	C:\Windows\System32\win32u.dll
-0x00007ffd30610000 - 0x00007ffd3063b000 	C:\Windows\System32\GDI32.dll
-0x00007ffd2fe20000 - 0x00007ffd2ff2b000 	C:\Windows\System32\gdi32full.dll
-0x00007ffd2fa30000 - 0x00007ffd2facd000 	C:\Windows\System32\msvcp_win.dll
-0x00007ffd2fd20000 - 0x00007ffd2fe20000 	C:\Windows\System32\ucrtbase.dll
-0x00007ffd1b570000 - 0x00007ffd1b80a000 	C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
-0x00007ffd30420000 - 0x00007ffd30450000 	C:\Windows\System32\IMM32.DLL
-0x000000005b4c0000 - 0x000000005b592000 	D:\jdk\jre\bin\msvcr100.dll
-0x000000005ac10000 - 0x000000005b4b4000 	D:\jdk\jre\bin\server\jvm.dll
-0x00007ffd30600000 - 0x00007ffd30608000 	C:\Windows\System32\PSAPI.DLL
-0x00007ffd21110000 - 0x00007ffd21137000 	C:\Windows\SYSTEM32\WINMM.dll
-0x00007ffd1b9e0000 - 0x00007ffd1b9e9000 	C:\Windows\SYSTEM32\WSOCK32.dll
-0x00007ffd30640000 - 0x00007ffd306ab000 	C:\Windows\System32\WS2_32.dll
-0x00007ffd218e0000 - 0x00007ffd218ea000 	C:\Windows\SYSTEM32\VERSION.dll
-0x000000005ac00000 - 0x000000005ac0f000 	D:\jdk\jre\bin\verify.dll
-0x000000005abd0000 - 0x000000005abf9000 	D:\jdk\jre\bin\java.dll
-0x000000005ab30000 - 0x000000005ab65000 	D:\jdk\jre\bin\jdwp.dll
-0x000000005ab20000 - 0x000000005ab28000 	D:\jdk\jre\bin\npt.dll
-0x000000005aaf0000 - 0x000000005ab13000 	D:\jdk\jre\bin\instrument.dll
-0x000000005abb0000 - 0x000000005abc6000 	D:\jdk\jre\bin\zip.dll
-
-VM Arguments:
-jvm_args: -agentlib:jdwp=transport=dt_socket,address=127.0.0.1:51688,suspend=y,server=n -ea -Didea.test.cyclic.buffer.size=1048576 -javaagent:C:\Users\Administrator\AppData\Local\JetBrains\IntelliJIdea2023.1\captureAgent\debugger-agent.jar -Dfile.encoding=UTF-8 
-java_command: com.intellij.rt.junit.JUnitStarter -ideVersion5 -junit4 cn.pluss.platform.klk.service.LklPayService
-java_class_path (initial): D:\IntelliJ IDEA 2023.1\lib\idea_rt.jar;D:\IntelliJ IDEA 2023.1\plugins\junit\lib\junit5-rt.jar;D:\IntelliJ IDEA 2023.1\plugins\junit\lib\junit-rt.jar;D:\jdk\jre\lib\charsets.jar;D:\jdk\jre\lib\deploy.jar;D:\jdk\jre\lib\ext\access-bridge-64.jar;D:\jdk\jre\lib\ext\cldrdata.jar;D:\jdk\jre\lib\ext\dnsns.jar;D:\jdk\jre\lib\ext\jaccess.jar;D:\jdk\jre\lib\ext\jfxrt.jar;D:\jdk\jre\lib\ext\localedata.jar;D:\jdk\jre\lib\ext\nashorn.jar;D:\jdk\jre\lib\ext\sunec.jar;D:\jdk\jre\lib\ext\sunjce_provider.jar;D:\jdk\jre\lib\ext\sunmscapi.jar;D:\jdk\jre\lib\ext\sunpkcs11.jar;D:\jdk\jre\lib\ext\zipfs.jar;D:\jdk\jre\lib\javaws.jar;D:\jdk\jre\lib\jce.jar;D:\jdk\jre\lib\jfr.jar;D:\jdk\jre\lib\jfxswt.jar;D:\jdk\jre\lib\jsse.jar;D:\jdk\jre\lib\management-agent.jar;D:\jdk\jre\lib\plugin.jar;D:\jdk\jre\lib\resources.jar;D:\jdk\jre\lib\rt.jar;D:\project\chaozhanggui\pluss-service-bundle\target\classes;D:\project\chaozhanggui\pluss-dao-bundle\target\classes;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-boot-starter\3.3.2\mybatis-plus-boot-starter-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus\3.3.2\mybatis-plus-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-extension\3.3.2\mybatis-plus-extension-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-core\3.3.2\mybatis-plus-core-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\github\jsqlparser\jsqlparser\3.1\jsqlparser-3.1.jar;D:\apache-maven-3.8.8\repository\org\mybatis\mybatis-spring\2.0.4\mybatis-spring-2.0.4.jar;D:\apache-maven-3.8.8\repository\org\springframework\boot\spring-boot-autoconfigure\2.1.0.RELEASE\spring-boot-autoconfigure-2.1.0.RELEASE.jar;D:\apache-maven-3.8.8\repository\org\springframework\boot\spring-boot-starter-jdbc\2.1.0.RELEASE\spring-boot-starter-jdbc-2.1.0.RELEASE.jar;D:\apache-maven-3.8.8\repository\com\zaxxer\HikariCP\3.2.0\HikariCP-3.2.0.jar;D:\apache-maven-3.8.8\repository\org\springframework\spring-jdbc\5.1.2.RELEASE
-Launcher Type: SUN_STANDARD
-
-Environment Variables:
-JAVA_HOME=D:\jdk
-CLASSPATH=.;D:\jdk\lib;D:\jdk\lib\tools.jar
-PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\jdk\bin;D:\apache-maven-3.8.8\bin;E:\git\bin;E:\xshell\;E:\xshell\xftp\;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;
-USERNAME=Administrator
-OS=Windows_NT
-PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 42 Stepping 7, GenuineIntel
-
-
-
----------------  S Y S T E M  ---------------
-
-OS: Windows 10.0 , 64 bit Build 19041 (10.0.19041.1566)
-
-CPU:total 4 (initial active 4) (4 cores per cpu, 1 threads per core) family 6 model 42 stepping 7, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, aes, clmul, tsc, tscinvbit
-
-Memory: 4k page, physical 16645820k(2560500k free), swap 23433272k(5160k free)
-
-vm_info: Java HotSpot(TM) 64-Bit Server VM (25.191-b12) for windows-amd64 JRE (1.8.0_191-b12), built on Oct  6 2018 09:29:03 by "java_re" with MS VC++ 10.0 (VS2010)
-
-time: Thu Apr 27 16:48:34 2023
-elapsed time: 0 seconds (0d 0h 0m 0s)
-

pluss-service-bundle/hs_err_pid81560.log

@@ -1,155 +0,0 @@
-#
-# There is insufficient memory for the Java Runtime Environment to continue.
-# Native memory allocation (malloc) failed to allocate 1048576 bytes for AllocateHeap
-# Possible reasons:
-#   The system is out of physical RAM or swap space
-#   In 32 bit mode, the process size limit was hit
-# Possible solutions:
-#   Reduce memory load on the system
-#   Increase physical memory or swap space
-#   Check if swap backing store is full
-#   Use 64 bit Java on a 64 bit OS
-#   Decrease Java heap size (-Xmx/-Xms)
-#   Decrease number of Java threads
-#   Decrease Java thread stack sizes (-Xss)
-#   Set larger code cache with -XX:ReservedCodeCacheSize=
-# This output file may be truncated or incomplete.
-#
-#  Out of Memory Error (memory/allocation.inline.hpp:61), pid=81560, tid=0x0000000000013830
-#
-# JRE version:  (8.0_191-b12) (build )
-# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.191-b12 mixed mode windows-amd64 compressed oops)
-# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
-#
-
----------------  T H R E A D  ---------------
-
-Current thread (0x0000000002f08800):  JavaThread "Unknown thread" [_thread_in_vm, id=79920, stack(0x0000000002e00000,0x0000000002f00000)]
-
-Stack: [0x0000000002e00000,0x0000000002f00000]
-[error occurred during error reporting (printing stack bounds), id 0xc0000005]
-
-Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-
-
----------------  P R O C E S S  ---------------
-
-Java Threads: ( => current thread )
-
-Other Threads:
-
-=>0x0000000002f08800 (exited) JavaThread "Unknown thread" [_thread_in_vm, id=79920, stack(0x0000000002e00000,0x0000000002f00000)]
-
-VM state:not at safepoint (normal execution)
-
-VM Mutex/Monitor currently owned by a thread: None
-
-Heap:
- PSYoungGen      total 75776K, used 1300K [0x000000076b580000, 0x0000000770a00000, 0x00000007c0000000)
-  eden space 65024K, 2% used [0x000000076b580000,0x000000076b6c51f8,0x000000076f500000)
-  from space 10752K, 0% used [0x000000076ff80000,0x000000076ff80000,0x0000000770a00000)
-  to   space 10752K, 0% used [0x000000076f500000,0x000000076f500000,0x000000076ff80000)
- ParOldGen       total 173568K, used 0K [0x00000006c2000000, 0x00000006cc980000, 0x000000076b580000)
-  object space 173568K, 0% used [0x00000006c2000000,0x00000006c2000000,0x00000006cc980000)
- Metaspace       used 775K, capacity 4480K, committed 4480K, reserved 1056768K
-  class space    used 76K, capacity 384K, committed 384K, reserved 1048576K
-
-Card table byte_map: [0x0000000012550000,0x0000000012d50000] byte_map_base: 0x000000000ef40000
-
-Marking Bits: (ParMarkBitMap*) 0x000000005b433e30
- Begin Bits: [0x00000000136a0000, 0x0000000017620000)
- End Bits:   [0x0000000017620000, 0x000000001b5a0000)
-
-Polling page: 0x00000000012a0000
-
-CodeCache: size=245760Kb used=328Kb max_used=328Kb free=245431Kb
- bounds [0x0000000003190000, 0x0000000003400000, 0x0000000012190000]
- total_blobs=58 nmethods=0 adapters=38
- compilation: enabled
-
-Compilation events (0 events):
-No events
-
-GC Heap History (0 events):
-No events
-
-Deoptimization events (0 events):
-No events
-
-Classes redefined (0 events):
-No events
-
-Internal exceptions (0 events):
-No events
-
-Events (10 events):
-Event: 0.045 loading class java/lang/Short
-Event: 0.045 loading class java/lang/Short done
-Event: 0.045 loading class java/lang/Integer
-Event: 0.046 loading class java/lang/Integer done
-Event: 0.046 loading class java/lang/Long
-Event: 0.046 loading class java/lang/Long done
-Event: 0.046 loading class java/lang/NullPointerException
-Event: 0.046 loading class java/lang/NullPointerException done
-Event: 0.046 loading class java/lang/ArithmeticException
-Event: 0.047 loading class java/lang/ArithmeticException done
-
-
-Dynamic libraries:
-0x00007ff6c21e0000 - 0x00007ff6c2217000 	D:\jdk\bin\java.exe
-0x00007ffd31ed0000 - 0x00007ffd320c5000 	C:\Windows\SYSTEM32\ntdll.dll
-0x00007ffd31700000 - 0x00007ffd317be000 	C:\Windows\System32\KERNEL32.DLL
-0x00007ffd2f620000 - 0x00007ffd2f8e8000 	C:\Windows\System32\KERNELBASE.dll
-0x00007ffd30150000 - 0x00007ffd301fe000 	C:\Windows\System32\ADVAPI32.dll
-0x00007ffd300b0000 - 0x00007ffd3014e000 	C:\Windows\System32\msvcrt.dll
-0x00007ffd30f00000 - 0x00007ffd30f9c000 	C:\Windows\System32\sechost.dll
-0x00007ffd30fa0000 - 0x00007ffd310c5000 	C:\Windows\System32\RPCRT4.dll
-0x00007ffd31540000 - 0x00007ffd316e0000 	C:\Windows\System32\USER32.dll
-0x00007ffd2fca0000 - 0x00007ffd2fcc2000 	C:\Windows\System32\win32u.dll
-0x00007ffd30610000 - 0x00007ffd3063b000 	C:\Windows\System32\GDI32.dll
-0x00007ffd2fe20000 - 0x00007ffd2ff2b000 	C:\Windows\System32\gdi32full.dll
-0x00007ffd2fa30000 - 0x00007ffd2facd000 	C:\Windows\System32\msvcp_win.dll
-0x00007ffd2fd20000 - 0x00007ffd2fe20000 	C:\Windows\System32\ucrtbase.dll
-0x00007ffd1b570000 - 0x00007ffd1b80a000 	C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
-0x00007ffd30420000 - 0x00007ffd30450000 	C:\Windows\System32\IMM32.DLL
-0x000000005b4c0000 - 0x000000005b592000 	D:\jdk\jre\bin\msvcr100.dll
-0x000000005ac10000 - 0x000000005b4b4000 	D:\jdk\jre\bin\server\jvm.dll
-0x00007ffd30600000 - 0x00007ffd30608000 	C:\Windows\System32\PSAPI.DLL
-0x00007ffd1b9e0000 - 0x00007ffd1b9e9000 	C:\Windows\SYSTEM32\WSOCK32.dll
-0x00007ffd30640000 - 0x00007ffd306ab000 	C:\Windows\System32\WS2_32.dll
-0x00007ffd21110000 - 0x00007ffd21137000 	C:\Windows\SYSTEM32\WINMM.dll
-0x00007ffd218e0000 - 0x00007ffd218ea000 	C:\Windows\SYSTEM32\VERSION.dll
-0x000000005ac00000 - 0x000000005ac0f000 	D:\jdk\jre\bin\verify.dll
-0x000000005abd0000 - 0x000000005abf9000 	D:\jdk\jre\bin\java.dll
-0x000000005aaf0000 - 0x000000005ab13000 	D:\jdk\jre\bin\instrument.dll
-0x000000005abb0000 - 0x000000005abc6000 	D:\jdk\jre\bin\zip.dll
-
-VM Arguments:
-jvm_args: -ea -Didea.test.cyclic.buffer.size=1048576 -javaagent:D:\IntelliJ IDEA 2023.1\lib\idea_rt.jar=51651:D:\IntelliJ IDEA 2023.1\bin -Dfile.encoding=UTF-8 
-java_command: com.intellij.rt.junit.JUnitStarter -ideVersion5 -junit4 cn.pluss.platform.klk.service.LklPayService
-java_class_path (initial): D:\IntelliJ IDEA 2023.1\lib\idea_rt.jar;D:\IntelliJ IDEA 2023.1\plugins\junit\lib\junit5-rt.jar;D:\IntelliJ IDEA 2023.1\plugins\junit\lib\junit-rt.jar;D:\jdk\jre\lib\charsets.jar;D:\jdk\jre\lib\deploy.jar;D:\jdk\jre\lib\ext\access-bridge-64.jar;D:\jdk\jre\lib\ext\cldrdata.jar;D:\jdk\jre\lib\ext\dnsns.jar;D:\jdk\jre\lib\ext\jaccess.jar;D:\jdk\jre\lib\ext\jfxrt.jar;D:\jdk\jre\lib\ext\localedata.jar;D:\jdk\jre\lib\ext\nashorn.jar;D:\jdk\jre\lib\ext\sunec.jar;D:\jdk\jre\lib\ext\sunjce_provider.jar;D:\jdk\jre\lib\ext\sunmscapi.jar;D:\jdk\jre\lib\ext\sunpkcs11.jar;D:\jdk\jre\lib\ext\zipfs.jar;D:\jdk\jre\lib\javaws.jar;D:\jdk\jre\lib\jce.jar;D:\jdk\jre\lib\jfr.jar;D:\jdk\jre\lib\jfxswt.jar;D:\jdk\jre\lib\jsse.jar;D:\jdk\jre\lib\management-agent.jar;D:\jdk\jre\lib\plugin.jar;D:\jdk\jre\lib\resources.jar;D:\jdk\jre\lib\rt.jar;D:\project\chaozhanggui\pluss-service-bundle\target\classes;D:\project\chaozhanggui\pluss-dao-bundle\target\classes;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-boot-starter\3.3.2\mybatis-plus-boot-starter-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus\3.3.2\mybatis-plus-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-extension\3.3.2\mybatis-plus-extension-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-core\3.3.2\mybatis-plus-core-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\github\jsqlparser\jsqlparser\3.1\jsqlparser-3.1.jar;D:\apache-maven-3.8.8\repository\org\mybatis\mybatis-spring\2.0.4\mybatis-spring-2.0.4.jar;D:\apache-maven-3.8.8\repository\org\springframework\boot\spring-boot-autoconfigure\2.1.0.RELEASE\spring-boot-autoconfigure-2.1.0.RELEASE.jar;D:\apache-maven-3.8.8\repository\org\springframework\boot\spring-boot-starter-jdbc\2.1.0.RELEASE\spring-boot-starter-jdbc-2.1.0.RELEASE.jar;D:\apache-maven-3.8.8\repository\com\zaxxer\HikariCP\3.2.0\HikariCP-3.2.0.jar;D:\apache-maven-3.8.8\repository\org\springframework\spring-jdbc\5.1.2.RELEASE
-Launcher Type: SUN_STANDARD
-
-Environment Variables:
-JAVA_HOME=D:\jdk
-CLASSPATH=.;D:\jdk\lib;D:\jdk\lib\tools.jar
-PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\jdk\bin;D:\apache-maven-3.8.8\bin;E:\git\bin;E:\xshell\;E:\xshell\xftp\;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;
-USERNAME=Administrator
-OS=Windows_NT
-PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 42 Stepping 7, GenuineIntel
-
-
-
----------------  S Y S T E M  ---------------
-
-OS: Windows 10.0 , 64 bit Build 19041 (10.0.19041.1566)
-
-CPU:total 4 (initial active 4) (4 cores per cpu, 1 threads per core) family 6 model 42 stepping 7, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, aes, clmul, tsc, tscinvbit
-
-Memory: 4k page, physical 16645820k(2651352k free), swap 23433272k(5624k free)
-
-vm_info: Java HotSpot(TM) 64-Bit Server VM (25.191-b12) for windows-amd64 JRE (1.8.0_191-b12), built on Oct  6 2018 09:29:03 by "java_re" with MS VC++ 10.0 (VS2010)
-
-time: Thu Apr 27 16:47:34 2023
-elapsed time: 0 seconds (0d 0h 0m 0s)
-

pluss-service-bundle/hs_err_pid81780.log

@@ -1,155 +0,0 @@
-#
-# There is insufficient memory for the Java Runtime Environment to continue.
-# Native memory allocation (malloc) failed to allocate 1048576 bytes for AllocateHeap
-# Possible reasons:
-#   The system is out of physical RAM or swap space
-#   In 32 bit mode, the process size limit was hit
-# Possible solutions:
-#   Reduce memory load on the system
-#   Increase physical memory or swap space
-#   Check if swap backing store is full
-#   Use 64 bit Java on a 64 bit OS
-#   Decrease Java heap size (-Xmx/-Xms)
-#   Decrease number of Java threads
-#   Decrease Java thread stack sizes (-Xss)
-#   Set larger code cache with -XX:ReservedCodeCacheSize=
-# This output file may be truncated or incomplete.
-#
-#  Out of Memory Error (memory/allocation.inline.hpp:61), pid=81780, tid=0x000000000000b114
-#
-# JRE version:  (8.0_191-b12) (build )
-# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.191-b12 mixed mode windows-amd64 compressed oops)
-# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
-#
-
----------------  T H R E A D  ---------------
-
-Current thread (0x0000000003538800):  JavaThread "Unknown thread" [_thread_in_vm, id=45332, stack(0x0000000003430000,0x0000000003530000)]
-
-Stack: [0x0000000003430000,0x0000000003530000]
-[error occurred during error reporting (printing stack bounds), id 0xc0000005]
-
-Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-
-
----------------  P R O C E S S  ---------------
-
-Java Threads: ( => current thread )
-
-Other Threads:
-
-=>0x0000000003538800 (exited) JavaThread "Unknown thread" [_thread_in_vm, id=45332, stack(0x0000000003430000,0x0000000003530000)]
-
-VM state:not at safepoint (normal execution)
-
-VM Mutex/Monitor currently owned by a thread: None
-
-Heap:
- PSYoungGen      total 75776K, used 1300K [0x000000076b580000, 0x0000000770a00000, 0x00000007c0000000)
-  eden space 65024K, 2% used [0x000000076b580000,0x000000076b6c51f8,0x000000076f500000)
-  from space 10752K, 0% used [0x000000076ff80000,0x000000076ff80000,0x0000000770a00000)
-  to   space 10752K, 0% used [0x000000076f500000,0x000000076f500000,0x000000076ff80000)
- ParOldGen       total 173568K, used 0K [0x00000006c2000000, 0x00000006cc980000, 0x000000076b580000)
-  object space 173568K, 0% used [0x00000006c2000000,0x00000006c2000000,0x00000006cc980000)
- Metaspace       used 775K, capacity 4480K, committed 4480K, reserved 1056768K
-  class space    used 76K, capacity 384K, committed 384K, reserved 1048576K
-
-Card table byte_map: [0x0000000012b50000,0x0000000013350000] byte_map_base: 0x000000000f540000
-
-Marking Bits: (ParMarkBitMap*) 0x000000005b433e30
- Begin Bits: [0x0000000013ca0000, 0x0000000017c20000)
- End Bits:   [0x0000000017c20000, 0x000000001bba0000)
-
-Polling page: 0x0000000001530000
-
-CodeCache: size=245760Kb used=328Kb max_used=328Kb free=245431Kb
- bounds [0x0000000003790000, 0x0000000003a00000, 0x0000000012790000]
- total_blobs=58 nmethods=0 adapters=38
- compilation: enabled
-
-Compilation events (0 events):
-No events
-
-GC Heap History (0 events):
-No events
-
-Deoptimization events (0 events):
-No events
-
-Classes redefined (0 events):
-No events
-
-Internal exceptions (0 events):
-No events
-
-Events (10 events):
-Event: 0.041 loading class java/lang/Short
-Event: 0.041 loading class java/lang/Short done
-Event: 0.041 loading class java/lang/Integer
-Event: 0.041 loading class java/lang/Integer done
-Event: 0.041 loading class java/lang/Long
-Event: 0.041 loading class java/lang/Long done
-Event: 0.042 loading class java/lang/NullPointerException
-Event: 0.042 loading class java/lang/NullPointerException done
-Event: 0.042 loading class java/lang/ArithmeticException
-Event: 0.042 loading class java/lang/ArithmeticException done
-
-
-Dynamic libraries:
-0x00007ff6c21e0000 - 0x00007ff6c2217000 	D:\jdk\bin\java.exe
-0x00007ffd31ed0000 - 0x00007ffd320c5000 	C:\Windows\SYSTEM32\ntdll.dll
-0x00007ffd31700000 - 0x00007ffd317be000 	C:\Windows\System32\KERNEL32.DLL
-0x00007ffd2f620000 - 0x00007ffd2f8e8000 	C:\Windows\System32\KERNELBASE.dll
-0x00007ffd30150000 - 0x00007ffd301fe000 	C:\Windows\System32\ADVAPI32.dll
-0x00007ffd300b0000 - 0x00007ffd3014e000 	C:\Windows\System32\msvcrt.dll
-0x00007ffd30f00000 - 0x00007ffd30f9c000 	C:\Windows\System32\sechost.dll
-0x00007ffd30fa0000 - 0x00007ffd310c5000 	C:\Windows\System32\RPCRT4.dll
-0x00007ffd31540000 - 0x00007ffd316e0000 	C:\Windows\System32\USER32.dll
-0x00007ffd2fca0000 - 0x00007ffd2fcc2000 	C:\Windows\System32\win32u.dll
-0x00007ffd30610000 - 0x00007ffd3063b000 	C:\Windows\System32\GDI32.dll
-0x00007ffd2fe20000 - 0x00007ffd2ff2b000 	C:\Windows\System32\gdi32full.dll
-0x00007ffd2fa30000 - 0x00007ffd2facd000 	C:\Windows\System32\msvcp_win.dll
-0x00007ffd2fd20000 - 0x00007ffd2fe20000 	C:\Windows\System32\ucrtbase.dll
-0x00007ffd1b570000 - 0x00007ffd1b80a000 	C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
-0x00007ffd30420000 - 0x00007ffd30450000 	C:\Windows\System32\IMM32.DLL
-0x000000005b4c0000 - 0x000000005b592000 	D:\jdk\jre\bin\msvcr100.dll
-0x000000005ac10000 - 0x000000005b4b4000 	D:\jdk\jre\bin\server\jvm.dll
-0x00007ffd30600000 - 0x00007ffd30608000 	C:\Windows\System32\PSAPI.DLL
-0x00007ffd1b9e0000 - 0x00007ffd1b9e9000 	C:\Windows\SYSTEM32\WSOCK32.dll
-0x00007ffd21110000 - 0x00007ffd21137000 	C:\Windows\SYSTEM32\WINMM.dll
-0x00007ffd30640000 - 0x00007ffd306ab000 	C:\Windows\System32\WS2_32.dll
-0x00007ffd218e0000 - 0x00007ffd218ea000 	C:\Windows\SYSTEM32\VERSION.dll
-0x000000005ac00000 - 0x000000005ac0f000 	D:\jdk\jre\bin\verify.dll
-0x000000005abd0000 - 0x000000005abf9000 	D:\jdk\jre\bin\java.dll
-0x000000005aaf0000 - 0x000000005ab13000 	D:\jdk\jre\bin\instrument.dll
-0x000000005abb0000 - 0x000000005abc6000 	D:\jdk\jre\bin\zip.dll
-
-VM Arguments:
-jvm_args: -ea -Didea.test.cyclic.buffer.size=1048576 -javaagent:D:\IntelliJ IDEA 2023.1\lib\idea_rt.jar=51664:D:\IntelliJ IDEA 2023.1\bin -Dfile.encoding=UTF-8 
-java_command: com.intellij.rt.junit.JUnitStarter -ideVersion5 -junit4 cn.pluss.platform.klk.service.LklPayService
-java_class_path (initial): D:\IntelliJ IDEA 2023.1\lib\idea_rt.jar;D:\IntelliJ IDEA 2023.1\plugins\junit\lib\junit5-rt.jar;D:\IntelliJ IDEA 2023.1\plugins\junit\lib\junit-rt.jar;D:\jdk\jre\lib\charsets.jar;D:\jdk\jre\lib\deploy.jar;D:\jdk\jre\lib\ext\access-bridge-64.jar;D:\jdk\jre\lib\ext\cldrdata.jar;D:\jdk\jre\lib\ext\dnsns.jar;D:\jdk\jre\lib\ext\jaccess.jar;D:\jdk\jre\lib\ext\jfxrt.jar;D:\jdk\jre\lib\ext\localedata.jar;D:\jdk\jre\lib\ext\nashorn.jar;D:\jdk\jre\lib\ext\sunec.jar;D:\jdk\jre\lib\ext\sunjce_provider.jar;D:\jdk\jre\lib\ext\sunmscapi.jar;D:\jdk\jre\lib\ext\sunpkcs11.jar;D:\jdk\jre\lib\ext\zipfs.jar;D:\jdk\jre\lib\javaws.jar;D:\jdk\jre\lib\jce.jar;D:\jdk\jre\lib\jfr.jar;D:\jdk\jre\lib\jfxswt.jar;D:\jdk\jre\lib\jsse.jar;D:\jdk\jre\lib\management-agent.jar;D:\jdk\jre\lib\plugin.jar;D:\jdk\jre\lib\resources.jar;D:\jdk\jre\lib\rt.jar;D:\project\chaozhanggui\pluss-service-bundle\target\classes;D:\project\chaozhanggui\pluss-dao-bundle\target\classes;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-boot-starter\3.3.2\mybatis-plus-boot-starter-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus\3.3.2\mybatis-plus-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-extension\3.3.2\mybatis-plus-extension-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\baomidou\mybatis-plus-core\3.3.2\mybatis-plus-core-3.3.2.jar;D:\apache-maven-3.8.8\repository\com\github\jsqlparser\jsqlparser\3.1\jsqlparser-3.1.jar;D:\apache-maven-3.8.8\repository\org\mybatis\mybatis-spring\2.0.4\mybatis-spring-2.0.4.jar;D:\apache-maven-3.8.8\repository\org\springframework\boot\spring-boot-autoconfigure\2.1.0.RELEASE\spring-boot-autoconfigure-2.1.0.RELEASE.jar;D:\apache-maven-3.8.8\repository\org\springframework\boot\spring-boot-starter-jdbc\2.1.0.RELEASE\spring-boot-starter-jdbc-2.1.0.RELEASE.jar;D:\apache-maven-3.8.8\repository\com\zaxxer\HikariCP\3.2.0\HikariCP-3.2.0.jar;D:\apache-maven-3.8.8\repository\org\springframework\spring-jdbc\5.1.2.RELEASE
-Launcher Type: SUN_STANDARD
-
-Environment Variables:
-JAVA_HOME=D:\jdk
-CLASSPATH=.;D:\jdk\lib;D:\jdk\lib\tools.jar
-PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\jdk\bin;D:\apache-maven-3.8.8\bin;E:\git\bin;E:\xshell\;E:\xshell\xftp\;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;
-USERNAME=Administrator
-OS=Windows_NT
-PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 42 Stepping 7, GenuineIntel
-
-
-
----------------  S Y S T E M  ---------------
-
-OS: Windows 10.0 , 64 bit Build 19041 (10.0.19041.1566)
-
-CPU:total 4 (initial active 4) (4 cores per cpu, 1 threads per core) family 6 model 42 stepping 7, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, aes, clmul, tsc, tscinvbit
-
-Memory: 4k page, physical 16645820k(2553524k free), swap 23433272k(5712k free)
-
-vm_info: Java HotSpot(TM) 64-Bit Server VM (25.191-b12) for windows-amd64 JRE (1.8.0_191-b12), built on Oct  6 2018 09:29:03 by "java_re" with MS VC++ 10.0 (VS2010)
-
-time: Thu Apr 27 16:47:50 2023
-elapsed time: 0 seconds (0d 0h 0m 0s)
-

pluss-service-bundle/pom.xml

@@ -73,17 +73,6 @@
             <artifactId>cloudauth20200618</artifactId>
             <version>2.0.3</version>
         </dependency>
-        <dependency>
-            <groupId>com.alipay.sdk</groupId>
-            <artifactId>alipay-sdk-java</artifactId>
-            <version>4.16.11.ALL</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-           <groupId>org.springframework.boot</groupId>
-           <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
 
     </dependencies>