diff --git a/mallinkAdmin/hs_err_pid13284.log b/mallinkAdmin/hs_err_pid13284.log
new file mode 100644
index 000000000..c270bab7e
--- /dev/null
+++ b/mallinkAdmin/hs_err_pid13284.log
@@ -0,0 +1,439 @@
+#
+# A fatal error has been detected by the Java Runtime Environment:
+#
+# EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x0000000063358225, pid=13284, tid=8664
+#
+# JRE version: Java(TM) SE Runtime Environment (8.0_40-b25) (build 1.8.0_40-b25)
+# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.40-b25 mixed mode windows-amd64 compressed oops)
+# Problematic frame:
+# V [jvm.dll+0x128225]
+#
+# 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 (0x000000001a159800): JavaThread "JDWP Transport Listener: dt_socket" daemon [_thread_in_vm, id=8664, stack(0x000000001a6b0000,0x000000001a7b0000)]
+
+siginfo: ExceptionCode=0xc0000005, reading address 0x0000000000000030
+
+Registers:
+RAX=0x000000001a7af301, RBX=0x000000001a159800, RCX=0x0000000000000030, RDX=0x0000000000000000
+RSP=0x000000001a7af2f0, RBP=0x0000000000000030, RSI=0x000000001a7af408, RDI=0x0000000002f68570
+R8 =0x000000001a159800, R9 =0x0000000000000001, R10=0x0000000000008000, R11=0x000000001a7af240
+R12=0x0000000000000000, R13=0x000000001a161ef8, R14=0x0000000000000000, R15=0x0000000000000000
+RIP=0x0000000063358225, EFLAGS=0x0000000000010206
+
+Top of Stack: (sp=0x000000001a7af2f0)
+0x000000001a7af2f0: 0000000000000001 0000000020780220
+0x000000001a7af300: 000000001a7af4d0 000000006355c6db
+0x000000001a7af310: 000000001a159800 0000000063578f3d
+0x000000001a7af320: 0000000000000000 0000000061f39155
+0x000000001a7af330: 00000000239139f8 0000000061f4291e
+0x000000001a7af340: 000000001a159800 0000000000000000
+0x000000001a7af350: 0000000000000000 0000000000000000
+0x000000001a7af360: 0000000000000030 0000000061f41a15
+0x000000001a7af370: 000000001a7af408 000000001a7af3e0
+0x000000001a7af380: 0000000000000001 00000000239139f8
+0x000000001a7af390: 0000000000000030 0000000061f253b3
+0x000000001a7af3a0: 000000001a7af4d0 0000000000000001
+0x000000001a7af3b0: 0000000000000001 00000000239139f8
+0x000000001a7af3c0: 0000000000000001 0000000000000000
+0x000000001a7af3d0: 0000000000000000 0000000000000000
+0x000000001a7af3e0: 0000000000000001 0000000061f25571
+
+Instructions: (pc=0x0000000063358225)
+0x0000000063358205: cc cc cc cc cc cc cc cc cc cc cc 48 83 ec 28 48
+0x0000000063358215: 85 c9 75 07 33 c0 48 83 c4 28 c3 48 89 5c 24 20
+0x0000000063358225: 48 8b 19 48 85 db 74 20 48 83 fb 37 74 1a 48 8b
+0x0000000063358235: 13 48 8b cb ff 52 10 84 c0 74 0d 48 8b c3 48 8b
+
+
+Register to memory mapping:
+
+RAX=0x000000001a7af301 is pointing into the stack for thread: 0x000000001a159800
+RBX=0x000000001a159800 is a thread
+RCX=0x0000000000000030 is an unknown value
+RDX=0x0000000000000000 is an unknown value
+RSP=0x000000001a7af2f0 is pointing into the stack for thread: 0x000000001a159800
+RBP=0x0000000000000030 is an unknown value
+RSI=0x000000001a7af408 is pointing into the stack for thread: 0x000000001a159800
+RDI=0x0000000002f68570 is an unknown value
+R8 =0x000000001a159800 is a thread
+R9 =0x0000000000000001 is an unknown value
+R10=0x0000000000008000 is an unknown value
+R11=0x000000001a7af240 is pointing into the stack for thread: 0x000000001a159800
+R12=0x0000000000000000 is an unknown value
+R13=0x000000001a161ef8 is an unknown value
+R14=0x0000000000000000 is an unknown value
+R15=0x0000000000000000 is an unknown value
+
+
+Stack: [0x000000001a6b0000,0x000000001a7b0000], sp=0x000000001a7af2f0, free space=1020k
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V [jvm.dll+0x128225]
+V [jvm.dll+0x348f3d]
+C [jdwp.dll+0x21a15]
+C [jdwp.dll+0x53b3]
+C [jdwp.dll+0x5571]
+C [jdwp.dll+0xf0a8]
+C [jdwp.dll+0x1f2d5]
+C [jdwp.dll+0x1f4aa]
+V [jvm.dll+0x1bad48]
+V [jvm.dll+0x241914]
+V [jvm.dll+0x29848a]
+C [msvcr100.dll+0x21d9f]
+C [msvcr100.dll+0x21e3b]
+C [KERNEL32.DLL+0x17bd4]
+C [ntdll.dll+0x6ce51]
+
+
+--------------- P R O C E S S ---------------
+
+Java Threads: ( => current thread )
+ 0x000000001d677000 JavaThread "lettuce-eventExecutorLoop-1-3" daemon [_thread_blocked, id=10548, stack(0x00000000358d0000,0x00000000359d0000)]
+ 0x000000001d676000 JavaThread "lettuce-eventExecutorLoop-1-2" daemon [_thread_blocked, id=10660, stack(0x0000000034710000,0x0000000034810000)]
+ 0x000000001d66f800 JavaThread "lettuce-eventExecutorLoop-1-1" daemon [_thread_blocked, id=12824, stack(0x0000000034610000,0x0000000034710000)]
+ 0x000000001d675800 JavaThread "lettuce-nioEventLoop-4-1" daemon [_thread_in_native, id=1608, stack(0x0000000033500000,0x0000000033600000)]
+ 0x000000001d671800 JavaThread "SessionValidationThread-1" daemon [_thread_blocked, id=13280, stack(0x0000000031eb0000,0x0000000031fb0000)]
+ 0x000000001f61b800 JavaThread "XNIO-1 task-1" [_thread_blocked, id=10388, stack(0x0000000031db0000,0x0000000031eb0000)]
+ 0x000000001fdfb000 JavaThread "DestroyJavaVM" [_thread_blocked, id=7892, stack(0x0000000002f70000,0x0000000003070000)]
+ 0x000000001f625000 JavaThread "XNIO-1 Accept" [_thread_in_native, id=4816, stack(0x0000000032db0000,0x0000000032eb0000)]
+ 0x000000001f622000 JavaThread "XNIO-1 I/O-8" [_thread_in_native, id=7856, stack(0x0000000032cb0000,0x0000000032db0000)]
+ 0x000000001f623000 JavaThread "XNIO-1 I/O-7" [_thread_in_native, id=10348, stack(0x0000000032bb0000,0x0000000032cb0000)]
+ 0x000000001f623800 JavaThread "XNIO-1 I/O-6" [_thread_in_native, id=10032, stack(0x0000000032ab0000,0x0000000032bb0000)]
+ 0x000000001f628000 JavaThread "XNIO-1 I/O-5" [_thread_in_native, id=3784, stack(0x00000000325b0000,0x00000000326b0000)]
+ 0x000000001f626000 JavaThread "XNIO-1 I/O-4" [_thread_in_native, id=12560, stack(0x00000000324b0000,0x00000000325b0000)]
+ 0x000000001f627800 JavaThread "XNIO-1 I/O-3" [_thread_in_native, id=12968, stack(0x00000000323b0000,0x00000000324b0000)]
+ 0x000000001f626800 JavaThread "XNIO-1 I/O-2" [_thread_in_native, id=12712, stack(0x00000000322b0000,0x00000000323b0000)]
+ 0x000000001f624800 JavaThread "XNIO-1 I/O-1" [_thread_in_native, id=256, stack(0x00000000321b0000,0x00000000322b0000)]
+ 0x000000001f620800 JavaThread "logback-8" daemon [_thread_blocked, id=12584, stack(0x0000000028ee0000,0x0000000028fe0000)]
+ 0x000000001f61d800 JavaThread "quartzScheduler_QuartzSchedulerThread" [_thread_blocked, id=13084, stack(0x0000000031560000,0x0000000031660000)]
+ 0x000000001f61f000 JavaThread "quartzScheduler_Worker-10" [_thread_blocked, id=5140, stack(0x00000000326b0000,0x00000000327b0000)]
+ 0x000000001f61c000 JavaThread "quartzScheduler_Worker-9" [_thread_blocked, id=12384, stack(0x0000000031850000,0x0000000031950000)]
+ 0x0000000029ac8800 JavaThread "quartzScheduler_Worker-8" [_thread_blocked, id=4156, stack(0x0000000031750000,0x0000000031850000)]
+ 0x0000000029ac7000 JavaThread "quartzScheduler_Worker-7" [_thread_blocked, id=6352, stack(0x000000002f430000,0x000000002f530000)]
+ 0x0000000029ac6800 JavaThread "quartzScheduler_Worker-6" [_thread_blocked, id=7332, stack(0x000000002f330000,0x000000002f430000)]
+ 0x0000000029ac8000 JavaThread "quartzScheduler_Worker-5" [_thread_blocked, id=5604, stack(0x000000002f230000,0x000000002f330000)]
+ 0x0000000029ac5800 JavaThread "quartzScheduler_Worker-4" [_thread_blocked, id=10288, stack(0x000000002b5e0000,0x000000002b6e0000)]
+ 0x0000000029ac4000 JavaThread "quartzScheduler_Worker-3" [_thread_blocked, id=6804, stack(0x000000002b220000,0x000000002b320000)]
+ 0x0000000029ac9800 JavaThread "quartzScheduler_Worker-2" [_thread_blocked, id=12800, stack(0x000000002b120000,0x000000002b220000)]
+ 0x0000000029ac5000 JavaThread "quartzScheduler_Worker-1" [_thread_blocked, id=10148, stack(0x0000000027f60000,0x0000000028060000)]
+ 0x0000000029abc800 JavaThread "IdleConnectionMonitorThread" daemon [_thread_blocked, id=2768, stack(0x000000002c980000,0x000000002ca80000)]
+ 0x0000000029ac2800 JavaThread "flowable-reset-expired-jobs" [_thread_blocked, id=12804, stack(0x0000000028060000,0x0000000028160000)]
+ 0x0000000029ac1000 JavaThread "flowable-acquire-timer-jobs" [_thread_blocked, id=8388, stack(0x0000000001180000,0x0000000001280000)]
+ 0x0000000029ac0800 JavaThread "flowable-acquire-async-jobs" [_thread_blocked, id=3512, stack(0x0000000001080000,0x0000000001180000)]
+ 0x0000000029ac2000 JavaThread "logback-7" daemon [_thread_blocked, id=4908, stack(0x0000000000f80000,0x0000000001080000)]
+ 0x0000000029abf800 JavaThread "logback-6" daemon [_thread_blocked, id=12572, stack(0x0000000027e60000,0x0000000027f60000)]
+ 0x0000000029abb000 JavaThread "logback-5" daemon [_thread_blocked, id=2392, stack(0x0000000021b60000,0x0000000021c60000)]
+ 0x0000000029abd800 JavaThread "logback-4" daemon [_thread_blocked, id=7496, stack(0x000000001f020000,0x000000001f120000)]
+ 0x0000000029abe000 JavaThread "logback-3" daemon [_thread_blocked, id=11384, stack(0x0000000027240000,0x0000000027340000)]
+ 0x0000000029aba800 JavaThread "Druid-ConnectionPool-Destroy-1007094494" daemon [_thread_blocked, id=3104, stack(0x000000002cb50000,0x000000002cc50000)]
+ 0x000000001fdfe000 JavaThread "Druid-ConnectionPool-Create-1007094494" daemon [_thread_blocked, id=12700, stack(0x00000000290c0000,0x00000000291c0000)]
+ 0x000000001fe02000 JavaThread "mysql-cj-abandoned-connection-cleanup" daemon [_thread_blocked, id=9432, stack(0x0000000028c60000,0x0000000028d60000)]
+ 0x000000001fdff800 JavaThread "IdleConnectionMonitorThread" daemon [_thread_blocked, id=1948, stack(0x0000000028de0000,0x0000000028ee0000)]
+ 0x000000001fe01000 JavaThread "commons-pool-evictor-thread" daemon [_thread_blocked, id=12956, stack(0x00000000275e0000,0x00000000276e0000)]
+ 0x000000001fdfc000 JavaThread "logback-2" daemon [_thread_blocked, id=12756, stack(0x000000001ea90000,0x000000001eb90000)]
+ 0x000000001e386000 JavaThread "logback-1" daemon [_thread_blocked, id=8500, stack(0x00000000203c0000,0x00000000204c0000)]
+ 0x000000001b4d2000 JavaThread "Service Thread" daemon [_thread_blocked, id=10652, stack(0x000000001c580000,0x000000001c680000)]
+ 0x000000001b441000 JavaThread "C1 CompilerThread3" daemon [_thread_blocked, id=10520, stack(0x000000001c480000,0x000000001c580000)]
+ 0x000000001b440000 JavaThread "C2 CompilerThread2" daemon [_thread_blocked, id=12608, stack(0x000000001c380000,0x000000001c480000)]
+ 0x000000001b43d800 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=1536, stack(0x000000001c280000,0x000000001c380000)]
+ 0x000000001b3b6800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=9612, stack(0x000000001c180000,0x000000001c280000)]
+ 0x000000001a165000 JavaThread "JDWP Command Reader" daemon [_thread_in_native, id=12716, stack(0x000000001a8b0000,0x000000001a9b0000)]
+ 0x000000001a164000 JavaThread "JDWP Event Helper Thread" daemon [_thread_blocked, id=10864, stack(0x000000001a7b0000,0x000000001a8b0000)]
+=>0x000000001a159800 JavaThread "JDWP Transport Listener: dt_socket" daemon [_thread_in_vm, id=8664, stack(0x000000001a6b0000,0x000000001a7b0000)]
+ 0x000000001a145000 JavaThread "Attach Listener" daemon [_thread_blocked, id=10980, stack(0x000000001a5b0000,0x000000001a6b0000)]
+ 0x000000001a0f7800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=11068, stack(0x000000001a4b0000,0x000000001a5b0000)]
+ 0x00000000180f8800 JavaThread "Finalizer" daemon [_thread_blocked, id=12876, stack(0x0000000019fb0000,0x000000001a0b0000)]
+ 0x00000000180f2000 JavaThread "Reference Handler" daemon [_thread_blocked, id=9572, stack(0x0000000019eb0000,0x0000000019fb0000)]
+
+Other Threads:
+ 0x00000000180ee000 VMThread [stack: 0x0000000019db0000,0x0000000019eb0000] [id=432]
+ 0x000000001b3b5000 WatcherThread [stack: 0x000000001c680000,0x000000001c780000] [id=1436]
+
+VM state:not at safepoint (normal execution)
+
+VM Mutex/Monitor currently owned by a thread: None
+
+Heap:
+ PSYoungGen total 629248K, used 61596K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 584704K, 6% used [0x00000000d6f80000,0x00000000d9723b28,0x00000000faa80000)
+ from space 44544K, 47% used [0x00000000fd480000,0x00000000fe9036d0,0x0000000100000000)
+ to space 43008K, 0% used [0x00000000faa80000,0x00000000faa80000,0x00000000fd480000)
+ ParOldGen total 238080K, used 117995K [0x0000000084e00000, 0x0000000093680000, 0x00000000d6f80000)
+ object space 238080K, 49% used [0x0000000084e00000,0x000000008c13afd8,0x0000000093680000)
+ Metaspace used 103233K, capacity 107294K, committed 107340K, reserved 1144832K
+ class space used 12255K, capacity 12927K, committed 12928K, reserved 1048576K
+
+Card table byte_map: [0x0000000012710000,0x0000000012af0000] byte_map_base: 0x00000000122e9000
+
+Marking Bits: (ParMarkBitMap*) 0x0000000063a34040
+ Begin Bits: [0x0000000013590000, 0x0000000015458000)
+ End Bits: [0x0000000015458000, 0x0000000017320000)
+
+Polling page: 0x00000000009f0000
+
+CodeCache: size=245760Kb used=40297Kb max_used=42500Kb free=205462Kb
+ bounds [0x0000000003350000, 0x0000000005d50000, 0x0000000012350000]
+ total_blobs=10999 nmethods=10337 adapters=581
+ compilation: enabled
+
+Compilation events (10 events):
+Event: 211.438 Thread 0x000000001b441000 13525 1 com.alibaba.druid.pool.DruidPooledPreparedStatement::isPooled (5 bytes)
+Event: 211.438 Thread 0x000000001b441000 nmethod 13525 0x00000000045112d0 code [0x0000000004511420, 0x0000000004511530]
+Event: 212.828 Thread 0x000000001b441000 13526 3 com.mysql.cj.protocol.Resultset$Type::fromValue (42 bytes)
+Event: 212.829 Thread 0x000000001b441000 nmethod 13526 0x000000000598a3d0 code [0x000000000598a560, 0x000000000598aa68]
+Event: 212.829 Thread 0x000000001b441000 13527 3 com.mysql.cj.protocol.Resultset$Type::values (10 bytes)
+Event: 212.830 Thread 0x000000001b441000 nmethod 13527 0x0000000003db2950 code [0x0000000003db2ac0, 0x0000000003db2da8]
+Event: 212.874 Thread 0x000000001b441000 13528 3 org.springframework.transaction.support.DefaultTransactionStatus::hasTransaction (13 bytes)
+Event: 212.875 Thread 0x000000001b441000 nmethod 13528 0x000000000476c390 code [0x000000000476c4e0, 0x000000000476c690]
+Event: 212.896 Thread 0x000000001b43d800 13529 % 4 java.util.HashMap::forEach @ 36 (103 bytes)
+Event: 212.905 Thread 0x000000001b43d800 nmethod 13529% 0x0000000003917e10 code [0x0000000003917f60, 0x0000000003918258]
+
+GC Heap History (10 events):
+Event: 68.202 GC heap before
+{Heap before GC invocations=24 (full 3):
+ PSYoungGen total 634880K, used 634876K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 605696K, 100% used [0x00000000d6f80000,0x00000000fbf00000,0x00000000fbf00000)
+ from space 29184K, 99% used [0x00000000fe380000,0x00000000fffff1e8,0x0000000100000000)
+ to space 33280K, 0% used [0x00000000fbf00000,0x00000000fbf00000,0x00000000fdf80000)
+ ParOldGen total 164352K, used 70560K [0x0000000084e00000, 0x000000008ee80000, 0x00000000d6f80000)
+ object space 164352K, 42% used [0x0000000084e00000,0x00000000892e82a8,0x000000008ee80000)
+ Metaspace used 83438K, capacity 86412K, committed 86656K, reserved 1126400K
+ class space used 10011K, capacity 10528K, committed 10624K, reserved 1048576K
+Event: 68.232 GC heap after
+Heap after GC invocations=24 (full 3):
+ PSYoungGen total 629248K, used 23366K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 605696K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000fbf00000)
+ from space 23552K, 99% used [0x00000000fbf00000,0x00000000fd5d18f0,0x00000000fd600000)
+ to space 34816K, 0% used [0x00000000fde00000,0x00000000fde00000,0x0000000100000000)
+ ParOldGen total 164352K, used 86745K [0x0000000084e00000, 0x000000008ee80000, 0x00000000d6f80000)
+ object space 164352K, 52% used [0x0000000084e00000,0x000000008a2b6648,0x000000008ee80000)
+ Metaspace used 83438K, capacity 86412K, committed 86656K, reserved 1126400K
+ class space used 10011K, capacity 10528K, committed 10624K, reserved 1048576K
+}
+Event: 72.333 GC heap before
+{Heap before GC invocations=25 (full 3):
+ PSYoungGen total 629248K, used 629062K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 605696K, 100% used [0x00000000d6f80000,0x00000000fbf00000,0x00000000fbf00000)
+ from space 23552K, 99% used [0x00000000fbf00000,0x00000000fd5d18f0,0x00000000fd600000)
+ to space 34816K, 0% used [0x00000000fde00000,0x00000000fde00000,0x0000000100000000)
+ ParOldGen total 164352K, used 86745K [0x0000000084e00000, 0x000000008ee80000, 0x00000000d6f80000)
+ object space 164352K, 52% used [0x0000000084e00000,0x000000008a2b6648,0x000000008ee80000)
+ Metaspace used 94394K, capacity 98050K, committed 98176K, reserved 1136640K
+ class space used 11217K, capacity 11837K, committed 11904K, reserved 1048576K
+Event: 72.365 GC heap after
+Heap after GC invocations=25 (full 3):
+ PSYoungGen total 620032K, used 34800K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 585216K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000fab00000)
+ from space 34816K, 99% used [0x00000000fde00000,0x00000000ffffc310,0x0000000100000000)
+ to space 43520K, 0% used [0x00000000fab00000,0x00000000fab00000,0x00000000fd580000)
+ ParOldGen total 164352K, used 97846K [0x0000000084e00000, 0x000000008ee80000, 0x00000000d6f80000)
+ object space 164352K, 59% used [0x0000000084e00000,0x000000008ad8dab0,0x000000008ee80000)
+ Metaspace used 94394K, capacity 98050K, committed 98176K, reserved 1136640K
+ class space used 11217K, capacity 11837K, committed 11904K, reserved 1048576K
+}
+Event: 72.434 GC heap before
+{Heap before GC invocations=26 (full 3):
+ PSYoungGen total 620032K, used 52077K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 585216K, 2% used [0x00000000d6f80000,0x00000000d805f420,0x00000000fab00000)
+ from space 34816K, 99% used [0x00000000fde00000,0x00000000ffffc310,0x0000000100000000)
+ to space 43520K, 0% used [0x00000000fab00000,0x00000000fab00000,0x00000000fd580000)
+ ParOldGen total 164352K, used 97846K [0x0000000084e00000, 0x000000008ee80000, 0x00000000d6f80000)
+ object space 164352K, 59% used [0x0000000084e00000,0x000000008ad8dab0,0x000000008ee80000)
+ Metaspace used 94698K, capacity 98274K, committed 98380K, reserved 1136640K
+ class space used 11259K, capacity 11869K, committed 11904K, reserved 1048576K
+Event: 72.460 GC heap after
+Heap after GC invocations=26 (full 3):
+ PSYoungGen total 585728K, used 497K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 585216K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000fab00000)
+ from space 512K, 97% used [0x00000000fab00000,0x00000000fab7c568,0x00000000fab80000)
+ to space 44544K, 0% used [0x00000000fd480000,0x00000000fd480000,0x0000000100000000)
+ ParOldGen total 164352K, used 132343K [0x0000000084e00000, 0x000000008ee80000, 0x00000000d6f80000)
+ object space 164352K, 80% used [0x0000000084e00000,0x000000008cf3dc38,0x000000008ee80000)
+ Metaspace used 94698K, capacity 98274K, committed 98380K, reserved 1136640K
+ class space used 11259K, capacity 11869K, committed 11904K, reserved 1048576K
+}
+Event: 72.460 GC heap before
+{Heap before GC invocations=27 (full 4):
+ PSYoungGen total 585728K, used 497K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 585216K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000fab00000)
+ from space 512K, 97% used [0x00000000fab00000,0x00000000fab7c568,0x00000000fab80000)
+ to space 44544K, 0% used [0x00000000fd480000,0x00000000fd480000,0x0000000100000000)
+ ParOldGen total 164352K, used 132343K [0x0000000084e00000, 0x000000008ee80000, 0x00000000d6f80000)
+ object space 164352K, 80% used [0x0000000084e00000,0x000000008cf3dc38,0x000000008ee80000)
+ Metaspace used 94698K, capacity 98274K, committed 98380K, reserved 1136640K
+ class space used 11259K, capacity 11869K, committed 11904K, reserved 1048576K
+Event: 72.838 GC heap after
+Heap after GC invocations=27 (full 4):
+ PSYoungGen total 585728K, used 0K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 585216K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000fab00000)
+ from space 512K, 0% used [0x00000000fab00000,0x00000000fab00000,0x00000000fab80000)
+ to space 44544K, 0% used [0x00000000fd480000,0x00000000fd480000,0x0000000100000000)
+ ParOldGen total 238080K, used 117987K [0x0000000084e00000, 0x0000000093680000, 0x00000000d6f80000)
+ object space 238080K, 49% used [0x0000000084e00000,0x000000008c138fd8,0x0000000093680000)
+ Metaspace used 94698K, capacity 98274K, committed 98380K, reserved 1136640K
+ class space used 11259K, capacity 11869K, committed 11904K, reserved 1048576K
+}
+Event: 83.655 GC heap before
+{Heap before GC invocations=28 (full 4):
+ PSYoungGen total 585728K, used 585216K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 585216K, 100% used [0x00000000d6f80000,0x00000000fab00000,0x00000000fab00000)
+ from space 512K, 0% used [0x00000000fab00000,0x00000000fab00000,0x00000000fab80000)
+ to space 44544K, 0% used [0x00000000fd480000,0x00000000fd480000,0x0000000100000000)
+ ParOldGen total 238080K, used 117987K [0x0000000084e00000, 0x0000000093680000, 0x00000000d6f80000)
+ object space 238080K, 49% used [0x0000000084e00000,0x000000008c138fd8,0x0000000093680000)
+ Metaspace used 101747K, capacity 105768K, committed 105932K, reserved 1142784K
+ class space used 12090K, capacity 12734K, committed 12800K, reserved 1048576K
+Event: 83.670 GC heap after
+Heap after GC invocations=28 (full 4):
+ PSYoungGen total 629248K, used 21005K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000)
+ eden space 584704K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000faa80000)
+ from space 44544K, 47% used [0x00000000fd480000,0x00000000fe9036d0,0x0000000100000000)
+ to space 43008K, 0% used [0x00000000faa80000,0x00000000faa80000,0x00000000fd480000)
+ ParOldGen total 238080K, used 117995K [0x0000000084e00000, 0x0000000093680000, 0x00000000d6f80000)
+ object space 238080K, 49% used [0x0000000084e00000,0x000000008c13afd8,0x0000000093680000)
+ Metaspace used 101747K, capacity 105768K, committed 105932K, reserved 1142784K
+ class space used 12090K, capacity 12734K, committed 12800K, reserved 1048576K
+}
+
+Deoptimization events (10 events):
+Event: 121.623 Thread 0x000000001f61b800 Uncommon trap: reason=unhandled action=none pc=0x0000000003fc6f8c method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44
+Event: 121.624 Thread 0x000000001f61b800 Uncommon trap: reason=unhandled action=none pc=0x0000000003fc6f8c method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44
+Event: 121.624 Thread 0x000000001f61b800 Uncommon trap: reason=unhandled action=none pc=0x0000000003fc6f8c method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44
+Event: 121.625 Thread 0x000000001f61b800 Uncommon trap: reason=unhandled action=none pc=0x0000000003fc6f8c method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44
+Event: 121.626 Thread 0x000000001f61b800 Uncommon trap: reason=unhandled action=none pc=0x0000000003fc6f8c method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44
+Event: 121.626 Thread 0x000000001f61b800 Uncommon trap: reason=unhandled action=none pc=0x0000000003fc6f8c method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44
+Event: 121.627 Thread 0x000000001f61b800 Uncommon trap: reason=unhandled action=none pc=0x0000000003fc6f8c method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44
+Event: 121.628 Thread 0x000000001f61b800 Uncommon trap: reason=unhandled action=none pc=0x0000000003fc6f8c method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44
+Event: 121.654 Thread 0x000000001f61b800 Uncommon trap: reason=unhandled action=none pc=0x0000000003fc6f8c method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44
+Event: 202.783 Thread 0x000000001fe01000 Uncommon trap: reason=unhandled action=none pc=0x0000000003fc6f8c method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44
+
+Internal exceptions (10 events):
+Event: 82.990 Thread 0x000000001f61b800 Exception (0x00000000f91f6a70) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\oops\instanceKlass.cpp, line 943]
+Event: 83.540 Thread 0x000000001d675800 Exception (0x00000000fa0038d8) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\interpreter\interpreterRuntime.cpp, line 366]
+Event: 83.540 Thread 0x000000001d675800 Exception (0x00000000fa004718) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\interpreter\interpreterRuntime.cpp, line 366]
+Event: 83.671 Thread 0x000000001d675800 Implicit null exception at 0x0000000004e9b2c7 to 0x0000000004ea1391
+Event: 121.269 Thread 0x000000001f61b800 Exception (0x00000000d7ca4e20) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\interpreter\interpreterRuntime.cpp, line 366]
+Event: 121.288 Thread 0x000000001f61b800 Exception (0x00000000d823b7b8) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\interpreter\interpreterRuntime.cpp, line 366]
+Event: 121.578 Thread 0x000000001f61b800 Implicit null exception at 0x000000000364835a to 0x0000000003648483
+Event: 121.578 Thread 0x000000001f61b800 Implicit null exception at 0x0000000004ae1c46 to 0x0000000004ae1d82
+Event: 121.578 Thread 0x000000001f61b800 Implicit null exception at 0x0000000005a0e0de to 0x0000000005a0e2ae
+Event: 121.587 Thread 0x000000001f61b800 Exception (0x00000000d86a4418) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\interpreter\interpreterRuntime.cpp, line 366]
+
+Events (10 events):
+Event: 202.783 loading class redis/clients/jedis/util/IOUtils done
+Event: 202.783 Thread 0x000000001fe01000 Uncommon trap: trap_request=0xffffffa7 fr.pc=0x0000000003fc6f8c
+Event: 202.783 Thread 0x000000001fe01000 DEOPT PACKING pc=0x0000000003fc6f8c sp=0x00000000276dd820
+Event: 202.783 Thread 0x000000001fe01000 DEOPT UNPACKING pc=0x000000000339582a sp=0x00000000276dd718 mode 2
+Event: 214.763 Executing VM operation: RedefineClasses
+Event: 214.825 Executing VM operation: RedefineClasses done
+Event: 214.844 Executing VM operation: ChangeBreakpoints
+Event: 214.849 Executing VM operation: ChangeBreakpoints done
+Event: 219.419 Executing VM operation: RedefineClasses
+Event: 219.484 Executing VM operation: RedefineClasses done
+
+
+Dynamic libraries:
+0x00007ff618ba0000 - 0x00007ff618bd7000 C:\soft-install\JDK8\JDK8\bin\javaw.exe
+0x00007ff92dba0000 - 0x00007ff92dd90000 C:\WINDOWS\SYSTEM32\ntdll.dll
+0x00007ff92cd00000 - 0x00007ff92cdb2000 C:\WINDOWS\System32\KERNEL32.DLL
+0x00007ff92adb0000 - 0x00007ff92b054000 C:\WINDOWS\System32\KERNELBASE.dll
+0x00007ff92c4c0000 - 0x00007ff92c563000 C:\WINDOWS\System32\ADVAPI32.dll
+0x00007ff92da40000 - 0x00007ff92dade000 C:\WINDOWS\System32\msvcrt.dll
+0x00007ff92d8d0000 - 0x00007ff92d967000 C:\WINDOWS\System32\sechost.dll
+0x00007ff92c180000 - 0x00007ff92c2a0000 C:\WINDOWS\System32\RPCRT4.dll
+0x00007ff92c570000 - 0x00007ff92c705000 C:\WINDOWS\System32\USER32.dll
+0x00007ff92abd0000 - 0x00007ff92abf1000 C:\WINDOWS\System32\win32u.dll
+0x00007ff92bc50000 - 0x00007ff92bc76000 C:\WINDOWS\System32\GDI32.dll
+0x00007ff92b9c0000 - 0x00007ff92bb56000 C:\WINDOWS\System32\gdi32full.dll
+0x00007ff92bb60000 - 0x00007ff92bbfe000 C:\WINDOWS\System32\msvcp_win.dll
+0x00007ff92acb0000 - 0x00007ff92adaa000 C:\WINDOWS\System32\ucrtbase.dll
+0x00007ff920ef0000 - 0x00007ff921174000 C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.18362.1016_none_9e7a36bbe461dae4\COMCTL32.dll
+0x00007ff92c9c0000 - 0x00007ff92ccf5000 C:\WINDOWS\System32\combase.dll
+0x00007ff92ac00000 - 0x00007ff92ac80000 C:\WINDOWS\System32\bcryptPrimitives.dll
+0x00007ff92bc80000 - 0x00007ff92bcae000 C:\WINDOWS\System32\IMM32.DLL
+0x0000000061f60000 - 0x0000000062032000 C:\soft-install\JDK8\JDK8\jre\bin\msvcr100.dll
+0x0000000063230000 - 0x0000000063ab3000 C:\soft-install\JDK8\JDK8\jre\bin\server\jvm.dll
+0x00007ff92c7a0000 - 0x00007ff92c7a8000 C:\WINDOWS\System32\PSAPI.DLL
+0x00007ff928160000 - 0x00007ff928169000 C:\WINDOWS\SYSTEM32\WSOCK32.dll
+0x00007ff9256d0000 - 0x00007ff9256da000 C:\WINDOWS\SYSTEM32\VERSION.dll
+0x00007ff927ff0000 - 0x00007ff928014000 C:\WINDOWS\SYSTEM32\WINMM.dll
+0x00007ff92d630000 - 0x00007ff92d69f000 C:\WINDOWS\System32\WS2_32.dll
+0x00007ff927b70000 - 0x00007ff927b9d000 C:\WINDOWS\SYSTEM32\WINMMBASE.dll
+0x00007ff92bc00000 - 0x00007ff92bc4a000 C:\WINDOWS\System32\cfgmgr32.dll
+0x0000000063140000 - 0x000000006314f000 C:\soft-install\JDK8\JDK8\jre\bin\verify.dll
+0x0000000063110000 - 0x0000000063139000 C:\soft-install\JDK8\JDK8\jre\bin\java.dll
+0x0000000061f20000 - 0x0000000061f55000 C:\soft-install\JDK8\JDK8\jre\bin\jdwp.dll
+0x0000000061f10000 - 0x0000000061f18000 C:\soft-install\JDK8\JDK8\jre\bin\npt.dll
+0x00000000630e0000 - 0x0000000063103000 C:\soft-install\JDK8\JDK8\jre\bin\instrument.dll
+0x00000000630c0000 - 0x00000000630d6000 C:\soft-install\JDK8\JDK8\jre\bin\zip.dll
+0x00007ff92ce70000 - 0x00007ff92d557000 C:\WINDOWS\System32\SHELL32.dll
+0x00007ff92c7d0000 - 0x00007ff92c879000 C:\WINDOWS\System32\shcore.dll
+0x00007ff92b230000 - 0x00007ff92b9b2000 C:\WINDOWS\System32\windows.storage.dll
+0x00007ff92aaa0000 - 0x00007ff92aac3000 C:\WINDOWS\System32\profapi.dll
+0x00007ff92aad0000 - 0x00007ff92ab1a000 C:\WINDOWS\System32\powrprof.dll
+0x00007ff92aa50000 - 0x00007ff92aa60000 C:\WINDOWS\System32\UMPDC.dll
+0x00007ff92c2a0000 - 0x00007ff92c2f2000 C:\WINDOWS\System32\shlwapi.dll
+0x00007ff92aa80000 - 0x00007ff92aa91000 C:\WINDOWS\System32\kernel.appcore.dll
+0x00007ff92b210000 - 0x00007ff92b227000 C:\WINDOWS\System32\cryptsp.dll
+0x0000000061f00000 - 0x0000000061f09000 C:\soft-install\JDK8\JDK8\jre\bin\dt_socket.dll
+0x00007ff920c60000 - 0x00007ff920c76000 C:\WINDOWS\system32\napinsp.dll
+0x00007ff916320000 - 0x00007ff91633a000 C:\WINDOWS\system32\pnrpnsp.dll
+0x00007ff92a250000 - 0x00007ff92a2b7000 C:\WINDOWS\System32\mswsock.dll
+0x00007ff929fa0000 - 0x00007ff92a06b000 C:\WINDOWS\SYSTEM32\DNSAPI.dll
+0x00007ff92c4b0000 - 0x00007ff92c4b8000 C:\WINDOWS\System32\NSI.dll
+0x00007ff929f60000 - 0x00007ff929f9a000 C:\WINDOWS\SYSTEM32\IPHLPAPI.DLL
+0x00007ff918540000 - 0x00007ff91854e000 C:\WINDOWS\System32\winrnr.dll
+0x00007ff926820000 - 0x00007ff92683c000 C:\WINDOWS\system32\NLAapi.dll
+0x00007ff910540000 - 0x00007ff910555000 C:\WINDOWS\system32\wshbth.dll
+0x00007ff920ac0000 - 0x00007ff920b37000 C:\WINDOWS\System32\fwpuclnt.dll
+0x00007ff92ac80000 - 0x00007ff92aca6000 C:\WINDOWS\System32\bcrypt.dll
+0x00007ff91e450000 - 0x00007ff91e45a000 C:\Windows\System32\rasadhlp.dll
+0x0000000061ef0000 - 0x0000000061efd000 C:\soft-install\JDK8\JDK8\jre\bin\management.dll
+0x00000000630a0000 - 0x00000000630ba000 C:\soft-install\JDK8\JDK8\jre\bin\net.dll
+0x0000000063080000 - 0x0000000063091000 C:\soft-install\JDK8\JDK8\jre\bin\nio.dll
+0x0000000063050000 - 0x0000000063074000 C:\soft-install\JDK8\JDK8\jre\bin\sunec.dll
+0x00007ff929dc0000 - 0x00007ff929df3000 C:\WINDOWS\system32\rsaenh.dll
+0x00007ff92a970000 - 0x00007ff92a995000 C:\WINDOWS\SYSTEM32\USERENV.dll
+0x00007ff92a420000 - 0x00007ff92a42c000 C:\WINDOWS\SYSTEM32\CRYPTBASE.dll
+0x00007ff922200000 - 0x00007ff922216000 C:\WINDOWS\SYSTEM32\dhcpcsvc6.DLL
+0x00007ff922390000 - 0x00007ff9223ac000 C:\WINDOWS\SYSTEM32\dhcpcsvc.DLL
+0x0000000061ee0000 - 0x0000000061eeb000 C:\soft-install\JDK8\JDK8\jre\bin\sunmscapi.dll
+0x00007ff92b0c0000 - 0x00007ff92b209000 C:\WINDOWS\System32\CRYPT32.dll
+0x00007ff92aa60000 - 0x00007ff92aa72000 C:\WINDOWS\System32\MSASN1.dll
+0x00007ff9153c0000 - 0x00007ff9155b4000 C:\WINDOWS\SYSTEM32\dbghelp.dll
+
+VM Arguments:
+jvm_args: -agentlib:jdwp=transport=dt_socket,suspend=y,address=localhost:53298 -javaagent:C:\soft-install\jee-2019-09\eclipse\configuration\org.eclipse.osgi\412\0\.cp\lib\javaagent-shaded.jar -Dfile.encoding=UTF-8
+java_command: com.iformall.UserApplication
+java_class_path (initial): C:\project\formall\formallWu\formallProject\mallinkAdmin\target\classes;C:\Users\alascor\.m2\repository\javax\activation\activation\1.1\activation-1.1.jar;C:\Users\alascor\.m2\repository\javax\xml\bind\jaxb-api\2.3.0\jaxb-api-2.3.0.jar;C:\project\formall\formallWu\formallProject\mallinkService\target\classes;C:\Users\alascor\.m2\repository\net\sf\dozer\dozer\5.5.1\dozer-5.5.1.jar;C:\Users\alascor\.m2\repository\commons-beanutils\commons-beanutils\1.9.1\commons-beanutils-1.9.1.jar;C:\Users\alascor\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Users\alascor\.m2\repository\org\apache\commons\commons-lang3\3.8\commons-lang3-3.8.jar;C:\Users\alascor\.m2\repository\org\slf4j\slf4j-api\1.7.30\slf4j-api-1.7.30.jar;C:\Users\alascor\.m2\repository\org\slf4j\jcl-over-slf4j\1.7.30\jcl-over-slf4j-1.7.30.jar;C:\Users\alascor\.m2\repository\org\springframework\boot\spring-boot-starter-web\2.2.5.RELEASE\spring-boot-starter-web-2.2.5.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\boot\spring-boot-starter\2.2.5.RELEASE\spring-boot-starter-2.2.5.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\boot\spring-boot\2.2.5.RELEASE\spring-boot-2.2.5.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-core\5.2.4.RELEASE\spring-core-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-jcl\5.2.4.RELEASE\spring-jcl-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-context\5.2.4.RELEASE\spring-context-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-aop\5.2.4.RELEASE\spring-aop-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-beans\5.2.4.RELEASE\spring-beans-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-expression\5.2.4.RELEASE\spring-expression-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\boot\spring-boot-autoc
+Launcher Type: SUN_STANDARD
+
+Environment Variables:
+JAVA_HOME=C:\soft-install\JDK8\JDK8
+CLASSPATH=.;C:\soft-install\JDK8\JDK8\lib;C:\soft-install\JDK8\JDK8\lib\tools.jar
+PATH=C:/soft-install/JDK8/JDK8/bin/../jre/bin/server;C:/soft-install/JDK8/JDK8/bin/../jre/bin;C:/soft-install/JDK8/JDK8/bin/../jre/lib/amd64;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\soft-install\Git\cmd\;%installation home%\bin\;C:\Users\alascor\AppData\Local\Microsoft\WindowsApps;C:\soft-install\JDK8\JDK8\bin;C:\soft-install\JDK8\JDK8\jre\bin;C:\soft-install\apache-maven-3.3.9\apache-maven-3.3.9\bin;;C:\Users\alascor\Desktop;
+USERNAME=alascor
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 60 Stepping 3, GenuineIntel
+
+
+
+--------------- S Y S T E M ---------------
+
+OS: Windows 10.0 , 64 bit Build 18362 (10.0.18362.959)
+
+CPU:total 8 (4 cores per cpu, 2 threads per core) family 6 model 60 stepping 3, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, clmul, erms, lzcnt, ht, tsc, tscinvbit, bmi1, bmi2
+
+Memory: 4k page, physical 8068152k(1438196k free), swap 14621752k(5397372k free)
+
+vm_info: Java HotSpot(TM) 64-Bit Server VM (25.40-b25) for windows-amd64 JRE (1.8.0_40-b25), built on Feb 10 2015 21:53:57 by "java_re" with MS VC++ 10.0 (VS2010)
+
+time: Wed Aug 19 19:03:22 2020
+elapsed time: 219 seconds (0d 0h 3m 39s)
+
diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
index ad3b2ca39..43c9e2138 100644
--- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
+++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
@@ -154,7 +154,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/logout", "authc");
filterChainDefinitionMap.put("/**", "corsFilter,token,authc");
- filterChainDefinitionMap.put("/**", "anon");
+// filterChainDefinitionMap.put("/**", "anon");
shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);
diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
index 2651dfe6b..55f2c476e 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
@@ -327,9 +327,9 @@ public class WxRentContractController extends WxContractBaseController {
* @param wxRentContract
* @return
*/
- @GetMapping("/unvalid")
+ @PostMapping("/unvalid")
@SystemControllerLog(description = "租金合同-作废合同")
- public ResultData unvalid(@ModelAttribute WxRentContract wxRentContract) {
+ public ResultData unvalid(@RequestBody WxRentContract wxRentContract) {
WxRentContract contract = wxRentContractService.getSimpleDeatil(wxRentContract.getId());
if (null == contract) {
return new ResultData(Result.ERROR, "合同不存在.");
@@ -383,10 +383,10 @@ public class WxRentContractController extends WxContractBaseController {
}
- @GetMapping("effective")
+ @PostMapping("effective")
@ApiImplicitParams({})
@SystemControllerLog(description = "租金合同-合同生效")
- public ResultData effective(@ModelAttribute WxRentContract wxRentContract) {
+ public ResultData effective(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList");
WxRentContract contract = wxRentContractService.getSimpleDeatil(wxRentContract.getId());
if (null == contract) {
@@ -411,13 +411,12 @@ public class WxRentContractController extends WxContractBaseController {
@PostMapping("apply")
@SystemControllerLog(description = "租赁合同-提交审批")
- public ResultData apply(@ModelAttribute WxRentContract wxRentContract) {
- MallUserInfo user = getUser();
+ public ResultData apply(@RequestBody WxRentContract wxRentContract) {
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId());
if (null == rentContract) {
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同");
}
-
+ MallUserInfo user = getUser();
//查询是否有审批流程
if(rentContractHasWorkFlow(rentContract)) {
return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"租赁合同存在工作流,不允许直接生效。");
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
index a10dff55e..13536c206 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
@@ -2453,11 +2453,18 @@ public class WxRentContractServiceImpl implements WxRentContractService {
@Override
public ResultData apply(WxRentContract rentContract,MallUserInfo user) {
- //如果存在其他的草稿状态或者履约驳回状态的合同,不允许提交审批
- Integer count = wxRentContractMapper.getCanApplyCount(rentContract.getId());
- if (null != count && count.intValue()>0) {
- return new ResultData(Result.ERROR, "当前存在其他草稿状态或者履约驳回的合同。请先作废其他草稿或者审批拒绝或者撤回的合同。");
+ //如果存在审批中的合同,不允许提交审批
+ WxRentContract wrq = new WxRentContract();
+ wrq.updateTenantInfo(user);
+ wrq.setStatus(EnumRentContractStatus.PERFORMANCE.getCode());
+ List clist = wxRentContractMapper.findList(wrq);
+ if (null != clist && clist.size() > 0 ) {
+ return new ResultData(Result.ERROR, "当前存在其他审批中的合同。请先作完成。");
}
+// Integer count = wxRentContractMapper.getCanApplyCount(rentContract.getId());
+// if (null != count && count.intValue()>0) {
+// return new ResultData(Result.ERROR, "当前存在其他草稿状态或者履约驳回的合同。请先作废其他草稿或者审批拒绝或者撤回的合同。");
+// }
if (CollectionUtils.isEmpty(rentContract.getFlowParams())) {
return new ResultData(Result.ERROR, "编号["+rentContract.getId()+"]租金合同没有审批流程.");