文促会项目迁移

hs_err_pid30176.log

@@ -0,0 +1,156 @@
+#
+# 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=30176, tid=0x0000000000008254
+#
+# JRE version:  (8.0_92-b14) (build )
+# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.92-b14 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 (0x0000000002b98000):  JavaThread "Unknown thread" [_thread_in_vm, id=33364, stack(0x00000000029f0000,0x0000000002af0000)]
+
+Stack: [0x00000000029f0000,0x0000000002af0000]
+[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:
+
+=>0x0000000002b98000 (exited) JavaThread "Unknown thread" [_thread_in_vm, id=33364, stack(0x00000000029f0000,0x0000000002af0000)]
+
+VM state:not at safepoint (normal execution)
+
+VM Mutex/Monitor currently owned by a thread: None
+
+Heap:
+ PSYoungGen      total 114176K, used 1966K [0x0000000740e00000, 0x0000000748d00000, 0x00000007c0000000)
+  eden space 98304K, 2% used [0x0000000740e00000,0x0000000740feb860,0x0000000746e00000)
+  from space 15872K, 0% used [0x0000000747d80000,0x0000000747d80000,0x0000000748d00000)
+  to   space 15872K, 0% used [0x0000000746e00000,0x0000000746e00000,0x0000000747d80000)
+ ParOldGen       total 261120K, used 0K [0x0000000642a00000, 0x0000000652900000, 0x0000000740e00000)
+  object space 261120K, 0% used [0x0000000642a00000,0x0000000642a00000,0x0000000652900000)
+ Metaspace       used 780K, capacity 4480K, committed 4480K, reserved 1056768K
+  class space    used 75K, capacity 384K, committed 384K, reserved 1048576K
+
+Card table byte_map: [0x0000000012150000,0x0000000012d40000] byte_map_base: 0x000000000ef3b000
+
+Marking Bits: (ParMarkBitMap*) 0x00000000620864f0
+ Begin Bits: [0x0000000013b40000, 0x0000000019a98000)
+ End Bits:   [0x0000000019a98000, 0x000000001f9f0000)
+
+Polling page: 0x0000000000910000
+
+CodeCache: size=245760Kb used=328Kb max_used=328Kb free=245431Kb
+ bounds [0x0000000002d90000, 0x0000000003000000, 0x0000000011d90000]
+ 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
+
+Internal exceptions (0 events):
+No events
+
+Events (10 events):
+Event: 0.033 loading class java/lang/Short
+Event: 0.034 loading class java/lang/Short done
+Event: 0.034 loading class java/lang/Integer
+Event: 0.034 loading class java/lang/Integer done
+Event: 0.034 loading class java/lang/Long
+Event: 0.034 loading class java/lang/Long done
+Event: 0.034 loading class java/lang/NullPointerException
+Event: 0.034 loading class java/lang/NullPointerException done
+Event: 0.034 loading class java/lang/ArithmeticException
+Event: 0.034 loading class java/lang/ArithmeticException done
+
+
+Dynamic libraries:
+0x00007ff6f6a70000 - 0x00007ff6f6aa7000 	D:\Program Files\Java\jdk1.8.0_92\bin\java.exe
+0x00007ff8e83a0000 - 0x00007ff8e858d000 	C:\Windows\SYSTEM32\ntdll.dll
+0x00007ff8e7d00000 - 0x00007ff8e7db3000 	C:\Windows\System32\KERNEL32.DLL
+0x00007ff8e4870000 - 0x00007ff8e4b03000 	C:\Windows\System32\KERNELBASE.dll
+0x00007ff8e8190000 - 0x00007ff8e8233000 	C:\Windows\System32\ADVAPI32.dll
+0x00007ff8e77e0000 - 0x00007ff8e787e000 	C:\Windows\System32\msvcrt.dll
+0x00007ff8e7930000 - 0x00007ff8e79ce000 	C:\Windows\System32\sechost.dll
+0x00007ff8e8060000 - 0x00007ff8e8183000 	C:\Windows\System32\RPCRT4.dll
+0x00007ff8e7e40000 - 0x00007ff8e7fd7000 	C:\Windows\System32\USER32.dll
+0x00007ff8e5500000 - 0x00007ff8e5520000 	C:\Windows\System32\win32u.dll
+0x00007ff8e55f0000 - 0x00007ff8e5619000 	C:\Windows\System32\GDI32.dll
+0x00007ff8e46d0000 - 0x00007ff8e486a000 	C:\Windows\System32\gdi32full.dll
+0x00007ff8e5260000 - 0x00007ff8e5300000 	C:\Windows\System32\msvcp_win.dll
+0x00007ff8e53b0000 - 0x00007ff8e54ac000 	C:\Windows\System32\ucrtbase.dll
+0x00007ff8d7ad0000 - 0x00007ff8d7d49000 	C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.17763.168_none_05b737f6071d80ab\COMCTL32.dll
+0x00007ff8e79d0000 - 0x00007ff8e7cfd000 	C:\Windows\System32\combase.dll
+0x00007ff8e5300000 - 0x00007ff8e537e000 	C:\Windows\System32\bcryptPrimitives.dll
+0x00007ff8e7880000 - 0x00007ff8e78ae000 	C:\Windows\System32\IMM32.DLL
+0x0000000062110000 - 0x00000000621e2000 	D:\Program Files\Java\jdk1.8.0_92\jre\bin\msvcr100.dll
+0x0000000061870000 - 0x0000000062106000 	D:\Program Files\Java\jdk1.8.0_92\jre\bin\server\jvm.dll
+0x00007ff8e55d0000 - 0x00007ff8e55d8000 	C:\Windows\System32\PSAPI.DLL
+0x00007ff8dc530000 - 0x00007ff8dc539000 	C:\Windows\SYSTEM32\WSOCK32.dll
+0x00007ff8e7650000 - 0x00007ff8e76bd000 	C:\Windows\System32\WS2_32.dll
+0x00007ff8dcba0000 - 0x00007ff8dcbc4000 	C:\Windows\SYSTEM32\WINMM.dll
+0x00007ff8e02b0000 - 0x00007ff8e02ba000 	C:\Windows\SYSTEM32\VERSION.dll
+0x00007ff8dcb70000 - 0x00007ff8dcb9d000 	C:\Windows\SYSTEM32\WINMMBASE.dll
+0x00007ff8e54b0000 - 0x00007ff8e54fa000 	C:\Windows\System32\cfgmgr32.dll
+0x0000000061860000 - 0x000000006186f000 	D:\Program Files\Java\jdk1.8.0_92\jre\bin\verify.dll
+0x0000000061830000 - 0x0000000061859000 	D:\Program Files\Java\jdk1.8.0_92\jre\bin\java.dll
+0x0000000061420000 - 0x0000000061455000 	D:\Program Files\Java\jdk1.8.0_92\jre\bin\jdwp.dll
+0x00000000617d0000 - 0x00000000617d8000 	D:\Program Files\Java\jdk1.8.0_92\jre\bin\npt.dll
+0x00000000613f0000 - 0x0000000061413000 	D:\Program Files\Java\jdk1.8.0_92\jre\bin\instrument.dll
+0x0000000061790000 - 0x00000000617a6000 	D:\Program Files\Java\jdk1.8.0_92\jre\bin\zip.dll
+
+VM Arguments:
+jvm_args: -agentlib:jdwp=transport=dt_socket,address=127.0.0.1:59174,suspend=y,server=n -XX:TieredStopAtLevel=1 -Xverify:none -Dspring.output.ansi.enabled=always -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=59173 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Dspring.liveBeansView.mbeanDomain -Dspring.application.admin.enabled=true -javaagent:C:\Users\liugw\.IntelliJIdea2018.2\system\captureAgent\debugger-agent.jar=file:/C:/Users/liugw/AppData/Local/Temp/capture.props -Dfile.encoding=UTF-8 
+java_command: com.xdf.creative.CreativeApplication
+java_class_path (initial): D:\Program Files\Java\jdk1.8.0_92\jre\lib\charsets.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\deploy.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\access-bridge-64.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\cldrdata.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\dnsns.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\jaccess.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\jfxrt.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\localedata.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\nashorn.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\sunec.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\sunjce_provider.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\sunmscapi.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\sunpkcs11.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\ext\zipfs.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\javaws.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\jce.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\jfr.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\jfxswt.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\jsse.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\management-agent.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\plugin.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\resources.jar;D:\Program Files\Java\jdk1.8.0_92\jre\lib\rt.jar;D:\liugw\GitLabProject\cultural_server\target\classes;D:\mavenWrok\repository\org\springframework\boot\spring-boot-starter-web\2.1.2.RELEASE\spring-boot-starter-web-2.1.2.RELEASE.jar;D:\mavenWrok\repository\org\springframework\boot\spring-boot-starter\2.1.2.RELEASE\spring-boot-starter-2.1.2.RELEASE.jar;D:\mavenWrok\repository\org\springframework\boot\spring-boot\2.1.2.RELEASE\spring-boot-2.1.2.RELEASE.jar;D:\mavenWrok\repository\org\springframework\boot\spring-boot-starter-logging\2.1.2.RELEASE\spring-boot-starter-logging-2.1.2.RELEASE.jar;D:\mavenWrok\repository\ch\qos\logback\logback-classic\1.2.3\logback-classic-1.2.3.jar;D:\mavenWrok\repository\ch\qos\logback\
+Launcher Type: SUN_STANDARD
+
+Environment Variables:
+PATH=D:\installSoft\xftp\NetSarang\Xftp 6\;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\iCLS\;C:\Program Files\Intel\Intel(R) Management Engine Components\iCLS\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\MySQL\MySQL Utilities 1.6\;D:\installWork\Git\cmd;D:\Program Files\TortoiseSVN\bin;C:\Users\liugw\AppData\Local\Microsoft\WindowsApps;D:\installWork\Git\cmd;
+USERNAME=liugw
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 10, GenuineIntel
+
+
+
+---------------  S Y S T E M  ---------------
+
+OS: Windows 10.0 , 64 bit Build 17763 (10.0.17763.1)
+
+CPU:total 6 (6 cores per cpu, 1 threads per core) family 6 model 158 stepping 10, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, 3dnowpref, lzcnt, tsc, tscinvbit, bmi1, bmi2, adx
+
+Memory: 4k page, physical 24988048k(7720864k free), swap 38573580k(5468k free)
+
+vm_info: Java HotSpot(TM) 64-Bit Server VM (25.92-b14) for windows-amd64 JRE (1.8.0_92-b14), built on Mar 31 2016 21:03:04 by "java_re" with MS VC++ 10.0 (VS2010)
+
+time: Fri Apr 17 16:29:55 2020
+elapsed time: 0 seconds (0d 0h 0m 0s)
+

logs/web-error.log

@@ -0,0 +1,420 @@
+2020-09-10 11:07:03.614 ERROR 18384 [main] com.alibaba.druid.pool.DruidDataSource   936 : init datasource error, url: jdbc:mysql://172.19.175.249:3306/dfzx_wch?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+
+com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
+	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
+	at com.mysql.jdbc.Util.handleNewInstance(Util.java:425)
+	at com.mysql.jdbc.SQLError.createCommunicationsException(SQLError.java:990)
+	at com.mysql.jdbc.MysqlIO.<init>(MysqlIO.java:342)
+	at com.mysql.jdbc.ConnectionImpl.coreConnect(ConnectionImpl.java:2197)
+	at com.mysql.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:2230)
+	at com.mysql.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:2025)
+	at com.mysql.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:778)
+	at com.mysql.jdbc.JDBC4Connection.<init>(JDBC4Connection.java:47)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
+	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
+	at com.mysql.jdbc.Util.handleNewInstance(Util.java:425)
+	at com.mysql.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:386)
+	at com.mysql.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:330)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156)
+	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:218)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150)
+	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150)
+	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787)
+	at com.alibaba.druid.filter.FilterEventAdapter.connection_connect(FilterEventAdapter.java:38)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150)
+	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1645)
+	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1709)
+	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:932)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1870)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1813)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1741)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:576)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:857)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:760)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:509)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1288)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1127)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:538)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1467)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1362)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:575)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:593)
+	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:90)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:374)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1378)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:575)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:593)
+	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:90)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:374)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1378)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:575)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:846)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:863)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:546)
+	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:142)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:775)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:397)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:316)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1260)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1248)
+	at com.xdf.creative.CreativeApplication.main(CreativeApplication.java:31)
+Caused by: java.net.ConnectException: Connection timed out: connect
+	at java.net.DualStackPlainSocketImpl.connect0(Native Method)
+	at java.net.DualStackPlainSocketImpl.socketConnect(DualStackPlainSocketImpl.java:79)
+	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350)
+	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206)
+	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188)
+	at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:172)
+	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392)
+	at java.net.Socket.connect(Socket.java:589)
+	at com.mysql.jdbc.StandardSocketFactory.connect(StandardSocketFactory.java:211)
+	at com.mysql.jdbc.MysqlIO.<init>(MysqlIO.java:301)
+	... 97 common frames omitted
+
+2020-09-10 11:07:03.623 ERROR 18384 [main] com.alibaba.druid.pool.DruidDataSource   978 : {dataSource-1} init error
+
+com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
+	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
+	at com.mysql.jdbc.Util.handleNewInstance(Util.java:425)
+	at com.mysql.jdbc.SQLError.createCommunicationsException(SQLError.java:990)
+	at com.mysql.jdbc.MysqlIO.<init>(MysqlIO.java:342)
+	at com.mysql.jdbc.ConnectionImpl.coreConnect(ConnectionImpl.java:2197)
+	at com.mysql.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:2230)
+	at com.mysql.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:2025)
+	at com.mysql.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:778)
+	at com.mysql.jdbc.JDBC4Connection.<init>(JDBC4Connection.java:47)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
+	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
+	at com.mysql.jdbc.Util.handleNewInstance(Util.java:425)
+	at com.mysql.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:386)
+	at com.mysql.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:330)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156)
+	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:218)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150)
+	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150)
+	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787)
+	at com.alibaba.druid.filter.FilterEventAdapter.connection_connect(FilterEventAdapter.java:38)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150)
+	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1645)
+	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1709)
+	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:932)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1870)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1813)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1741)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:576)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:857)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:760)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:509)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1288)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1127)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:538)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1467)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1362)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:575)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:593)
+	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:90)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:374)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1378)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:575)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:593)
+	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:90)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:374)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1378)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:575)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:846)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:863)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:546)
+	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:142)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:775)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:397)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:316)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1260)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1248)
+	at com.xdf.creative.CreativeApplication.main(CreativeApplication.java:31)
+Caused by: java.net.ConnectException: Connection timed out: connect
+	at java.net.DualStackPlainSocketImpl.connect0(Native Method)
+	at java.net.DualStackPlainSocketImpl.socketConnect(DualStackPlainSocketImpl.java:79)
+	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350)
+	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206)
+	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188)
+	at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:172)
+	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392)
+	at java.net.Socket.connect(Socket.java:589)
+	at com.mysql.jdbc.StandardSocketFactory.connect(StandardSocketFactory.java:211)
+	at com.mysql.jdbc.MysqlIO.<init>(MysqlIO.java:301)
+	... 97 common frames omitted
+
+2020-09-10 11:07:03.651 ERROR 18384 [main] o.s.boot.SpringApplication               858 : Application run failed
+
+org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'infoAttachmentController': Unsatisfied dependency expressed through field 'infoAttachmentService'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'infoAttachmentServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'infoAttachmentMapper' defined in file [D:\liugw\GitLabProject\xdf_wch_server\target\classes\com\xdf\creative\module\mapper\InfoAttachmentMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:596)
+	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:90)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:374)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1378)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:575)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:846)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:863)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:546)
+	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:142)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:775)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:397)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:316)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1260)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1248)
+	at com.xdf.creative.CreativeApplication.main(CreativeApplication.java:31)
+Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'infoAttachmentServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'infoAttachmentMapper' defined in file [D:\liugw\GitLabProject\xdf_wch_server\target\classes\com\xdf\creative\module\mapper\InfoAttachmentMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:596)
+	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:90)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:374)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1378)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:575)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:593)
+	... 19 common frames omitted
+Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'infoAttachmentMapper' defined in file [D:\liugw\GitLabProject\xdf_wch_server\target\classes\com\xdf\creative\module\mapper\InfoAttachmentMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1482)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1362)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:575)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:593)
+	... 32 common frames omitted
+Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:769)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:509)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1288)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1127)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:538)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1467)
+	... 43 common frames omitted
+Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1745)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:576)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:498)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:320)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:318)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:277)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1244)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1164)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:857)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:760)
+	... 56 common frames omitted
+Caused by: com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
+	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
+	at com.mysql.jdbc.Util.handleNewInstance(Util.java:425)
+	at com.mysql.jdbc.SQLError.createCommunicationsException(SQLError.java:990)
+	at com.mysql.jdbc.MysqlIO.<init>(MysqlIO.java:342)
+	at com.mysql.jdbc.ConnectionImpl.coreConnect(ConnectionImpl.java:2197)
+	at com.mysql.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:2230)
+	at com.mysql.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:2025)
+	at com.mysql.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:778)
+	at com.mysql.jdbc.JDBC4Connection.<init>(JDBC4Connection.java:47)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
+	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
+	at com.mysql.jdbc.Util.handleNewInstance(Util.java:425)
+	at com.mysql.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:386)
+	at com.mysql.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:330)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156)
+	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:218)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150)
+	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150)
+	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787)
+	at com.alibaba.druid.filter.FilterEventAdapter.connection_connect(FilterEventAdapter.java:38)
+	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150)
+	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1645)
+	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1709)
+	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:932)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1870)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1813)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1741)
+	... 67 common frames omitted
+Caused by: java.net.ConnectException: Connection timed out: connect
+	at java.net.DualStackPlainSocketImpl.connect0(Native Method)
+	at java.net.DualStackPlainSocketImpl.socketConnect(DualStackPlainSocketImpl.java:79)
+	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350)
+	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206)
+	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188)
+	at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:172)
+	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392)
+	at java.net.Socket.connect(Socket.java:589)
+	at com.mysql.jdbc.StandardSocketFactory.connect(StandardSocketFactory.java:211)
+	at com.mysql.jdbc.MysqlIO.<init>(MysqlIO.java:301)
+	... 97 common frames omitted
+
+2020-09-10 11:12:49.247 ERROR 87580 [http-nio-8989-exec-26] o.s.web.servlet.HandlerInterceptor       103 : 令牌过期
+2020-09-10 11:25:59.375 ERROR 87580 [http-nio-8989-exec-12] o.s.web.servlet.HandlerInterceptor       196 : 该用户没有权限访问/webInitiationApply/getPageListByFirstAudit
+2020-09-10 11:26:11.782 ERROR 87580 [http-nio-8989-exec-20] o.s.web.servlet.HandlerInterceptor       196 : 该用户没有权限访问/webInitiationApply/getPageListByFirstAudit
+2020-09-10 11:27:46.227 ERROR 87580 [http-nio-8989-exec-28] o.s.web.servlet.HandlerInterceptor       196 : 该用户没有权限访问/webInitiationApply/getPageListByCreditAudit
+2020-09-10 11:28:48.327 ERROR 87580 [http-nio-8989-exec-21] o.s.web.servlet.HandlerInterceptor       196 : 该用户没有权限访问/webInitiationApply/getPageListByFinalAudit
+2020-09-10 11:29:51.409 ERROR 87580 [http-nio-8989-exec-12] o.s.web.servlet.HandlerInterceptor       196 : 该用户没有权限访问/webInitiationApply/getPageListByFirstAudit
+2020-09-10 11:31:03.026 ERROR 56356 [http-nio-8989-exec-8] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:31:03.026 ERROR 56356 [http-nio-8989-exec-4] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:31:05.501 ERROR 56356 [http-nio-8989-exec-14] o.s.web.servlet.HandlerInterceptor       196 : 该用户没有权限访问/webInitiationApply/getPageListByFirstAudit
+2020-09-10 11:31:06.627 ERROR 56356 [http-nio-8989-exec-17] o.s.web.servlet.HandlerInterceptor       196 : 该用户没有权限访问/webInitiationApply/getPageListByFirstAudit
+2020-09-10 11:31:08.409 ERROR 56356 [http-nio-8989-exec-19] o.s.web.servlet.HandlerInterceptor       196 : 该用户没有权限访问/webInitiationApply/getPageListByCreditAudit
+2020-09-10 11:31:29.238 ERROR 56356 [http-nio-8989-exec-12] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:32:00.878 ERROR 56356 [http-nio-8989-exec-27] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:32:00.929 ERROR 56356 [http-nio-8989-exec-5] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:33:16.355 ERROR 56356 [http-nio-8989-exec-23] o.s.web.servlet.HandlerInterceptor       196 : 该用户没有权限访问/webInitiationApply/firstAudit
+2020-09-10 11:34:14.991 ERROR 56356 [http-nio-8989-exec-8] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:34:15.026 ERROR 56356 [http-nio-8989-exec-6] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:35:16.413 ERROR 56356 [http-nio-8989-exec-30] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:37:37.771 ERROR 56356 [http-nio-8989-exec-2] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:37:37.821 ERROR 56356 [http-nio-8989-exec-14] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:39:17.524 ERROR 56356 [http-nio-8989-exec-24] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:39:31.091 ERROR 56356 [http-nio-8989-exec-2] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 11:51:27.681 ERROR 56356 [http-nio-8989-exec-26] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 16:08:22.535 ERROR 56356 [http-nio-8989-exec-19] o.s.web.servlet.HandlerInterceptor       103 : 令牌过期
+2020-09-10 16:55:38.802 ERROR 71776 [http-nio-8989-exec-3] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 16:56:25.648 ERROR 71776 [http-nio-8989-exec-21] o.s.web.servlet.HandlerInterceptor       157 : 该token未登录，非法访问!
+2020-09-10 17:22:37.466 ERROR 71776 [http-nio-8989-exec-5] o.s.web.servlet.HandlerInterceptor       103 : 令牌过期
+2020-09-10 17:22:37.478 ERROR 71776 [http-nio-8989-exec-4] o.s.web.servlet.HandlerInterceptor       103 : 令牌过期
+2020-09-10 17:22:37.481 ERROR 71776 [http-nio-8989-exec-6] o.s.web.servlet.HandlerInterceptor       103 : 令牌过期

pom.xml

@@ -10,7 +10,7 @@
     <groupId>com.xdf</groupId>
     <artifactId>creative</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>creative</name>
+    <name>xdf_wch_server</name>
     <description>wenchuangban project for Spring Boot</description>
 
     <properties>
@@ -229,15 +229,41 @@
         </dependency>
 
 
+        <!--CAS客户端集成-->
+        <dependency>
+            <groupId>net.unicon.cas</groupId>
+            <artifactId>cas-client-autoconfig-support</artifactId>
+            <version>1.5.0-GA</version>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-core</artifactId>
+            <version>2.1.4.RELEASE</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+
+
+
     </dependencies>
 
 
     <build>
-        <finalName>cultural_server</finalName>
+        <finalName>xdf_wch_server</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -249,14 +275,69 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
-                    <skipTests>true</skipTests>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
             </plugin>
 
         </plugins>
     </build>
 
+    <!--MAVEN打包选择运行环境-->
+    <!-- 1:local(默认) 本地 2:dev:开发环境 3:test 4:uat 用户验收测试 5.pro:生产环境 -->
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <project.classifier>dev</project.classifier>
+            </properties>
+            <!-- 默认激活dev配置 -->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <filters>
+                    <filter>src/main/filter/dev_filter.properties</filter>
+                </filters>
+            </build>
+        </profile>
+        <profile>
+            <id>sit</id>
+            <properties>
+                <project.classifier>sit</project.classifier>
+            </properties>
+            <build>
+                <filters>
+                    <filter>src/main/filter/sit_filter.properties</filter>
+                </filters>
+            </build>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <project.classifier>test</project.classifier>
+            </properties>
+            <build>
+                <filters>
+                    <filter>src/main/filter/test_filter.properties</filter>
+                </filters>
+            </build>
+        </profile>
+        <profile>
+            <id>pro</id>
+            <properties>
+                <project.classifier>pro</project.classifier>
+            </properties>
+            <build>
+                <filters>
+                    <filter>src/main/filter/pro_filter.properties</filter>
+                </filters>
+            </build>
+        </profile>
+    </profiles>
+
+
 </project>

src/main/filter/dev_filter.properties

@@ -0,0 +1,36 @@
+log_level=debug
+#db1\u6570\u636E\u5E93
+jdbc_url=jdbc:mysql://127.0.0.1:3306/dfzx_wch?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+jdbc_username=root
+jdbc_password=123456
+
+
+#redis
+redis_host=192.168.160.152
+redis_port=6379
+redis_pass=xdf@eastday88
+##web
+druidManagementAllow=192.168.1.193
+druidManagementDeny=192.168.1.102
+druidManagementLoginUsername=xdf
+druidManagementLoginPassword=xdf@1912
+
+upload_basePath=D:/xdf_image/xdf/
+upload_basePath_tmp=D:/xdf_image/xdf/dfzx_tmp/
+wx_basePath=wx/
+
+
+server-url-prefix: http://server.sso.com:8080/cas  #CAS砐醴華硊
+server-login-url: http://server.sso.com:8080/cas/login #CAS腎翹華硊
+client-host-url: http://app.tyrz.com:8993/  #掛砐醴華硊
+
+#ゴ傷砐醴豖堤華硊
+client-host-home-url: http://192.168.1.176:8000
+client-host-logout-url: http://192.168.1.176:8002
+client-host-logout-back-url: http://192.168.1.176:8005
+
+
+tyrz_user_info_url=http://app.tyrz.com:8996/currentUserInfo
+tyrz_user_back_info_url=http://app.tyrz.com:8995/currentUserInfo
+tyrz_user_bond_url=http://app.tyrz.com:8996/bondUser
+tyrz_user_bond_back_url=http://app.tyrz.com:8995/bondUser

src/main/filter/pro_filter.properties

@@ -0,0 +1,49 @@
+log_level=info
+#db\u6570\u636E\u5E93
+jdbc_url=jdbc:mysql://172.19.175.249:3306/dfzx_wch?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc_username=root
+jdbc_password=SwNspCVZt7,S!6
+##web\u76D1\u63A7
+druidManagementAllow=192.168.1.193
+druidManagementDeny=192.168.1.102
+druidManagementLoginUsername=xdf
+druidManagementLoginPassword=xdf@1912
+
+##Redis
+redis_host=r-uf6xe6d4wbr2g4vx7hpd.redis.rds.aliyuncs.com
+redis_port=6379
+redis_pass=xdf@eastday1912
+
+##\u4E0A\u4F20\u6587\u4EF6\u5730\u57401
+upload_basePath=/mnt/dfzx/nfs01/dfzx_wch/
+upload_basePath_tmp=/mnt/dfzx/app/dfzx_wch_service/dfzx_tmp/
+wx_basePath=wx/
+
+server-url-prefix: http://passport.xdfdata.com/cas  #CAS砐醴華硊
+server-login-url: http://passport.xdfdata.com/cas/login  #CAS腎翹華硊
+client-host-url: http://xdfdata.com  #掛砐醴華硊
+
+#\u524D\u7AEF\u9879\u76EE\u9000\u51FA\u5730\u5740
+#ゴ傷砐醴豖堤華硊
+client-host-home-url: http://wch.xdfdata.com
+client-host-logout-url: http://hall.xdfdata.com
+client-host-logout-back-url: http://center.xdfdata.com
+
+
+tyrz_user_info_url=http://xdfdata.com:8996/currentUserInfo
+tyrz_user_back_info_url=http://xdfdata.com:8995/currentUserInfo
+tyrz_user_bond_url=http://xdfdata.com:8996/bondUser
+tyrz_user_bond_back_url=http://xdfdata.com:8995/bondUser
+
+
+
+
+
+
+
+
+
+
+
+
+

src/main/filter/sit_filter.properties

@@ -0,0 +1,27 @@
+env_spring_profile=sit
+eureka_host=http://root:xindf@127.0.0.1:8760/eureka/
+log_level=info
+#db1 权限控制中心
+db1_jdbc_url=jdbc:mysql://192.168.160.151:3306/xdftest?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+db1_jdbc_username=root
+db1_jdbc_password=SwNspCVZt7,S!6
+##Redis配置
+redis_host=192.168.160.152
+redis_port=6379
+redis_pass=xdf@eastday88
+##web监控配置
+#白名单ip
+druidManagementAllow=192.168.1.193
+#黑名单ip
+druidManagementDeny=192.168.1.102
+#用户名
+druidManagementLoginUsername=xdf
+#密码
+druidManagementLoginPassword=xdf@1912
+
+
+
+
+
+
+

src/main/filter/test_filter.properties

@@ -0,0 +1,26 @@
+env_spring_profile=test
+eureka_host=http://root:xindf@127.0.0.1:8761/eureka/
+log_level=debug
+#db1 权限控制中心
+db1_jdbc_url=jdbc:mysql://192.168.160.151:3306/xdftest?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+db1_jdbc_username=root
+db1_jdbc_password=SwNspCVZt7,S!6
+##Redis配置
+#redis_host=192.168.160.152
+#redis_port=6379
+#redis_pass=xdf@eastday88
+##web监控配置
+#白名单ip
+druidManagementAllow=192.168.1.193
+#黑名单ip
+druidManagementDeny=192.168.1.102
+#用户名
+druidManagementLoginUsername=xdf
+#密码
+druidManagementLoginPassword=xdf@1912
+
+
+
+
+
+

src/main/java/com/xdf/creative/CreativeApplication.java

@@ -1,5 +1,6 @@
 package com.xdf.creative;
 
+import net.unicon.cas.client.configuration.EnableCasClient;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -8,6 +9,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ImportResource;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.context.request.RequestContextListener;
@@ -22,7 +24,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication
 @ServletComponentScan
 //@EnableScheduling
-@ImportResource(locations = {"classpath:kaptcha.xml"})
+@EnableAsync
 public class CreativeApplication {
 
     public static void main(String[] args) {

src/main/java/com/xdf/creative/base/params/DtUploadCompanyDescript.java

@@ -1,54 +0,0 @@
-package com.xdf.creative.base.params;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.entity.BaseEntity;
-import com.xdf.creative.util.excel.Description;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * <p>
- * 企业上传
- * </p>
- *
- * @author lgw
- * @since 2020-05-07
- */
-@Data
-public class DtUploadCompanyDescript {
-
-    @Description(showName = "园区名称")
-    private String parkName;
-
-    @Description(showName = "企业名称")
-    private String companyName;
-
-    @Description(showName = "企业统一社会信用代码")
-    private String serialNumber;
-
-    @Description(showName =  "企业法人")
-    private String legalPersonName;
-
-    @Description(showName =  "注册资本数字")
-    private String regCapitalNo;
-
-    @Description(showName =  "注册资本单位")
-    private String unit;
-
-    @Description(showName =  "所属行业名称")
-    private String cateName;
-
-    @Description(showName =  "成立日期")
-    private String estiblishTime;
-
-    @Description(showName =  "是否为个体户")
-    private String companyType;
-
-
-}

src/main/java/com/xdf/creative/base/params/WebParkEnterApplyEmailParam.java

@@ -0,0 +1,63 @@
+package com.xdf.creative.base.params;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 园区入会申请 查询参数对象
+ * </p>
+ *
+ * @author lgw
+ * @date 2020-04-09
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WebParkEnterQueryParam对象", description = "园区入会申请查询参数")
+public class WebParkEnterApplyEmailParam extends QueryParam {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "联系人")
+    @NotBlank(message = "联系人不能为空！")
+    private String linkMan;
+
+    @ApiModelProperty(value = "职位")
+    @NotBlank(message = "职位不能为空！")
+    private String duty;
+
+    @ApiModelProperty(value = "联系电话")
+    @NotBlank(message = "联系电话不能为空！")
+    private String mobile;
+
+    @ApiModelProperty(value = "单位名称")
+    @NotBlank(message = "单位名称不能为空！")
+    private String companyName;
+
+    @ApiModelProperty(value = "园区主键id")
+    @NotNull(message = "园区未选择！")
+    private Long parkId;
+
+    @ApiModelProperty(value = "园区名称")
+    @NotBlank(message = "园区名称不能为空！")
+    private String parkName;
+
+
+    @ApiModelProperty(value = "申请来源1PC 2移动")
+    private Integer source;
+
+
+}

src/main/java/com/xdf/creative/base/params/creative/SysOrganizeAddParkParam.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.NotBlank;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -35,9 +36,13 @@ public class SysOrganizeAddParkParam extends QueryParam {
     private String organizeName;
 
     @ApiModelProperty(value = "管辖区域")
-    @NotNull(message = "行政区域不能为空！")
     private Long popedomId;
 
+
+    @ApiModelProperty(value = "管辖区域")
+    @NotBlank(message = "行政区域不能为空！")
+    private String regionId;
+
     @ApiModelProperty(value = "0 不添加用户 1添加用户")
     private Integer isCreateUser;
 
@@ -47,6 +52,10 @@ public class SysOrganizeAddParkParam extends QueryParam {
     @ApiModelProperty(value = "密码")
     private String password;
 
+
+    @ApiModelProperty(value = "账户手机号")
+    private String mobile;
+
     @ApiModelProperty(value = "昵称")
     private String nickname;
 
@@ -82,5 +91,15 @@ public class SysOrganizeAddParkParam extends QueryParam {
     @NotNull(message = "园区管理公司不能为空")
     private String parentCom;
 
+    @ApiModelProperty(value = "所属省")
+    private String province;
+
+    @ApiModelProperty(value = "所属市")
+    private String city;
+
+    @ApiModelProperty(value = "所属区")
+    private String district;
+
+
 
 }

src/main/java/com/xdf/creative/base/params/creative/SysRoleQueryParam.java

@@ -12,6 +12,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Null;
 import java.util.Date;
 
@@ -41,6 +42,10 @@ public class SysRoleQueryParam extends QueryParam {
     private String code;
 
 
+    @ApiModelProperty(value = "角色等级")
+    @NotNull(message = "角色等级不能为空")
+    private Integer level;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 

src/main/java/com/xdf/creative/base/params/creative/WebInitiationApplyQueryParam.java

@@ -0,0 +1,183 @@
+package com.xdf.creative.base.params.creative;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xdf.creative.base.params.QueryParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 文促会入会申请表 查询参数对象
+ * </p>
+ *
+ * @author DeanYe
+ * @date 2019-10-30
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WebInitiationApplyQueryParam对象", description = "文促会入会申请表查询参数")
+public class WebInitiationApplyQueryParam extends QueryParam {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+//@NotNull(message = "主键id不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "单位名称")
+    private String name;
+
+    @ApiModelProperty(value = "单位logo")
+    private String logo;
+
+    @ApiModelProperty(value = "机关类型  1、国营企业 2、事业单位  3、民营企业 4、社会组织")
+    private Integer unitType;
+
+    @ApiModelProperty(value = "注册地址省")
+    private Long province;
+
+    @ApiModelProperty(value = "注册地址市")
+    private Long city;
+
+    @ApiModelProperty(value = "注册地址区")
+    private Long county;
+
+    @ApiModelProperty(value = "主要办公地址")
+    private String contactAddress;
+
+    @ApiModelProperty(value = "邮编")
+    private String post;
+
+    @ApiModelProperty(value = "公司网址")
+    private String website;
+
+    @ApiModelProperty(value = "法人姓名")
+    private String legalPerson;
+
+    @ApiModelProperty(value = "法人职务")
+    private String legalDuty;
+
+    @ApiModelProperty(value = "固定电话")
+    private String legalPhone;
+
+    @ApiModelProperty(value = "手机号")
+    private String legalMobile;
+
+    @ApiModelProperty(value = "日常联系人姓名")
+    private String linkMan;
+
+    @ApiModelProperty(value = "日常联系人职务")
+    private String linkDuty;
+
+    @ApiModelProperty(value = "日常联系人固定电话")
+    private String linkPhone;
+
+    @ApiModelProperty(value = "日常联系人手机号")
+    private String linkMobile;
+
+    @ApiModelProperty(value = "单位简介")
+    private String introduction;
+
+    @ApiModelProperty(value = "申报产业类别：1、媒体业 2、艺术业 3、工业设计 4、建筑设计业 5、时尚设计业  6、互联网相关服务业 7、软件与信息技术服务业8、咨询服务业9、广告及会展服务业  10、休闲娱乐业 11、文化装备制造业12、文化创意投资运营13、文化创意用品生产")
+    private Integer declareCategory;
+
+    @ApiModelProperty(value = "希望成为哪一级会员  1、普通会员 2、理事会员  3、常务理事会员")
+    private Integer vipLevel;
+
+    @ApiModelProperty(value = "附件证明")
+    private String attachment;
+
+    @ApiModelProperty(value = "会员是否阅读协议 0 否 1是")
+    private Integer existsRead;
+
+    @ApiModelProperty(value = "初审是否通过  1待审核 2审核通过 3审核不通过4、是否报送 ")
+    private Integer firstAudit;
+
+    @ApiModelProperty(value = "初审原因")
+    private String firstAuditCause;
+
+    @ApiModelProperty(value = "初审开始时间")
+    private Date startFirstAuditTime;
+
+    @ApiModelProperty(value = "初审结束时间")
+    private Date endFirstAuditTime;
+
+
+    @ApiModelProperty(value = "初审人员id")
+    private Long firstAuditUserId;
+
+    @ApiModelProperty(value = "初审是否通过  1、待审核 2信用良好  3、信用不良 4、是否报送 ")
+    private Integer creditAudit;
+
+    @ApiModelProperty(value = "信用审核原因")
+    private String creditAuditCause;
+
+    @ApiModelProperty(value = "信用审核开始时间")
+    private Date startCreditAuditTime;
+
+    @ApiModelProperty(value = "信用审核结束时间")
+    private Date endCreditAuditTime;
+
+
+    @ApiModelProperty(value = "信用审核人员id")
+    private Long creditAuditUserId;
+
+    @ApiModelProperty(value = "审核是否通过  1待审核 2审核通过 3审核不通过 4、是否报送")
+    private Integer finalAudit;
+
+    @ApiModelProperty(value = "理事会审核原因")
+    private String finalAuditCause;
+
+    @ApiModelProperty(value = "理事会审核开始时间")
+    private Date startFinalAuditTime;
+
+    @ApiModelProperty(value = "理事会审核结束时间")
+    private Date endFinalAuditTime;
+
+
+    @ApiModelProperty(value = "理事会审核人员id")
+    private Long finalAuditUserId;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private Date startCreateTime;
+    @ApiModelProperty(value = "创建结束时间")
+    private Date endCreateTime;
+
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "法人简介")
+    private String legalIntroduction;
+
+    @ApiModelProperty(value = "专列与荣誉")
+    private String honner;
+
+    @ApiModelProperty(value = "金融服务 1、股权 2、债权 3、担保 4、融资租赁 5、其他")
+    private Integer financeService;
+
+    @ApiModelProperty(value = "产业合作 1、对接上下游企业资源 2、展会参展 3、园区入驻")
+    private Integer industry;
+
+    @ApiModelProperty(value = "企业服务 1、扶持资金 2、信用评级 3、知识与版权交易 4、财务与法律资讯 5、投融资对接")
+    private Integer companyService;
+
+    @ApiModelProperty(value = "其他")
+    private String otherService;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String username;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String nickname;
+
+
+}

src/main/java/com/xdf/creative/base/params/dt/DtActivityAttachmentQueryParam.java

@@ -1,60 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 园区活动板块附件 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtActivityAttachmentQueryParam对象", description = "园区活动板块附件查询参数")
-public class DtActivityAttachmentQueryParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "主键Id")
-    @TableId(value = "id", type = IdType.AUTO)
-    @NotNull(message = "主键Id不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "附件名称")
-    private String activityAttachmentName;
-
-    @ApiModelProperty(value = "附件存放地址")
-    private String activityAttachmentAddress;
-
-    @ApiModelProperty(value = "附件上传时间")
-    private Date uploadTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "显示类型 0  不显示 1 显示  ，显示是指数据审核通过后 发布正式网站")
-    private Integer displayType;
-
-    @ApiModelProperty(value = "组Id ，用于识别 草稿和发布信息是否属于同一组 ，便于数组删除")
-    private String groupId;
-
-    @ApiModelProperty(value = "园区活动随机Id")
-    @NotBlank(message = "园区活动随机Id不能为空")
-    private String parkActivityId;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtEnterCompanyQueryParam.java

@@ -1,99 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-05-11
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtEnterCompanyQueryParam对象", description = "查询参数")
-public class DtEnterCompanyQueryParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "主键id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "组织id")
-    private Long orgParkId;
-
-    @ApiModelProperty(value = "园区库id")
-    private Long bizParkId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "园区名称")
-    private String parkName;
-
-    @ApiModelProperty(value = "企业统一社会信用代码")
-    private String serialNumber;
-
-    @ApiModelProperty(value = "企业法人名字")
-    private String legalPersonName;
-
-    @ApiModelProperty(value = "注册资本数字")
-    private String regCapitalNo;
-
-    @ApiModelProperty(value = "注册资本单位")
-    private String unit;
-
-    @ApiModelProperty(value = "注册资本")
-    private String regCapital;
-
-    @ApiModelProperty(value = "所属行业名称")
-    private String categ;
-
-    @ApiModelProperty(value = "所属行业名称")
-    private String cateName;
-
-    @ApiModelProperty(value = "成立日期")
-    private Date estiblishTime;
-
-    @ApiModelProperty(value = "是否为战略融资")
-    private String isInvest;
-
-    @ApiModelProperty(value = "是否为上市公司")
-    private String listedCom;
-
-    @ApiModelProperty(value = "是否为高新技术企业")
-    private String isHighTecNew;
-
-    @ApiModelProperty(value = "是否为企业500强")
-    private String isFiveNew;
-
-    @ApiModelProperty(value = "是否存在")
-    private Integer exist;
-
-    @ApiModelProperty(value = "是否为个体户 0否 1是")
-    private Integer companyType;
-
-    @ApiModelProperty(value = "开始更新时间")
-    private Date startUpdateTime;
-
-    @ApiModelProperty(value = "结束更新时间")
-    private Date endUpdateTime;
-
-    @ApiModelProperty(value = "企业id")
-    private Long companyId;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtInfoAuditBackParam.java

@@ -1,62 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 基本信息审核表 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtInfoAuditQueryParam对象", description = "基本信息审核表查询参数")
-public class DtInfoAuditBackParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-
-    @ApiModelProperty(value = "信息状态 0 默认 1草稿 2提交")
-    private Integer infoState;
-
-    @ApiModelProperty(value = "审核状态 0 待审核 1审核通过 2 审核不通过 审核通过后 需要将数据提交到正式数据 目前做先删除再添加")
-    private Integer auditState;
-
-
-    @ApiModelProperty(value = "0 普通用户   5、园区 8 区文创办 9 市文创办  99 公司后台管理")
-    private Integer auditType;
-
-
-    @ApiModelProperty(value = "开始提交时间")
-    private Date startSubmitTime;
-
-    @ApiModelProperty(value = "结束提交时间")
-    private Date endSubmitTime;
-
-    private String organizeName;
-
-    /**
-     * 用户名
-     */
-    private String userName;
-
-    private String nickName;
-
-    private String phone;
-
-    private String regionId;
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtInfoAuditQueryAuiditParam.java

@@ -1,70 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 基本信息审核表 查询参数对象
- * </p>
- *
- * @author DeanYe
- * @date 2020-01-03
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtInfoAuditQueryParam对象", description = "基本信息审核表查询参数")
-public class DtInfoAuditQueryAuiditParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "主键id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "信息状态 1 默认 2草稿 3提交")
-    private Integer infoState;
-
-    @ApiModelProperty(value = "审核状态 1待审核 2审核通过 3 审核不通过 审核通过后 需要将数据提交到正式数据 目前做先删除再添加")
-    private Integer auditState;
-
-    @ApiModelProperty(value = "提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date auditTime;
-
-    @ApiModelProperty(value = "审核人员ID")
-    private Long auditId;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "提交人员Id")
-    private Long submitUserId;
-
-    @ApiModelProperty(value = "0 普通用户   5、园区 8 区文创办 9 市文创办  99 公司后台管理")
-    private Integer auditType;
-
-
-    @ApiModelProperty(value = "审核意见")
-    private String opinion;
-
-    @ApiModelProperty(value = "信息完成度")
-    private BigDecimal finishRatio;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtInfoAuditQueryOrganizeIdParam.java

@@ -1,32 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 基本信息审核表 查询参数对象
- * </p>
- *
- * @author DeanYe
- * @date 2020-01-03
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtInfoAuditQueryParam对象", description = "基本信息审核表查询参数")
-public class DtInfoAuditQueryOrganizeIdParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "0 普通用户  1、企业  2、金融机构 3、投资机构 4、服务机构 5、园区 6、协（商会）  7、项目管理公司 8 区文创办 9 市文创办  99 公司后台管理")
-    private Integer auditType;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtInfoAuditQueryParam.java

@@ -1,69 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 基本信息审核表 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtInfoAuditQueryParam对象", description = "基本信息审核表查询参数")
-public class DtInfoAuditQueryParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @TableId(value = "id", type = IdType.AUTO)
-    @NotNull(message = "不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "信息状态 0 默认 1草稿 2提交")
-    private Integer infoState;
-
-    @ApiModelProperty(value = "审核状态 0 待审核 1审核通过 2 审核不通过 审核通过后 需要将数据提交到正式数据 目前做先删除再添加")
-    private Integer auditState;
-
-    @ApiModelProperty(value = "提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date auditTime;
-
-    @ApiModelProperty(value = "审核人员ID")
-    private Long auditId;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "提交人员Id")
-    private Long submitUserId;
-
-    @ApiModelProperty(value = "0 普通用户   5、园区 8 区文创办 9 市文创办  99 公司后台管理")
-    private Integer auditType;
-
-    @ApiModelProperty(value = "信息是否被认证过 0 否 1是 指有没有被发布到首页")
-    private Integer infoVerify;
-
-    @ApiModelProperty(value = "审核意见")
-    private String opinion;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtParkActivitBackParam.java

@@ -1,55 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 园区活动 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkActivityQueryParam对象", description = "园区活动查询参数")
-public class DtParkActivitBackParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "更新开始时间")
-    private Date startUpdateTime;
-
-    @ApiModelProperty(value = "更新开始时间")
-    private Date endUpdateTime;
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-    private String userName;
-
-    private String organizeName;
-
-
-    private String nickName;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtParkActivitWebParam.java

@@ -1,52 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 园区活动 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkActivityQueryParam对象", description = "园区活动查询参数")
-public class DtParkActivitWebParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "企业id")
-    @NotNull(message = "组织id不能为空！")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "更新开始时间")
-    private Date startUpdateTime;
-
-    @ApiModelProperty(value = "更新开始时间")
-    private Date endUpdateTime;
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-    private String userName;
-
-    private String organizeName;
-
-    private String nickName;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtParkActivityAddParam.java

@@ -1,48 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import com.xdf.creative.module.entity.DtActivityAttachment;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 园区活动 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkActivityQueryParam对象", description = "园区活动查询参数")
-public class DtParkActivityAddParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "banner图")
-    private String bannerPath;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "发布时间")
-    private Date publishTime;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    private List<DtActivityAttachment> dtActivityAttachmentList;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtParkActivityQueryParam.java

@@ -1,71 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 园区活动 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkActivityQueryParam对象", description = "园区活动查询参数")
-public class DtParkActivityQueryParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @TableId(value = "id", type = IdType.AUTO)
-    @NotNull(message = "不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "banner图")
-    private String bannerPath;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "发布时间")
-    private Date publishTime;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "显示类型 0  不显示 1 显示  ，显示是指数据审核通过后 发布正式网站")
-    private Integer displayType;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-    @ApiModelProperty(value = "组Id ，用于识别 草稿和发布信息是否属于同一组 ，便于数组删除")
-    private String groupId;
-
-    @ApiModelProperty(value = "外键标识ID")
-    @NotBlank(message = "外键标识ID不能为空")
-    private String foreignId;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtParkActivityUpdateParam.java

@@ -1,58 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import com.xdf.creative.module.entity.DtActivityAttachment;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 园区活动 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkActivityQueryParam对象", description = "园区活动查询参数")
-public class DtParkActivityUpdateParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @TableId(value = "id", type = IdType.AUTO)
-    @NotNull(message = "不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "banner图")
-    private String bannerPath;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "发布时间")
-    private Date publishTime;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-    private List<DtActivityAttachment> dtActivityAttachmentList;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtParkCompanyQueryParam.java

@@ -1,49 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 园区企业申诉文件 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-20
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkCompanyQueryParam对象", description = "园区企业申诉文件查询参数")
-public class DtParkCompanyQueryParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "主键id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "文件类型")
-    private String fileType;
-
-    @ApiModelProperty(value = "状态 0 不可用 1可用")
-    private Integer state;
-
-    private String organizeName;
-
-    private String nickName;
-
-    private String userName;
-}

src/main/java/com/xdf/creative/base/params/dt/DtParkInfoDraftQueryParam.java

@@ -1,138 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 园区表_syr made 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkInfoDraftQueryParam对象", description = "园区表_syr made查询参数")
-public class DtParkInfoDraftQueryParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    @NotNull(message = "主键ID不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "园区名称")
-    private String name;
-
-    @ApiModelProperty(value = "省ID")
-    private Long provinceId;
-
-    @ApiModelProperty(value = "市ID")
-    private Long cityId;
-
-    @ApiModelProperty(value = "区县ID")
-    private Long districtId;
-
-    @ApiModelProperty(value = "区名称")
-    private String districtName;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "新_老园区")
-    private String oldNew;
-
-    @ApiModelProperty(value = "联系人")
-    private String contactor;
-
-    @ApiModelProperty(value = "职务")
-    private String contactorPos;
-
-    @ApiModelProperty(value = "手机")
-    private String mobile;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "建筑面积平方米")
-    private Double areaBuild;
-
-    @ApiModelProperty(value = "占地面积")
-    private Double areaOcup;
-
-    @ApiModelProperty(value = "产证面积")
-    private Double areaLice;
-
-    @ApiModelProperty(value = "已出租面积")
-    private Double areaLease;
-
-    @ApiModelProperty(value = "入驻企业个数")
-    private Integer cntComJoin;
-
-    @ApiModelProperty(value = "文创企业个数")
-    private Integer cntComCult;
-
-    @ApiModelProperty(value = "运营管理公司从业人数")
-    private Integer cntMgStaff;
-
-    @ApiModelProperty(value = "入驻企业从业人员数")
-    private Integer cntJoinStaff;
-
-    @ApiModelProperty(value = "公共服务平台个数")
-    private Integer cntPubPlat;
-
-    @ApiModelProperty(value = "园区品牌企业个数")
-    private Integer cntBandsCom;
-
-    @ApiModelProperty(value = "园区企业高级人才数")
-    private Integer cntHighStaff;
-
-    @ApiModelProperty(value = "申报单位")
-    private String parentCom;
-
-    @ApiModelProperty(value = "状态：1已满 0未满")
-    private Integer enterStatus;
-
-    @ApiModelProperty(value = "状态：1正常 0待审核 -1已删除")
-    private Integer status;
-
-    @ApiModelProperty(value = "添加时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "完整地址")
-    private String newAddress;
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-
-    @ApiModelProperty(value = "组织机构ID")
-    private Long organizeId;
-
-
-    @ApiModelProperty(value = "组织机构ID")
-    private Long dateParkId;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtParkInfoDraftUpdateParam.java

@@ -1,132 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 园区表_syr made 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkInfoDraftQueryParam对象", description = "园区表_syr made查询参数")
-public class DtParkInfoDraftUpdateParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    @NotNull(message = "主键ID不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "省ID")
-    private Long provinceId;
-
-    @ApiModelProperty(value = "市ID")
-    private Long cityId;
-
-    @ApiModelProperty(value = "区县ID")
-    private Long districtId;
-
-    @ApiModelProperty(value = "区名称")
-    private String districtName;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "新_老园区")
-    private String oldNew;
-
-    @ApiModelProperty(value = "联系人")
-    private String contactor;
-
-    @ApiModelProperty(value = "职务")
-    private String contactorPos;
-
-    @ApiModelProperty(value = "手机")
-    private String mobile;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "建筑面积平方米")
-    private Double areaBuild;
-
-    @ApiModelProperty(value = "占地面积")
-    private Double areaOcup;
-
-    @ApiModelProperty(value = "产证面积")
-    private Double areaLice;
-
-    @ApiModelProperty(value = "已出租面积")
-    private Double areaLease;
-
-    @ApiModelProperty(value = "入驻企业个数")
-    private Integer cntComJoin;
-
-    @ApiModelProperty(value = "文创企业个数")
-    private Integer cntComCult;
-
-    @ApiModelProperty(value = "运营管理公司从业人数")
-    private Integer cntMgStaff;
-
-    @ApiModelProperty(value = "入驻企业从业人员数")
-    private Integer cntJoinStaff;
-
-    @ApiModelProperty(value = "公共服务平台个数")
-    private Integer cntPubPlat;
-
-    @ApiModelProperty(value = "园区品牌企业个数")
-    private Integer cntBandsCom;
-
-    @ApiModelProperty(value = "园区企业高级人才数")
-    private Integer cntHighStaff;
-
-    @ApiModelProperty(value = "申报单位")
-    private String parentCom;
-
-    @ApiModelProperty(value = "完整地址")
-    private String newAddress;
-
-    @ApiModelProperty(value = "政策")
-    private String policy;
-
-
-    @ApiModelProperty(value = "服务")
-    private String serve;
-
-
-
-    @ApiModelProperty(value = "简介")
-    private String intro;
-
-    private String logo;
-
-    private String qr;
-
-    @ApiModelProperty(value = "补充地址")
-    private String addressAp;
-
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/DtUploadCompanyQueryParam.java

@@ -1,90 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 企业上传 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-05-07
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtUploadCompanyQueryParam对象", description = "企业上传查询参数")
-public class DtUploadCompanyQueryParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "主键id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "组织id")
-    private Long orgParkId;
-
-    @ApiModelProperty(value = "园区库id")
-    private Long bizParkId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "园区名称")
-    private String parkName;
-
-    @ApiModelProperty(value = "企业统一社会信用代码")
-    private String serialNumber;
-
-    @ApiModelProperty(value = "企业法人名字")
-    private String legalPersonName;
-
-    @ApiModelProperty(value = "注册资本数字")
-    private String regCapitalNo;
-
-    @ApiModelProperty(value = "注册资本单位")
-    private String unit;
-
-    @ApiModelProperty(value = "注册资本")
-    private String regCapital;
-
-    @ApiModelProperty(value = "所属行业名称")
-    private String cateName;
-
-    @ApiModelProperty(value = "成立日期")
-    private Date estiblishTime;
-
-    @ApiModelProperty(value = "是否为个体户 0否 1是")
-    private Integer companyType;
-
-    @ApiModelProperty(value = "开始更新时间")
-    private Date startUpdateTime;
-
-    @ApiModelProperty(value = "结束更新时间")
-    private Date endUpdateTime;
-
-    @ApiModelProperty(value = "开始上传时间")
-    private Date startCreateTime;
-
-    @ApiModelProperty(value = "结束上传时间")
-    private Date endCreateTime;
-
-    @ApiModelProperty(value = "更新状态 1、新增 （待处理）    2、更新（待处理） 3、删除（待处理） ")
-    private Integer state;
-
-    @ApiModelProperty(value = "处理状态1、待处理   2、已处理（成功） 3已处理（失败） 4 未找到")
-    private Integer disposeState;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/ParkDataTeamQueryParam.java

@@ -1,127 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 园区表_syr made 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "ParkDataTeamQueryParam对象", description = "园区表_syr made查询参数")
-public class ParkDataTeamQueryParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    @NotNull(message = "主键ID不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "园区名称")
-    private String name;
-
-    @ApiModelProperty(value = "省ID")
-    private Long provinceId;
-
-    @ApiModelProperty(value = "市ID")
-    private Long cityId;
-
-    @ApiModelProperty(value = "区县ID")
-    private Long districtId;
-
-    @ApiModelProperty(value = "区名称")
-    private String districtName;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "新_老园区")
-    private String oldNew;
-
-    @ApiModelProperty(value = "联系人")
-    private String contactor;
-
-    @ApiModelProperty(value = "职务")
-    private String contactorPos;
-
-    @ApiModelProperty(value = "手机")
-    private String mobile;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "建筑面积平方米")
-    private Double areaBuild;
-
-    @ApiModelProperty(value = "占地面积")
-    private Double areaOcup;
-
-    @ApiModelProperty(value = "产证面积")
-    private Double areaLice;
-
-    @ApiModelProperty(value = "已出租面积")
-    private Double areaLease;
-
-    @ApiModelProperty(value = "入驻企业个数")
-    private Integer cntComJoin;
-
-    @ApiModelProperty(value = "文创企业个数")
-    private Integer cntComCult;
-
-    @ApiModelProperty(value = "运营管理公司从业人数")
-    private Integer cntMgStaff;
-
-    @ApiModelProperty(value = "入驻企业从业人员数")
-    private Integer cntJoinStaff;
-
-    @ApiModelProperty(value = "公共服务平台个数")
-    private Integer cntPubPlat;
-
-    @ApiModelProperty(value = "园区品牌企业个数")
-    private Integer cntBandsCom;
-
-    @ApiModelProperty(value = "园区企业高级人才数")
-    private Integer cntHighStaff;
-
-    @ApiModelProperty(value = "申报单位")
-    private String parentCom;
-
-    @ApiModelProperty(value = "状态：1已满 0未满")
-    private Integer enterStatus;
-
-    @ApiModelProperty(value = "状态：1正常 0待审核 -1已删除")
-    private Integer status;
-
-    @ApiModelProperty(value = "添加时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "完整地址")
-    private String newAddress;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/ParkDataTeamWebParam.java

@@ -1,48 +0,0 @@
-package com.xdf.creative.base.params.dt;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.params.QueryParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 园区表_syr made 查询参数对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "ParkDataTeamQueryParam对象", description = "园区表_syr made查询参数")
-public class ParkDataTeamWebParam extends QueryParam {
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "园区名称")
-    private String name;
-
-    @ApiModelProperty(value = "区县ID")
-    private Long districtId;
-
-    @ApiModelProperty(value = "区名称")
-    private String districtName;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-
-}

src/main/java/com/xdf/creative/base/params/dt/WebParkEnterApplyParam.java

@@ -45,12 +45,16 @@ public class WebParkEnterApplyParam extends QueryParam {
     @NotBlank(message = "联系电话不能为空！")
     private String mobile;
 
+
+    @ApiModelProperty(value = "园区名称")
+    @NotBlank(message = "园区名称不能为空！")
+    private String parkName;
+
     @ApiModelProperty(value = "单位名称")
     @NotBlank(message = "单位名称不能为空！")
     private String companyName;
 
     @ApiModelProperty(value = "园区主键id")
-    @NotNull(message = "园区未选择！")
     private Long parkId;
 
     @ApiModelProperty(value = "处理过程状态 1 待处理 2沟通中 3 已完结（入住） 4已完结（未入住）")

src/main/java/com/xdf/creative/base/params/dt/WebParkEnterQueryParam.java

@@ -45,8 +45,9 @@ public class WebParkEnterQueryParam extends QueryParam {
     private String companyName;
 
     private Long parkId;
+
     @ApiModelProperty(value = "园区名称")
-    private String organizeName;
+    private String parkName;
 
 
     @ApiModelProperty(value = "处理过程状态 1 待处理 2沟通中 3 已完结（入住） 4已完结（未入住）")

src/main/java/com/xdf/creative/base/vo/CommonIdName.java

@@ -1,26 +0,0 @@
-
-package com.xdf.creative.base.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 公共ID-NAME-VO对象
- * </p>
- *
- * @author DeanYe
- * @since 2018-11-08
- */
-@ApiModel("ID-NAME-VO")
-@Data
-public class CommonIdName {
-
-    @ApiModelProperty("id")
-    private String id;
-
-    @ApiModelProperty("名称")
-    private String name;
-
-}

src/main/java/com/xdf/creative/base/vo/CompanyBaseInfoVO.java

@@ -1,119 +0,0 @@
-package com.xdf.creative.base.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class CompanyBaseInfoVO {
-
-    private Long id;
-    /**
-     * 企业名称
-     */
-    private String name;
-    /**
-     * 法人代表
-     */
-    private String legalPersonName;
-    /**
-     * 注册资金
-     */
-    private String regCapital;
-
-    /**
-     * 实收注册资金
-     */
-    private String actualCapital;
-
-    /**
-     * 营业状态
-     */
-    private String regStatus;
-
-    /**
-     * 成立日期
-     */
-    private Date estiblishTime;
-
-    /**
-     * 统一社会信用代码
-     */
-    private String propertyCode;
-
-    /**
-     * 纳税识别号
-     */
-    private String payTaxesNumber;
-    /**
-     * 注册号
-     */
-    private String regNumber;
-    /**
-     * 组织机构代码
-     */
-    private String orgNumber;
-    /**
-     * 公司类型
-     */
-    private String companyOrgType;
-    /**
-     * 核准日期
-     */
-    private Date approvedTime;
-    /**
-     * 登记机关
-     */
-    private String regInstitute;
-    /**
-     * 营业期限开始日期
-     */
-    private Date fromTime;
-    /**
-     * 营业期限终止日期
-     */
-    private Date toTime;
-    /**
-     * 注册地址
-     */
-    private String regLocation;
-    /**
-     * 经营范围
-     */
-    private String businessScope;
-    /**
-     * 雇员数量
-     */
-    private String employeeNum;
-
-    /**
-     * 参保人数
-     */
-    private String endowmentInsurance;
-    /**
-     * categoryName
-     */
-    private String categoryName;
-
-    /**
-     * 英文名
-     */
-    private String enName;
-
-    /**
-     * 归属省份的首字母小写
-     */
-    private String base;
-
-    /**
-     * 曾用名
-     */
-    private List<String> historyName;
-
-
-    /**
-     * 企业简介
-     */
-    private String introduction;
-}

src/main/java/com/xdf/creative/base/vo/CompanyInfoDocument.java

@@ -1,213 +0,0 @@
-package com.xdf.creative.base.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class CompanyInfoDocument {
-
-    /**
-     * 公司id
-     */
-    private Long com_id;
-    /**
-     * 是否抽查检查
-     */
-    private String is_check_info;
-    /**
-     * 是否经营异常
-     */
-    private String is_abnormal;
-    /**
-     * 是否上市公司
-     */
-    private String listed_com;
-    /**
-     * 信用等级
-     */
-    private String tax_credit;
-    /**
-     * 是否严重违法
-     */
-    private String is_illegal_info;
-    /**
-     * 是否股权出质
-     */
-    private String is_equity_info;
-    /**
-     * 是否购地
-     */
-    private String is_purchase_land;
-    /**
-     * 是否欠税
-     */
-    private String is_own_tax;
-    /**
-     * 是否融资信息
-     */
-    private String is_invest;
-    /**
-     * 是否失信
-     */
-    private String is_dishonest;
-    /**
-     * 是否是执行人
-     */
-    private String is_zhixing;
-    /**
-     * 是否有产品
-     */
-    private String is_product;
-    /**
-     * 是否动产抵押
-     */
-    private String is_mortgage;
-    /**
-     * 是否有作品著作权
-     */
-    private String is_copyright_work;
-    /**
-     * 是否有执行处罚
-     */
-    private String is_punish;
-    /**
-     * 是否有招聘信息
-     */
-    private String is_employer;
-    /**
-     * 是否招标
-     */
-    private String is_purchaser;
-    /**
-     * 高管名称
-     */
-    private String high_name;
-    /**
-     * 高管ID
-     */
-    private String high_id;
-    /**
-     * 是否有软件著作权
-     */
-    private String is_copyright_reg;
-    /**
-     * 参保人数
-     */
-    private String endowment_insurance;
-
-    /**
-     * 公司名称
-     */
-    private String com_name;
-    /**
-     * 法人名称
-     */
-    private String fr_nm;
-    /**
-     * 公司类型
-     */
-    private String com_org_tp;
-    /**
-     * 注册地址
-     */
-    private String reg_loc;
-    /**
-     * 注册时间
-     */
-    private String est_tm;
-    /**
-     * 经营范围
-     */
-    private String bus_sp;
-    /**
-     * 注册状态
-     */
-    private String reg_st;
-    /**
-     * 注册资本
-     */
-    private String reg_cpl;
-    /**
-     * 注册号
-     */
-    private String reg_num;
-    /**
-     * 组织机构代码
-     */
-    private String org_num;
-    /**
-     * 统一社会信用代码
-     */
-    private String soci_num;
-
-    /**
-     * 注册资金
-     */
-    private String reg_val;
-    /**
-     * 资金单位
-     */
-    private String reg_unit;
-
-    /**
-     * 行业代码
-     */
-    private String categ;
-    /**
-     * 是否有商标
-     */
-    private String is_trade_mark;
-    /**
-     * 是否有专利
-     */
-    private String is_patents;
-    /**
-     * 是否有网站
-     */
-    private String is_haveWeb;
-    /**
-     * 是否500强
-     */
-    private String is_500;
-    /**
-     * 是否高新
-     */
-    private String is_high_tec;
-    /**
-     * 是否诉讼
-     */
-    private String is_lawsuit;
-    /**
-     * 是否法院公告
-     */
-    private String is_court;
-    /**
-     * 是否有座机
-     */
-    private String is_phone;
-    /**
-     * 是否有移动电话
-     */
-    private String is_mobile;
-    /**
-     * 是否有电邮
-     */
-    private String is_email;
-
-    //注册时间
-    private Date reg_date;
-
-    /**
-     * 企业信用评分
-     */
-    private int com_score;
-    //认领状态
-    private int claimStatus;
-    //是否高薪技术企业
-    private String is_high_tec_new;
-    //是否500强
-    private String is_500_new;
-
-
-}

src/main/java/com/xdf/creative/base/vo/creative/InfoContentHomePageQueryVo.java

@@ -34,6 +34,8 @@ public class InfoContentHomePageQueryVo implements Serializable {
     @ApiModelProperty(value = "栏目名称")
     private String infoName;
 
+    @ApiModelProperty(value = "来源地址")
+    private String sourceUrl;
 
     @ApiModelProperty(value = "图片地址")
     private String imageUrl;

src/main/java/com/xdf/creative/base/vo/creative/SysRoleListQueryVo.java

@@ -56,7 +56,7 @@ public class SysRoleListQueryVo implements Serializable {
     private Date createTime;
 
 
-
+    private Integer level;
 
 
 }

src/main/java/com/xdf/creative/base/vo/creative/SysUserInfoQueryVo.java

@@ -62,6 +62,8 @@ public class SysUserInfoQueryVo implements Serializable {
     @ApiModelProperty(value = "remark")
     private String remark;
 
+    private Integer loginType;
+
 
 
 }

src/main/java/com/xdf/creative/base/vo/creative/WebInitiationApplyQueryVo.java

@@ -0,0 +1,163 @@
+package com.xdf.creative.base.vo.creative;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 文促会入会申请表 查询结果对象
+ * </p>
+ *
+ * @author DeanYe
+ * @date 2019-10-30
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "WebInitiationApplyQueryVo对象", description = "文促会入会申请表查询参数")
+public class WebInitiationApplyQueryVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "单位名称")
+    private String name;
+
+    @ApiModelProperty(value = "单位logo")
+    private String logo;
+
+
+    @ApiModelProperty(value = "机关类型  1、国营企业 2、事业单位  3、民营企业 4、社会组织")
+    private Integer unitType;
+
+    @ApiModelProperty(value = "注册地址省")
+    private Long province;
+
+    @ApiModelProperty(value = "注册地址市")
+    private Long city;
+
+    @ApiModelProperty(value = "注册地址区")
+    private Long county;
+
+    @ApiModelProperty(value = "主要办公地址")
+    private String contactAddress;
+
+    @ApiModelProperty(value = "邮编")
+    private String post;
+    @ApiModelProperty(value = "公司网址")
+    private String website;
+
+    @ApiModelProperty(value = "法人姓名")
+    private String legalPerson;
+
+    @ApiModelProperty(value = "法人职务")
+    private String legalDuty;
+
+    @ApiModelProperty(value = "固定电话")
+    private String legalPhone;
+
+    @ApiModelProperty(value = "手机号")
+    private String legalMobile;
+
+    @ApiModelProperty(value = "日常联系人姓名")
+    private String linkMan;
+
+    @ApiModelProperty(value = "日常联系人职务")
+    private String linkDuty;
+
+    @ApiModelProperty(value = "日常联系人固定电话")
+    private String linkPhone;
+
+    @ApiModelProperty(value = "日常联系人手机号")
+    private String linkMobile;
+
+    @ApiModelProperty(value = "单位简介")
+    private String introduction;
+
+    @ApiModelProperty(value = "申报产业类别：1、媒体业 2、艺术业 3、工业设计 4、建筑设计业 5、时尚设计业  6、互联网相关服务业 7、软件与信息技术服务业8、咨询服务业9、广告及会展服务业  10、休闲娱乐业 11、文化装备制造业12、文化创意投资运营13、文化创意用品生产")
+    private Integer declareCategory;
+
+    @ApiModelProperty(value = "希望成为哪一级会员  1、普通会员 2、理事会员  3、常务理事会员")
+    private Integer vipLevel;
+
+    @ApiModelProperty(value = "附件证明")
+    private String attachment;
+
+    @ApiModelProperty(value = "会员是否阅读协议 0 否 1是")
+    private Integer existsRead;
+
+    @ApiModelProperty(value = "初审是否通过  1待审核 2审核通过 3审核不通过 4、是否报送")
+    private Integer firstAudit;
+
+    @ApiModelProperty(value = "初审原因")
+    private String firstAuditCause;
+
+    @ApiModelProperty(value = "初审时间")
+    private Date firstAuditTime;
+
+    @ApiModelProperty(value = "初审人员id")
+    private Long firstAuditUserId;
+
+    @ApiModelProperty(value = "初审是否通过  1、待审核 2信用良好  3、信用不良 4、是否报送 ")
+    private Integer creditAudit;
+
+    @ApiModelProperty(value = "信用审核原因")
+    private String creditAuditCause;
+
+    @ApiModelProperty(value = "信用审核时间")
+    private Date creditAuditTime;
+
+    @ApiModelProperty(value = "信用审核人员id")
+    private Long creditAuditUserId;
+
+    @ApiModelProperty(value = "审核是否通过  1待审核 2审核通过 3审核不通过 4、是否报送")
+    private Integer finalAudit;
+
+    @ApiModelProperty(value = "理事会审核原因")
+    private String finalAuditCause;
+
+    @ApiModelProperty(value = "理事会审核时间")
+    private Date finalAuditTime;
+
+    @ApiModelProperty(value = "理事会审核人员id")
+    private Long finalAuditUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "法人简介")
+    private String legalIntroduction;
+
+
+    @ApiModelProperty(value = "专列与荣誉")
+    private String honner;
+
+
+    @ApiModelProperty(value = "金融服务 1、股权 2、债权 3、担保 4、融资租赁 5、其他")
+    private Integer financeService;
+
+    @ApiModelProperty(value = "产业合作 1、对接上下游企业资源 2、展会参展 3、园区入驻")
+    private Integer industry;
+
+    @ApiModelProperty(value = "企业服务 1、扶持资金 2、信用评级 3、知识与版权交易 4、财务与法律资讯 5、投融资对接")
+    private Integer companyService;
+
+    @ApiModelProperty(value = "其他")
+    private String otherService;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String username;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String nickname;
+
+
+}

src/main/java/com/xdf/creative/base/vo/dt/DtActivityAttachmentQueryVo.java

@@ -1,49 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-
-import java.util.Date;
-
-/**
- * <p>
- * 园区活动板块附件 查询结果对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DtActivityAttachmentQueryVo对象", description = "园区活动板块附件查询参数")
-public class DtActivityAttachmentQueryVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键Id")
-    private Long id;
-
-    @ApiModelProperty(value = "附件名称")
-    private String activityAttachmentName;
-
-    @ApiModelProperty(value = "附件存放地址")
-    private String activityAttachmentAddress;
-
-    @ApiModelProperty(value = "附件上传时间")
-    private Date uploadTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "显示类型 0  不显示 1 显示  ，显示是指数据审核通过后 发布正式网站")
-    private Integer displayType;
-
-    @ApiModelProperty(value = "组Id ，用于识别 草稿和发布信息是否属于同一组 ，便于数组删除")
-    private String groupId;
-
-    @ApiModelProperty(value = "园区活动随机Id")
-    private String parkActivityId;
-
-}

src/main/java/com/xdf/creative/base/vo/dt/DtInfoAuditBackVo.java

@@ -1,71 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 基本信息审核表 查询结果对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DtInfoAuditQueryVo对象", description = "基本信息审核表查询参数")
-public class DtInfoAuditBackVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-   private Long id;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "信息状态 0 默认 1草稿 2提交")
-    private Integer infoState;
-
-    @ApiModelProperty(value = "审核状态 0 待审核 1审核通过 2 审核不通过 审核通过后 需要将数据提交到正式数据 目前做先删除再添加")
-    private Integer auditState;
-
-    @ApiModelProperty(value = "提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date auditTime;
-
-    @ApiModelProperty(value = "审核人员ID")
-    private Long auditId;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "提交人员Id")
-    private Long submitUserId;
-
-    @ApiModelProperty(value = "0 普通用户   5、园区 8 区文创办 9 市文创办  99 公司后台管理")
-    private Integer auditType;
-
-    @ApiModelProperty(value = "信息是否被认证过 0 否 1是 指有没有被发布到首页")
-    private Integer infoVerify;
-
-    @ApiModelProperty(value = "审核意见")
-    private String opinion;
-
-    private String organizeName;
-
-    /**
-     * 用户名
-     */
-    private String userName;
-
-    private String nickName;
-
-    private String phone;
-
-}

src/main/java/com/xdf/creative/base/vo/dt/DtInfoAuditQueryVo.java

@@ -1,60 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-
-import java.util.Date;
-
-/**
- * <p>
- * 基本信息审核表 查询结果对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DtInfoAuditQueryVo对象", description = "基本信息审核表查询参数")
-public class DtInfoAuditQueryVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-private Long id;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "信息状态 0 默认 1草稿 2提交")
-    private Integer infoState;
-
-    @ApiModelProperty(value = "审核状态 0 待审核 1审核通过 2 审核不通过 审核通过后 需要将数据提交到正式数据 目前做先删除再添加")
-    private Integer auditState;
-
-    @ApiModelProperty(value = "提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date auditTime;
-
-    @ApiModelProperty(value = "审核人员ID")
-    private Long auditId;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "提交人员Id")
-    private Long submitUserId;
-
-    @ApiModelProperty(value = "0 普通用户   5、园区 8 区文创办 9 市文创办  99 公司后台管理")
-    private Integer auditType;
-
-    @ApiModelProperty(value = "信息是否被认证过 0 否 1是 指有没有被发布到首页")
-    private Integer infoVerify;
-
-    @ApiModelProperty(value = "审核意见")
-    private String opinion;
-
-}

src/main/java/com/xdf/creative/base/vo/dt/DtParkActivityBackVo.java

@@ -1,56 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 园区活动 查询结果对象
- * </p>
- *
- * @author DeanYe
- * @date 2019-12-18
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DtParkActivityQueryVo对象", description = "园区活动查询参数")
-public class DtParkActivityBackVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "banner图")
-    private String bannerPath;
-
-    @ApiModelProperty(value = "活动内容")
-    private String content;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "创建人id")
-    private Long createUserId;
-
-    private String userName;
-
-    private String organizeName;
-
-
-    private String nickName;
-
-
-}

src/main/java/com/xdf/creative/base/vo/dt/DtParkActivityInfoDetailVo.java

@@ -1,57 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import com.xdf.creative.module.entity.DtActivityAttachment;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 园区活动 查询结果对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DtParkActivityQueryVo对象", description = "园区活动查询参数")
-public class DtParkActivityInfoDetailVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "banner图")
-    private String bannerPath;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "发布时间")
-    private Date publishTime;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "显示类型 0  不显示 1 显示  ，显示是指数据审核通过后 发布正式网站")
-    private Integer displayType;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-    private List<DtActivityAttachment> dtActivityAttachmentList;
-}

src/main/java/com/xdf/creative/base/vo/dt/DtParkActivityQueryVo.java

@@ -1,60 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-
-import java.util.Date;
-
-/**
- * <p>
- * 园区活动 查询结果对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DtParkActivityQueryVo对象", description = "园区活动查询参数")
-public class DtParkActivityQueryVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-private Long id;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "banner图")
-    private String bannerPath;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "发布时间")
-    private Date publishTime;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "显示类型 0  不显示 1 显示  ，显示是指数据审核通过后 发布正式网站")
-    private Integer displayType;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-    @ApiModelProperty(value = "组Id ，用于识别 草稿和发布信息是否属于同一组 ，便于数组删除")
-    private String groupId;
-
-    @ApiModelProperty(value = "外键标识ID")
-    private String foreignId;
-
-}

src/main/java/com/xdf/creative/base/vo/dt/DtParkActivityWebVo.java

@@ -1,58 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 园区活动 查询结果对象
- * </p>
- *
- * @author DeanYe
- * @date 2019-12-18
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DtParkActivityQueryVo对象", description = "园区活动查询参数")
-public class DtParkActivityWebVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "banner图")
-    private String bannerPath;
-
-    @ApiModelProperty(value = "活动内容")
-    private String content;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "创建人id")
-    private Long createUserId;
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-    private String userName;
-
-    private String organizeName;
-
-
-    private String nickName;
-
-}

src/main/java/com/xdf/creative/base/vo/dt/DtParkCompanyQueryVo.java

@@ -1,52 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 园区企业申诉文件 查询结果对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-20
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DtParkCompanyQueryVo对象", description = "园区企业申诉文件查询参数")
-public class DtParkCompanyQueryVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键id")
-    private Long id;
-
-    @ApiModelProperty(value = "上传企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "上传用户id1")
-    private Long createUserId;
-
-    @ApiModelProperty(value = "文件地址")
-    private String path;
-
-    @ApiModelProperty(value = "文件类型")
-    private String fileType;
-
-    @ApiModelProperty(value = "状态 0 不可用 1可用")
-    private Integer state;
-
-    private String organizeName;
-
-    private String nickName;
-
-    private String userName;
-
-}

src/main/java/com/xdf/creative/base/vo/dt/DtParkInfoDraftDetailVo.java

@@ -1,131 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 园区表_syr made 查询结果对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DtParkInfoDraftQueryVo对象", description = "园区表_syr made查询参数")
-public class DtParkInfoDraftDetailVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
-    @ApiModelProperty(value = "园区名称")
-    private String name;
-
-    @ApiModelProperty(value = "省ID")
-    private Long provinceId;
-
-    @ApiModelProperty(value = "市ID")
-    private Long cityId;
-
-    @ApiModelProperty(value = "区县ID")
-    private Long districtId;
-
-    @ApiModelProperty(value = "区名称")
-    private String districtName;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "新_老园区")
-    private String oldNew;
-
-    @ApiModelProperty(value = "联系人")
-    private String contactor;
-
-    @ApiModelProperty(value = "职务")
-    private String contactorPos;
-
-    @ApiModelProperty(value = "手机")
-    private String mobile;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "建筑面积平方米")
-    private Double areaBuild;
-
-    @ApiModelProperty(value = "占地面积")
-    private Double areaOcup;
-
-    @ApiModelProperty(value = "产证面积")
-    private Double areaLice;
-
-    @ApiModelProperty(value = "已出租面积")
-    private Double areaLease;
-
-    @ApiModelProperty(value = "入驻企业个数")
-    private Integer cntComJoin;
-
-    @ApiModelProperty(value = "文创企业个数")
-    private Integer cntComCult;
-
-    @ApiModelProperty(value = "运营管理公司从业人数")
-    private Integer cntMgStaff;
-
-    @ApiModelProperty(value = "入驻企业从业人员数")
-    private Integer cntJoinStaff;
-
-    @ApiModelProperty(value = "公共服务平台个数")
-    private Integer cntPubPlat;
-
-    @ApiModelProperty(value = "园区品牌企业个数")
-    private Integer cntBandsCom;
-
-    @ApiModelProperty(value = "园区企业高级人才数")
-    private Integer cntHighStaff;
-
-    @ApiModelProperty(value = "申报单位")
-    private String parentCom;
-
-    @ApiModelProperty(value = "状态：1已满 0未满")
-    private Integer enterStatus;
-
-
-    @ApiModelProperty(value = "简介")
-    private String intro;
-
-
-    @ApiModelProperty(value = "政策")
-    private String policy;
-
-
-    @ApiModelProperty(value = "服务")
-    private String serve;
-
-
-    @ApiModelProperty(value = "完整地址")
-    private String newAddress;
-
-    private Long dateParkId;
-
-    private String logo;
-
-    @ApiModelProperty(value = "二维码")
-    private String qr;
-
-    private String addressAp;
-
-}

src/main/java/com/xdf/creative/base/vo/dt/DtParkInfoDraftQueryVo.java

@@ -1,149 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-
-import java.util.Date;
-
-/**
- * <p>
- * 园区表_syr made 查询结果对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DtParkInfoDraftQueryVo对象", description = "园区表_syr made查询参数")
-public class DtParkInfoDraftQueryVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
-    @ApiModelProperty(value = "园区名称")
-    private String name;
-
-    @ApiModelProperty(value = "省ID")
-    private Long provinceId;
-
-    @ApiModelProperty(value = "市ID")
-    private Long cityId;
-
-    @ApiModelProperty(value = "区县ID")
-    private Long districtId;
-
-    @ApiModelProperty(value = "区名称")
-    private String districtName;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "新_老园区")
-    private String oldNew;
-
-    @ApiModelProperty(value = "联系人")
-    private String contactor;
-
-    @ApiModelProperty(value = "职务")
-    private String contactorPos;
-
-    @ApiModelProperty(value = "手机")
-    private String mobile;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "建筑面积平方米")
-    private Double areaBuild;
-
-    @ApiModelProperty(value = "占地面积")
-    private Double areaOcup;
-
-    @ApiModelProperty(value = "产证面积")
-    private Double areaLice;
-
-    @ApiModelProperty(value = "已出租面积")
-    private Double areaLease;
-
-    @ApiModelProperty(value = "入驻企业个数")
-    private Integer cntComJoin;
-
-    @ApiModelProperty(value = "文创企业个数")
-    private Integer cntComCult;
-
-    @ApiModelProperty(value = "运营管理公司从业人数")
-    private Integer cntMgStaff;
-
-    @ApiModelProperty(value = "入驻企业从业人员数")
-    private Integer cntJoinStaff;
-
-    @ApiModelProperty(value = "公共服务平台个数")
-    private Integer cntPubPlat;
-
-    @ApiModelProperty(value = "园区品牌企业个数")
-    private Integer cntBandsCom;
-
-    @ApiModelProperty(value = "园区企业高级人才数")
-    private Integer cntHighStaff;
-
-    @ApiModelProperty(value = "申报单位")
-    private String parentCom;
-
-    @ApiModelProperty(value = "状态：1已满 0未满")
-    private Integer enterStatus;
-
-    @ApiModelProperty(value = "状态：1正常 0待审核 -1已删除")
-    private Integer status;
-
-
-    @ApiModelProperty(value = "政策")
-    private String policy;
-
-
-    @ApiModelProperty(value = "服务")
-    private String serve;
-
-
-
-    @ApiModelProperty(value = "简介")
-    private String intro;
-
-    @ApiModelProperty(value = "添加时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "完整地址")
-    private String newAddress;
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-    @ApiModelProperty(value = "组织机构ID")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "组织机构ID")
-    private Long dateParkId;
-
-
-    private String logo;
-
-    @ApiModelProperty(value = "二维码")
-    private String qr;
-
-    @ApiModelProperty(value = "补充地址")
-    private String addressAp;
-
-}

src/main/java/com/xdf/creative/base/vo/dt/ParkDataTeamQueryVo.java

@@ -1,139 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-
-import java.util.Date;
-
-/**
- * <p>
- * 园区表_syr made 查询结果对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "ParkDataTeamQueryVo对象", description = "园区表_syr made查询参数")
-public class ParkDataTeamQueryVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
-    @ApiModelProperty(value = "园区名称")
-    private String name;
-
-    @ApiModelProperty(value = "省ID")
-    private Long provinceId;
-
-    @ApiModelProperty(value = "市ID")
-    private Long cityId;
-
-    @ApiModelProperty(value = "区县ID")
-    private Long districtId;
-
-    @ApiModelProperty(value = "区名称")
-    private String districtName;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "新_老园区")
-    private String oldNew;
-
-    @ApiModelProperty(value = "联系人")
-    private String contactor;
-
-    @ApiModelProperty(value = "职务")
-    private String contactorPos;
-
-    @ApiModelProperty(value = "手机")
-    private String mobile;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "建筑面积平方米")
-    private Double areaBuild;
-
-    @ApiModelProperty(value = "占地面积")
-    private Double areaOcup;
-
-    @ApiModelProperty(value = "产证面积")
-    private Double areaLice;
-
-    @ApiModelProperty(value = "已出租面积")
-    private Double areaLease;
-
-    @ApiModelProperty(value = "入驻企业个数")
-    private Integer cntComJoin;
-
-    @ApiModelProperty(value = "文创企业个数")
-    private Integer cntComCult;
-
-    @ApiModelProperty(value = "运营管理公司从业人数")
-    private Integer cntMgStaff;
-
-    @ApiModelProperty(value = "入驻企业从业人员数")
-    private Integer cntJoinStaff;
-
-    @ApiModelProperty(value = "公共服务平台个数")
-    private Integer cntPubPlat;
-
-    @ApiModelProperty(value = "园区品牌企业个数")
-    private Integer cntBandsCom;
-
-    @ApiModelProperty(value = "园区企业高级人才数")
-    private Integer cntHighStaff;
-
-    @ApiModelProperty(value = "申报单位")
-    private String parentCom;
-
-    @ApiModelProperty(value = "状态：1已满 0未满")
-    private Integer enterStatus;
-
-    @ApiModelProperty(value = "状态：1正常 0待审核 -1已删除")
-    private Integer status;
-
-    @ApiModelProperty(value = "添加时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "完整地址")
-    private String newAddress;
-
-    @ApiModelProperty(value = "简介")
-    private String intro;
-
-    private Long organizeId;
-
-    @ApiModelProperty(value = "政策")
-    private String policy;
-
-
-    @ApiModelProperty(value = "服务")
-    private String serve;
-
-    private String logo;
-
-    private String qr;
-
-    private String addressAp;
-
-    private Integer parkType;
-
-
-}

src/main/java/com/xdf/creative/base/vo/dt/ParkDataTeamWebVo.java

@@ -1,102 +0,0 @@
-package com.xdf.creative.base.vo.dt;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 园区表_syr made 查询结果对象
- * </p>
- *
- * @author lgw
- * @date 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "ParkDataTeamQueryVo对象", description = "园区表_syr made查询参数")
-public class ParkDataTeamWebVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
-    @ApiModelProperty(value = "园区名称")
-    private String name;
-
-    @ApiModelProperty(value = "省ID")
-    private Long provinceId;
-
-    @ApiModelProperty(value = "市ID")
-    private Long cityId;
-
-    @ApiModelProperty(value = "区县ID")
-    private Long districtId;
-
-    @ApiModelProperty(value = "区名称")
-    private String districtName;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-
-    @ApiModelProperty(value = "联系人")
-    private String contactor;
-
-    @ApiModelProperty(value = "职务")
-    private String contactorPos;
-
-    @ApiModelProperty(value = "手机")
-    private String mobile;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "入驻企业个数")
-    private Integer cntComJoin;
-
-    @ApiModelProperty(value = "文创企业个数")
-    private Integer cntComCult;
-
-    @ApiModelProperty(value = "申报单位")
-    private String parentCom;
-
-    @ApiModelProperty(value = "状态：1已满 0未满")
-    private Integer enterStatus;
-
-
-    @ApiModelProperty(value = "政策")
-    private String policy;
-
-
-    @ApiModelProperty(value = "服务")
-    private String serve;
-
-    private String logo;
-
-
-    @ApiModelProperty(value = "简介")
-    private String intro;
-
-    private Long organizeId;
-
-    private String qr;
-
-    private String addressAp;
-
-    private Integer parkType;
-
-
-
-
-}

src/main/java/com/xdf/creative/base/vo/dt/WebParkEnterQueryVo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 import java.util.Date;
@@ -40,6 +42,10 @@ public class WebParkEnterQueryVo implements Serializable {
     @ApiModelProperty(value = "园区主键id")
     private Long parkId;
 
+
+    @ApiModelProperty(value = "园区名称")
+    private String parkName;
+
     @ApiModelProperty(value = "处理过程状态 1 待处理 2沟通中 3 已完结（入住） 4已完结（未入住）")
     private Integer processState;
 

src/main/java/com/xdf/creative/base/vo/tyrz/SysUserCurrentExtInfoVo.java

@@ -0,0 +1,32 @@
+package com.xdf.creative.base.vo.tyrz;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户绑定第三方app用户 查询结果对象
+ * </p>
+ *
+ * @author lgw
+ * @date 2020-06-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "SysUserExtQueryVo对象", description = "用户绑定第三方app用户查询参数")
+public class SysUserCurrentExtInfoVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private long Id;
+
+    @ApiModelProperty(value = "appId")
+    private Long appId;
+
+    @ApiModelProperty(value = "三方系统用户id")
+    private String appUserId;
+
+
+}

src/main/java/com/xdf/creative/base/vo/tyrz/SysUserCurrentIdentityVo.java

@@ -0,0 +1,64 @@
+package com.xdf.creative.base.vo.tyrz;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 普通用户入驻（账号变更） 查询结果对象
+ * </p>
+ *
+ * @author lgw
+ * @date 2020-06-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "BusAccountEnterQueryVo对象", description = "普通用户入驻（账号变更）查询参数")
+public class SysUserCurrentIdentityVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "组织类型: 0 普通用户  1、企业  2、金融机构 3、投资机构 4、服务机构 5、园区 6、协（商会）  7、项目管理公司 8 区文创办 9 市文创办  99 公司后台管理")
+    private Integer enterType;
+
+    @ApiModelProperty(value = "机构名称")
+    private String organizeName;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String creditCode;
+
+    @ApiModelProperty(value = "运营企业名称")
+    private String optOrganizeName;
+
+
+    @ApiModelProperty(value = "联系人")
+    private String linkMan;
+
+    @ApiModelProperty(value = "办公电话")
+    private String linkMobile;
+
+    @ApiModelProperty(value = "职务")
+    private String duty;
+
+    @ApiModelProperty(value = "简介")
+    private String introduce;
+
+    @ApiModelProperty(value = "所属协会")
+    private String associationName;
+
+    @ApiModelProperty(value = "所属园区")
+    private String parkName;
+
+    @ApiModelProperty(value = "所属省")
+    private String province;
+
+    @ApiModelProperty(value = "所属市")
+    private String city;
+
+    @ApiModelProperty(value = "所属区")
+    private String district;
+
+}

src/main/java/com/xdf/creative/base/vo/tyrz/SysUserCurrentInfoVo.java

@@ -0,0 +1,56 @@
+package com.xdf.creative.base.vo.tyrz;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 系统用户表 查询结果对象
+ * </p>
+ *
+ * @author lgw
+ * @date 2020-06-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "SysUserQueryVo对象", description = "系统用户表查询参数")
+public class SysUserCurrentInfoVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "登录用户名")
+    private String username;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "头像")
+    private String head;
+
+    @ApiModelProperty(value = "性别 1男 2女")
+    private Integer sex;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    private List<SysUserCurrentIdentityVo> identityInfo;
+
+    private SysUserCurrentExtInfoVo extInfo;
+
+
+
+
+
+
+}

src/main/java/com/xdf/creative/config/CorsFilter.java

@@ -1,35 +0,0 @@
-package com.xdf.creative.config;
-
-/**
- * @author : lgw
- * @date : 9:59 2020/3/16
- */
-import com.xdf.creative.config.xss.XssHttpServletRequestWrapper;
-import org.springframework.stereotype.Component;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-/*避免传参跨域*/
-
-@Component
-public class CorsFilter implements Filter {
-    @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        HttpServletResponse httpResponse = (HttpServletResponse) response;
-        HttpServletRequest httpRequest = (HttpServletRequest) request;
-        httpResponse.setHeader("Access-Control-Allow-Origin", httpRequest.getHeader("Origin"));
-        httpResponse.setHeader("Access-Control-Allow-Methods", httpRequest.getMethod());
-        httpResponse.setHeader("Access-Control-Max-Age", "3600");
-        httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
-        httpResponse.setHeader("Access-Control-Allow-Headers", httpRequest.getHeader("Access-Control-Request-Headers"));
-        XssHttpServletRequestWrapper xssRequest = new XssHttpServletRequestWrapper(
-                (HttpServletRequest) request);
-        chain.doFilter(xssRequest, response);
-    }
-
-    @Override
-    public void destroy() {
-
-    }
-}

src/main/java/com/xdf/creative/config/CorsFilterUser.java

@@ -0,0 +1,146 @@
+package com.xdf.creative.config;
+
+/*
+*
+ * @author : lgw
+ * @date : 9:59 2020/3/16
+
+*/
+
+import com.alibaba.fastjson.JSON;
+import com.xdf.creative.enums.ApiCode;
+import com.xdf.creative.util.PasswordUtil;
+import com.xdf.creative.util.UUIDUtil;
+import com.xdf.creative.util.page.ApiResult;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.shiro.web.util.WebUtils;
+import org.jasig.cas.client.util.AbstractCasFilter;
+import org.jasig.cas.client.validation.Assertion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+import org.springframework.web.cors.*;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.*;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
+/*
+避免传参跨域
+*/
+
+
+@Component
+@Order(-1)
+public class CorsFilterUser implements Filter {
+/*    @Value("${cas.server-url-prefix}")
+    private String CAS_URL;*/
+    @Value("${auth_skip_urls}")
+    private List<String> skipAuthUrls;
+
+    private final static Logger log = LoggerFactory.getLogger(CorsFilterUser.class);
+
+    private final static List<String> heardSList = Arrays.asList("Accept","Origin","X-Requested-With","Content-Type", "Last-Modified","*");
+    private final CorsConfigurationSource configSource;
+    private CorsProcessor processor = new DefaultCorsProcessor();
+
+
+    public CorsFilterUser(@Qualifier("faviconRequestHandler") CorsConfigurationSource configSource) {
+        Assert.notNull(configSource, "CorsConfigurationSource must not be null");
+        this.configSource = configSource;
+    }
+
+    public void setCorsProcessor(CorsProcessor processor) {
+        Assert.notNull(processor, "CorsProcessor must not be null");
+        this.processor = processor;
+    }
+
+    @Bean
+    public FilterRegistrationBean corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true);
+        config.addAllowedOrigin("*");
+        config.addAllowedMethod("*");
+        config.setAllowedHeaders(heardSList);
+        config.setAllowCredentials(true);
+        source.registerCorsConfiguration("/**", config);
+        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
+        bean.setOrder(-1000);  //优先级最高 在拦截器之前执行
+        return bean;
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+
+        HttpServletResponse httpResponse = (HttpServletResponse) response;
+        HttpServletRequest httpRequest = (HttpServletRequest) request;
+      /*  httpResponse.setHeader("Set-Cookie", "CookieName=JSESSIONID;Path=/;SameSite=None;Secure");
+          if(!skipAuthUrls.contains(httpRequest.getRequestURI().substring(httpRequest.getContextPath().length(),httpRequest.getRequestURI().length()))){
+            HttpSession session = httpRequest.getSession(false);
+            if(null!=session) {
+                Assertion assertion = (Assertion) session.getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION);
+                if(null!=assertion) {
+                    String username = assertion.getPrincipal().getName();
+                    Long userId = Long.parseLong((String) assertion.getPrincipal().getAttributes().get("id"));
+                }else{
+                    ApiResult result = new ApiResult();
+                    result.setCode(ApiCode.TOKEN_INVALID.getCode());
+                    result.setMsg(ApiCode.TOKEN_INVALID.getMsg());
+                    getResponseResult(response, result);
+                    return ;
+                }
+            }else{
+                ApiResult result = new ApiResult();
+                result.setCode(ApiCode.TOKEN_INVALID.getCode());
+                result.setMsg(ApiCode.TOKEN_INVALID.getMsg());
+                getResponseResult(response, result);
+                return ;
+
+            }
+        }*/
+
+        chain.doFilter(httpRequest, httpResponse);
+    }
+
+    /*
+     *
+     * 返回结果
+     *
+     * @param response
+     */
+
+    public void getResponseResult(ServletResponse response, ApiResult result) {
+        response.setCharacterEncoding("UTF-8");
+        response.setContentType("application/json;charset=utf-8");
+        PrintWriter printWriter = null;
+        try {
+            printWriter = WebUtils.toHttp(response).getWriter();
+            printWriter.write(JSON.toJSONString(result));
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            if (null != printWriter) {
+                printWriter.close();
+            }
+        }
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}

src/main/java/com/xdf/creative/config/SpringBootPlusWebMvcConfig.java

@@ -1,34 +0,0 @@
-
-package com.xdf.creative.config;
-
-import com.alibaba.fastjson.JSON;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-
-/**
- * WebMvc配置
- *
- * @author DeanYe
- * @date 2018-11-08
- */
-@Slf4j
-@Configuration
-public class SpringBootPlusWebMvcConfig implements WebMvcConfigurer {
-
-    @Value("${upload_basePath}")
-    private String basePath;
-
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        //路径前面要使用file协议，本地路径使用/分隔
-        registry.addResourceHandler("/resource/**").addResourceLocations("file:" + basePath);
-    }
-
-
-
-}

src/main/java/com/xdf/creative/config/SpringSessionConfig.java

@@ -1,25 +0,0 @@
-package com.xdf.creative.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author : lgw
- * @date : 12:21 2020/4/11
- */
-/*
-@Configuration
-public class SpringSessionConfig {
-
-    public SpringSessionConfig() {
-    }
-
-    @Bean
-    public CookieSerializer httpSessionIdResolver() {
-        DefaultCookieSerializer cookieSerializer = new DefaultCookieSerializer();
-        // 取消仅限同一站点设置
-        cookieSerializer.setSameSite(null);
-        return cookieSerializer;
-    }
-}
-*/

src/main/java/com/xdf/creative/config/auth/CasConfig.java

@@ -0,0 +1,208 @@
+/*
+package com.xdf.creative.config.auth;
+
+import net.unicon.cas.client.configuration.CasClientConfigurerAdapter;
+import org.jasig.cas.client.authentication.AuthenticationFilter;
+import org.jasig.cas.client.session.SingleSignOutFilter;
+import org.jasig.cas.client.session.SingleSignOutHttpSessionListener;
+import org.jasig.cas.client.util.HttpServletRequestWrapperFilter;
+import org.jasig.cas.client.validation.Cas30ProxyReceivingTicketValidationFilter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSession;
+import java.util.EventListener;
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+public class CasConfig extends CasClientConfigurerAdapter {
+
+    @Value("${cas.server-url-prefix}")
+    private String CAS_URL;
+
+    @Value("${cas.server-login-url}")
+    private String CAS_URL_LOGIN;
+
+    @Value("${cas.client-host-url}")
+    private String APP_URL;
+
+    @Value("${cas.authentication-url-patterns}")
+    private String casIgnorePattern;
+
+
+
+
+    */
+/**
+     * 配置登出过滤器(过滤器顺序有要求，先登出-》授权过滤器-》配置过滤验证器-》wraper过滤器)
+     * @return
+     *//*
+
+    @Bean
+    public FilterRegistrationBean filterSingleRegistration() {
+        final FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setFilter(new SingleSignOutFilter());
+        // 设定匹配的路径
+        registration.addUrlPatterns("/*");
+        Map<String,String>  initParameters = new HashMap<String, String>();
+        initParameters.put("casServerUrlPrefix", CAS_URL);
+        registration.setInitParameters(initParameters);
+        // 设定加载的顺序
+        registration.setOrder(1);
+
+        try {
+            trustAllHttpsCertificates();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        HttpsURLConnection.setDefaultHostnameVerifier(hv);
+        return registration;
+    }
+
+    */
+/**
+     * 配置授权过滤器
+     * @return
+     *//*
+
+    @Bean
+    public FilterRegistrationBean filterAuthenticationRegistration() {
+        final FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setFilter(new AuthenticationFilter());
+        // 设定匹配的路径
+        registration.addUrlPatterns("/*");
+        Map<String,String>  initParameters = new HashMap<String, String>();
+        initParameters.put("casServerLoginUrl", CAS_URL_LOGIN);
+        initParameters.put("serverName", APP_URL);
+
+        if(casIgnorePattern != null && !"".equals(casIgnorePattern)){
+            initParameters.put("ignorePattern", casIgnorePattern);
+        }
+        //自定义UrlPatternMatcherStrategy 验证规则
+      */
+/*  if(ignoreUrlPatternType != null && !"".equals(ignoreUrlPatternType)){
+            initParameters.put("ignoreUrlPatternType", ignoreUrlPatternType);
+        }
+*//*
+
+        registration.setInitParameters(initParameters);
+        // 设定加载的顺序
+        registration.setOrder(2);
+        return registration;
+    }
+
+    */
+/**
+     * 配置过滤验证器 这里用的是Cas30ProxyReceivingTicketValidationFilter
+     * @return
+     *//*
+
+    @Bean
+    public FilterRegistrationBean filterValidationRegistration() {
+        final FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setFilter(new Cas30ProxyReceivingTicketValidationFilter());
+        // 设定匹配的路径
+        registration.addUrlPatterns("/*");
+        Map<String,String> initParameters = new HashMap<String, String>();
+        initParameters.put("casServerUrlPrefix", CAS_URL);
+        initParameters.put("serverName", APP_URL);
+        initParameters.put("useSession", "true");
+        registration.setInitParameters(initParameters);
+        // 设定加载的顺序
+        registration.setOrder(3);
+        return registration;
+    }
+
+    */
+/**
+     * request wraper过滤器
+     * @return
+     *//*
+
+    @Bean
+    public FilterRegistrationBean filterWrapperRegistration() {
+        final FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setFilter(new HttpServletRequestWrapperFilter());
+        // 设定匹配的路径
+        registration.addUrlPatterns("/*");
+        // 设定加载的顺序
+        registration.setOrder(4);
+        return registration;
+    }
+
+    */
+/**
+     * 添加监听器
+     * @return
+     *//*
+
+    @Bean
+    public ServletListenerRegistrationBean<EventListener> singleSignOutListenerRegistration() {
+        ServletListenerRegistrationBean<EventListener> registrationBean = new ServletListenerRegistrationBean<EventListener>();
+        registrationBean.setListener(new SingleSignOutHttpSessionListener());
+        registrationBean.setOrder(1);
+        return registrationBean;
+    }
+
+
+    HostnameVerifier hv = new HostnameVerifier() {
+        public boolean verify(String urlHostName, SSLSession session) {
+            System.out.println("Warning: URL Host: " + urlHostName + " vs. "
+                    + session.getPeerHost());
+            return true;
+        }
+    };
+
+
+
+    private static void trustAllHttpsCertificates() throws Exception {
+        javax.net.ssl.TrustManager[] trustAllCerts = new javax.net.ssl.TrustManager[1];
+        javax.net.ssl.TrustManager tm = new miTM();
+        trustAllCerts[0] = tm;
+        javax.net.ssl.SSLContext sc = javax.net.ssl.SSLContext
+                .getInstance("SSL");
+        sc.init(null, trustAllCerts, null);
+        javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory(sc
+                .getSocketFactory());
+    }
+
+    static class miTM implements javax.net.ssl.TrustManager,
+            javax.net.ssl.X509TrustManager {
+        public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+            return null;
+        }
+
+        public boolean isServerTrusted(
+                java.security.cert.X509Certificate[] certs) {
+            return true;
+        }
+
+        public boolean isClientTrusted(
+                java.security.cert.X509Certificate[] certs) {
+            return true;
+        }
+
+        public void checkServerTrusted(
+                java.security.cert.X509Certificate[] certs, String authType)
+                throws java.security.cert.CertificateException {
+            return;
+        }
+
+        public void checkClientTrusted(
+                java.security.cert.X509Certificate[] certs, String authType)
+                throws java.security.cert.CertificateException {
+            return;
+        }
+    }
+
+
+
+}
+
+*/

src/main/java/com/xdf/creative/config/auth/GlobalCorsConfig.java

@@ -0,0 +1,72 @@
+/*
+package com.xdf.creative.config.auth;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+import java.util.Arrays;
+import java.util.List;
+
+*/
+/*
+*
+ * @author : lgw
+ * @date : 17:00 2020/6/15
+
+*//*
+
+
+
+@Configuration
+@Order(-1)
+public class GlobalCorsConfig {
+    private final static  List<String>  heardSList = Arrays.asList("Accept","Origin","X-Requested-With","Content-Type", "Last-Modified","*");
+
+*/
+/*,"Cookie", "Set-Cookie"*//*
+
+
+*/
+/* @Bean
+    public CorsFilter corsFilter() {
+        CorsConfiguration config = new CorsConfiguration();
+        config.addAllowedOrigin("*");
+        config.setAllowCredentials(true);
+        config.addAllowedMethod("*");
+        config.addAllowedHeader("*");
+
+        UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
+        configSource.registerCorsConfiguration("/**", config);
+        return new CorsFilter(configSource);
+    }*//*
+
+
+   @Bean
+   public FilterRegistrationBean corsFilter() {
+       UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+       CorsConfiguration config = new CorsConfiguration();
+       config.setAllowCredentials(true);
+       config.addAllowedOrigin("*");
+      */
+/* config.addAllowedHeader("*");*//*
+
+       config.addAllowedMethod("*");
+       config.setAllowedHeaders(heardSList);
+   */
+/*    config.addExposedHeader("Set-Cookie");*//*
+
+       config.setAllowCredentials(true);
+       source.registerCorsConfiguration("/**", config);
+       FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
+       bean.setOrder(-10000);  //优先级最高 在拦截器之前执行
+       return bean;
+   }
+
+
+}
+*/

src/main/java/com/xdf/creative/config/xss/FilterConfig.java

@@ -0,0 +1,49 @@
+package com.xdf.creative.config.xss;
+
+/**
+ * @author : lgw
+ * @date : 10:24 2020/7/21
+ */
+
+import lombok.Data;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.DispatcherType;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 设置跨站脚本过滤
+ */
+@Configuration
+@Data
+public class FilterConfig {
+    @Value("${xss.enabled}")
+    private String enabled;
+
+    @Value("${xss.excludes}")
+    private String excludes;
+
+    @Value("${xss.urlPatterns}")
+    private String urlPatterns;
+
+    @Bean
+    public FilterRegistrationBean xssFilterRegistration() {
+        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+        registrationBean.setDispatcherTypes(DispatcherType.REQUEST);
+        registrationBean.setFilter(new XssFilter());
+        registrationBean.addUrlPatterns(StringUtils.split(urlPatterns, ","));
+        registrationBean.setName("XssFilter");
+        registrationBean.setOrder(9999);
+        Map<String, String> initParameters = new HashMap<>();
+        initParameters.put("excludes", excludes);
+        initParameters.put("enabled", enabled);
+        registrationBean.setInitParameters(initParameters);
+        return registrationBean;
+    }
+}
+

src/main/java/com/xdf/creative/config/xss/HTMLFilter.java

@@ -1,530 +0,0 @@
-package com.xdf.creative.config.xss;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- *
- * HTML filtering utility for protecting against XSS (Cross Site Scripting).
- *
- * This code is licensed LGPLv3
- *
- * This code is a Java port of the original work in PHP by Cal Hendersen.
- * http://code.iamcal.com/php/lib_filter/
- *
- * The trickiest part of the translation was handling the differences in regex handling
- * between PHP and Java.  These resources were helpful in the process:
- *
- * http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html
- * http://us2.php.net/manual/en/reference.pcre.pattern.modifiers.php
- * http://www.regular-expressions.info/modifiers.html
- *
- * A note on naming conventions: instance variables are prefixed with a "v"; global
- * constant are in all caps.
- *
- * Sample use:
- * String input = ...
- * String clean = new HTMLFilter().filter( input );
- *
- * The class is not thread safe. Create a new instance if in doubt.
- *
- * If you find bugs or have suggestions on improvement (especially regarding
- * performance), please contact us.  The latest version of this
- * source, and our contact details, can be found at http://xss-html-filter.sf.net
- *
- * @author Joseph O'Connell
- * @author Cal Hendersen
- * @author Michael Semb Wever
- */
-public final class HTMLFilter {
-
-    /** regex flag union representing /si modifiers in php **/
-    private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL;
-    private static final Pattern P_COMMENTS = Pattern.compile("<!--(.*?)-->", Pattern.DOTALL);
-    private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI);
-    private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL);
-    private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI);
-    private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI);
-    private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI);
-    private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI);
-    private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI);
-    private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?");
-    private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?");
-    private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?");
-    private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))");
-    private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL);
-    private static final Pattern P_END_ARROW = Pattern.compile("^>");
-    private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)");
-    private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)");
-    private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)");
-    private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)");
-    private static final Pattern P_AMP = Pattern.compile("&");
-    private static final Pattern P_QUOTE = Pattern.compile("<");
-    private static final Pattern P_LEFT_ARROW = Pattern.compile("<");
-    private static final Pattern P_RIGHT_ARROW = Pattern.compile(">");
-    private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>");
-
-    // @xxx could grow large... maybe use sesat's ReferenceMap
-    private static final ConcurrentMap<String,Pattern> P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<String, Pattern>();
-    private static final ConcurrentMap<String,Pattern> P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<String, Pattern>();
-
-    /** set of allowed html elements, along with allowed attributes for each element **/
-    private final Map<String, List<String>> vAllowed;
-    /** counts of open tags for each (allowable) html element **/
-    private final Map<String, Integer> vTagCounts = new HashMap<String, Integer>();
-
-    /** html elements which must always be self-closing (e.g. "<img />") **/
-    private final String[] vSelfClosingTags;
-    /** html elements which must always have separate opening and closing tags (e.g. "<b></b>") **/
-    private final String[] vNeedClosingTags;
-    /** set of disallowed html elements **/
-    private final String[] vDisallowed;
-    /** attributes which should be checked for valid protocols **/
-    private final String[] vProtocolAtts;
-    /** allowed protocols **/
-    private final String[] vAllowedProtocols;
-    /** tags which should be removed if they contain no content (e.g. "<b></b>" or "<b />") **/
-    private final String[] vRemoveBlanks;
-    /** entities allowed within html markup **/
-    private final String[] vAllowedEntities;
-    /** flag determining whether comments are allowed in input String. */
-    private final boolean stripComment;
-    private final boolean encodeQuotes;
-    private boolean vDebug = false;
-    /**
-     * flag determining whether to try to make tags when presented with "unbalanced"
-     * angle brackets (e.g. "<b text </b>" becomes "<b> text </b>").  If set to false,
-     * unbalanced angle brackets will be html escaped.
-     */
-    private final boolean alwaysMakeTags;
-
-    /** Default constructor.
-     *
-     */
-    public HTMLFilter() {
-        vAllowed = new HashMap<>();
-
-        final ArrayList<String> a_atts = new ArrayList<String>();
-        a_atts.add("href");
-        a_atts.add("target");
-        vAllowed.put("a", a_atts);
-
-        final ArrayList<String> img_atts = new ArrayList<String>();
-        img_atts.add("src");
-        img_atts.add("width");
-        img_atts.add("height");
-        img_atts.add("alt");
-        vAllowed.put("img", img_atts);
-
-        final ArrayList<String> no_atts = new ArrayList<String>();
-        vAllowed.put("b", no_atts);
-        vAllowed.put("strong", no_atts);
-        vAllowed.put("i", no_atts);
-        vAllowed.put("em", no_atts);
-
-        vSelfClosingTags = new String[]{"img"};
-        vNeedClosingTags = new String[]{"a", "b", "strong", "i", "em"};
-        vDisallowed = new String[]{};
-        vAllowedProtocols = new String[]{"http", "mailto", "https"}; // no ftp.
-        vProtocolAtts = new String[]{"src", "href"};
-        vRemoveBlanks = new String[]{"a", "b", "strong", "i", "em"};
-        vAllowedEntities = new String[]{"amp", "gt", "lt", "quot"};
-        stripComment = true;
-        encodeQuotes = true;
-        alwaysMakeTags = true;
-    }
-
-    /** Set debug flag to true. Otherwise use default settings. See the default constructor.
-     *
-     * @param debug turn debug on with a true argument
-     */
-    public HTMLFilter(final boolean debug) {
-        this();
-        vDebug = debug;
-
-    }
-
-    /** Map-parameter configurable constructor.
-     *
-     * @param conf map containing configuration. keys match field names.
-     */
-    public HTMLFilter(final Map<String,Object> conf) {
-
-        assert conf.containsKey("vAllowed") : "configuration requires vAllowed";
-        assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags";
-        assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags";
-        assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed";
-        assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols";
-        assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts";
-        assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks";
-        assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities";
-
-        vAllowed = Collections.unmodifiableMap((HashMap<String, List<String>>) conf.get("vAllowed"));
-        vSelfClosingTags = (String[]) conf.get("vSelfClosingTags");
-        vNeedClosingTags = (String[]) conf.get("vNeedClosingTags");
-        vDisallowed = (String[]) conf.get("vDisallowed");
-        vAllowedProtocols = (String[]) conf.get("vAllowedProtocols");
-        vProtocolAtts = (String[]) conf.get("vProtocolAtts");
-        vRemoveBlanks = (String[]) conf.get("vRemoveBlanks");
-        vAllowedEntities = (String[]) conf.get("vAllowedEntities");
-        stripComment =  conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true;
-        encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true;
-        alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true;
-    }
-
-    private void reset() {
-        vTagCounts.clear();
-    }
-
-    private void debug(final String msg) {
-        if (vDebug) {
-            Logger.getAnonymousLogger().info(msg);
-        }
-    }
-
-    //---------------------------------------------------------------
-    // my versions of some PHP library functions
-    public static String chr(final int decimal) {
-        return String.valueOf((char) decimal);
-    }
-
-    public static String htmlSpecialChars(final String s) {
-        String result = s;
-        result = regexReplace(P_AMP, "&amp;", result);
-        result = regexReplace(P_QUOTE, "&quot;", result);
-        result = regexReplace(P_LEFT_ARROW, "&lt;", result);
-        result = regexReplace(P_RIGHT_ARROW, "&gt;", result);
-        return result;
-    }
-
-    //---------------------------------------------------------------
-    /**
-     * given a user submitted input String, filter out any invalid or restricted
-     * html.
-     *
-     * @param input text (i.e. submitted by a user) than may contain html
-     * @return "clean" version of input, with only valid, whitelisted html elements allowed
-     */
-    public String filter(final String input) {
-        reset();
-        String s = input;
-
-        debug("************************************************");
-        debug("              INPUT: " + input);
-
-        s = escapeComments(s);
-        debug("     escapeComments: " + s);
-
-        s = balanceHTML(s);
-        debug("        balanceHTML: " + s);
-
-        s = checkTags(s);
-        debug("          checkTags: " + s);
-
-        s = processRemoveBlanks(s);
-        debug("processRemoveBlanks: " + s);
-
-        s = validateEntities(s);
-        debug("    validateEntites: " + s);
-
-        debug("************************************************\n\n");
-        return s;
-    }
-
-    public boolean isAlwaysMakeTags(){
-        return alwaysMakeTags;
-    }
-
-    public boolean isStripComments(){
-        return stripComment;
-    }
-
-    private String escapeComments(final String s) {
-        final Matcher m = P_COMMENTS.matcher(s);
-        final StringBuffer buf = new StringBuffer();
-        if (m.find()) {
-            final String match = m.group(1); //(.*?)
-            m.appendReplacement(buf, Matcher.quoteReplacement("<!--" + htmlSpecialChars(match) + "-->"));
-        }
-        m.appendTail(buf);
-
-        return buf.toString();
-    }
-
-    private String balanceHTML(String s) {
-        if (alwaysMakeTags) {
-            //
-            // try and form html
-            //
-            s = regexReplace(P_END_ARROW, "", s);
-            s = regexReplace(P_BODY_TO_END, "<$1>", s);
-            s = regexReplace(P_XML_CONTENT, "$1<$2", s);
-
-        } else {
-            //
-            // escape stray brackets
-            //
-            s = regexReplace(P_STRAY_LEFT_ARROW, "&lt;$1", s);
-            s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2&gt;<", s);
-
-            //
-            // the last regexp causes '<>' entities to appear
-            // (we need to do a lookahead assertion so that the last bracket can
-            // be used in the next pass of the regexp)
-            //
-            s = regexReplace(P_BOTH_ARROWS, "", s);
-        }
-
-        return s;
-    }
-
-    private String checkTags(String s) {
-        Matcher m = P_TAGS.matcher(s);
-
-        final StringBuffer buf = new StringBuffer();
-        while (m.find()) {
-            String replaceStr = m.group(1);
-            replaceStr = processTag(replaceStr);
-            m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr));
-        }
-        m.appendTail(buf);
-
-        s = buf.toString();
-
-        // these get tallied in processTag
-        // (remember to reset before subsequent calls to filter method)
-        for (String key : vTagCounts.keySet()) {
-            for (int ii = 0; ii < vTagCounts.get(key); ii++) {
-                s += "</" + key + ">";
-            }
-        }
-
-        return s;
-    }
-
-    private String processRemoveBlanks(final String s) {
-        String result = s;
-        for (String tag : vRemoveBlanks) {
-            if(!P_REMOVE_PAIR_BLANKS.containsKey(tag)){
-                P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?></" + tag + ">"));
-            }
-            result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result);
-            if(!P_REMOVE_SELF_BLANKS.containsKey(tag)){
-                P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>"));
-            }
-            result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result);
-        }
-
-        return result;
-    }
-
-    private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s) {
-        Matcher m = regex_pattern.matcher(s);
-        return m.replaceAll(replacement);
-    }
-
-    private String processTag(final String s) {
-        // ending tags
-        Matcher m = P_END_TAG.matcher(s);
-        if (m.find()) {
-            final String name = m.group(1).toLowerCase();
-            if (allowed(name)) {
-                if (!inArray(name, vSelfClosingTags)) {
-                    if (vTagCounts.containsKey(name)) {
-                        vTagCounts.put(name, vTagCounts.get(name) - 1);
-                        return "</" + name + ">";
-                    }
-                }
-            }
-        }
-
-        // starting tags
-        m = P_START_TAG.matcher(s);
-        if (m.find()) {
-            final String name = m.group(1).toLowerCase();
-            final String body = m.group(2);
-            String ending = m.group(3);
-
-            //debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" );
-            if (allowed(name)) {
-                String params = "";
-
-                final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body);
-                final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body);
-                final List<String> paramNames = new ArrayList<String>();
-                final List<String> paramValues = new ArrayList<String>();
-                while (m2.find()) {
-                    paramNames.add(m2.group(1)); //([a-z0-9]+)
-                    paramValues.add(m2.group(3)); //(.*?)
-                }
-                while (m3.find()) {
-                    paramNames.add(m3.group(1)); //([a-z0-9]+)
-                    paramValues.add(m3.group(3)); //([^\"\\s']+)
-                }
-
-                String paramName, paramValue;
-                for (int ii = 0; ii < paramNames.size(); ii++) {
-                    paramName = paramNames.get(ii).toLowerCase();
-                    paramValue = paramValues.get(ii);
-
-//          debug( "paramName='" + paramName + "'" );
-//          debug( "paramValue='" + paramValue + "'" );
-//          debug( "allowed? " + vAllowed.get( name ).contains( paramName ) );
-
-                    if (allowedAttribute(name, paramName)) {
-                        if (inArray(paramName, vProtocolAtts)) {
-                            paramValue = processParamProtocol(paramValue);
-                        }
-                        params += " " + paramName + "=\"" + paramValue + "\"";
-                    }
-                }
-
-                if (inArray(name, vSelfClosingTags)) {
-                    ending = " /";
-                }
-
-                if (inArray(name, vNeedClosingTags)) {
-                    ending = "";
-                }
-
-                if (ending == null || ending.length() < 1) {
-                    if (vTagCounts.containsKey(name)) {
-                        vTagCounts.put(name, vTagCounts.get(name) + 1);
-                    } else {
-                        vTagCounts.put(name, 1);
-                    }
-                } else {
-                    ending = " /";
-                }
-                return "<" + name + params + ending + ">";
-            } else {
-                return "";
-            }
-        }
-
-        // comments
-        m = P_COMMENT.matcher(s);
-        if (!stripComment && m.find()) {
-            return  "<" + m.group() + ">";
-        }
-
-        return "";
-    }
-
-    private String processParamProtocol(String s) {
-        s = decodeEntities(s);
-        final Matcher m = P_PROTOCOL.matcher(s);
-        if (m.find()) {
-            final String protocol = m.group(1);
-            if (!inArray(protocol, vAllowedProtocols)) {
-                // bad protocol, turn into local anchor link instead
-                s = "#" + s.substring(protocol.length() + 1, s.length());
-                if (s.startsWith("#//")) {
-                    s = "#" + s.substring(3, s.length());
-                }
-            }
-        }
-
-        return s;
-    }
-
-    private String decodeEntities(String s) {
-        StringBuffer buf = new StringBuffer();
-
-        Matcher m = P_ENTITY.matcher(s);
-        while (m.find()) {
-            final String match = m.group(1);
-            final int decimal = Integer.decode(match).intValue();
-            m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
-        }
-        m.appendTail(buf);
-        s = buf.toString();
-
-        buf = new StringBuffer();
-        m = P_ENTITY_UNICODE.matcher(s);
-        while (m.find()) {
-            final String match = m.group(1);
-            final int decimal = Integer.valueOf(match, 16).intValue();
-            m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
-        }
-        m.appendTail(buf);
-        s = buf.toString();
-
-        buf = new StringBuffer();
-        m = P_ENCODE.matcher(s);
-        while (m.find()) {
-            final String match = m.group(1);
-            final int decimal = Integer.valueOf(match, 16).intValue();
-            m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
-        }
-        m.appendTail(buf);
-        s = buf.toString();
-
-        s = validateEntities(s);
-        return s;
-    }
-
-    private String validateEntities(final String s) {
-        StringBuffer buf = new StringBuffer();
-
-        // validate entities throughout the string
-        Matcher m = P_VALID_ENTITIES.matcher(s);
-        while (m.find()) {
-            final String one = m.group(1); //([^&;]*)
-            final String two = m.group(2); //(?=(;|&|$))
-            m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two)));
-        }
-        m.appendTail(buf);
-
-        return encodeQuotes(buf.toString());
-    }
-
-    private String encodeQuotes(final String s){
-        if(encodeQuotes){
-            StringBuffer buf = new StringBuffer();
-            Matcher m = P_VALID_QUOTES.matcher(s);
-            while (m.find()) {
-                final String one = m.group(1); //(>|^)
-                final String two = m.group(2); //([^<]+?)
-                final String three = m.group(3); //(<|$)
-                m.appendReplacement(buf, Matcher.quoteReplacement(one + regexReplace(P_QUOTE, "&quot;", two) + three));
-            }
-            m.appendTail(buf);
-            return buf.toString();
-        }else{
-            return s;
-        }
-    }
-
-    private String checkEntity(final String preamble, final String term) {
-
-        return ";".equals(term) && isValidEntity(preamble)
-                ? '&' + preamble
-                : "&amp;" + preamble;
-    }
-
-    private boolean isValidEntity(final String entity) {
-        return inArray(entity, vAllowedEntities);
-    }
-
-    private static boolean inArray(final String s, final String[] array) {
-        for (String item : array) {
-            if (item != null && item.equals(s)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean allowed(final String name) {
-        return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed);
-    }
-
-    private boolean allowedAttribute(final String name, final String paramName) {
-        return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName));
-    }
-}

src/main/java/com/xdf/creative/config/xss/SQLFilter.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.xdf.creative.config.xss;
+import com.xdf.creative.enums.StatusCode;
+import com.xdf.creative.support.exception.InfoFormException;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * SQL过滤
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+public class SQLFilter {
+
+    /**
+     * SQL注入过滤
+     * @param str  待验证的字符串
+     */
+    public static String sqlInject(String str) {
+        if (StringUtils.isBlank(str)) {
+            return null;
+        }
+        //转换成小写
+        String value = str.toLowerCase();
+        //非法字符
+        String[] keywords = {"master", "truncate", "insert", "select", "delete",  "alert", "drop"};
+
+        //判断是否包含非法字符
+        for (String keyword : keywords) {
+            if (value.indexOf(keyword) != -1) {
+                throw new InfoFormException(StatusCode.FORM_INFO_CONTENT_FORDATE_VERIFY);
+            }
+        }
+        return str;
+    }
+}

src/main/java/com/xdf/creative/config/xss/XssFilter.java

@@ -1,44 +1,83 @@
-/*
 package com.xdf.creative.config.xss;
 
-*/
 /**
  * @author : lgw
- * @date : 13:28 2020/3/16
- *//*
-
-import org.springframework.stereotype.Component;
+ * @date : 10:21 2020/7/21
+ */
+import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
+import javax.servlet.FilterConfig;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
-*/
-/** * XSS过滤器 * @author Jozz *//*
-
-@WebFilter(filterName="xssFilter",urlPatterns="/*")
 public class XssFilter implements Filter {
+
+    private List<String> excludes = new ArrayList<>();
+
+    private boolean enabled = false;
+
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
+        String strExcludes = filterConfig.getInitParameter("excludes");
+        String strEnabled = filterConfig.getInitParameter("enabled");
+        //将不需要xss过滤的接口添加到列表中
+        if(StringUtils.isNotEmpty(strExcludes)){
+            String[] urls = strExcludes.split(",");
+            for(String url:urls){
+                excludes.add(url);
+            }
+        }
+        if(StringUtils.isNotEmpty(strEnabled)){
+            enabled = Boolean.valueOf(strEnabled);
+        }
+    }
+
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+
+        //如果该访问接口在排除列表里面则不拦截
+        if(isExcludeUrl(request.getServletPath())){
+            filterChain.doFilter(servletRequest,servletResponse);
+            return;
+        }
+        //拦截该url并进行xss过滤
+        XssHttpServletRequestWrapper xssHttpServletRequestWrapper = new XssHttpServletRequestWrapper(request);
+        filterChain.doFilter(xssHttpServletRequestWrapper,servletResponse);
 
     }
+
     @Override
-    public void doFilter(ServletRequest servletRequest,
-                         ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest)servletRequest; String path = request.getServletPath();
-        //由于我的@WebFilter注解配置的是urlPatterns="/*"(过滤所有请求),所以这里对不需要过滤的静态资源url,作忽略处理(大家可以依照具体需求配置)
-        String[] exclusionsUrls = {".js",".gif",".jpg",".png",".css",".ico"};
-        for (String str : exclusionsUrls) {
-            if (path.contains(str)) {
-                filterChain.doFilter(servletRequest,servletResponse);
-                return;
+    public void destroy() {
+
+    }
+
+    private boolean isExcludeUrl(String urlPath){
+        if(!enabled){
+            //如果xss开关关闭了，则所有url都不拦截
+            return true;
+        }
+        if(excludes==null||excludes.isEmpty()){
+            return false;
+        }
+
+        String url = urlPath;
+        for(String pattern:excludes){
+            Pattern p = Pattern.compile("^"+pattern);
+            Matcher m = p.matcher(url);
+            if(m.find()){
+                return true;
             }
         }
-        XssHttpServletRequestWrapper xssRequest = new XssHttpServletRequestWrapper(request);
-        filterChain.doFilter(xssRequest,servletResponse);
+        return false;
     }
-    @Override public void destroy() {
 
-    }
-}*/
+
+
+}

src/main/java/com/xdf/creative/config/xss/XssHttpServletRequestWrapper.java

@@ -8,9 +8,10 @@
 
 package com.xdf.creative.config.xss;
 
-import com.xdf.creative.util.XssUtil;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 
@@ -20,6 +21,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -29,10 +32,9 @@ import java.util.Map;
  * @author Mark sunlightcs@gmail.com
  */
 public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
+    private static final Logger logger = LoggerFactory.getLogger(XssHttpServletRequestWrapper.class);
     //没被包装过的HttpServletRequest（特殊场景，需要自己过滤）
     HttpServletRequest orgRequest;
-    //html过滤
-    private final static HTMLFilter htmlFilter = new HTMLFilter();
 
     public XssHttpServletRequestWrapper(HttpServletRequest request) {
         super(request);
@@ -45,15 +47,11 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
         if(!MediaType.APPLICATION_JSON_VALUE.equalsIgnoreCase(super.getHeader(HttpHeaders.CONTENT_TYPE))){
             return super.getInputStream();
         }
-
         //为空，直接返回
         String json = IOUtils.toString(super.getInputStream(), "utf-8");
         if (StringUtils.isBlank(json)) {
             return super.getInputStream();
         }
-
-
-
         //xss过滤
         json = xssEncode(json);
         final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8"));
@@ -72,7 +70,6 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
             public void setReadListener(ReadListener readListener) {
 
             }
-
             @Override
             public int read() throws IOException {
                 return bis.read();
@@ -95,7 +92,6 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
         if (parameters == null || parameters.length == 0) {
             return null;
         }
-
         for (int i = 0; i < parameters.length; i++) {
             parameters[i] = xssEncode(parameters[i]);
         }
@@ -125,27 +121,26 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
         return value;
     }
 
+
     private String xssEncode(String input) {
-        //return htmlFilter.filter(input);
-        return XssUtil.stripSqlXss(input);
+        return this.stripSqlXss(input);
     }
 
-    /**
-     * 获取最原始的request
-     */
-    public HttpServletRequest getOrgRequest() {
-        return orgRequest;
-    }
 
-    /**
-     * 获取最原始的request
+    /* *
+     * @Description 过滤SQL 和 XSS注入内容
+     * @Param [value]
+     * @Return java.lang.String
      */
-    public static HttpServletRequest getOrgRequest(HttpServletRequest request) {
-        if (request instanceof XssHttpServletRequestWrapper) {
-            return ((XssHttpServletRequestWrapper) request).getOrgRequest();
+    public static String stripSqlXss(String value)  {
+        try {
+            return  URLDecoder.decode(SQLFilter.sqlInject(value),"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
         }
-
-        return request;
+        return "";
     }
 
+
+
 }

src/main/java/com/xdf/creative/enums/ApiCode.java

@@ -51,6 +51,10 @@ public enum ApiCode {
 
     SERVICE_EXCEPTION(5004, "RPC下游服务异常"),
 
+    TYRZ_SERVICE_EXCEPTION(20002, "统一认证登录失效"),
+
+    TYRZ_SERVICE_USER_EXCEPTION(101001, "当前用户名已存在！"),
+
 
     ;
 

src/main/java/com/xdf/creative/enums/DeviceEnum.java

@@ -0,0 +1,30 @@
+
+package com.xdf.creative.enums;
+
+/**
+ * @author DeanYe
+ * @date 2019-10-24
+ **/
+public enum DeviceEnum implements BaseTypeStateEnum {
+    ONE(1, "PC端"),
+    TWO(2, "移动端"),
+   ;
+
+    private Integer key;
+    private String value;
+
+    DeviceEnum(Integer key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    @Override
+    public Integer getKey() {
+        return this.key;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+}

src/main/java/com/xdf/creative/enums/InitiationApplryAduitStateEnum.java

@@ -0,0 +1,29 @@
+package com.xdf.creative.enums;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum InitiationApplryAduitStateEnum {
+    /**
+     * 审核状态  1 待审核  2审核通过  3审核失败
+     */
+    INITIATION_APPLRY_ADUIT_STATE_WAIT(1, "待审核 "),
+    INITIATION_APPLRY_ADUIT_STATE_PASS(2, "审核通过"),
+    INITIATION_APPLRY_ADUIT_STATE_FAILED(3, "审核失败"),
+    INITIATION_APPLRY_ADUIT_STATE_SEND(4, "报送");
+    private Integer code;
+    private String name;
+
+    public static String getNameByCode(Integer code) {
+        for (InitiationApplryAduitStateEnum sysSignState : InitiationApplryAduitStateEnum.values()) {
+            if (sysSignState.code == code) {
+                return sysSignState.name;
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/xdf/creative/enums/InitiationApplryAduitTypeEnum.java

@@ -0,0 +1,28 @@
+package com.xdf.creative.enums;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum InitiationApplryAduitTypeEnum {
+    /**
+     * 提交阶段  1 初审  2 二审 3终审
+     */
+    INITIATION_APPLRY_ADUIT_TYPE_INIT(1, "初审"),
+    INITIATION_APPLRY_ADUIT_TYPE_SECOND(2, "二审"),
+    NITIATION_APPLRY_ADUIT_TYPE_FINAL(3, "终审");
+    private Integer code;
+    private String name;
+
+    public static String getNameByCode(Integer code) {
+        for (InitiationApplryAduitTypeEnum sysSignState : InitiationApplryAduitTypeEnum.values()) {
+            if (sysSignState.code == code) {
+                return sysSignState.name;
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/xdf/creative/enums/LoginTypeEnum.java

@@ -0,0 +1,26 @@
+package com.xdf.creative.enums;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+/**
+ * 类型 1登录成功 2登录失败
+ */
+public enum LoginTypeEnum {
+    LOGIN_TYPE_SUCCESS(1, "WEB用户登录"),
+    LOGIN_TYPE_FAIL(2, "ADMIN用户登录");
+    private Integer code;
+    private String name;
+    public static String getNameByCode(Integer code) {
+        for (LoginTypeEnum organizeTypeEnum : LoginTypeEnum.values()) {
+            if (organizeTypeEnum.code == code) {
+                return organizeTypeEnum.name;
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/xdf/creative/enums/ServiceFileDirEnum.java

@@ -8,36 +8,13 @@ import lombok.Getter;
 @AllArgsConstructor
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum ServiceFileDirEnum {
-    //0 banner 1 动态新闻 2活动 3专项资金 4政策导航 5 其他
+    // 0 banner 101 1 公告信息 102 2文创会动态 103 3行业动态 106 4政策动态 108 5 文化活动activity 109
     SERVICE_FILE_DIR_PUBLIC_BANNER(101, "banner"),
-    //信息发布文件
     SERVICE_FILE_DIR_PUBLIC_NOTICE(102, "notice"),
-    //信息发布文件
     SERVICE_FILE_DIR_PUBLIC_DYNAMIC(103, "dynamic"),
-    //区划信息
-    SERVICE_FILE_DIR_PUBLIC_DIVISION(104, "division"),
-    //园区信息
-    SERVICE_FILE_DIR_PUBLIC_PARK(105, "park"),
-
-    //文创金融
-    SERVICE_FILE_DIR_PUBLIC_FINANCIAL(106, "financial"),
-
-    //品牌活动
-    SERVICE_FILE_DIR_PUBLIC_ACTIVITY(107, "activity"),
-
-    //政策导航
-    SERVICE_FILE_DIR_POLICY(108, "policy"),
-
-    //专项资金
-    SERVICE_FILE_DIR_SUPPORT(110, "support"),
-
-    SERVICE_PARK_FILE_DIR_OTHER(776, "parkFile"),
-
-    SERVICE_PARK_LOGO_DIR_OTHER(777, "parkLogo"),
-
-    SERVICE_PARK_QR_DIR_OTHER(778, "parkQr"),
-
-    SERVICE_PARK_ACTIVITY_DIR_OTHER(888, "parkActivity"),
+    SERVICE_FILE_DIR_PUBLIC_TRADE_DYNAMIC(106, "tradeDynamic"),
+    SERVICE_FILE_DIR_PUBLIC_POLICY(108, "policy"),
+    SERVICE_FILE_DIR_PUBLIC_ACTIVITY(109, "activity"),
     //其他
     SERVICE_FILE_DIR_OTHER(999, "other");
 

src/main/java/com/xdf/creative/enums/StatusCode.java

@@ -20,6 +20,7 @@ public enum StatusCode {
     FORM_AUDIT_FINAL_AUDIT_PASS_VERIFY(000011,"只能操作终审通过的信息！"),
     FORM_INFO_CONTENT_SORT_VERIFY(000012,"请输入排序号！"),
     FORM_INFO_CONTENT_DELETE_VERIFY(000013,"存在信息非法删除！"),
+    FORM_INFO_CONTENT_FORDATE_VERIFY(000014,"存在非法字符信息！"),
 
     FORM_AUTH_UPDATE_VERIFY_ERROR(000006, "存在非法更新！"),
     SMS_SEND_VERIFICATION_CODE_SUCCESS(20000, "短信发送成功"),
@@ -28,6 +29,10 @@ public enum StatusCode {
     SMS_MESSAGE_VERIFICATION_CODE_ERROR(20003, "验证码错误！"),
     WEB_MANAGE_PUBLIC_DETAIL_BODY_NULL(200003001, "正文内容不能为空！"),
 
+    WEB_INITIATION_APPLY_FIRST_AUDIT(200001001, "审核类型不能为空！"),
+    WEB_INITIATION_APPLY_SEND_AUDIT(200001002, "提交数据为空，请重新选择！"),
+    WEB_INITIATION_APPLY_SEND_SUCCESS(200001003, "数据提交完成，其中失败[%s]条！"),
+
 
     SYS_ROLE_EXIST(100001,"角色已存在！"),
     SYS_USER_ROLE_EXIST(100002,"该角色下还存在可用用户，不能删除！"),
@@ -46,7 +51,32 @@ public enum StatusCode {
     WEB_FILE_DIR_PATH_TYPE_ILLEGAL(200004002, "文件目录类型非法！"),
     WEB_FILE_DIR_PATH_CREATE_ERROR(200004003, "文件目录创建失败！"),
     FILE_CL_UPLOAD_FAILED(700102,"文件上传失败，系统未知异常！"),
-    WEB_FILE_UPLOAD_FAILED(200004004, "系统仅支持后缀为.pdf、.doc、.docx、.xls、.xlsx、.ppt、.pptx、.png、.jpg、.txt文件上传！");
+    WEB_FILE_UPLOAD_FAILED(200004004, "系统仅支持后缀为.pdf、.doc、.docx、.xls、.xlsx、.ppt、.pptx、.png、.jpg、.txt文件上传！"),
+
+
+
+    TYRZ_LOGIN_SERVICE_FAILE(10001,"服务不可用！"),
+    TYRZ_LOGIN_OUT_FAILE(10002,"登录已失效！"),
+    TYRZ_LOGIN_PARAMS_FAILE(10003,"参数不全！"),
+    TYRZ_LOGIN_APP_FAILE(10004,"接入系统验证错误！"),
+    TYRZ_LOGIN_APP_VERIFY_FAILE(10005,"非法操作！"),
+    TYRZ_LOGIN_APP_GET_INFO_FAILE(10005,"登录失败，信息不全！"),
+    TYRZ_LOGIN_USER_BOND_VERIFY_FAILE(10006,"当前用户未绑定！"),
+
+    TYRZ_LOGIN_USER_VERIFY_EXIT_FAILE(10008,"系统检测到当前账户已存在，请直接点击绑定账号，进行登录！"),
+
+    TYRZ_LOGIN_USER_INFO_VERIFY_FAILE(10009,"系统检测到您未提交身份认证信息，请先提交园区身份认证信息！"),
+
+
+
+
+
+
+    ;
+
+
+
+
 
 
 

src/main/java/com/xdf/creative/module/controller/CodeController.java

@@ -1,26 +1,24 @@
 package com.xdf.creative.module.controller;
 
-import com.google.code.kaptcha.Constants;
-import com.google.code.kaptcha.Producer;
 import com.xdf.creative.base.params.VerifyCode;
+import com.xdf.creative.constant.CommonConstant;
 import com.xdf.creative.module.service.IVerifyCodeGen;
 import com.xdf.creative.module.service.impl.SimpleCharVerifyCodeGenImpl;
+import com.xdf.creative.util.page.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.imageio.ImageIO;
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author : lgw
@@ -33,56 +31,38 @@ import java.io.IOException;
 @Api("验证吗 API")
 public class CodeController {
 
-        @Autowired
-        private Producer captchaProducer = null;
 
-        private Logger logger = LoggerFactory.getLogger(CodeController.class);
+    private Logger logger = LoggerFactory.getLogger(CodeController.class);
 
- /*       @RequestMapping("/code")
-        public void getKaptchaImage(HttpServletRequest request, HttpServletResponse response) throws Exception {
-            HttpSession session = request.getSession();
-            response.setDateHeader("Expires", 0);
-            response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
-            response.addHeader("Cache-Control", "post-check=0, pre-check=0");
+    @ApiOperation(value = "验证码")
+    @RequestMapping("/code")
+    public ApiResult verifyCode(HttpServletRequest request, HttpServletResponse response) {
+        IVerifyCodeGen iVerifyCodeGen = new SimpleCharVerifyCodeGenImpl();
+            //设置长宽
+        VerifyCode verifyCode = null;
+        try {
+            verifyCode = iVerifyCodeGen.generate(100, 50);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        String code = verifyCode.getCode();
+            logger.info(code);
+            //将VerifyCode绑定session
+            request.getSession().setAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY, code);
+            //设置响应头
             response.setHeader("Pragma", "no-cache");
+            //设置响应头
+            response.setHeader("Cache-Control", "no-cache");
+            //在代理服务器端防止缓冲
+            response.setDateHeader("Expires", 0);
+            //设置响应内容类型
             response.setContentType("image/jpeg");
-            //生成验证码
-            String capText = captchaProducer.createText();
-            session.setAttribute(Constants.KAPTCHA_SESSION_KEY, capText);
-            //向客户端写出
-            BufferedImage bi = captchaProducer.createImage(capText);
-            ServletOutputStream out = response.getOutputStream();
-            ImageIO.write(bi, "jpg", out);
-            try {
-                out.flush();
-            } finally {
-                out.close();
-            }
-        }*/
+            // response.getOutputStream().write(verifyCode.getImgBytes());
 
-        @ApiOperation(value = "验证码")
-        @RequestMapping("/code")
-        public void verifyCode(HttpServletRequest request, HttpServletResponse response) {
-            IVerifyCodeGen iVerifyCodeGen = new SimpleCharVerifyCodeGenImpl();
-            try {
-                //设置长宽
-                VerifyCode verifyCode = iVerifyCodeGen.generate(100, 50);
-                String code = verifyCode.getCode();
-                logger.info(code);
-                //将VerifyCode绑定session
-                request.getSession().setAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY, code);
-                //设置响应头
-                response.setHeader("Pragma", "no-cache");
-                //设置响应头
-                response.setHeader("Cache-Control", "no-cache");
-                //在代理服务器端防止缓冲
-                response.setDateHeader("Expires", 0);
-                //设置响应内容类型
-                response.setContentType("image/jpeg");
-                response.getOutputStream().write(verifyCode.getImgBytes());
-                response.getOutputStream().flush();
-            } catch (IOException e) {
-                logger.info("", e);
-            }
-        }
-    }
+            String base64 = Base64.getEncoder().encodeToString(verifyCode.getImgBytes());
+            Map<String, Object> map = new HashMap<>(2);
+            map.put(CommonConstant.IMAGE, CommonConstant.BASE64_PREFIX + base64);
+            return ApiResult.ok(map);
+
+    }
+}

src/main/java/com/xdf/creative/module/controller/DtActivityAttachmentController.java

@@ -1,90 +0,0 @@
-package com.xdf.creative.module.controller;
-
-import com.xdf.creative.base.controller.BaseController;
-import com.xdf.creative.base.params.IdParam;
-import com.xdf.creative.base.params.dt.DtActivityAttachmentQueryParam;
-import com.xdf.creative.base.vo.dt.DtActivityAttachmentQueryVo;
-import com.xdf.creative.module.entity.DtActivityAttachment;
-import com.xdf.creative.module.service.DtActivityAttachmentService;
-import com.xdf.creative.util.page.ApiResult;
-import com.xdf.creative.util.page.PageTool;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- * 园区活动板块附件 前端控制器
- * </p>
- *
- * @author lgw
- * @since 2020-04-09
- */
-@Slf4j
-@RestController
-@RequestMapping("/dtActivityAttachment")
-@Api("园区活动板块附件 API")
-public class DtActivityAttachmentController extends BaseController {
-
-    @Autowired
-    private DtActivityAttachmentService dtActivityAttachmentService;
-
-    /**
-     * 添加园区活动板块附件
-     */
-    @PostMapping("/add")
-    @ApiOperation(value = "添加DtActivityAttachment对象", notes = "添加园区活动板块附件", response = ApiResult.class)
-    public ApiResult<Boolean> addDtActivityAttachment(@Valid @RequestBody DtActivityAttachment dtActivityAttachment) throws Exception {
-        boolean flag = dtActivityAttachmentService.save(dtActivityAttachment);
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 修改园区活动板块附件
-     */
-    @PostMapping("/update")
-    @ApiOperation(value = "修改DtActivityAttachment对象", notes = "修改园区活动板块附件", response = ApiResult.class)
-    public ApiResult<Boolean> updateDtActivityAttachment(@Valid @RequestBody DtActivityAttachment dtActivityAttachment) throws Exception {
-        boolean flag = dtActivityAttachmentService.updateById(dtActivityAttachment);
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 删除园区活动板块附件
-     */
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除DtActivityAttachment对象", notes = "删除园区活动板块附件", response = ApiResult.class)
-    public ApiResult<Boolean> deleteDtActivityAttachment(@Valid @RequestBody IdParam idParam) throws Exception {
-        boolean flag = dtActivityAttachmentService.removeById(idParam.getId());
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 获取园区活动板块附件
-     */
-    @PostMapping("/info")
-    @ApiOperation(value = "获取DtActivityAttachment对象详情", notes = "查看园区活动板块附件", response = DtActivityAttachmentQueryVo.class)
-    public ApiResult<DtActivityAttachmentQueryVo> getDtActivityAttachment(@Valid @RequestBody IdParam idParam) throws Exception {
-        DtActivityAttachmentQueryVo dtActivityAttachmentQueryVo = dtActivityAttachmentService.getDtActivityAttachmentById(idParam.getId());
-        return ApiResult.ok(dtActivityAttachmentQueryVo);
-    }
-
-    /**
-     * 园区活动板块附件分页列表
-     */
-    @PostMapping("/getPageList")
-    @ApiOperation(value = "获取DtActivityAttachment分页列表", notes = "园区活动板块附件分页列表", response = DtActivityAttachmentQueryVo.class)
-    public ApiResult<PageTool<DtActivityAttachmentQueryVo>> getDtActivityAttachmentPageList(@Valid @RequestBody DtActivityAttachmentQueryParam dtActivityAttachmentQueryParam) throws Exception {
-        PageTool<DtActivityAttachmentQueryVo> pageList = dtActivityAttachmentService.getDtActivityAttachmentPageList(dtActivityAttachmentQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-}
-

src/main/java/com/xdf/creative/module/controller/DtEnterCompanyController.java

@@ -1,117 +0,0 @@
-package com.xdf.creative.module.controller;
-
-import com.xdf.creative.base.controller.BaseController;
-import com.xdf.creative.base.params.IdParam;
-import com.xdf.creative.base.params.dt.DtEnterCompanyQueryParam;
-import com.xdf.creative.base.vo.creative.DtEnterCompanyQueryVo;
-import com.xdf.creative.module.entity.DtEnterCompany;
-import com.xdf.creative.module.service.DtEnterCompanyService;
-import com.xdf.creative.util.page.ApiResult;
-import com.xdf.creative.util.page.PageTool;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author lgw
- * @since 2020-05-11
- */
-@Slf4j
-@RestController
-@RequestMapping("/dtEnterCompany")
-@Api("API")
-public class DtEnterCompanyController extends BaseController {
-
-    @Autowired
-    private DtEnterCompanyService dtEnterCompanyService;
-
-
-    /**
-     * 清理数据
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("/cleanParkCompany")
-    @ApiOperation(value = "清理数据DtEnterCompany对象", notes = "清理数据", response = ApiResult.class)
-    public ApiResult  cleanParkCompany() throws Exception {
-        return dtEnterCompanyService.cleanParkCompany();
-    }
-
-
-    /**
-     * 添加
-     */
-    @PostMapping("/add")
-    @ApiOperation(value = "添加DtEnterCompany对象", notes = "添加", response = ApiResult.class)
-    public ApiResult<Boolean> addDtEnterCompany(@Valid @RequestBody DtEnterCompany dtEnterCompany) throws Exception {
-        boolean flag = dtEnterCompanyService.save(dtEnterCompany);
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 修改
-     */
-    @PostMapping("/update")
-    @ApiOperation(value = "修改DtEnterCompany对象", notes = "修改", response = ApiResult.class)
-    public ApiResult<Boolean> updateDtEnterCompany(@Valid @RequestBody DtEnterCompany dtEnterCompany) throws Exception {
-        boolean flag = dtEnterCompanyService.updateById(dtEnterCompany);
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除DtEnterCompany对象", notes = "删除", response = ApiResult.class)
-    public ApiResult<Boolean> deleteDtEnterCompany(@Valid @RequestBody IdParam idParam) throws Exception {
-        boolean flag = dtEnterCompanyService.removeById(idParam.getId());
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 获取
-     */
-    @PostMapping("/info")
-    @ApiOperation(value = "获取DtEnterCompany对象详情", notes = "查看", response = DtEnterCompanyQueryVo.class)
-    public ApiResult<DtEnterCompanyQueryVo> getDtEnterCompany(@Valid @RequestBody IdParam idParam) throws Exception {
-        DtEnterCompanyQueryVo dtEnterCompanyQueryVo = dtEnterCompanyService.getDtEnterCompanyById(idParam.getId());
-        return ApiResult.ok(dtEnterCompanyQueryVo);
-    }
-
-    /**
-     * 分页列表
-     */
-    @PostMapping("/getPageList")
-    @ApiOperation(value = "获取DtEnterCompany分页列表", notes = "分页列表", response = DtEnterCompanyQueryVo.class)
-    public ApiResult<PageTool<DtEnterCompanyQueryVo>> getDtEnterCompanyPageList(@RequestBody DtEnterCompanyQueryParam dtEnterCompanyQueryParam) throws Exception {
-        PageTool<DtEnterCompanyQueryVo> pageList = dtEnterCompanyService.getDtEnterCompanyPageList(dtEnterCompanyQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-    @PostMapping("/getUserList")
-    @ApiOperation(value = "获取DtEnterCompany分页列表", notes = "分页列表", response = DtEnterCompanyQueryVo.class)
-    public ApiResult<PageTool<DtEnterCompanyQueryVo>> getDtEnterCompanyUserList(@RequestBody DtEnterCompanyQueryParam dtEnterCompanyQueryParam) throws Exception {
-        PageTool<DtEnterCompanyQueryVo> pageList = dtEnterCompanyService.getDtEnterCompanyUserList(dtEnterCompanyQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-    @PostMapping("/getHomeList")
-    @ApiOperation(value = "获取DtEnterCompany分页列表", notes = "分页列表", response = DtEnterCompanyQueryVo.class)
-    public ApiResult<PageTool<DtEnterCompanyQueryVo>> getDtEnterCompanyHomeList(@RequestBody DtEnterCompanyQueryParam dtEnterCompanyQueryParam) throws Exception {
-        if(null==dtEnterCompanyQueryParam.getOrgParkId()){
-            return ApiResult.fail("请选择园区！");
-        }
-        PageTool<DtEnterCompanyQueryVo> pageList = dtEnterCompanyService.getDtEnterCompanyHomeList(dtEnterCompanyQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-}
-

src/main/java/com/xdf/creative/module/controller/DtInfoAuditController.java

@@ -1,95 +0,0 @@
-package com.xdf.creative.module.controller;
-
-import com.xdf.creative.base.controller.BaseController;
-import com.xdf.creative.base.params.IdParam;
-import com.xdf.creative.base.params.dt.DtInfoAuditBackParam;
-import com.xdf.creative.base.params.dt.DtInfoAuditQueryAuiditParam;
-import com.xdf.creative.base.params.dt.DtInfoAuditQueryParam;
-import com.xdf.creative.base.vo.dt.DtInfoAuditBackVo;
-import com.xdf.creative.base.vo.dt.DtInfoAuditQueryVo;
-import com.xdf.creative.module.entity.DtInfoAudit;
-import com.xdf.creative.module.service.DtInfoAuditService;
-import com.xdf.creative.support.aop.OperateLogger;
-import com.xdf.creative.util.page.ApiResult;
-import com.xdf.creative.util.page.PageTool;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- * 基本信息审核表 前端控制器
- * </p>
- *
- * @author lgw
- * @since 2020-04-09
- */
-@Slf4j
-@RestController
-@RequestMapping("/dtInfoAudit")
-@Api("基本信息审核表 API")
-public class DtInfoAuditController extends BaseController {
-
-    @Autowired
-    private DtInfoAuditService dtInfoAuditService;
-
-
-
-    /**
-     * 获取审核基本信息（进入企业基本信息调用接口）
-     */
-    @PostMapping("/getOrganizeAuditInfo")
-    @ApiOperation(value = "获取审核基本信息", notes = "获取审核基本信息（进入企业基本信息调用接口）", response = ApiResult.class)
-    public ApiResult getOrganizeAuditInfo() throws Exception {
-        return dtInfoAuditService.getOrganizeAuditInfo();
-    }
-    /**
-     *提交审核基本信息
-     */
-    @PostMapping("/submitAuditInfo")
-    @ApiOperation(value = "提交审核基本信息", notes = "提交审核基本信息", response = ApiResult.class)
-    public ApiResult submitAuditInfo() throws Exception {
-        return dtInfoAuditService.submitAuditInfo();
-    }
-    /**
-     * 审核基本信息
-     */
-    @PostMapping("/auditInfo")
-    @ApiOperation(value = "修改DtInfoAudit对象", notes = "审核基本信息", response = ApiResult.class)
-    @OperateLogger(name = "审核自主信息",attributeId="id",attributeName="organizeId")
-    public ApiResult  auditInfo(@Valid @RequestBody DtInfoAuditQueryAuiditParam dtInfoAuditQueryAuiditParam) throws Exception {
-        return dtInfoAuditService.auditInfo(dtInfoAuditQueryAuiditParam);
-    }
-
-
-    /**
-     * 后台审核自主信息列表
-     */
-    @PostMapping("/getAuditPageList")
-    @ApiOperation(value = "获取DtInfoAudit分页列表", notes = "基本信息审核表分页列表", response = DtInfoAuditQueryVo.class)
-    public ApiResult<PageTool<DtInfoAuditBackVo>> getAuditPageList(@Valid @RequestBody DtInfoAuditBackParam dtInfoAuditBackParam) throws Exception {
-        PageTool<DtInfoAuditBackVo> pageList = dtInfoAuditService.getAuditPageList(dtInfoAuditBackParam);
-        return ApiResult.ok(pageList);
-    }
-
-
-
-    /**
-     * 基本信息审核表分页列表
-     */
-    @PostMapping("/getPageList")
-    @ApiOperation(value = "获取DtInfoAudit分页列表", notes = "基本信息审核表分页列表", response = DtInfoAuditQueryVo.class)
-    public ApiResult<PageTool<DtInfoAuditQueryVo>> getDtInfoAuditPageList(@Valid @RequestBody DtInfoAuditQueryParam dtInfoAuditQueryParam) throws Exception {
-        PageTool<DtInfoAuditQueryVo> pageList = dtInfoAuditService.getDtInfoAuditPageList(dtInfoAuditQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-}
-

src/main/java/com/xdf/creative/module/controller/DtParkActivityController.java

@@ -1,118 +0,0 @@
-package com.xdf.creative.module.controller;
-
-import com.xdf.creative.base.controller.BaseController;
-import com.xdf.creative.base.params.IdParam;
-import com.xdf.creative.base.params.dt.DtParkActivitWebParam;
-import com.xdf.creative.base.params.dt.DtParkActivityAddParam;
-import com.xdf.creative.base.params.dt.DtParkActivityQueryParam;
-import com.xdf.creative.base.params.dt.DtParkActivityUpdateParam;
-import com.xdf.creative.base.vo.dt.DtParkActivityQueryVo;
-import com.xdf.creative.base.vo.dt.DtParkActivityWebVo;
-import com.xdf.creative.module.entity.DtParkActivity;
-import com.xdf.creative.module.service.DtParkActivityService;
-import com.xdf.creative.util.page.ApiResult;
-import com.xdf.creative.util.page.PageTool;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- * 园区活动 前端控制器
- * </p>
- *
- * @author lgw
- * @since 2020-04-09
- */
-@Slf4j
-@RestController
-@RequestMapping("/dtParkActivity")
-@Api("园区活动 API")
-public class DtParkActivityController extends BaseController {
-
-    @Autowired
-    private DtParkActivityService dtParkActivityService;
-
-
-    /**
-     * 增加园区活动
-     * @param dtParkActivityAddParam
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("/addParkActivity")
-    @ApiOperation(value = "添加DtParkActivity对象", notes = "添加园区活动", response = ApiResult.class)
-    public ApiResult<Boolean> addParkActivity(@Valid @RequestBody DtParkActivityAddParam dtParkActivityAddParam) throws Exception {
-        return  dtParkActivityService.addParkActivity(dtParkActivityAddParam);
-    }
-
-
-    /**
-     * 修改园区活动
-     * @param dtParkActivityUpdateParam
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("/updateParkActivity")
-    @ApiOperation(value = "添加DtParkActivity对象", notes = "添加园区活动", response = ApiResult.class)
-    public ApiResult<Boolean> updateParkActivity(@Valid @RequestBody DtParkActivityUpdateParam dtParkActivityUpdateParam) throws Exception {
-        return dtParkActivityService.updateParkActivity(dtParkActivityUpdateParam);
-    }
-
-
-    /**
-     * 获取园区活动详情
-     */
-    @PostMapping("/getParkActivityInfo")
-    @ApiOperation(value = "获取DtParkActivity对象详情", notes = "查看园区活动", response = DtParkActivityQueryVo.class)
-    public ApiResult getParkActivityInfo(@Valid @RequestBody IdParam idParam) throws Exception {
-        return dtParkActivityService.getParkActivityInfo(idParam.getId());
-    }
-
-
-
-    /**
-     * 园区首页活动分页列表
-     */
-    @PostMapping("/getWebPageList")
-    @ApiOperation(value = "获取DtParkActivity分页列表", notes = "园区活动分页列表", response = DtParkActivityWebVo.class)
-    public ApiResult<PageTool<DtParkActivityWebVo>> getWebPageList(@Valid @RequestBody DtParkActivitWebParam dtParkActivitWebParam) throws Exception {
-        PageTool<DtParkActivityWebVo> pageList = dtParkActivityService.getWebPageList(dtParkActivitWebParam);
-        return ApiResult.ok(pageList);
-    }
-
-
-    /**
-     * 园区活动用户发布列表
-     */
-    @PostMapping("/getUserPageList")
-    @ApiOperation(value = "获取DtParkActivity分页列表", notes = "园区活动分页列表", response = DtParkActivityWebVo.class)
-    public ApiResult<PageTool<DtParkActivityWebVo>> getUserPageList(@Valid @RequestBody DtParkActivitWebParam dtParkActivitWebParam) throws Exception {
-        PageTool<DtParkActivityWebVo> pageList = dtParkActivityService.getUserPageList(dtParkActivitWebParam);
-        return ApiResult.ok(pageList);
-    }
-
-
-
-
-
-
-    /**
-     * 园区活动分页列表
-     */
-    @PostMapping("/getPageList")
-    @ApiOperation(value = "获取DtParkActivity分页列表", notes = "园区活动分页列表", response = DtParkActivityQueryVo.class)
-    public ApiResult<PageTool<DtParkActivityQueryVo>> getDtParkActivityPageList(@Valid @RequestBody DtParkActivityQueryParam dtParkActivityQueryParam) throws Exception {
-        PageTool<DtParkActivityQueryVo> pageList = dtParkActivityService.getDtParkActivityPageList(dtParkActivityQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-}
-

src/main/java/com/xdf/creative/module/controller/DtParkCompanyController.java

@@ -1,89 +0,0 @@
-package com.xdf.creative.module.controller;
-
-import com.xdf.creative.base.controller.BaseController;
-import com.xdf.creative.base.params.IdParam;
-import com.xdf.creative.base.params.dt.DtParkCompanyQueryParam;
-import com.xdf.creative.base.vo.dt.DtParkCompanyQueryVo;
-import com.xdf.creative.module.entity.DtParkCompany;
-import com.xdf.creative.module.service.DtParkCompanyService;
-import com.xdf.creative.util.page.ApiResult;
-import com.xdf.creative.util.page.PageTool;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- * 园区企业申诉文件 前端控制器
- * </p>
- *
- * @author lgw
- * @since 2020-04-20
- */
-@Slf4j
-@RestController
-@RequestMapping("/dtParkCompany")
-@Api("园区企业申诉文件 API")
-public class DtParkCompanyController extends BaseController {
-
-    @Autowired
-    private DtParkCompanyService dtParkCompanyService;
-
-    /**
-     * 添加园区企业申诉文件
-     */
-    @PostMapping("/add")
-    @ApiOperation(value = "添加DtParkCompany对象", notes = "添加园区企业申诉文件", response = ApiResult.class)
-    public ApiResult  add(@Valid @RequestBody DtParkCompany dtParkCompany) throws Exception {
-        return dtParkCompanyService.add(dtParkCompany);
-    }
-
-    /**
-     * 修改园区企业申诉文件
-     */
-    @PostMapping("/update")
-    @ApiOperation(value = "修改DtParkCompany对象", notes = "修改园区企业申诉文件", response = ApiResult.class)
-    public ApiResult<Boolean> updateDtParkCompany(@Valid @RequestBody DtParkCompany dtParkCompany) throws Exception {
-        boolean flag = dtParkCompanyService.updateById(dtParkCompany);
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 删除园区企业申诉文件
-     */
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除DtParkCompany对象", notes = "删除园区企业申诉文件", response = ApiResult.class)
-    public ApiResult<Boolean> deleteDtParkCompany(@Valid @RequestBody IdParam idParam) throws Exception {
-        boolean flag = dtParkCompanyService.removeById(idParam.getId());
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 获取园区企业申诉文件
-     */
-    @PostMapping("/info")
-    @ApiOperation(value = "获取DtParkCompany对象详情", notes = "查看园区企业申诉文件", response = DtParkCompanyQueryVo.class)
-    public ApiResult<DtParkCompanyQueryVo> getDtParkCompany(@Valid @RequestBody IdParam idParam) throws Exception {
-        DtParkCompanyQueryVo dtParkCompanyQueryVo = dtParkCompanyService.getDtParkCompanyById(idParam.getId());
-        return ApiResult.ok(dtParkCompanyQueryVo);
-    }
-
-    /**
-     * 园区企业申诉文件分页列表
-     */
-    @PostMapping("/getPageList")
-    @ApiOperation(value = "获取DtParkCompany分页列表", notes = "园区企业申诉文件分页列表", response = DtParkCompanyQueryVo.class)
-    public ApiResult<PageTool<DtParkCompanyQueryVo>> getDtParkCompanyPageList(@Valid @RequestBody DtParkCompanyQueryParam dtParkCompanyQueryParam) throws Exception {
-        PageTool<DtParkCompanyQueryVo> pageList = dtParkCompanyService.getDtParkCompanyPageList(dtParkCompanyQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-}
-

src/main/java/com/xdf/creative/module/controller/DtParkInfoDraftController.java

@@ -1,122 +0,0 @@
-package com.xdf.creative.module.controller;
-
-import com.xdf.creative.base.controller.BaseController;
-import com.xdf.creative.base.params.IdParam;
-import com.xdf.creative.base.params.dt.DtParkInfoDraftQueryParam;
-import com.xdf.creative.base.params.dt.DtParkInfoDraftUpdateParam;
-import com.xdf.creative.base.vo.dt.DtParkInfoDraftQueryVo;
-import com.xdf.creative.module.entity.DtParkInfoDraft;
-import com.xdf.creative.module.service.DtParkInfoDraftService;
-import com.xdf.creative.util.page.ApiResult;
-import com.xdf.creative.util.page.PageTool;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- * 园区表_syr made 前端控制器
- * </p>
- *
- * @author lgw
- * @since 2020-04-09
- */
-@Slf4j
-@RestController
-@RequestMapping("/dtParkInfoDraft")
-@Api("园区表_syr made API")
-public class DtParkInfoDraftController extends BaseController {
-
-    @Autowired
-    private DtParkInfoDraftService dtParkInfoDraftService;
-
-
-
-    /**
-     * 修改园区本地未发布信息
-     */
-    @PostMapping("/updateParkInfoDraf")
-    @ApiOperation(value = "修改DtParkInfoDraft对象", notes = "修改园区表_syr made", response = ApiResult.class)
-    public ApiResult  updateParkInfoDraf(@Valid @RequestBody DtParkInfoDraftUpdateParam dtParkInfoDraftUpdateParam) throws Exception {
-        return dtParkInfoDraftService.updateParkInfoDraf(dtParkInfoDraftUpdateParam);
-    }
-
-
-    /**
-     * 获取本地修改园区基本信息
-     * @param
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("/getParkDraf")
-    @ApiOperation(value = "获取DtParkInfoDraft对象详情", notes = "查看园区表_syr made", response = DtParkInfoDraftQueryVo.class)
-    public ApiResult getParkDraf(@Valid @RequestBody IdParam idParam) throws Exception {
-        return dtParkInfoDraftService.getParkDraf(idParam.getId());
-    }
-
-
-
-
-
-
-
-
-    /**
-     * 添加园区表_syr made
-     */
-    @PostMapping("/add")
-    @ApiOperation(value = "添加DtParkInfoDraft对象", notes = "添加园区表_syr made", response = ApiResult.class)
-    public ApiResult<Boolean> addDtParkInfoDraft(@Valid @RequestBody DtParkInfoDraft dtParkInfoDraft) throws Exception {
-        boolean flag = dtParkInfoDraftService.save(dtParkInfoDraft);
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 修改园区表_syr made
-     */
-    @PostMapping("/update")
-    @ApiOperation(value = "修改DtParkInfoDraft对象", notes = "修改园区表_syr made", response = ApiResult.class)
-    public ApiResult<Boolean> updateDtParkInfoDraft(@Valid @RequestBody DtParkInfoDraft dtParkInfoDraft) throws Exception {
-        boolean flag = dtParkInfoDraftService.updateById(dtParkInfoDraft);
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 删除园区表_syr made
-     */
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除DtParkInfoDraft对象", notes = "删除园区表_syr made", response = ApiResult.class)
-    public ApiResult<Boolean> deleteDtParkInfoDraft(@Valid @RequestBody IdParam idParam) throws Exception {
-        boolean flag = dtParkInfoDraftService.removeById(idParam.getId());
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 获取园区表_syr made
-     */
-    @PostMapping("/info")
-    @ApiOperation(value = "获取DtParkInfoDraft对象详情", notes = "查看园区表_syr made", response = DtParkInfoDraftQueryVo.class)
-    public ApiResult<DtParkInfoDraftQueryVo> getDtParkInfoDraft(@Valid @RequestBody IdParam idParam) throws Exception {
-        DtParkInfoDraftQueryVo dtParkInfoDraftQueryVo = dtParkInfoDraftService.getDtParkInfoDraftById(idParam.getId());
-        return ApiResult.ok(dtParkInfoDraftQueryVo);
-    }
-
-    /**
-     * 园区表_syr made分页列表
-     */
-    @PostMapping("/getPageList")
-    @ApiOperation(value = "获取DtParkInfoDraft分页列表", notes = "园区表_syr made分页列表", response = DtParkInfoDraftQueryVo.class)
-    public ApiResult<PageTool<DtParkInfoDraftQueryVo>> getDtParkInfoDraftPageList(@Valid @RequestBody DtParkInfoDraftQueryParam dtParkInfoDraftQueryParam) throws Exception {
-        PageTool<DtParkInfoDraftQueryVo> pageList = dtParkInfoDraftService.getDtParkInfoDraftPageList(dtParkInfoDraftQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-}
-

src/main/java/com/xdf/creative/module/controller/DtUploadCompanyController.java

@@ -1,93 +0,0 @@
-package com.xdf.creative.module.controller;
-
-import com.xdf.creative.base.controller.BaseController;
-import com.xdf.creative.base.params.IdParam;
-import com.xdf.creative.base.params.dt.DtUploadCompanyQueryParam;
-import com.xdf.creative.base.vo.dt.DtUploadCompanyQueryVo;
-import com.xdf.creative.module.entity.DtUploadCompany;
-import com.xdf.creative.module.service.DtUploadCompanyService;
-import com.xdf.creative.util.page.ApiResult;
-import com.xdf.creative.util.page.PageTool;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- * 企业上传 前端控制器
- * </p>
- *
- * @author lgw
- * @since 2020-05-07
- */
-@Slf4j
-@RestController
-@RequestMapping("/dtUploadCompany")
-@Api("企业上传 API")
-public class DtUploadCompanyController extends BaseController {
-
-    @Autowired
-    private DtUploadCompanyService dtUploadCompanyService;
-
-    /**
-     * 添加企业上传
-     */
-    @PostMapping("/add")
-    @ApiOperation(value = "添加DtUploadCompany对象", notes = "添加企业上传", response = ApiResult.class)
-    public ApiResult<Boolean> addDtUploadCompany(@Valid @RequestBody DtUploadCompany dtUploadCompany) throws Exception {
-        boolean flag = dtUploadCompanyService.save(dtUploadCompany);
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 修改企业上传
-     */
-    @PostMapping("/update")
-    @ApiOperation(value = "修改DtUploadCompany对象", notes = "修改企业上传", response = ApiResult.class)
-    public ApiResult<Boolean> updateDtUploadCompany(@Valid @RequestBody DtUploadCompany dtUploadCompany) throws Exception {
-        boolean flag = dtUploadCompanyService.updateById(dtUploadCompany);
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 删除企业上传
-     */
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除DtUploadCompany对象", notes = "删除企业上传", response = ApiResult.class)
-    public ApiResult<Boolean> deleteDtUploadCompany(@Valid @RequestBody IdParam idParam) throws Exception {
-        boolean flag = dtUploadCompanyService.removeById(idParam.getId());
-        return ApiResult.result(flag);
-    }
-
-    /**
-     * 获取企业上传
-     */
-    @PostMapping("/info")
-    @ApiOperation(value = "获取DtUploadCompany对象详情", notes = "查看企业上传", response = DtUploadCompanyQueryVo.class)
-    public ApiResult<DtUploadCompanyQueryVo> getDtUploadCompany(@Valid @RequestBody IdParam idParam) throws Exception {
-        DtUploadCompanyQueryVo dtUploadCompanyQueryVo = dtUploadCompanyService.getDtUploadCompanyById(idParam.getId());
-        return ApiResult.ok(dtUploadCompanyQueryVo);
-    }
-
-    /**
-     * 企业上传分页列表
-     */
-    @PostMapping("/getPageList")
-    @ApiOperation(value = "获取DtUploadCompany分页列表", notes = "企业上传分页列表", response = DtUploadCompanyQueryVo.class)
-    public ApiResult<PageTool<DtUploadCompanyQueryVo>> getDtUploadCompanyPageList(@RequestBody DtUploadCompanyQueryParam dtUploadCompanyQueryParam) throws Exception {
-        PageTool<DtUploadCompanyQueryVo> pageList = dtUploadCompanyService.getDtUploadCompanyPageList(dtUploadCompanyQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-
-
-
-}
-

src/main/java/com/xdf/creative/module/controller/FileUploadController.java

@@ -1,13 +1,10 @@
 package com.xdf.creative.module.controller;
 
 
-import com.xdf.creative.base.params.DtUploadCompanyDescript;
 import com.xdf.creative.enums.ApiCode;
 import com.xdf.creative.enums.ServiceFileUploadTypeEnum;
 import com.xdf.creative.enums.StatusCode;
-import com.xdf.creative.module.entity.DtUploadCompany;
 import com.xdf.creative.module.entity.FileUploadQuery;
-import com.xdf.creative.module.service.DtUploadCompanyService;
 import com.xdf.creative.module.service.FileClientService;
 import com.xdf.creative.util.StringUtil;
 import com.xdf.creative.util.UUIDUtil;
@@ -23,9 +20,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Slf4j
 @RestController
 @RequestMapping("/upload")
@@ -37,9 +31,6 @@ public class FileUploadController {
     @Autowired
     private FileClientService fileClientService;
 
-    @Autowired
-    private DtUploadCompanyService dtUploadCompanyService;
-
     /**
      * 上传文件
      *
@@ -67,8 +58,8 @@ public class FileUploadController {
 
         //检测excel是否符合要求
         ApiResult rs = ExcelUtil.importExcel(file);
-        if(ApiCode.SUCCESS.getCode()!=rs.getCode()){
-            return  rs;
+        if (ApiCode.SUCCESS.getCode() != rs.getCode()) {
+            return rs;
         }
 
         String finalPath = ServerUploadDirUtil.getFileUploadDir(uploadPath);
@@ -120,15 +111,14 @@ public class FileUploadController {
     }
 
 
-
     @RequestMapping(value = "/getFileByte")
     public ApiResult getFileByte(@RequestBody FileUploadQuery fileUploadQuery) {
         try {
             String uploadPath = fileUploadQuery.getUploadPath();
-            if(StringUtil.isEmpty(uploadPath)){
+            if (StringUtil.isEmpty(uploadPath)) {
                 return ApiResult.fail("图片地址不能为空！");
             }
-            String encode = FileToBase64.encodeBase64File(basePath+uploadPath);
+            String encode = FileToBase64.encodeBase64File(basePath + uploadPath);
             return ApiResult.ok(encode);
         } catch (Exception e) {
             return ApiResult.fail("文件读取失败！");
@@ -136,8 +126,6 @@ public class FileUploadController {
     }
 
 
-
-
     /**
      * 获取随机ID
      */
@@ -147,16 +135,4 @@ public class FileUploadController {
     }
 
 
-    /**
-     * excle导入更新
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("/importCompany")
-    @ApiOperation(value = "添加MultipartFile对象", notes = "添加图片上传", response = ApiResult.class)
-    public ApiResult<String> importCompany(MultipartFile file) throws Exception {
-        List<DtUploadCompanyDescript> dtoList =new ExcelUtil().readExcelFileToDTO(file, DtUploadCompanyDescript.class);
-        return dtUploadCompanyService.addCompanyByExcel(dtoList);
-    }
 }

src/main/java/com/xdf/creative/module/controller/LoginController.java

@@ -0,0 +1,158 @@
+/*
+package com.xdf.creative.module.controller;
+
+import com.alibaba.fastjson.JSONException;
+import com.xdf.creative.enums.ApiCode;
+import com.xdf.creative.enums.LoginTypeEnum;
+import com.xdf.creative.module.service.OauthTokenService;
+import com.xdf.creative.shiro.jwt.JwtUtil;
+import com.xdf.creative.util.CookieUtils;
+import com.xdf.creative.util.StringUtil;
+import com.xdf.creative.util.page.ApiResult;
+import org.jasig.cas.client.util.AbstractCasFilter;
+import org.jasig.cas.client.validation.Assertion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
+@Controller
+public class LoginController {
+
+
+    @Value("${cas.server-url-prefix}")
+    private String CAS_URL;
+
+    @Value("${cas.client-host-url}")
+    private String APP_URL;
+
+    @Value("${client-host-logout-url}")
+    private String APP_OUT_URL;
+
+    @Value("${client-host-logout-back-url}")
+    private String APP_BACK_OUT_URL;
+
+    @Value("${client-host-home-url}")
+    private String APP_HOME_URL;
+
+
+    @Autowired
+    private OauthTokenService oauthTokenService;
+
+    private Logger log = LoggerFactory.getLogger(LoginController.class);
+
+
+    @GetMapping("/loginIndex")
+    @ResponseBody
+    public ApiResult loginIndex(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        String loginUrl = request.getParameter("loginUrl");
+        HttpSession session = request.getSession(false);
+        String userType = "";
+        if (null != session) {
+            Assertion assertion = (Assertion) session.getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION);
+            if (assertion != null) {
+                userType = (String) assertion.getPrincipal().getAttributes().get("user_type");
+            }
+        }
+        log.error("login:" + CookieUtils.getCookie(request, "JSESSIONID"));
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Headers", "x-requested-with,content-type");
+        response.sendRedirect(CAS_URL + "?service=" + loginUrl + */
+/*"?jsessionid=" + jsonId+*//*
+"?loginType=" + userType);
+        return ApiResult.ok();
+    }
+
+
+    @GetMapping("/loginHome")
+    @ResponseBody
+    public ApiResult loginHome(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        HttpSession session = request.getSession(false);
+        String userType = "";
+        if (null != session) {
+            Assertion assertion = (Assertion) session.getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION);
+            if (assertion != null) {
+                userType = (String) assertion.getPrincipal().getAttributes().get("user_type");
+            }
+        }
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Headers", "x-requested-with,content-type");
+        response.sendRedirect(response.encodeRedirectURL(CAS_URL + "?service=" + APP_HOME_URL + */
+/*"?jsessionid=" + jsonId+*//*
+"?loginType=" + userType));
+        return ApiResult.ok();
+    }
+
+
+    @GetMapping("/index")
+    @ResponseBody
+    public ApiResult index(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        request.getSession(true);
+        return ApiResult.ok();
+    }
+
+
+    @GetMapping("/validate")
+    @ResponseBody
+    public ApiResult validate(HttpServletRequest request, HttpServletResponse response) throws JSONException {
+        HttpSession session = request.getSession(false);
+        if (null != session) {
+            Assertion assertion = (Assertion) session.getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION);
+            if (assertion == null || assertion.getPrincipal().getName() == null) {
+                return ApiResult.result(ApiCode.TYRZ_SERVICE_EXCEPTION, CAS_URL + "/login?service=" + "http://app.tyrz.com:8999/wcapi/loginIndex");
+            } else {
+                return ApiResult.ok();
+            }
+        } else {
+            return ApiResult.result(ApiCode.TYRZ_SERVICE_EXCEPTION, CAS_URL + "/login?service=" + "http://app.tyrz.com:8999/wcapi/loginIndex");
+        }
+    }
+
+    //登出
+    @RequestMapping("/logout")
+    @ResponseBody
+    public ApiResult logout(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        HttpSession httpSession = request.getSession(false);
+        String userType = "";
+        if (null != httpSession) {
+            Assertion assertion = (Assertion) httpSession.getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION);
+            if (assertion != null) {
+                userType = (String) assertion.getPrincipal().getAttributes().get("user_type");
+
+            }
+        }
+        if (null != httpSession) {
+            httpSession.invalidate();
+        }
+        String token = request.getHeader("Authorization");
+        Long userId = JwtUtil.getUserId(token);
+        oauthTokenService.removeTokenByUserId(userId);
+        if (StringUtil.isEmpty(userType)) {
+            String type = request.getParameter("type");
+            if (LoginTypeEnum.LOGIN_TYPE_FAIL.getCode().toString().equals(type)) {
+                response.sendRedirect(CAS_URL + "/logout?service=" + APP_BACK_OUT_URL);
+            } else {
+                response.sendRedirect(CAS_URL + "/logout?service=" + APP_OUT_URL);
+            }
+
+        } else {
+            if (LoginTypeEnum.LOGIN_TYPE_FAIL.getCode().toString().equals(userType)) {
+                response.sendRedirect(CAS_URL + "/logout?service=" + APP_BACK_OUT_URL);
+            } else {
+                response.sendRedirect(CAS_URL + "/logout?service=" + APP_OUT_URL);
+            }
+        }
+        return ApiResult.ok();
+    }
+}
+*/

src/main/java/com/xdf/creative/module/controller/ParkDataTeamController.java

@@ -1,84 +0,0 @@
-package com.xdf.creative.module.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.xdf.creative.base.controller.BaseController;
-import com.xdf.creative.base.params.IdParam;
-import com.xdf.creative.base.params.dt.ParkDataTeamQueryParam;
-import com.xdf.creative.base.params.dt.ParkDataTeamWebParam;
-import com.xdf.creative.base.vo.dt.ParkDataTeamQueryVo;
-import com.xdf.creative.base.vo.dt.ParkDataTeamWebVo;
-import com.xdf.creative.module.entity.DtParkInfoDraft;
-import com.xdf.creative.module.entity.ParkDataTeam;
-import com.xdf.creative.module.service.DtParkInfoDraftService;
-import com.xdf.creative.module.service.ParkDataTeamService;
-import com.xdf.creative.util.page.ApiResult;
-import com.xdf.creative.util.page.PageTool;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- * 园区表_syr made 前端控制器
- * </p>
- *
- * @author lgw
- * @since 2020-04-09
- */
-@Slf4j
-@RestController
-@RequestMapping("/parkDataTeam")
-@Api("园区表_syr made API")
-public class ParkDataTeamController extends BaseController {
-
-    @Autowired
-    private ParkDataTeamService parkDataTeamService;
-
-    @Autowired
-    private DtParkInfoDraftService dtParkInfoDraftService;
-
-
-    /**
-     * 园区表_syr made分页列表
-     */
-    @PostMapping("/getWebPageList")
-    @ApiOperation(value = "获取ParkDataTeam分页列表", notes = "园区表_syr made分页列表", response = ParkDataTeamQueryVo.class)
-    public ApiResult<PageTool<ParkDataTeamWebVo>> getWebPageList(@Valid @RequestBody ParkDataTeamWebParam parkDataTeamWebParam) throws Exception {
-        PageTool<ParkDataTeamWebVo> pageList = parkDataTeamService.getWebPageList(parkDataTeamWebParam);
-        return ApiResult.ok(pageList);
-    }
-
-
-
-
-    /**
-     * 获取园区表_syr made
-     */
-    @PostMapping("/info")
-    @ApiOperation(value = "获取ParkDataTeam对象详情", notes = "查看园区表_syr made", response = ParkDataTeamQueryVo.class)
-    public ApiResult<ParkDataTeamQueryVo> getParkDataTeam(@Valid @RequestBody IdParam idParam) throws Exception {
-        ParkDataTeamQueryVo parkDataTeamQueryVo = parkDataTeamService.getParkDataTeamById(idParam.getId());
-        DtParkInfoDraft dtParkInfoDraft= dtParkInfoDraftService.getOne(new QueryWrapper<DtParkInfoDraft>().eq("date_park_id",parkDataTeamQueryVo.getId()));
-        parkDataTeamQueryVo.setOrganizeId(dtParkInfoDraft.getOrganizeId());
-        return ApiResult.ok(parkDataTeamQueryVo);
-    }
-
-
-
-
-    /**
-     * 园区表_syr made分页列表
-     */
-    @PostMapping("/getPageList")
-    @ApiOperation(value = "获取ParkDataTeam分页列表", notes = "园区表_syr made分页列表", response = ParkDataTeamQueryVo.class)
-    public ApiResult<PageTool<ParkDataTeamQueryVo>> getParkDataTeamPageList(@Valid @RequestBody ParkDataTeamQueryParam parkDataTeamQueryParam) throws Exception {
-        PageTool<ParkDataTeamQueryVo> pageList = parkDataTeamService.getParkDataTeamPageList(parkDataTeamQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-}
-

src/main/java/com/xdf/creative/module/controller/SysOrganizeController.java

@@ -3,7 +3,10 @@ package com.xdf.creative.module.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xdf.creative.base.controller.BaseController;
 import com.xdf.creative.base.params.IdParam;
-import com.xdf.creative.base.params.creative.*;
+import com.xdf.creative.base.params.creative.SysOrganizeAddParam;
+import com.xdf.creative.base.params.creative.SysOrganizeBackParam;
+import com.xdf.creative.base.params.creative.SysOrganizeEditParam;
+import com.xdf.creative.base.params.creative.SysOrganizeQueryParam;
 import com.xdf.creative.base.vo.creative.SysOrganizeBackVo;
 import com.xdf.creative.base.vo.creative.SysOrganizeQueryVo;
 import com.xdf.creative.base.vo.creative.SysOrganizeTreeVo;
@@ -54,12 +57,6 @@ public class SysOrganizeController extends BaseController {
         return sysOrganizeService.add(sysOrganizeAddParam);
     }
 
-    @PostMapping("/addPark")
-    @ApiOperation(value = "添加SysOrganize对象", notes = "添加组织信息", response = ApiResult.class)
-    public ApiResult addPark(@Valid @RequestBody SysOrganizeAddParkParam sysOrganizeAddParkParam) throws Exception {
-        return sysOrganizeService.addPark(sysOrganizeAddParkParam);
-    }
-
     /**
      * 启用停用组织
      */
@@ -70,7 +67,6 @@ public class SysOrganizeController extends BaseController {
     }
 
 
-
     /**
      * 编辑文创办组织信息
      */
@@ -80,16 +76,6 @@ public class SysOrganizeController extends BaseController {
         return sysOrganizeService.editMange(sysOrganizeAddParam);
     }
 
-
-    /**
-     * 编辑园区组织信息
-     */
-    @PostMapping("/editPark")
-    @ApiOperation(value = "添加SysOrganize对象", notes = "编辑文创办组织信息", response = ApiResult.class)
-    public ApiResult editPark(@Valid @RequestBody SysOrganizeEditParam sysOrganizeAddParam) throws Exception {
-        return sysOrganizeService.editPark(sysOrganizeAddParam);
-    }
-
     /**
      * 组织信息分页列表
      */
@@ -112,7 +98,6 @@ public class SysOrganizeController extends BaseController {
     }
 
 
-
     /**
      * 后台获取园区组织
      */
@@ -124,8 +109,6 @@ public class SysOrganizeController extends BaseController {
     }
 
 
-
-
     /**
      * 组织机构Tree列表
      */
@@ -140,6 +123,7 @@ public class SysOrganizeController extends BaseController {
 
     /**
      * 添加园区用户 所需要的组织list
+     *
      * @return
      * @throws Exception
      */
@@ -151,11 +135,6 @@ public class SysOrganizeController extends BaseController {
     }
 
 
-
-
-
-
-
     /**
      * 修改组织信息
      */

src/main/java/com/xdf/creative/module/controller/SysUserController.java

@@ -5,17 +5,14 @@ import com.xdf.creative.base.controller.BaseController;
 import com.xdf.creative.base.params.IdParam;
 import com.xdf.creative.base.params.creative.*;
 import com.xdf.creative.base.vo.creative.SysUserBackQueryVo;
-import com.xdf.creative.base.vo.creative.SysUserInfoQueryVo;
 import com.xdf.creative.base.vo.creative.SysUserQueryVo;
 import com.xdf.creative.enums.StatusCode;
 import com.xdf.creative.module.service.OauthTokenService;
 import com.xdf.creative.module.service.SysUserService;
 import com.xdf.creative.shiro.jwt.JwtUtil;
-import com.xdf.creative.support.aop.AccountLogger;
 import com.xdf.creative.support.aop.OperateLogger;
 import com.xdf.creative.support.auth.LoginParam;
 import com.xdf.creative.support.auth.LoginRefreshParam;
-import com.xdf.creative.support.auth.LoginSysUserTokenVo;
 import com.xdf.creative.util.StringUtil;
 import com.xdf.creative.util.page.ApiResult;
 import com.xdf.creative.util.page.PageTool;
@@ -23,6 +20,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -48,6 +46,8 @@ public class SysUserController extends BaseController {
     @Autowired
     private OauthTokenService oauthTokenService;
 
+   /* @Value("${cas.server-url-prefix}")
+    private String CAS_URL;*/
 
     /**
      * 用户登录
@@ -60,7 +60,7 @@ public class SysUserController extends BaseController {
     @PostMapping("/login")
     @ApiOperation(value = "登陆", notes = "系统用户登陆", response = ApiResult.class)
     public ApiResult login(@Valid @RequestBody LoginParam loginParam, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        return  sysUserService.login(loginParam,request);
+        return sysUserService.login(loginParam, request);
     }
 
 
@@ -73,11 +73,10 @@ public class SysUserController extends BaseController {
     @PostMapping("/initUser")
     @ApiOperation(value = "初始化用户", notes = "初始化用户", response = ApiResult.class)
     public ApiResult initUser() throws Exception {
-        return  sysUserService.initUser();
+        return sysUserService.initUser();
     }
 
 
-
     /**
      * 用户登出
      *
@@ -91,24 +90,22 @@ public class SysUserController extends BaseController {
         String token = request.getHeader("Authorization");
         Long userId = JwtUtil.getUserId(token);
         oauthTokenService.removeTokenByUserId(userId);
-        return ApiResult.ok("登陆成功");
+        return ApiResult.ok("退出成功");
     }
 
-
-
     /**
      * 验证用户是否存在
      */
     @PostMapping("/verifySysUser")
     @ApiOperation(value = " 验证用户是否存在", notes = " 验证用户是否存在", response = ApiResult.class)
     public ApiResult verifySysUser(@RequestBody SysUserAddQueryParam sysUserAddQueryParam) throws Exception {
-        if(StringUtil.isEmpty(sysUserAddQueryParam.getUsername())){
+        if (StringUtil.isEmpty(sysUserAddQueryParam.getUsername())) {
             return ApiResult.fail("请输入用户名！");
         }
         boolean isExists = sysUserService.isExistsByUsername(sysUserAddQueryParam.getUsername());
         if (isExists) {
             return ApiResult.error(StatusCode.SYS_USER_NAME_EXIST);
-        }else{
+        } else {
             return ApiResult.ok();
         }
 
@@ -125,18 +122,6 @@ public class SysUserController extends BaseController {
         return sysUserService.addSysUser(sysUserAddQueryParam);
     }
 
-    /**
-     * 添加园区用户
-     */
-    @PostMapping("/addParkUser")
-    @ApiOperation(value = "添加SysUser对象", notes = "添加系统用户", response = ApiResult.class)
-    @OperateLogger(name = "添加用户", attributeId = "id", attributeName = "username")
-    public ApiResult addParkUser(@Valid @RequestBody SysUserAddParkParam sysUserAddParkParam) throws Exception {
-        return sysUserService.addParkUser(sysUserAddParkParam);
-    }
-
-
-
 
     /**
      * 停用启用用户
@@ -225,32 +210,16 @@ public class SysUserController extends BaseController {
     }
 
 
-    /**
-     * 后台园区用户获取列表
-     */
-    @PostMapping("/getParkUserBackList")
-    @ApiOperation(value = "获取SysUser分页列表", notes = "系统用户分页列表", response = SysUserQueryVo.class)
-    public ApiResult<PageTool<SysUserBackQueryVo>> getParkUserBackList(@Valid @RequestBody SysUserBackQueryParam sysUserQueryParam) throws Exception {
-        PageTool<SysUserBackQueryVo> pageList = sysUserService.getParkUserBackList(sysUserQueryParam);
-        return ApiResult.ok(pageList);
-    }
-
-
-
-
     /**
      * 获取系统用户token
      */
     @GetMapping("/getSysUserById")
     @ApiOperation(value = "获取SysUser对象详情", notes = "查看系统用户", response = SysUserQueryVo.class)
-    public ApiResult getSysUser() throws Exception {
-        return sysUserService.getSysUserById();
+    public ApiResult getSysUser(HttpServletRequest request) throws Exception {
+        return sysUserService.getSysUserById(request);
     }
 
 
-
-
-
     /**
      * 系统用户分页列表
      */

src/main/java/com/xdf/creative/module/controller/WebInitiationApplyController.java

@@ -0,0 +1,239 @@
+package com.xdf.creative.module.controller;
+
+import com.xdf.creative.base.controller.BaseController;
+import com.xdf.creative.base.params.IdParam;
+import com.xdf.creative.base.params.creative.WebInitiationApplyQueryParam;
+import com.xdf.creative.base.vo.creative.WebInitiationApplyQueryVo;
+import com.xdf.creative.enums.InitiationApplryAduitStateEnum;
+import com.xdf.creative.enums.StatusCode;
+import com.xdf.creative.module.entity.WebInitiationApply;
+import com.xdf.creative.module.service.WebInitiationApplyService;
+import com.xdf.creative.shiro.jwt.JwtUtil;
+import com.xdf.creative.util.page.ApiResult;
+import com.xdf.creative.util.page.PageTool;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+/**
+ * <p>
+ * 文促会入会申请表 前端控制器
+ * </p>
+ *
+ * @author DeanYe
+ * @since 2019-10-30
+ */
+@Slf4j
+@RestController
+@RequestMapping("/webInitiationApply")
+@Api("文促会入会申请表 API")
+public class WebInitiationApplyController extends BaseController {
+
+    @Autowired
+    private WebInitiationApplyService webInitiationApplyService;
+
+    /**
+     * 添加文促会入会申请表
+     */
+    @PostMapping("/add")
+    @ApiOperation(value = "添加WebInitiationApply对象", notes = "添加文促会入会申请表", response = ApiResult.class)
+    public ApiResult<Boolean> addWebInitiationApply(@Valid @RequestBody WebInitiationApply webInitiationApply) throws Exception {
+        webInitiationApply.setFirstAudit(InitiationApplryAduitStateEnum.INITIATION_APPLRY_ADUIT_STATE_WAIT.getCode());
+        boolean flag = webInitiationApplyService.save(webInitiationApply);
+        return ApiResult.result(flag);
+    }
+
+    /**
+     * 修改文促会入会申请表
+     */
+    @PostMapping("/update")
+    @ApiOperation(value = "修改WebInitiationApply对象", notes = "修改文促会入会申请表", response = ApiResult.class)
+    public ApiResult<Boolean> updateWebInitiationApply(@RequestBody WebInitiationApply webInitiationApply) throws Exception {
+        if (0 == webInitiationApply.getId()) {
+            return ApiResult.error(StatusCode.FORM_SUBMIT_ID_VERIFY);
+        }
+        webInitiationApply.setUpdateTime(new Date());
+        boolean flag = webInitiationApplyService.updateById(webInitiationApply);
+        return ApiResult.result(flag);
+    }
+
+
+    /**
+     * 文促会入会申请初审
+     */
+    @PostMapping("/firstAudit")
+    @ApiOperation(value = "修改WebInitiationApply对象", notes = "文促会入会申请初审", response = ApiResult.class)
+    public ApiResult<Boolean> firstAudit(@RequestBody WebInitiationApply webInitiationApply) throws Exception {
+        if (null == webInitiationApply.getId()) {
+            return ApiResult.error(StatusCode.FORM_SUBMIT_ID_VERIFY);
+        }
+        if (null == webInitiationApply.getFirstAudit()) {
+            return ApiResult.error(StatusCode.WEB_INITIATION_APPLY_FIRST_AUDIT);
+        }
+        WebInitiationApply webInitiationApplyNew = webInitiationApplyService.getById(webInitiationApply.getId());
+        if (null == webInitiationApplyNew) {
+            return ApiResult.error(StatusCode.FORM_SUBMIT_UPDATE_VERIFY);
+        }
+
+        if (InitiationApplryAduitStateEnum.INITIATION_APPLRY_ADUIT_STATE_PASS.getCode().equals(webInitiationApply.getFirstAudit())) {
+            webInitiationApplyNew.setCreditAudit(InitiationApplryAduitStateEnum.INITIATION_APPLRY_ADUIT_STATE_WAIT.getCode());
+        }
+        webInitiationApplyNew.setFirstAudit(webInitiationApply.getFirstAudit());
+        webInitiationApplyNew.setFirstAuditCause(webInitiationApply.getFirstAuditCause());
+        webInitiationApplyNew.setFirstAuditTime(new Date());
+        webInitiationApplyNew.setFirstAuditUserId(JwtUtil.getUserId(getRequest().getHeader("token")));
+        webInitiationApplyNew.setUpdateTime(new Date());
+        boolean flag = webInitiationApplyService.updateById(webInitiationApplyNew);
+        return ApiResult.result(flag);
+    }
+
+    /**
+     * 文促会入会审核报送
+     */
+    @PostMapping("/sendAudit")
+    @ApiOperation(value = "修改WebInitiationApply对象", notes = "文促会入会审核报送", response = ApiResult.class)
+    public ApiResult<Boolean> sendAudit(@RequestBody WebInitiationApply webInitiationApply) throws Exception {
+        return webInitiationApplyService.sendAudit(webInitiationApply);
+    }
+
+
+    /**
+     * 文促会入会信用审核
+     */
+    @PostMapping("/creditAudit")
+    @ApiOperation(value = "修改WebInitiationApply对象", notes = "文促会入会信用审核", response = ApiResult.class)
+    public ApiResult<Boolean> creditAudit(@RequestBody WebInitiationApply webInitiationApply) throws Exception {
+        if (0 == webInitiationApply.getId()) {
+            return ApiResult.error(StatusCode.FORM_SUBMIT_ID_VERIFY);
+        }
+        if (null == webInitiationApply.getCreditAudit()) {
+            return ApiResult.error(StatusCode.WEB_INITIATION_APPLY_FIRST_AUDIT);
+        }
+        WebInitiationApply webInitiationApplyNew = webInitiationApplyService.getById(webInitiationApply.getId());
+        if (null == webInitiationApplyNew) {
+            return ApiResult.error(StatusCode.FORM_SUBMIT_UPDATE_VERIFY);
+        }
+        if (InitiationApplryAduitStateEnum.INITIATION_APPLRY_ADUIT_STATE_PASS.getCode().equals(webInitiationApply.getCreditAudit())) {
+            webInitiationApplyNew.setFinalAudit(InitiationApplryAduitStateEnum.INITIATION_APPLRY_ADUIT_STATE_WAIT.getCode());
+        }
+        webInitiationApplyNew.setCreditAudit(webInitiationApply.getCreditAudit());
+        webInitiationApplyNew.setCreditAuditCause(webInitiationApply.getCreditAuditCause());
+        webInitiationApplyNew.setCreditAuditTime(new Date());
+        webInitiationApplyNew.setCreditAuditUserId(JwtUtil.getUserId(getRequest().getHeader("token")));
+        webInitiationApplyNew.setUpdateTime(new Date());
+        boolean flag = webInitiationApplyService.updateById(webInitiationApplyNew);
+        return ApiResult.result(flag);
+    }
+
+    /**
+     * 文促会入会最终审核
+     */
+    @PostMapping("/finnalAudit")
+    @ApiOperation(value = "修改WebInitiationApply对象", notes = "文促会入会最终审核", response = ApiResult.class)
+    public ApiResult<Boolean> finnalAudit(@RequestBody WebInitiationApply webInitiationApply) throws Exception {
+        if (0 == webInitiationApply.getId()) {
+            return ApiResult.error(StatusCode.FORM_SUBMIT_ID_VERIFY);
+        }
+        if (null == webInitiationApply.getFinalAudit()) {
+            return ApiResult.error(StatusCode.WEB_INITIATION_APPLY_FIRST_AUDIT);
+        }
+        WebInitiationApply webInitiationApplyNew = webInitiationApplyService.getById(webInitiationApply.getId());
+        if (null == webInitiationApplyNew) {
+            return ApiResult.error(StatusCode.FORM_SUBMIT_UPDATE_VERIFY);
+        }
+        webInitiationApplyNew.setFinalAudit(webInitiationApply.getFinalAudit());
+        webInitiationApplyNew.setFinalAuditCause(webInitiationApply.getFinalAuditCause());
+        webInitiationApplyNew.setFinalAuditTime(new Date());
+        webInitiationApplyNew.setFinalAuditUserId(JwtUtil.getUserId(getRequest().getHeader("token")));
+        webInitiationApplyNew.setUpdateTime(new Date());
+        boolean flag = webInitiationApplyService.updateById(webInitiationApplyNew);
+        return ApiResult.result(flag);
+    }
+
+
+    /**
+     * 删除文促会入会申请表
+     */
+    @PostMapping("/delete")
+    @ApiOperation(value = "删除WebInitiationApply对象", notes = "删除文促会入会申请表", response = ApiResult.class)
+    public ApiResult<Boolean> deleteWebInitiationApply(@Valid @RequestBody IdParam idParam) throws Exception {
+        boolean flag = webInitiationApplyService.removeById(idParam.getId());
+        return ApiResult.result(flag);
+    }
+
+
+    /**
+     * 获取文促会入会申请表
+     */
+    @PostMapping("/info")
+    @ApiOperation(value = "获取WebInitiationApply对象详情", notes = "查看文促会入会申请表", response = WebInitiationApplyQueryVo.class)
+    public ApiResult<WebInitiationApplyQueryVo> getWebInitiationApply(@Valid @RequestBody IdParam idParam) throws Exception {
+        WebInitiationApplyQueryVo webInitiationApplyQueryVo = webInitiationApplyService.getWebInitiationApplyById(idParam.getId());
+        return ApiResult.ok(webInitiationApplyQueryVo);
+    }
+
+
+    /**
+     * 文促会入会申请管理员查询所有
+     */
+    @PostMapping("/getPageListBack")
+    @ApiOperation(value = "获取WebInitiationApply分页列表", notes = "文促会入会申请管理员查询所有", response = WebInitiationApplyQueryVo.class)
+    public ApiResult<PageTool<WebInitiationApplyQueryVo>> getWebInitiationApplyPageListBack(@RequestBody WebInitiationApplyQueryParam webInitiationApplyQueryParam) throws Exception {
+        PageTool<WebInitiationApplyQueryVo> pageList = webInitiationApplyService.getWebInitiationApplyPageListBack(webInitiationApplyQueryParam);
+        return ApiResult.ok(pageList);
+    }
+
+
+    /**
+     * 文促会成员web首页查询查询所有
+     */
+    @PostMapping("/getPageListHome")
+    @ApiOperation(value = "获取WebInitiationApply分页列表", notes = "文促会入会申请管理员查询所有", response = WebInitiationApplyQueryVo.class)
+    public ApiResult<PageTool<WebInitiationApplyQueryVo>> getWebInitiationApplyPageListHome(@RequestBody WebInitiationApplyQueryParam webInitiationApplyQueryParam) throws Exception {
+        PageTool<WebInitiationApplyQueryVo> pageList = webInitiationApplyService.getWebInitiationApplyPageListHome(webInitiationApplyQueryParam);
+        return ApiResult.ok(pageList);
+    }
+
+    /**
+     * 文促会入会申请初审人员查询
+     */
+    @PostMapping("/getPageListByFirstAudit")
+    @ApiOperation(value = "获取WebInitiationApply分页列表", notes = "文促会入会申请初审人员查询", response = WebInitiationApplyQueryVo.class)
+    public ApiResult<PageTool<WebInitiationApplyQueryVo>> getPageListByFirstAudit(@RequestBody WebInitiationApplyQueryParam webInitiationApplyQueryParam) throws Exception {
+        PageTool<WebInitiationApplyQueryVo> pageList = webInitiationApplyService.getPageListByFirstAudit(webInitiationApplyQueryParam);
+        return ApiResult.ok(pageList);
+    }
+
+    /**
+     * 文促会入会申请信用审核人员查询
+     */
+    @PostMapping("/getPageListByCreditAudit")
+    @ApiOperation(value = "获取WebInitiationApply分页列表", notes = "文促会入会申请信用审核人员查询", response = WebInitiationApplyQueryVo.class)
+    public ApiResult<PageTool<WebInitiationApplyQueryVo>> getPageListByCreditAudit(@RequestBody WebInitiationApplyQueryParam webInitiationApplyQueryParam) throws Exception {
+
+        PageTool<WebInitiationApplyQueryVo> pageList = webInitiationApplyService.getPageListByCreditAudit(webInitiationApplyQueryParam);
+        return ApiResult.ok(pageList);
+    }
+
+
+    /**
+     * 文促会入会申请终审人员查询
+     */
+    @PostMapping("/getPageListByFinalAudit")
+    @ApiOperation(value = "获取WebInitiationApply分页列表", notes = "文促会入会申请终审人员查询", response = WebInitiationApplyQueryVo.class)
+    public ApiResult<PageTool<WebInitiationApplyQueryVo>> getPageListByFinalAudit(@RequestBody WebInitiationApplyQueryParam webInitiationApplyQueryParam) throws Exception {
+
+        PageTool<WebInitiationApplyQueryVo> pageList = webInitiationApplyService.getPageListByFinalAudit(webInitiationApplyQueryParam);
+        return ApiResult.ok(pageList);
+    }
+
+}
+

src/main/java/com/xdf/creative/module/controller/WebParkEnterController.java

@@ -38,7 +38,6 @@ public class WebParkEnterController extends BaseController {
     @Autowired
     private WebParkEnterService webParkEnterService;
 
-
     /**
      * 添加园区入会申请
      */
@@ -48,9 +47,6 @@ public class WebParkEnterController extends BaseController {
         return webParkEnterService.apply(webParkEnterApplyParam);
     }
 
-
-
-
     /**
      * 审核园区入会申请
      */

src/main/java/com/xdf/creative/module/entity/DtActivityAttachment.java

@@ -1,56 +0,0 @@
-package com.xdf.creative.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * <p>
- * 园区活动板块附件
- * </p>
- *
- * @author lgw
- * @since 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtActivityAttachment对象", description = "园区活动板块附件")
-public class DtActivityAttachment extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键Id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "附件名称")
-    private String activityAttachmentName;
-
-    @ApiModelProperty(value = "附件存放地址")
-    private String activityAttachmentAddress;
-
-    @ApiModelProperty(value = "附件上传时间")
-    private Date uploadTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "显示类型 0  不显示 1 显示  ，显示是指数据审核通过后 发布正式网站")
-    private Integer displayType;
-
-    @ApiModelProperty(value = "组Id ，用于识别 草稿和发布信息是否属于同一组 ，便于数组删除")
-    private String groupId;
-
-    @ApiModelProperty(value = "园区活动随机Id")
-
-    private String parkActivityId;
-
-}

src/main/java/com/xdf/creative/module/entity/DtEnterCompany.java

@@ -1,94 +0,0 @@
-package com.xdf.creative.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author lgw
- * @since 2020-05-11
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtEnterCompany对象", description = "")
-public class DtEnterCompany extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "组织id")
-    private Long orgParkId;
-
-    @ApiModelProperty(value = "园区库id")
-    private Long bizParkId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "企业统一社会信用代码")
-    private String serialNumber;
-
-    @ApiModelProperty(value = "企业法人名字")
-    private String legalPersonName;
-
-    @ApiModelProperty(value = "注册资本数字")
-    private String regCapitalNo;
-
-    @ApiModelProperty(value = "注册资本单位")
-    private String unit;
-
-    @ApiModelProperty(value = "注册资本")
-    private String regCapital;
-
-    @ApiModelProperty(value = "所属行业代码")
-    private String categ;
-
-    @ApiModelProperty(value = "所属行业名称")
-    private String cateName;
-
-    @ApiModelProperty(value = "成立日期")
-    private Date estiblishTime;
-
-    @ApiModelProperty(value = "是否为战略融资")
-    private String isInvest;
-
-    @ApiModelProperty(value = "是否为上市公司")
-    private String listedCom;
-
-    @ApiModelProperty(value = "是否为高新技术企业")
-    private String isHighTecNew;
-
-    @ApiModelProperty(value = "是否为企业500强")
-    private String isFiveNew;
-
-    @ApiModelProperty(value = "是否存在")
-    private Integer exist;
-
-    @ApiModelProperty(value = "是否为个体户 0否 1是")
-    private Integer companyType;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "企业id")
-    private Long companyId;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sort;
-
-}

src/main/java/com/xdf/creative/module/entity/DtInfoAudit.java

@@ -1,66 +0,0 @@
-package com.xdf.creative.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * <p>
- * 基本信息审核表
- * </p>
- *
- * @author lgw
- * @since 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtInfoAudit对象", description = "基本信息审核表")
-public class DtInfoAudit extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "信息状态 0 默认 1草稿 2提交")
-    private Integer infoState;
-
-    @ApiModelProperty(value = "审核状态 0 待审核 1审核通过 2 审核不通过 审核通过后 需要将数据提交到正式数据 目前做先删除再添加")
-    private Integer auditState;
-
-    @ApiModelProperty(value = "提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date auditTime;
-
-    @ApiModelProperty(value = "审核人员ID")
-    private Long auditId;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "提交人员Id")
-    private Long submitUserId;
-
-    @ApiModelProperty(value = "0 普通用户   5、园区 8 区文创办 9 市文创办  99 公司后台管理")
-    private Integer auditType;
-
-    @ApiModelProperty(value = "信息是否被认证过 0 否 1是 指有没有被发布到首页")
-    private Integer infoVerify;
-
-    @ApiModelProperty(value = "审核意见")
-    private String opinion;
-
-}

src/main/java/com/xdf/creative/module/entity/DtParkActivity.java

@@ -1,69 +0,0 @@
-package com.xdf.creative.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * <p>
- * 园区活动
- * </p>
- *
- * @author lgw
- * @since 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkActivity对象", description = "园区活动")
-public class DtParkActivity extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "banner图")
-    private String bannerPath;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "发布时间")
-    private Date publishTime;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "显示类型 0  不显示 1 显示  ，显示是指数据审核通过后 发布正式网站")
-    private Integer displayType;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-    @ApiModelProperty(value = "组Id ，用于识别 草稿和发布信息是否属于同一组 ，便于数组删除")
-    private String groupId;
-
-    @ApiModelProperty(value = "外键标识ID")
-
-    private String foreignId;
-
-    private Long createUserId;
-
-}

src/main/java/com/xdf/creative/module/entity/DtParkCompany.java

@@ -1,52 +0,0 @@
-package com.xdf.creative.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * <p>
- * 园区企业申诉文件
- * </p>
- *
- * @author lgw
- * @since 2020-04-20
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkCompany对象", description = "园区企业申诉文件")
-public class DtParkCompany extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "上传企业id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "上传用户id1")
-    private Long createUserId;
-
-    @ApiModelProperty(value = "文件地址")
-    private String path;
-
-    @ApiModelProperty(value = "文件类型")
-    private String fileType;
-
-    @ApiModelProperty(value = "状态 0 不可用 1可用")
-    private Integer state;
-
-}

src/main/java/com/xdf/creative/module/entity/DtParkInfoDraft.java

@@ -1,162 +0,0 @@
-package com.xdf.creative.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * <p>
- * 园区表_syr made
- * </p>
- *
- * @author lgw
- * @since 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtParkInfoDraft对象", description = "园区表_syr made")
-public class DtParkInfoDraft extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "园区名称")
-    private String name;
-
-    @ApiModelProperty(value = "省ID")
-    private Long provinceId;
-
-    @ApiModelProperty(value = "市ID")
-    private Long cityId;
-
-    @ApiModelProperty(value = "区县ID")
-    private Long districtId;
-
-    @ApiModelProperty(value = "区名称")
-    private String districtName;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "新_老园区")
-    private String oldNew;
-
-    @ApiModelProperty(value = "联系人")
-    private String contactor;
-
-    @ApiModelProperty(value = "职务")
-    private String contactorPos;
-
-    @ApiModelProperty(value = "手机")
-    private String mobile;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "建筑面积平方米")
-    private Double areaBuild;
-
-    @ApiModelProperty(value = "占地面积")
-    private Double areaOcup;
-
-    @ApiModelProperty(value = "产证面积")
-    private Double areaLice;
-
-    @ApiModelProperty(value = "已出租面积")
-    private Double areaLease;
-
-    @ApiModelProperty(value = "入驻企业个数")
-    private Integer cntComJoin;
-
-    @ApiModelProperty(value = "文创企业个数")
-    private Integer cntComCult;
-
-    @ApiModelProperty(value = "运营管理公司从业人数")
-    private Integer cntMgStaff;
-
-    @ApiModelProperty(value = "入驻企业从业人员数")
-    private Integer cntJoinStaff;
-
-    @ApiModelProperty(value = "公共服务平台个数")
-    private Integer cntPubPlat;
-
-    @ApiModelProperty(value = "园区品牌企业个数")
-    private Integer cntBandsCom;
-
-    @ApiModelProperty(value = "园区企业高级人才数")
-    private Integer cntHighStaff;
-
-    @ApiModelProperty(value = "申报单位")
-    private String parentCom;
-
-    @ApiModelProperty(value = "状态：1已满 0未满")
-    private Integer enterStatus;
-
-    @ApiModelProperty(value = "状态：1正常 0待审核 -1已删除")
-    private Integer status;
-
-    @ApiModelProperty(value = "添加时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "完整地址")
-    private String newAddress;
-
-
-    @ApiModelProperty(value = "操作类型 0：初始 1：增加 2：修改 3：删除")
-    private Integer operateType;
-
-
-    @ApiModelProperty(value = "组织机构ID")
-    private Long organizeId;
-
-
-    @ApiModelProperty(value = "组织机构ID")
-    private Long dateParkId;
-
-    @ApiModelProperty(value = "政策")
-    private String policy;
-
-
-    @ApiModelProperty(value = "服务")
-    private String serve;
-
-
-
-    @ApiModelProperty(value = "简介")
-    private String intro;
-
-
-
-    private String logo;
-
-    @ApiModelProperty(value = "二维码")
-    private String qr;
-
-    @ApiModelProperty(value = "补充地址")
-    private String addressAp;
-
-
-    private Long createUserId;
-
-
-}

src/main/java/com/xdf/creative/module/entity/DtUploadCompany.java

@@ -1,86 +0,0 @@
-package com.xdf.creative.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * <p>
- * 企业上传
- * </p>
- *
- * @author lgw
- * @since 2020-05-07
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DtUploadCompany对象", description = "企业上传")
-public class DtUploadCompany extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-
-
-    @ApiModelProperty(value = "园区名称")
-    @TableField(exist = false)
-    private String parkName;
-
-    @ApiModelProperty(value = "组织id")
-    private Long orgParkId;
-
-    @ApiModelProperty(value = "园区库id")
-    private Long bizParkId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "企业统一社会信用代码")
-    private String serialNumber;
-
-    @ApiModelProperty(value = "企业法人名字")
-    private String legalPersonName;
-
-    @ApiModelProperty(value = "注册资本数字")
-    private String regCapitalNo;
-
-    @ApiModelProperty(value = "注册资本单位")
-    private String unit;
-
-    @ApiModelProperty(value = "注册资本")
-    private String regCapital;
-
-    @ApiModelProperty(value = "所属行业名称")
-    private String cateName;
-
-    @ApiModelProperty(value = "成立日期")
-    private Date estiblishTime;
-
-    @ApiModelProperty(value = "是否为个体户 0否 1是")
-    private Integer companyType;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "上传时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新状态 1、新增 （待处理）    2、更新（待处理） 3、删除（待处理） ")
-    private Integer state;
-
-    @ApiModelProperty(value = "处理状态1、待处理   2、已处理（成功） 3已处理（失败） 4 未找到")
-    private Integer disposeState;
-
-}

src/main/java/com/xdf/creative/module/entity/InfoContent.java

@@ -81,6 +81,7 @@ public class InfoContent extends BaseEntity {
 
     @ApiModelProperty(value = "终审时间")
     private Date finalAuditTime;
+
     @ApiModelProperty(value = "终审排序时间")
     private Date orderAuditTime;
 

src/main/java/com/xdf/creative/module/entity/ParkDataTeam.java

@@ -1,147 +0,0 @@
-package com.xdf.creative.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.xdf.creative.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * <p>
- * 园区表_syr made
- * </p>
- *
- * @author lgw
- * @since 2020-04-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "ParkDataTeam对象", description = "园区表_syr made")
-public class ParkDataTeam extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "园区名称")
-    private String name;
-
-    @ApiModelProperty(value = "省ID")
-    private Long provinceId;
-
-    @ApiModelProperty(value = "市ID")
-    private Long cityId;
-
-    @ApiModelProperty(value = "区县ID")
-    private Long districtId;
-
-    @ApiModelProperty(value = "区名称")
-    private String districtName;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "新_老园区")
-    private String oldNew;
-
-    @ApiModelProperty(value = "联系人")
-    private String contactor;
-
-    @ApiModelProperty(value = "职务")
-    private String contactorPos;
-
-    @ApiModelProperty(value = "手机")
-    private String mobile;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "建筑面积平方米")
-    private Double areaBuild;
-
-    @ApiModelProperty(value = "占地面积")
-    private Double areaOcup;
-
-    @ApiModelProperty(value = "产证面积")
-    private Double areaLice;
-
-    @ApiModelProperty(value = "已出租面积")
-    private Double areaLease;
-
-    @ApiModelProperty(value = "入驻企业个数")
-    private Integer cntComJoin;
-
-    @ApiModelProperty(value = "文创企业个数")
-    private Integer cntComCult;
-
-    @ApiModelProperty(value = "运营管理公司从业人数")
-    private Integer cntMgStaff;
-
-    @ApiModelProperty(value = "入驻企业从业人员数")
-    private Integer cntJoinStaff;
-
-    @ApiModelProperty(value = "公共服务平台个数")
-    private Integer cntPubPlat;
-
-    @ApiModelProperty(value = "园区品牌企业个数")
-    private Integer cntBandsCom;
-
-    @ApiModelProperty(value = "园区企业高级人才数")
-    private Integer cntHighStaff;
-
-    @ApiModelProperty(value = "申报单位")
-    private String parentCom;
-
-    @ApiModelProperty(value = "状态：1已满 0未满")
-    private Integer enterStatus;
-
-    @ApiModelProperty(value = "状态：1正常 0待审核 -1已删除")
-    private Integer status;
-
-    @ApiModelProperty(value = "添加时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "完整地址")
-    private String newAddress;
-
-
-    @ApiModelProperty(value = "政策")
-    private String policy;
-
-
-    @ApiModelProperty(value = "服务")
-    private String serve;
-
-
-
-    @ApiModelProperty(value = "简介")
-    private String intro;
-
-    private Integer sort;
-
-    private String logo;
-
-
-    @ApiModelProperty(value = "二维码")
-    private String qr;
-
-    @ApiModelProperty(value = "补充地址")
-    private String addressAp;
-}

src/main/java/com/xdf/creative/module/entity/WebInitiationApply.java

@@ -0,0 +1,185 @@
+package com.xdf.creative.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xdf.creative.base.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * <p>
+ * 文促会入会申请表
+ * </p>
+ *
+ * @author DeanYe
+ * @since 2019-10-30
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WebInitiationApply对象", description = "文促会入会申请表")
+public class WebInitiationApply extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+//    @NotNull(message = "主键id不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "单位名称")
+    @NotBlank(message = "单位名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "单位logo")
+    private String logo;
+
+
+    @ApiModelProperty(value = "机关类型  1、国营企业 2、事业单位  3、民营企业 4、社会组织")
+    @NotNull(message = "机关类型不能为空")
+    private Integer unitType;
+
+    @ApiModelProperty(value = "注册地址省")
+    @NotNull(message = "注册地址省份不能为空")
+    private Long province;
+
+    @ApiModelProperty(value = "注册地址市")
+    private Long city;
+
+    @ApiModelProperty(value = "注册地址区")
+    private Long county;
+
+    @ApiModelProperty(value = "主要办公地址")
+    @NotBlank(message = "办公地址不能为空")
+    private String contactAddress;
+
+    @ApiModelProperty(value = "邮编")
+    private String post;
+    @ApiModelProperty(value = "公司网址")
+    private String website;
+
+
+    @ApiModelProperty(value = "法人姓名")
+    @NotBlank(message = "法人姓名不能为空")
+    private String legalPerson;
+
+    @ApiModelProperty(value = "法人职务")
+    @NotBlank(message = "法人职务不能为空")
+    private String legalDuty;
+
+    @ApiModelProperty(value = "固定电话")
+    private String legalPhone;
+
+    @ApiModelProperty(value = "手机号")
+    private String legalMobile;
+
+    @ApiModelProperty(value = "日常联系人姓名")
+    private String linkMan;
+
+    @ApiModelProperty(value = "日常联系人职务")
+    private String linkDuty;
+
+    @ApiModelProperty(value = "日常联系人固定电话")
+    private String linkPhone;
+
+    @ApiModelProperty(value = "日常联系人手机号")
+    private String linkMobile;
+
+    @ApiModelProperty(value = "单位简介")
+    private String introduction;
+
+    @ApiModelProperty(value = "申报产业类别：1、媒体业 2、艺术业 3、工业设计 4、建筑设计业 5、时尚设计业  6、互联网相关服务业 7、软件与信息技术服务业8、咨询服务业9、广告及会展服务业  10、休闲娱乐业 11、文化装备制造业12、文化创意投资运营13、文化创意用品生产")
+    @NotNull(message = "申报产业类别不能为空")
+    private Integer declareCategory;
+
+    @ApiModelProperty(value = "希望成为哪一级会员  1、普通会员 2、理事会员  3、常务理事会员 4、是否报送")
+    @NotNull(message = "会员级别不能为空")
+    private Integer vipLevel;
+
+    @ApiModelProperty(value = "附件证明")
+    @NotBlank(message = "附件证明不能为空")
+    private String attachment;
+
+    @ApiModelProperty(value = "会员是否阅读协议 0 否 1是")
+    private Integer existsRead;
+
+    @ApiModelProperty(value = "初审是否通过  1待审核 2审核通过 3审核不通过 4、是否报送")
+    private Integer firstAudit;
+
+    @ApiModelProperty(value = "初审原因")
+    private String firstAuditCause;
+
+    @ApiModelProperty(value = "初审时间")
+    private Date firstAuditTime;
+
+
+    @ApiModelProperty(value = "初审人员id")
+    private Long firstAuditUserId;
+
+    @ApiModelProperty(value = "初审是否通过  1、待审核 2信用良好  3、信用不良 4、是否报送 ")
+    private Integer creditAudit;
+
+    @ApiModelProperty(value = "信用审核原因")
+    private String creditAuditCause;
+
+    @ApiModelProperty(value = "信用审核时间")
+    private Date creditAuditTime;
+
+
+    @ApiModelProperty(value = "信用审核人员id")
+    private Long creditAuditUserId;
+
+    @ApiModelProperty(value = "审核是否通过  1待审核 2审核通过 3审核不通过 4、是否报送")
+    private Integer finalAudit;
+
+    @ApiModelProperty(value = "理事会审核原因")
+    private String finalAuditCause;
+
+    @ApiModelProperty(value = "理事会审核时间")
+    private Date finalAuditTime;
+
+
+    @ApiModelProperty(value = "理事会审核人员id")
+    private Long finalAuditUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "法人简介")
+    private String legalIntroduction;
+
+    @ApiModelProperty(value = "专列与荣誉")
+    private String honner;
+
+    @ApiModelProperty(value = "金融服务 1、股权 2、债权 3、担保 4、融资租赁 5、其他")
+    private Integer financeService;
+
+    @ApiModelProperty(value = "产业合作 1、对接上下游企业资源 2、展会参展 3、园区入驻")
+    private Integer industry;
+
+    @ApiModelProperty(value = "企业服务 1、扶持资金 2、信用评级 3、知识与版权交易 4、财务与法律资讯 5、投融资对接")
+    private Integer companyService;
+
+    @ApiModelProperty(value = "其他")
+    private String otherService;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "审核类型 1 初审  2 二审   ")
+    protected Integer auditType;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "多个字符串id上传")
+    protected String ids;
+
+}