xs-server

.gitignore

@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/

.mvn/wrapper/MavenWrapperDownloader.java

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

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip

hs_err_pid21432.log

@@ -0,0 +1,337 @@
+#
+# There is insufficient memory for the Java Runtime Environment to continue.
+# Native memory allocation (malloc) failed to allocate 1163536 bytes for Chunk::new
+# Possible reasons:
+#   The system is out of physical RAM or swap space
+#   In 32 bit mode, the process size limit was hit
+# Possible solutions:
+#   Reduce memory load on the system
+#   Increase physical memory or swap space
+#   Check if swap backing store is full
+#   Use 64 bit Java on a 64 bit OS
+#   Decrease Java heap size (-Xmx/-Xms)
+#   Decrease number of Java threads
+#   Decrease Java thread stack sizes (-Xss)
+#   Set larger code cache with -XX:ReservedCodeCacheSize=
+# This output file may be truncated or incomplete.
+#
+#  Out of Memory Error (allocation.cpp:390), pid=21432, tid=0x0000000000000624
+#
+# JRE version: Java(TM) SE Runtime Environment (8.0_181-b13) (build 1.8.0_181-b13)
+# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.181-b13 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 (0x0000000019b54800):  JavaThread "C2 CompilerThread5" daemon [_thread_in_native, id=1572, stack(0x000000001bbf0000,0x000000001bcf0000)]
+
+Stack: [0x000000001bbf0000,0x000000001bcf0000]
+[error occurred during error reporting (printing stack bounds), id 0xc0000005]
+
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+
+
+Current CompileTask:
+C2:  38929 7370 %     4       lombok.javac.apt.LombokProcessor::process @ 366 (540 bytes)
+
+
+---------------  P R O C E S S  ---------------
+
+Java Threads: ( => current thread )
+  0x0000000019c32000 JavaThread "Service Thread" daemon [_thread_blocked, id=27076, stack(0x000000001c2f0000,0x000000001c3f0000)]
+  0x0000000019bd4000 JavaThread "C1 CompilerThread11" daemon [_thread_blocked, id=16184, stack(0x000000001c1f0000,0x000000001c2f0000)]
+  0x0000000019bd1000 JavaThread "C1 CompilerThread10" daemon [_thread_blocked, id=19572, stack(0x000000001c0f0000,0x000000001c1f0000)]
+  0x0000000019bb8800 JavaThread "C1 CompilerThread9" daemon [_thread_blocked, id=22288, stack(0x000000001bff0000,0x000000001c0f0000)]
+  0x0000000019b9f800 JavaThread "C1 CompilerThread8" daemon [_thread_blocked, id=19548, stack(0x000000001bef0000,0x000000001bff0000)]
+  0x0000000019b85000 JavaThread "C2 CompilerThread7" daemon [_thread_blocked, id=25536, stack(0x000000001bdf0000,0x000000001bef0000)]
+  0x0000000019b61000 JavaThread "C2 CompilerThread6" daemon [_thread_blocked, id=21360, stack(0x000000001bcf0000,0x000000001bdf0000)]
+=>0x0000000019b54800 JavaThread "C2 CompilerThread5" daemon [_thread_in_native, id=1572, stack(0x000000001bbf0000,0x000000001bcf0000)]
+  0x0000000019b53800 JavaThread "C2 CompilerThread4" daemon [_thread_in_native, id=16592, stack(0x000000001baf0000,0x000000001bbf0000)]
+  0x0000000019b43000 JavaThread "C2 CompilerThread3" daemon [_thread_in_vm, id=19900, stack(0x000000001b9f0000,0x000000001baf0000)]
+  0x0000000019b41000 JavaThread "C2 CompilerThread2" daemon [_thread_blocked, id=12120, stack(0x000000001b8f0000,0x000000001b9f0000)]
+  0x0000000019b3d800 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=23236, stack(0x000000001b7f0000,0x000000001b8f0000)]
+  0x0000000019b36800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=22688, stack(0x000000001b6f0000,0x000000001b7f0000)]
+  0x0000000019b16800 JavaThread "Monitor Ctrl-Break" daemon [_thread_in_native, id=23452, stack(0x000000001b5f0000,0x000000001b6f0000)]
+  0x0000000019afd000 JavaThread "Attach Listener" daemon [_thread_blocked, id=22488, stack(0x000000001b4f0000,0x000000001b5f0000)]
+  0x0000000019afc800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=20252, stack(0x000000001b3f0000,0x000000001b4f0000)]
+  0x0000000019a86800 JavaThread "Finalizer" daemon [_thread_blocked, id=12740, stack(0x000000001b2f0000,0x000000001b3f0000)]
+  0x000000001800b800 JavaThread "Reference Handler" daemon [_thread_blocked, id=23336, stack(0x000000001b1f0000,0x000000001b2f0000)]
+  0x0000000002a12800 JavaThread "main" [_thread_in_native, id=25460, stack(0x0000000002650000,0x0000000002750000)]
+
+Other Threads:
+  0x0000000019a63000 VMThread [stack: 0x000000001b0f0000,0x000000001b1f0000] [id=10984]
+  0x0000000019c1c800 WatcherThread [stack: 0x000000001c3f0000,0x000000001c4f0000] [id=11000]
+
+VM state:not at safepoint (normal execution)
+
+VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
+[0x000000000280d820] CodeCache_lock - owner thread: 0x0000000019b53800
+
+Heap:
+ PSYoungGen      total 358912K, used 166452K [0x00000000d5980000, 0x00000000ed680000, 0x0000000100000000)
+  eden space 327680K, 49% used [0x00000000d5980000,0x00000000df948fd8,0x00000000e9980000)
+  from space 31232K, 9% used [0x00000000e9980000,0x00000000e9c44030,0x00000000eb800000)
+  to   space 29696K, 0% used [0x00000000eb980000,0x00000000eb980000,0x00000000ed680000)
+ ParOldGen       total 163840K, used 146007K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 89% used [0x0000000080c00000,0x0000000089a95f48,0x000000008ac00000)
+ Metaspace       used 27172K, capacity 27944K, committed 28160K, reserved 1075200K
+  class space    used 3030K, capacity 3239K, committed 3328K, reserved 1048576K
+
+Card table byte_map: [0x0000000011ed0000,0x00000000122d0000] byte_map_base: 0x0000000011aca000
+
+Marking Bits: (ParMarkBitMap*) 0x00000000548a2d00
+ Begin Bits: [0x0000000013280000, 0x0000000015250000)
+ End Bits:   [0x0000000015250000, 0x0000000017220000)
+
+Polling page: 0x00000000005d0000
+
+CodeCache: size=245760Kb used=26921Kb max_used=26933Kb free=218838Kb
+ bounds [0x0000000002b10000, 0x0000000004580000, 0x0000000011b10000]
+ total_blobs=6425 nmethods=5993 adapters=340
+ compilation: enabled
+
+Compilation events (10 events):
+Event: 38.378 Thread 0x0000000019b9f800 7383       3       com.sun.tools.javac.jvm.ClassReader::readInnerClasses (183 bytes)
+Event: 38.379 Thread 0x0000000019b53800 7384       4       com.sun.tools.javac.jvm.ClassReader::readClass (474 bytes)
+Event: 38.380 Thread 0x0000000019b9f800 nmethod 7383 0x000000000455f650 code [0x000000000455f920, 0x0000000004560b38]
+Event: 38.463 Thread 0x0000000019b43000 7385   !   4       com.sun.tools.javac.comp.MemberEnter::complete (1573 bytes)
+Event: 38.487 Thread 0x0000000019b36800 7386       4       java.util.HashMap::containsKey (18 bytes)
+Event: 38.501 Thread 0x0000000019b36800 nmethod 7386 0x0000000004562f50 code [0x00000000045630a0, 0x0000000004563358]
+Event: 38.502 Thread 0x0000000019bd4000 7387       1       com.sun.tools.javac.code.Type$JCVoidType::getTag (4 bytes)
+Event: 38.502 Thread 0x0000000019bd4000 nmethod 7387 0x000000000455f390 code [0x000000000455f4e0, 0x000000000455f5f0]
+Event: 38.657 Thread 0x0000000019b61000 7388       4       com.sun.tools.javac.tree.JCTree$JCCompilationUnit::accept (6 bytes)
+Event: 38.698 Thread 0x0000000019b61000 nmethod 7388 0x00000000043ff290 code [0x00000000043ff3c0, 0x00000000043ff438]
+
+GC Heap History (10 events):
+Event: 30.695 GC heap before
+{Heap before GC invocations=27 (full 2):
+ PSYoungGen      total 264704K, used 241712K [0x00000000d5980000, 0x00000000e7a00000, 0x0000000100000000)
+  eden space 236032K, 100% used [0x00000000d5980000,0x00000000e4000000,0x00000000e4000000)
+  from space 28672K, 19% used [0x00000000e5e00000,0x00000000e638c0c0,0x00000000e7a00000)
+  to   space 29696K, 0% used [0x00000000e4000000,0x00000000e4000000,0x00000000e5d00000)
+ ParOldGen       total 163840K, used 106742K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 65% used [0x0000000080c00000,0x000000008743da38,0x000000008ac00000)
+ Metaspace       used 27076K, capacity 27880K, committed 28160K, reserved 1075200K
+  class space    used 3024K, capacity 3239K, committed 3328K, reserved 1048576K
+Event: 30.708 GC heap after
+Heap after GC invocations=27 (full 2):
+ PSYoungGen      total 265728K, used 5744K [0x00000000d5980000, 0x00000000e9e80000, 0x0000000100000000)
+  eden space 236032K, 0% used [0x00000000d5980000,0x00000000d5980000,0x00000000e4000000)
+  from space 29696K, 19% used [0x00000000e4000000,0x00000000e459c130,0x00000000e5d00000)
+  to   space 29184K, 0% used [0x00000000e8200000,0x00000000e8200000,0x00000000e9e80000)
+ ParOldGen       total 163840K, used 112259K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 68% used [0x0000000080c00000,0x00000000879a0c48,0x000000008ac00000)
+ Metaspace       used 27076K, capacity 27880K, committed 28160K, reserved 1075200K
+  class space    used 3024K, capacity 3239K, committed 3328K, reserved 1048576K
+}
+Event: 31.975 GC heap before
+{Heap before GC invocations=28 (full 2):
+ PSYoungGen      total 265728K, used 241776K [0x00000000d5980000, 0x00000000e9e80000, 0x0000000100000000)
+  eden space 236032K, 100% used [0x00000000d5980000,0x00000000e4000000,0x00000000e4000000)
+  from space 29696K, 19% used [0x00000000e4000000,0x00000000e459c130,0x00000000e5d00000)
+  to   space 29184K, 0% used [0x00000000e8200000,0x00000000e8200000,0x00000000e9e80000)
+ ParOldGen       total 163840K, used 112259K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 68% used [0x0000000080c00000,0x00000000879a0c48,0x000000008ac00000)
+ Metaspace       used 27118K, capacity 27880K, committed 28160K, reserved 1075200K
+  class space    used 3027K, capacity 3239K, committed 3328K, reserved 1048576K
+Event: 31.992 GC heap after
+Heap after GC invocations=28 (full 2):
+ PSYoungGen      total 301568K, used 5808K [0x00000000d5980000, 0x00000000e9d00000, 0x0000000100000000)
+  eden space 273920K, 0% used [0x00000000d5980000,0x00000000d5980000,0x00000000e6500000)
+  from space 27648K, 21% used [0x00000000e8200000,0x00000000e87ac0f0,0x00000000e9d00000)
+  to   space 28672K, 0% used [0x00000000e6500000,0x00000000e6500000,0x00000000e8100000)
+ ParOldGen       total 163840K, used 117831K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 71% used [0x0000000080c00000,0x0000000087f11eb8,0x000000008ac00000)
+ Metaspace       used 27118K, capacity 27880K, committed 28160K, reserved 1075200K
+  class space    used 3027K, capacity 3239K, committed 3328K, reserved 1048576K
+}
+Event: 33.285 GC heap before
+{Heap before GC invocations=29 (full 2):
+ PSYoungGen      total 301568K, used 279728K [0x00000000d5980000, 0x00000000e9d00000, 0x0000000100000000)
+  eden space 273920K, 100% used [0x00000000d5980000,0x00000000e6500000,0x00000000e6500000)
+  from space 27648K, 21% used [0x00000000e8200000,0x00000000e87ac0f0,0x00000000e9d00000)
+  to   space 28672K, 0% used [0x00000000e6500000,0x00000000e6500000,0x00000000e8100000)
+ ParOldGen       total 163840K, used 117831K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 71% used [0x0000000080c00000,0x0000000087f11eb8,0x000000008ac00000)
+ Metaspace       used 27118K, capacity 27880K, committed 28160K, reserved 1075200K
+  class space    used 3027K, capacity 3239K, committed 3328K, reserved 1048576K
+Event: 33.382 GC heap after
+Heap after GC invocations=29 (full 2):
+ PSYoungGen      total 302592K, used 20881K [0x00000000d5980000, 0x00000000ed700000, 0x0000000100000000)
+  eden space 273920K, 0% used [0x00000000d5980000,0x00000000d5980000,0x00000000e6500000)
+  from space 28672K, 72% used [0x00000000e6500000,0x00000000e7964760,0x00000000e8100000)
+  to   space 30208K, 0% used [0x00000000eb980000,0x00000000eb980000,0x00000000ed700000)
+ ParOldGen       total 163840K, used 123440K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 75% used [0x0000000080c00000,0x000000008848c1d8,0x000000008ac00000)
+ Metaspace       used 27118K, capacity 27880K, committed 28160K, reserved 1075200K
+  class space    used 3027K, capacity 3239K, committed 3328K, reserved 1048576K
+}
+Event: 35.418 GC heap before
+{Heap before GC invocations=30 (full 2):
+ PSYoungGen      total 302592K, used 294801K [0x00000000d5980000, 0x00000000ed700000, 0x0000000100000000)
+  eden space 273920K, 100% used [0x00000000d5980000,0x00000000e6500000,0x00000000e6500000)
+  from space 28672K, 72% used [0x00000000e6500000,0x00000000e7964760,0x00000000e8100000)
+  to   space 30208K, 0% used [0x00000000eb980000,0x00000000eb980000,0x00000000ed700000)
+ ParOldGen       total 163840K, used 123440K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 75% used [0x0000000080c00000,0x000000008848c1d8,0x000000008ac00000)
+ Metaspace       used 27147K, capacity 27880K, committed 28160K, reserved 1075200K
+  class space    used 3030K, capacity 3239K, committed 3328K, reserved 1048576K
+Event: 35.444 GC heap after
+Heap after GC invocations=30 (full 2):
+ PSYoungGen      total 357376K, used 20072K [0x00000000d5980000, 0x00000000ed680000, 0x0000000100000000)
+  eden space 327680K, 0% used [0x00000000d5980000,0x00000000d5980000,0x00000000e9980000)
+  from space 29696K, 67% used [0x00000000eb980000,0x00000000ecd1a288,0x00000000ed680000)
+  to   space 31232K, 0% used [0x00000000e9980000,0x00000000e9980000,0x00000000eb800000)
+ ParOldGen       total 163840K, used 128825K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 78% used [0x0000000080c00000,0x00000000889ce4e8,0x000000008ac00000)
+ Metaspace       used 27147K, capacity 27880K, committed 28160K, reserved 1075200K
+  class space    used 3030K, capacity 3239K, committed 3328K, reserved 1048576K
+}
+Event: 37.040 GC heap before
+{Heap before GC invocations=31 (full 2):
+ PSYoungGen      total 357376K, used 347752K [0x00000000d5980000, 0x00000000ed680000, 0x0000000100000000)
+  eden space 327680K, 100% used [0x00000000d5980000,0x00000000e9980000,0x00000000e9980000)
+  from space 29696K, 67% used [0x00000000eb980000,0x00000000ecd1a288,0x00000000ed680000)
+  to   space 31232K, 0% used [0x00000000e9980000,0x00000000e9980000,0x00000000eb800000)
+ ParOldGen       total 163840K, used 128825K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 78% used [0x0000000080c00000,0x00000000889ce4e8,0x000000008ac00000)
+ Metaspace       used 27168K, capacity 27944K, committed 28160K, reserved 1075200K
+  class space    used 3030K, capacity 3239K, committed 3328K, reserved 1048576K
+Event: 37.083 GC heap after
+Heap after GC invocations=31 (full 2):
+ PSYoungGen      total 358912K, used 2832K [0x00000000d5980000, 0x00000000ed680000, 0x0000000100000000)
+  eden space 327680K, 0% used [0x00000000d5980000,0x00000000d5980000,0x00000000e9980000)
+  from space 31232K, 9% used [0x00000000e9980000,0x00000000e9c44030,0x00000000eb800000)
+  to   space 29696K, 0% used [0x00000000eb980000,0x00000000eb980000,0x00000000ed680000)
+ ParOldGen       total 163840K, used 146007K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
+  object space 163840K, 89% used [0x0000000080c00000,0x0000000089a95f48,0x000000008ac00000)
+ Metaspace       used 27168K, capacity 27944K, committed 28160K, reserved 1075200K
+  class space    used 3030K, capacity 3239K, committed 3328K, reserved 1048576K
+}
+
+Deoptimization events (10 events):
+Event: 36.377 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003bfe850 method=lombok.javac.JavacNode.traverse(Llombok/javac/JavacASTVisitor;)V @ 478
+Event: 36.377 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003bfe850 method=lombok.javac.JavacNode.traverse(Llombok/javac/JavacASTVisitor;)V @ 478
+Event: 36.401 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003e3a408 method=com.sun.tools.javac.tree.Pretty.print(Ljava/lang/Object;)V @ 5
+Event: 36.477 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003e3a408 method=com.sun.tools.javac.tree.Pretty.print(Ljava/lang/Object;)V @ 5
+Event: 36.477 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003e3a408 method=com.sun.tools.javac.tree.Pretty.print(Ljava/lang/Object;)V @ 5
+Event: 36.477 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003e3a408 method=com.sun.tools.javac.tree.Pretty.print(Ljava/lang/Object;)V @ 5
+Event: 36.477 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x00000000045562c4 method=lombok.javac.JavacNode.traverse(Llombok/javac/JavacASTVisitor;)V @ 623
+Event: 37.564 Thread 0x0000000002a12800 Uncommon trap: reason=null_check action=make_not_entrant pc=0x0000000003b7f21c method=java.lang.Long.equals(Ljava/lang/Object;)Z @ 1
+Event: 37.564 Thread 0x0000000002a12800 Uncommon trap: reason=null_check action=make_not_entrant pc=0x00000000030e3a5c method=java.lang.Long.equals(Ljava/lang/Object;)Z @ 1
+Event: 37.567 Thread 0x0000000002a12800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00000000040c2994 method=com.sun.tools.javac.util.ListBuffer.next()Ljava/lang/Object; @ 12
+
+Classes redefined (0 events):
+No events
+
+Internal exceptions (10 events):
+Event: 24.386 Thread 0x0000000002a12800 Implicit null exception at 0x0000000002ef04b6 to 0x0000000002ef05f1
+Event: 24.389 Thread 0x0000000002a12800 Implicit null exception at 0x000000000337422e to 0x0000000003374361
+Event: 24.391 Thread 0x0000000002a12800 Implicit null exception at 0x00000000034305a6 to 0x0000000003430629
+Event: 34.356 Thread 0x0000000002a12800 Implicit null exception at 0x0000000003dc35cf to 0x0000000003dc36cd
+Event: 34.383 Thread 0x0000000002a12800 Implicit null exception at 0x0000000003e95e93 to 0x0000000003e95eda
+Event: 34.654 Thread 0x0000000002a12800 Implicit null exception at 0x0000000003f9530e to 0x0000000003f9723d
+Event: 35.385 Thread 0x0000000002a12800 Implicit null exception at 0x0000000004148b26 to 0x0000000004149fe1
+Event: 35.385 Thread 0x0000000002a12800 Implicit null exception at 0x00000000040c2f35 to 0x00000000040c3125
+Event: 37.564 Thread 0x0000000002a12800 Implicit null exception at 0x0000000003b7c20e to 0x0000000003b7f1e9
+Event: 37.564 Thread 0x0000000002a12800 Implicit null exception at 0x00000000030e3a0c to 0x00000000030e3a4d
+
+Events (10 events):
+Event: 37.083 Executing VM operation: ParallelGCFailedAllocation done
+Event: 37.564 Thread 0x0000000002a12800 Uncommon trap: trap_request=0xfffffff4 fr.pc=0x0000000003b7f21c
+Event: 37.564 Thread 0x0000000002a12800 DEOPT PACKING pc=0x0000000003b7f21c sp=0x000000000274d990
+Event: 37.564 Thread 0x0000000002a12800 DEOPT UNPACKING pc=0x0000000002b5583b sp=0x000000000274d958 mode 2
+Event: 37.564 Thread 0x0000000002a12800 Uncommon trap: trap_request=0xfffffff4 fr.pc=0x00000000030e3a5c
+Event: 37.564 Thread 0x0000000002a12800 DEOPT PACKING pc=0x00000000030e3a5c sp=0x000000000274d9a0
+Event: 37.564 Thread 0x0000000002a12800 DEOPT UNPACKING pc=0x0000000002b5583b sp=0x000000000274d948 mode 2
+Event: 37.566 Thread 0x0000000002a12800 Uncommon trap: trap_request=0xffffffde fr.pc=0x00000000040c2994
+Event: 37.567 Thread 0x0000000002a12800 DEOPT PACKING pc=0x00000000040c2994 sp=0x000000000274dcf0
+Event: 37.567 Thread 0x0000000002a12800 DEOPT UNPACKING pc=0x0000000002b5583b sp=0x000000000274dc90 mode 2
+
+
+Dynamic libraries:
+0x00007ff6d4630000 - 0x00007ff6d4667000 	C:\Program Files\Java\jdk1.8.0_181\bin\java.exe
+0x00007ffebc320000 - 0x00007ffebc510000 	C:\WINDOWS\SYSTEM32\ntdll.dll
+0x00007ffebacf0000 - 0x00007ffebada2000 	C:\WINDOWS\System32\KERNEL32.DLL
+0x00007ffeb97e0000 - 0x00007ffeb9a83000 	C:\WINDOWS\System32\KERNELBASE.dll
+0x00007ffebab60000 - 0x00007ffebac03000 	C:\WINDOWS\System32\ADVAPI32.dll
+0x00007ffebb9f0000 - 0x00007ffebba8e000 	C:\WINDOWS\System32\msvcrt.dll
+0x00007ffeba920000 - 0x00007ffeba9b7000 	C:\WINDOWS\System32\sechost.dll
+0x00007ffebc160000 - 0x00007ffebc280000 	C:\WINDOWS\System32\RPCRT4.dll
+0x00007ffeba9c0000 - 0x00007ffebab54000 	C:\WINDOWS\System32\USER32.dll
+0x00007ffeb9610000 - 0x00007ffeb9631000 	C:\WINDOWS\System32\win32u.dll
+0x00007ffebc2b0000 - 0x00007ffebc2d6000 	C:\WINDOWS\System32\GDI32.dll
+0x00007ffeb9640000 - 0x00007ffeb97d4000 	C:\WINDOWS\System32\gdi32full.dll
+0x00007ffeb9ac0000 - 0x00007ffeb9b5e000 	C:\WINDOWS\System32\msvcp_win.dll
+0x00007ffeb9510000 - 0x00007ffeb960a000 	C:\WINDOWS\System32\ucrtbase.dll
+0x00007ffeaec30000 - 0x00007ffeaeeb5000 	C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.18362.720_none_e6beb5c51314836b\COMCTL32.dll
+0x00007ffebb650000 - 0x00007ffebb986000 	C:\WINDOWS\System32\combase.dll
+0x00007ffeb9b60000 - 0x00007ffeb9be0000 	C:\WINDOWS\System32\bcryptPrimitives.dll
+0x00007ffebc280000 - 0x00007ffebc2ae000 	C:\WINDOWS\System32\IMM32.DLL
+0x0000000054930000 - 0x0000000054a02000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\msvcr100.dll
+0x0000000054080000 - 0x0000000054922000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\server\jvm.dll
+0x00007ffebbfb0000 - 0x00007ffebbfb8000 	C:\WINDOWS\System32\PSAPI.DLL
+0x00007ffeb5b00000 - 0x00007ffeb5b24000 	C:\WINDOWS\SYSTEM32\WINMM.dll
+0x00007ffeb1f20000 - 0x00007ffeb1f29000 	C:\WINDOWS\SYSTEM32\WSOCK32.dll
+0x00007ffeb20b0000 - 0x00007ffeb20ba000 	C:\WINDOWS\SYSTEM32\VERSION.dll
+0x00007ffebc0f0000 - 0x00007ffebc15f000 	C:\WINDOWS\System32\WS2_32.dll
+0x00007ffeb5ad0000 - 0x00007ffeb5afd000 	C:\WINDOWS\SYSTEM32\winmmbase.dll
+0x00007ffeba360000 - 0x00007ffeba3aa000 	C:\WINDOWS\System32\cfgmgr32.dll
+0x0000000054070000 - 0x000000005407f000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\verify.dll
+0x0000000054040000 - 0x0000000054069000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\java.dll
+0x0000000053f30000 - 0x0000000053f53000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\instrument.dll
+0x0000000053f10000 - 0x0000000053f26000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\zip.dll
+0x00007ffebaf60000 - 0x00007ffebb645000 	C:\WINDOWS\System32\SHELL32.dll
+0x00007ffebbf00000 - 0x00007ffebbfa9000 	C:\WINDOWS\System32\shcore.dll
+0x00007ffeb9be0000 - 0x00007ffeba360000 	C:\WINDOWS\System32\windows.storage.dll
+0x00007ffeb9280000 - 0x00007ffeb92a3000 	C:\WINDOWS\System32\profapi.dll
+0x00007ffeb91f0000 - 0x00007ffeb923a000 	C:\WINDOWS\System32\powrprof.dll
+0x00007ffeb91e0000 - 0x00007ffeb91f0000 	C:\WINDOWS\System32\UMPDC.dll
+0x00007ffebc090000 - 0x00007ffebc0e2000 	C:\WINDOWS\System32\shlwapi.dll
+0x00007ffeb9260000 - 0x00007ffeb9271000 	C:\WINDOWS\System32\kernel.appcore.dll
+0x00007ffeba3b0000 - 0x00007ffeba3c7000 	C:\WINDOWS\System32\cryptsp.dll
+0x0000000053ef0000 - 0x0000000053f0a000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\net.dll
+0x00007ffeb8a20000 - 0x00007ffeb8a87000 	C:\WINDOWS\system32\mswsock.dll
+0x00007ffeb8590000 - 0x00007ffeb85c3000 	C:\WINDOWS\system32\rsaenh.dll
+0x00007ffeb9a90000 - 0x00007ffeb9ab6000 	C:\WINDOWS\System32\bcrypt.dll
+0x00007ffeb90d0000 - 0x00007ffeb90f5000 	C:\WINDOWS\SYSTEM32\USERENV.dll
+0x00007ffeb8bf0000 - 0x00007ffeb8bfc000 	C:\WINDOWS\SYSTEM32\CRYPTBASE.dll
+0x00007ffeb8730000 - 0x00007ffeb876a000 	C:\WINDOWS\SYSTEM32\IPHLPAPI.DLL
+0x00007ffeba820000 - 0x00007ffeba828000 	C:\WINDOWS\System32\NSI.dll
+0x00007ffeb4b90000 - 0x00007ffeb4ba6000 	C:\WINDOWS\SYSTEM32\dhcpcsvc6.DLL
+0x00007ffeb4ab0000 - 0x00007ffeb4acc000 	C:\WINDOWS\SYSTEM32\dhcpcsvc.DLL
+0x00007ffeb8770000 - 0x00007ffeb883a000 	C:\WINDOWS\SYSTEM32\DNSAPI.dll
+0x0000000053ec0000 - 0x0000000053ed1000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\nio.dll
+0x00007ffeb4fb0000 - 0x00007ffeb4fba000 	C:\Users\gusy\AppData\Local\Temp\jansi-1.17.1-290790608197472631.dll
+0x00007ffeb1f30000 - 0x00007ffeb1f3a000 	C:\Users\gusy\AppData\Local\Temp\jansi-1.17.1-4597849990247348837.dll
+
+VM Arguments:
+jvm_args: -Dmaven.multiModuleProjectDirectory=D:\workspace\idea\2020\estateagents -Dmaven.home=D:\software\maven\apache-maven-3.6.3 -Dclassworlds.conf=D:\software\maven\apache-maven-3.6.3\bin\m2.conf -Dmaven.ext.class.path=D:\软件安装区\IntelliJ IDEA 2019.3.3\plugins\maven\lib\maven-event-listener.jar -javaagent:D:\软件安装区\IntelliJ IDEA 2019.3.3\lib\idea_rt.jar=53936:D:\软件安装区\IntelliJ IDEA 2019.3.3\bin -Dfile.encoding=UTF-8 
+java_command: org.codehaus.classworlds.Launcher -Didea.version2019.3.3 -s D:\software\maven\apache-maven-3.6.3\conf\settings.xml -Dmaven.repo.local=D:\software\maven\apache-maven-3.6.3\maven-rep -DskipTests=true compile -P blue
+java_class_path (initial): D:\software\maven\apache-maven-3.6.3\boot\plexus-classworlds-2.6.0.jar;D:\software\maven\apache-maven-3.6.3\boot\plexus-classworlds.license;D:\软件安装区\IntelliJ IDEA 2019.3.3\lib\idea_rt.jar
+Launcher Type: SUN_STANDARD
+
+Environment Variables:
+JAVA_HOME=C:\Program Files\Java\jdk1.8.0_181
+CLASSPATH=.;C:\Program Files\Java\jdk1.8.0_181\lib\dt.jar;C:\Program Files\Java\jdk1.8.0_181\lib\tools.jar;D:\software\ant\apache-ant-1.10.7\lib
+PATH=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\TortoiseGit\bin;C:\Program Files\Java\jdk1.8.0_181\bin;D:\software\ant\apache-ant-1.10.7\bin;C:\Users\gusy\AppData\Local\Yarn\bin;C:\Program Files\nodejs\;C:\Program Files\Docker\Docker\resources\bin;C:\ProgramData\DockerDesktop\version-bin;C:\Users\gusy\AppData\Local\Microsoft\WindowsApps;;D:\软件安装区\Microsoft VS Code\bin;C:\Users\gusy\AppData\Roaming\npm
+USERNAME=gusy
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=AMD64 Family 23 Model 8 Stepping 2, AuthenticAMD
+
+
+
+---------------  S Y S T E M  ---------------
+
+OS: Windows 10.0 , 64 bit Build 18362 (10.0.18362.329)
+
+CPU:total 16 (initial active 16) (16 cores per cpu, 1 threads per core) family 23 model 8 stepping 2, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, mmxext, 3dnowpref, lzcnt, sse4a, tsc, tscinvbit, tscinv, bmi1
+
+Memory: 4k page, physical 8338388k(350444k free), swap 23987528k(3008k free)
+
+vm_info: Java HotSpot(TM) 64-Bit Server VM (25.181-b13) for windows-amd64 JRE (1.8.0_181-b13), built on Jul  7 2018 04:01:33 by "java_re" with MS VC++ 10.0 (VS2010)
+
+time: Sat Mar 28 14:51:40 2020
+elapsed time: 38 seconds (0d 0h 0m 38s)
+

mvnw

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

mvnw.cmd

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

pom.xml

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.1.4.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.huiju</groupId>
+	<artifactId>zcloud</artifactId>
+	<version>v1.0.7</version>
+	<name>zhiyun</name>
+	<description>致云</description>
+
+	<properties>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<version>3.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-websocket</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.github.binarywang</groupId>
+			<artifactId>weixin-java-miniapp</artifactId>
+			<version>3.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.binarywang</groupId>
+			<artifactId>weixin-java-mp</artifactId>
+			<version>3.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.binarywang</groupId>
+			<artifactId>weixin-java-pay</artifactId>
+			<version>3.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.56</version>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-api</artifactId>
+			<version>0.10.5</version>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-impl</artifactId>
+			<version>0.10.5</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-jackson</artifactId>
+			<version>0.10.5</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.aliyun.oss</groupId>
+			<artifactId>aliyun-sdk-oss</artifactId>
+			<version>2.8.3</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.dom4j/dom4j -->
+		<dependency>
+			<groupId>org.dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+			<version>2.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jodd</groupId>
+			<artifactId>jodd-bean</artifactId>
+			<version>3.7.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>26.0-jre</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.alibaba/easyexcel -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+
+		<!-- swagger2 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.7.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.7.0</version>
+		</dependency>
+
+        <!-- aop 依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+
+		<dependency>
+			<groupId>fadada</groupId>
+			<artifactId>fadada_api_sdk</artifactId>
+			<version>2.4.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/resources/lib/fadada_api_sdk_2.4.0.jar</systemPath>
+		</dependency>
+	</dependencies>
+
+
+	<profiles>
+		<profile>
+			<id>dev</id>
+			<properties>
+				<profiles.active>dev</profiles.active>
+			</properties>
+		</profile>
+		<profile>
+			<id>prod</id>
+			<properties>
+				<profiles.active>prod</profiles.active>
+			</properties>
+		</profile>
+	</profiles>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+		<resources>
+				<resource>
+					<directory>${basedir}/src/main/resources/lib</directory>
+					<targetPath>BOOT-INF/lib/</targetPath>
+					<includes>
+						<include>**/*.jar</include>
+					</includes>
+				</resource>
+                <resource>
+                    <directory>src/main/resources</directory>
+                    <filtering>true</filtering>
+                    <includes>
+                        <include>application.yml</include>
+                        <include>application-${profiles.active}.yml</include>
+                        <include>mapper/**/*.xml</include>
+                        <include>log/*.xml</include>
+                        <include>lib/*.jar</include>
+                    </includes>
+                </resource>
+            </resources>
+        </build>
+
+    </project>

src/main/java/com/huiju/estateagents/EstateagentsApplication.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents;
+
+import com.huiju.estateagents.websocket.ChatServer;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+
+@SpringBootApplication
+public class EstateagentsApplication {
+
+	public static void main(String[] args) {
+		SpringApplication springApplication = new SpringApplication(EstateagentsApplication.class);
+		ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);
+		ChatServer.setApplicationContext(configurableApplicationContext);
+	}
+
+}

src/main/java/com/huiju/estateagents/activity/controller/ActivityController.java

@@ -0,0 +1,88 @@
+package com.huiju.estateagents.activity.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.activity.service.ActivityServiceI;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaRecommendCustomerService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "所有活动", tags = "所有活动")
+public class ActivityController extends BaseController {
+	
+	@Autowired
+	private ActivityServiceI activityService;
+	
+	@Autowired
+	private ITaPersonService taPersonService;
+	
+	@Autowired
+	ITaRecommendCustomerService taRecommendCustomerService;
+	
+	@RequestMapping(value = "/wx/activity/list", method = RequestMethod.GET)
+	public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
+	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+	                                           @RequestParam(value = "cityId",required = false)Integer cityId,
+	                                           HttpServletRequest request){
+		String openid = getOpenId(request);
+		Integer orgId = getOrgId(request);
+		ResponseBean  responseBean = new ResponseBean();
+		List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+		if (null == taPersons || taPersons.size() != 1) {
+			return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		TaPerson person = taPersons.get(0);
+		responseBean = activityService.getActivityList(pageNumber,pageSize,orgId,person,cityId);
+		
+		return responseBean;
+	}
+	
+	@RequestMapping(value = "/wx/customer/activity/list", method = RequestMethod.GET)
+	public ResponseBean wxActivityList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
+	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+	                                           @RequestParam(value = "customerId") String customerId,
+	                                           HttpServletRequest request){
+		ResponseBean  responseBean = new ResponseBean();
+		Integer orgId = getOrgId(request);
+		//查找客户信息
+		QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("customer_id",customerId);
+		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getOne(queryWrapper);
+		if (null == taRecommendCustomer){
+			//验证人员信息失败小程序端希望是空数组对象
+			return ResponseBean.success(new Page(pageNumber,pageSize));
+		}
+		if (null == taRecommendCustomer.getPersonId()){
+			//验证人员信息失败小程序端希望是空数组对象
+			return ResponseBean.success(new Page(pageNumber,pageSize));
+		}
+		
+		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+		taPersonQueryWrapper.eq("person_id",taRecommendCustomer.getPersonId());
+		TaPerson person = taPersonService.getOne(taPersonQueryWrapper);
+		if (null == person){
+			//验证人员信息失败小程序端希望是空数组对象
+			return ResponseBean.success(new Page(pageNumber,pageSize));
+		}
+		responseBean = activityService.getCustomerActivityList(pageNumber,pageSize,orgId,person);
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/activity/entity/Activity.java

@@ -0,0 +1,37 @@
+package com.huiju.estateagents.activity.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@Data
+public class Activity {
+
+	private Object id;
+	
+	private String mainImg;
+	
+	private String title;
+	
+	private LocalDateTime startDate;
+	
+	private LocalDateTime endDate;
+	
+	private Integer weight;
+	
+	/**
+	 *  0：进行中 1：未开始 2：已结束 3：已参与（微信端用）
+	 */
+	private Integer activityStatus;
+	
+	private String type;
+	
+	/**
+	 * 完成数量
+	 */
+	private Integer successNum;
+}

src/main/java/com/huiju/estateagents/activity/mapper/ActivityMapper.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.activity.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.activity.entity.Activity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface ActivityMapper {
+	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status,@Param("cityId") Integer cityId);
+	
+	/**
+	 * 获取客户参与的活动列表
+	 * @param pg
+	 * @param orgId
+	 * @param personId
+	 * @return
+	 */
+	List<Map<String,Object>> getCustomerActivityList(Page pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
+}

src/main/java/com/huiju/estateagents/activity/service/ActivityServiceI.java

@@ -0,0 +1,27 @@
+package com.huiju.estateagents.activity.service;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+
+public interface ActivityServiceI {
+	
+	/**
+	 * 获取三个活动
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person,Integer cityId);
+	
+	/**
+	 * 获取客户参加的活动信息
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getCustomerActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person);
+}

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -0,0 +1,135 @@
+package com.huiju.estateagents.activity.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.activity.entity.Activity;
+import com.huiju.estateagents.activity.mapper.ActivityMapper;
+import com.huiju.estateagents.activity.service.ActivityServiceI;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
+import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
+import com.huiju.estateagents.mapper.TaShareRecordMapper;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@Service
+public class ActivityServiceImpl implements ActivityServiceI {
+	
+	@Autowired
+	private ActivityMapper activityMapper;
+	
+	@Autowired
+	private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+	
+	@Autowired
+	private TaShareRecordMapper taShareRecordMapper;
+	
+	@Autowired
+	private HelpRecordMapper helpRecordMapper;
+	
+	@Autowired
+	private HelpInitiateRecordMapper helpInitiateRecordMapper;
+	
+	/**
+	 * 获取三个活动
+	 *
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	@Override
+	public ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person, Integer cityId) {
+		//查询是否报名了普通活动
+		QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("org_id",orgId);
+		queryWrapper.eq("person_id",person.getPersonId());
+		List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+		//查询是否报名了拼团活动
+		QueryWrapper<TaShareRecord> taShareRecordQueryWrapper = new QueryWrapper<>();
+		taShareRecordQueryWrapper.eq("org_id",orgId);
+		taShareRecordQueryWrapper.eq("person_id",person.getPersonId());
+		List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
+		//判断是否发起了助力活动
+		QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
+		helpInitiateRecordListQueryWrapper.eq("org_id",orgId);
+		helpInitiateRecordListQueryWrapper.eq("person_id",person.getPersonId());
+		List<HelpInitiateRecord> HelpInitiateRecords = helpInitiateRecordMapper.selectList(helpInitiateRecordListQueryWrapper);
+		
+		//分页获取全部数据
+		Page pg = new Page(pageNumber,pageSize);
+		List<Activity> list = activityMapper.getActivityList(pg,orgId, CommConstant.STATUS_NORMAL,cityId);
+		list.forEach(e -> {
+			if (e.getType().equals("dynamic")){
+				taActivityDynamicEnlists.forEach(dynamic -> {
+					if (e.getId().equals(dynamic.getDynamicId())){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+				e.setSuccessNum(null);
+			}else if (e.getType().equals("group")){
+				taShareRecords.forEach(share -> {
+					if (e.getId().equals(String.valueOf(share.getGroupActivityId()))){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+				//查看此活动已经完成的数量
+				QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
+				shareRecordQueryWrapper.eq("org_id",orgId);
+				shareRecordQueryWrapper.eq("group_activity_id",e.getId());
+				shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+				List<TaShareRecord> taShareRecordsList = taShareRecordMapper.selectList(shareRecordQueryWrapper);
+				e.setSuccessNum(taShareRecordsList.size());
+			}else if (e.getType().equals("help")){
+				HelpInitiateRecords.forEach(help -> {
+					if (e.getId().equals(help.getHelpActivityId())){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+				//查看此活动已经完成的数量
+				QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
+				helpInitiateRecordQueryWrapper.eq("org_id",orgId);
+				helpInitiateRecordQueryWrapper.eq("help_activity_id",e.getId());
+				helpInitiateRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+				List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
+				e.setSuccessNum(helpInitiateRecordList.size());
+			}
+		});
+		pg.setRecords(list);
+		return ResponseBean.success(pg);
+	}
+	
+	/**
+	 * 获取客户参加的活动信息
+	 *
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	@Override
+	public ResponseBean getCustomerActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person) {
+		//分页获取全部数据
+		Page pg = new Page(pageNumber,pageSize);
+		List<Map<String, Object>> customerActivityList = activityMapper.getCustomerActivityList(pg, orgId, person.getPersonId());
+		pg.setRecords(customerActivityList);
+		return ResponseBean.success(pg);
+	}
+}

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -0,0 +1,144 @@
+package com.huiju.estateagents.base;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.service.ITaPersonBuildingService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2018-12-18
+ */
+public class BaseController {
+    @Autowired
+    private ITaUserService taUserService;
+
+    @Autowired
+    private ITaPersonBuildingService taPersonBuildingService;
+
+    /**
+     * 获取orgId
+     *
+     * @param request
+     * @return
+     */
+    public Integer getOrgId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("orgId")) {
+            return Integer.valueOf(map.get("orgId").toString());
+        }
+
+        return null;
+    }
+
+    public Integer getChannelId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("channelId")) {
+            return Integer.valueOf(map.get("channelId").toString());
+        }
+
+        return null;
+    }
+
+    public String getChannelUserName(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userName")) {
+            return map.get("userName").toString();
+        }
+
+        return null;
+    }
+
+    public String getOpenId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("openId")) {
+            return map.get("openId").toString();
+        }
+
+        return null;
+    }
+
+    public String getPersonId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("personId")) {
+            return map.get("personId").toString();
+        }
+
+        return null;
+    }
+
+    /**
+     * 获取orgId
+     *
+     * @param request
+     * @return
+     */
+    public Integer getUserId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userId")) {
+            return Integer.valueOf(map.get("userId").toString());
+        }
+
+        return null;
+    }
+
+    /**
+     * 获取服务管理后台用户ID
+     *
+     * @param request
+     * @return
+     */
+    public Integer getSysUserId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userId")) {
+            return Integer.valueOf(map.get("userId").toString());
+        }
+        return null;
+    }
+
+    /**
+     * 获取服务管理后台用户ID
+     *
+     * @param request
+     * @return
+     */
+    public String getSysUserName(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userName")) {
+            return map.get("userName") + "";
+        }
+        return null;
+    }
+
+    public List<TaPersonBuilding> getTaPersonBuildingListByUserId(HttpServletRequest request) {
+        TaUser taUser = taUserService.getById(getUserId(request));
+        if (taUser == null) {
+            return null;
+        }
+        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+        if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
+            taPersonBuildingList = new ArrayList<>();
+        }
+        return taPersonBuildingList;
+    }
+}
+

src/main/java/com/huiju/estateagents/base/ResponseBean.java

@@ -0,0 +1,81 @@
+package com.huiju.estateagents.base;
+
+import java.io.Serializable;
+
+/**
+ * 接口统一状态返回BEAN.
+ */
+public class ResponseBean<T> implements Serializable {
+
+    private static final long serialVersionUID = 3593827217136880822L;
+
+    public static final int CODE_SUCCESS = 1000;
+    public static final int ERROR_AUTH_FAIL = 1001;
+    public static final int ERROR_AUTH_EXPIRED = 1002;
+    public static final int ERROR_MISSING_PARAMS = 1003;
+    public static final int ERROR_ILLEGAL_PARAMS = 1004;
+    public static final int ERROR_UNAVAILABLE = 1005;
+
+    private int code;
+    private String message;
+    private T data;
+
+    public ResponseBean() {
+        code = ResponseBean.CODE_SUCCESS;
+    }
+
+    public static <T> ResponseBean success(T data, String ...msgs) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.code = ResponseBean.CODE_SUCCESS;
+        responseBean.data = data;
+
+        if (null != msgs && msgs.length > 0) {
+            responseBean.message = msgs[0];
+        }
+
+        return responseBean;
+    }
+
+    public static <T> ResponseBean error(String msg, int code, T ...datas) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.code = code;
+        responseBean.message = msg;
+
+        if (null != datas && datas.length > 0) {
+            responseBean.data = datas[0];
+        }
+
+        return responseBean;
+    }
+    
+    public void addError(String message) {
+        this.code = ResponseBean.ERROR_UNAVAILABLE;
+        this.message = message;
+    }
+    
+    public void addSuccess(String message) {
+        this.code = ResponseBean.CODE_SUCCESS;
+        this.message = message;
+    }
+    
+    public void addSuccess(T data) {
+        this.code = ResponseBean.CODE_SUCCESS;
+        this.message = "成功";
+        this.data = data;
+    }
+
+    public T getData() {
+        return this.data;
+    }
+    public int getCode() {
+        return this.code;
+    }
+    public String getMessage() {
+        return this.message;
+    }
+
+    @Override
+    public String toString() {
+        return  "{ code: "+code+", message: "+message+", data: <T> }";
+    }
+}

src/main/java/com/huiju/estateagents/base/UserControl.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.base;
+
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.exception.EstaException;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * 用户控制
+ */
+public class UserControl {
+
+    /**
+     * 获取用户信息
+     * @return
+     */
+    public static TaUser getUser() {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
+        HttpSession session = servletRequestAttributes.getRequest().getSession();
+        TaUser taUser = (TaUser) session.getAttribute("miniapp_user");
+        if (null == taUser) {
+            throw new EstaException("用户信息不存在, 请登录!");
+        }
+        return taUser;
+    }
+
+    /**
+     * 获取公司 org_id
+     * @return
+     */
+    public static Integer getOrgId() {
+        TaUser user = getUser();
+        return user.getOrgId();
+    }
+
+}

src/main/java/com/huiju/estateagents/bo/request/ActivityStatisticResponseBO.java

@@ -0,0 +1,49 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 活动统计返回实体
+ *
+ * @author gusy
+ * @date 2020/4/26 13:15
+ */
+@Data
+public class ActivityStatisticResponseBO {
+
+    /**
+     * 活动分享人数
+     */
+    private Integer sharePersons;
+
+    /**
+     * 活动分享次数
+     */
+    private Integer shareNum;
+
+    /**
+     * 活动访问人数
+     */
+    private Integer visitPersons;
+
+    /**
+     * 活动访问次数
+     */
+    private Integer visitNum;
+
+    /**
+     * 分享新增用户
+     */
+    private Integer newPersons;
+
+    /**
+     * 分享新增客户
+     */
+    private Integer newCustomers;
+
+    /**
+     * 活动名称
+     */
+    private String activityName;
+
+}

src/main/java/com/huiju/estateagents/bo/request/ContractRecordRequestBO.java

@@ -0,0 +1,88 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 查询合同列表请求实体
+ */
+@Data
+public class ContractRecordRequestBO {
+
+    /**
+     * 页码
+     */
+    private Integer pageNum = 1;
+
+    /**
+     * 分页大小
+     */
+    private Integer pageSize = 10;
+
+    /**
+     * 公司名
+     */
+    private String companyName;
+
+    /**
+     * 公司编码
+     */
+    private String companyCode;
+
+    /**
+     * 组织名
+     */
+    private String orgName;
+
+    /**
+     * 小程序名
+     */
+    private String miniAppName;
+
+    /**
+     * 合同编号
+     */
+    private Integer contractId;
+
+    /**
+     * 合同名
+     */
+    private String contractName;
+
+    /**
+     * 渠道代理商
+     */
+    private String channelProxyName;
+
+    /**
+     * 是否结算
+     */
+    private Boolean settlement;
+
+    /**
+     * 甲方签署开始时间
+     */
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate signatoryStartTime;
+
+    /**
+     * 甲方签署结束时间
+     */
+
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate signatoryEndTime;
+
+    /**
+     * 结算开始时间
+     */
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate settlementStartTime;
+
+    /**
+     * 结算结束时间
+     */
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate settlementEndTime;
+}

src/main/java/com/huiju/estateagents/bo/request/HousingRaiseRequestBO.java

@@ -0,0 +1,65 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 查询房源认筹记录请求实体
+ *
+ * @Auther: gusy
+ * @Date: 2020/2/28 01:01
+ */
+@Data
+public class HousingRaiseRequestBO {
+
+    private Integer orgId;
+
+    /**
+     * 销售批次ID
+     */
+    private Integer salesBatchId;
+
+    /**
+     * 房源ID
+     */
+    private Integer houseId;
+
+    /**
+     * 期名
+     */
+    private String termName;
+
+    /**
+     * 楼栋名
+     */
+    private String blockName;
+
+    /**
+     * 单元名
+     */
+    private String unitName;
+
+    /**
+     * 楼层名
+     */
+    private String floorName;
+
+    /**
+     * 房间名
+     */
+    private String roomName;
+
+    /**
+     * 户型Id
+     */
+    private String apartmentId;
+
+    /**
+     * 房源发布状态
+     */
+    private Integer status;
+
+    /**
+     * 房源锁定状态
+     */
+    private String lockingStatus;
+}

src/main/java/com/huiju/estateagents/bo/request/PresecretRecordRequestBO.java

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 预选记录查询请求实体
+ *
+ * @Auther: gusy
+ * @Date: 2020/2/28 00:14
+ */
+@Data
+public class PresecretRecordRequestBO {
+
+    private Integer orgId;
+
+    private Integer salesBatchId;
+
+    /**
+     * 房源ID
+     */
+    private Integer houseId;
+
+    /**
+     * 期名
+     */
+    private String termName;
+
+    /**
+     * 楼栋名
+     */
+    private String blockName;
+
+    /**
+     * 单元名
+     */
+    private String unitName;
+
+    /**
+     * 楼层名
+     */
+    private String floorName;
+
+    /**
+     * 房间名
+     */
+    private String roomName;
+
+    /**
+     * 用户手机号
+     */
+    private String phone;
+
+    /**
+     * 户型Id
+     */
+    private String apartmentId;
+
+    /**
+     * 预选状态
+     */
+    private Integer status;
+
+    /**
+     * 修改开始时间
+     */
+    private String startTime;
+
+    /**
+     * 修改结束时间
+     */
+    private String endTime;
+}

src/main/java/com/huiju/estateagents/bo/request/QrCodeStatisticResponseBO.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 二维码统计返回实体
+ *
+ * @author gusy
+ * @date 2020/5/21 13:53
+ */
+@Data
+public class QrCodeStatisticResponseBO {
+
+    /**
+     * 访问人数
+     */
+    private Integer visitPersons;
+
+    /**
+     * 访问次数
+     */
+    private Integer visitNum;
+
+    /**
+     * 新增用户
+     */
+    private Integer newPersons;
+
+}

src/main/java/com/huiju/estateagents/bo/request/RaiseOrderRequestBO.java

@@ -0,0 +1,75 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 查询认筹订单请求实体
+ *
+ * @Auther: gusy
+ * @Date: 2020/2/27 22:10
+ */
+@Data
+public class RaiseOrderRequestBO {
+
+    private Integer orgId;
+
+    /**
+     * 认筹ID
+     */
+    private Integer raiseId;
+
+    /**
+     * 订单表ID
+     */
+    private Integer orderId;
+
+    /**
+     * 订单表ID
+     */
+    private Integer refundedOrderId;
+
+    /**
+     * 认筹单表ID
+     */
+    private Integer raiseRecordId;
+
+    /**
+     * 认筹手机号
+     */
+    private String tel;
+
+    /**
+     * 用户手机号
+     */
+    private String personTel;
+
+    /**
+     * 微信流水号
+     */
+    private String transactionId;
+
+    /**
+     * 微信退款号
+     */
+    private String refundNo;
+
+    /**
+     * 支付状态
+     */
+    private String payStatus;
+
+    /**
+     * 开始时间
+     */
+    private String payStartTime;
+
+    /**
+     * 结束时间
+     */
+    private String payEndTime;
+
+    /**
+     * 微信订单号
+     */
+    private String tradeNo;
+}

src/main/java/com/huiju/estateagents/bo/request/RaiseRecordRequestBO.java

@@ -0,0 +1,100 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 认筹单记录查询请求实体
+ *
+ * @Auther: gusy
+ * @Date: 2020/2/27 18:39
+ */
+@Data
+public class RaiseRecordRequestBO {
+
+    private Integer orgId;
+
+    /**
+     * 房源ID
+     */
+    private String houseId;
+
+    /**
+     * 认筹表ID
+     */
+    private Integer raiseId;
+
+    /**
+     * 认筹单ID
+     */
+    private Integer raiseRecordId;
+
+    /**
+     * 期名
+     */
+    private String termName;
+
+    /**
+     * 楼栋名
+     */
+    private String blockName;
+
+    /**
+     * 单元名
+     */
+    private String unitName;
+
+    /**
+     * 楼层名
+     */
+    private String floorName;
+
+    /**
+     * 房间名
+     */
+    private String roomName;
+
+    /**
+     * 是否作废
+     */
+    private Integer status;
+
+    /**
+     * 房源锁定状态
+     */
+    private String lockingStatus;
+
+    /**
+     * 认筹手机号
+     */
+    private String tel;
+
+    /**
+     * 用户手机号
+     */
+    private String personTel;
+
+    /**
+     * 缴费状态
+     */
+    private String payStatus;
+
+    /**
+     * 缴费方式
+     */
+    private String payType;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 用户姓名
+     */
+    private String personName;
+}

src/main/java/com/huiju/estateagents/bo/request/SaveCzOrderRequestBO.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 创建充值订单请求实体
+ *
+ * @author gusy
+ * @date 2020/6/9 14:58
+ */
+@Data
+public class SaveCzOrderRequestBO {
+
+    /**
+     * 充值金额
+     */
+    private Integer amount;
+}

src/main/java/com/huiju/estateagents/bo/request/SaveRefundOrderRequestBO.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 创建退款订单请求实体
+ *
+ * @author gusy
+ * @date 2020/6/9 14:58
+ */
+@Data
+public class SaveRefundOrderRequestBO {
+
+    /**
+     * 退款金额
+     */
+    private Integer amount;
+}

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysTokenController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.center.sysUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 令牌表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class SysTokenController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysTokenController.class);
+
+    @Autowired
+    public ISysTokenService iSysTokenService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysToken",method= RequestMethod.GET)
+    public ResponseBean sysTokenList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysToken> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysToken> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysToken> result = iSysTokenService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysToken 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysToken",method= RequestMethod.POST)
+    public ResponseBean sysTokenAdd(@RequestBody SysToken sysToken){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysTokenService.save(sysToken)){
+                responseBean.addSuccess(sysToken);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysToken/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysTokenDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysTokenService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysToken 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysToken/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysTokenUpdate(@PathVariable Integer id,
+                                        @RequestBody SysToken sysToken){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysTokenService.updateById(sysToken)){
+                responseBean.addSuccess(sysToken);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysToken/{id}",method= RequestMethod.GET)
+    public ResponseBean sysTokenGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysTokenService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -0,0 +1,271 @@
+package com.huiju.estateagents.center.sysUser.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+    * 系统用户 系统中心账户 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class SysUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysUserController.class);
+
+    @Autowired
+    public ISysUserService iSysUserService;
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+    @Autowired
+    private ITaUserService iTaUserService;
+
+    @Autowired
+    private ITaChannelProxyService iTaChannelProxyService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysUser",method= RequestMethod.GET)
+    public ResponseBean sysUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysUser> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysUser> result = iSysUserService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysUser",method= RequestMethod.POST)
+    public ResponseBean sysUserAdd(@RequestBody SysUser sysUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysUserService.save(sysUser)){
+                responseBean.addSuccess(sysUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysUser/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysUserDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysUserService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param sysUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/sysUser",method= RequestMethod.PUT)
+    public ResponseBean sysUserUpdate(@RequestBody SysUser sysUser,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String userName = JWTUtils.getSubject(request);
+            sysUser.setPassword(MD5Utils.md5(sysUser.getPassword()));
+            sysUser.setUserName(userName);
+            if (iSysUserService.updateById(sysUser)){
+                responseBean.addSuccess(sysUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysUser/{id}",method= RequestMethod.GET)
+    public ResponseBean sysUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysUserService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/center/current",method=RequestMethod.GET)
+    public ResponseBean currentUser(HttpServletRequest request){
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+        taChannelProxyQueryWrapper.eq("user_name", map.get("userName")).or().eq("channel_tel", map.get("userName"));
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(taChannelProxyQueryWrapper);
+        if (StringUtils.isEmpty(taChannelProxy.getUserName())){
+            taChannelProxy.setUserName(map.get("userName").toString());
+        }
+        return ResponseBean.success(taChannelProxy);
+    }
+    
+    @PostMapping("/center/signin")
+    public ResponseBean signin(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+        String userName = params.getString("userName");
+        if (StringUtils.isEmpty(userName)){
+            return ResponseBean.error("用户名不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taChannelProxyQueryWrapper.eq("user_name", userName).or().eq("channel_tel", userName);
+
+        //验证用户名密码是否正确
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(taChannelProxyQueryWrapper);
+        String defaultPsw = MD5Utils.md5(params.getString("password"));
+        if (taChannelProxy == null || !defaultPsw.equals(taChannelProxy.getPassword())) {
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        //校验是否过期且是否停用
+        if (LocalDateTime.now().isAfter(taChannelProxy.getExpireDate()) || taChannelProxy.getStatus() == 0){
+            return ResponseBean.error("当前后台服务已到期，请联系管理员", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Map map = new HashMap();
+        map.put("userName", StringUtils.isEmpty(taChannelProxy.getUserName()) ? taChannelProxy.getChannelTel() : taChannelProxy.getUserName());
+        map.put("channelId",taChannelProxy.getChannelId().toString());
+        String token = JWTUtils.newTokenByMap(map);
+
+        //保存token
+        sysTokenService.saveToken(token);
+        
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("user", taChannelProxy);
+        
+        return ResponseBean.success(result);
+    }
+
+    @PostMapping("/center/changePassword")
+    public ResponseBean changePassword(@RequestParam String originalPassword,
+                                       @RequestParam String newPassword,HttpServletRequest request) {
+
+        if (org.apache.commons.lang3.StringUtils.isBlank(newPassword) || newPassword.length() < 6) {
+            return ResponseBean.error("新密不能小于6位", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        Integer channelId = getChannelId(request);
+
+        // 校验当前旧密码是否正确
+        String password = MD5Utils.md5(MD5Utils.md5(originalPassword));
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getById(channelId);
+        if (!password.equals(taChannelProxy.getPassword())){
+            return ResponseBean.error("旧密码错误,请重新输入", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        try {
+            iTaChannelProxyService.resetPassword(channelId, newPassword);
+            return ResponseBean.success("操作成功！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @PostMapping("/center/signout")
+    public ResponseBean signout(HttpServletRequest request) {
+        String token = JWTUtils.getToken(request);
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
+        sysTokenQueryWrapper.eq("token",token);
+        sysTokenService.remove(sysTokenQueryWrapper);
+        return ResponseBean.success("成功退出");
+    }
+
+    @RequestMapping(value="/center/logo",method= RequestMethod.GET)
+    public ResponseBean getLogoImg(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer channelId = getChannelId(request);
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getById(channelId);
+        responseBean.addSuccess(taChannelProxy);
+        return responseBean;
+    }
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/entity/SysToken.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.center.sysUser.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 令牌表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysToken implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * token
+     */
+    @TableId(value = "token")
+    private String token;
+
+    /**
+     * 过期时间
+     */
+    private LocalDateTime expDate;
+
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/entity/SysUser.java

@@ -0,0 +1,55 @@
+package com.huiju.estateagents.center.sysUser.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 账户登录
+     */
+    @TableId(value = "user_id")
+    private Integer userId;
+
+    private String userName;
+
+    /**
+     * 登录密码
+     */
+    private String password;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysTokenMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.sysUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 令牌表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface SysTokenMapper extends BaseMapper<SysToken> {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysUserMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.sysUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/ISysTokenService.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.center.sysUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+
+/**
+ * <p>
+ * 令牌表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ISysTokenService extends IService<SysToken> {
+	
+	SysToken saveToken(String token);
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/ISysUserService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.sysUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ISysUserService extends IService<SysUser> {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysTokenServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.center.sysUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 令牌表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class SysTokenServiceImpl extends ServiceImpl<SysTokenMapper, SysToken> implements ISysTokenService {
+	
+	@Autowired
+	private SysTokenMapper sysTokenMapper;
+	
+	@Override
+	public SysToken saveToken(String token) {
+		SysToken sysToken = new SysToken();
+		sysToken.setToken(token);
+		sysToken.setExpDate(LocalDateTime.now().plusDays(7));
+		sysTokenMapper.insert(sysToken);
+		return sysToken;
+	}
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.center.sysUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.mapper.SysUserMapper;
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaButtonUriMapController.java

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+import com.huiju.estateagents.center.taUser.service.ITaButtonUriMapService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 按钮路由映射表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@RestController
+@RequestMapping("/")
+public class TaButtonUriMapController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaButtonUriMapController.class);
+
+    @Autowired
+    public ITaButtonUriMapService iTaButtonUriMapService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taButtonUriMap",method= RequestMethod.GET)
+    public ResponseBean taButtonUriMapList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaButtonUriMap> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaButtonUriMap> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaButtonUriMap> result = iTaButtonUriMapService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taButtonUriMap 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taButtonUriMap",method= RequestMethod.POST)
+    public ResponseBean taButtonUriMapAdd(@RequestBody TaButtonUriMap taButtonUriMap){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaButtonUriMapService.save(taButtonUriMap)){
+                responseBean.addSuccess(taButtonUriMap);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taButtonUriMap/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taButtonUriMapDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaButtonUriMapService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taButtonUriMap 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taButtonUriMap/{id}",method= RequestMethod.PUT)
+    public ResponseBean taButtonUriMapUpdate(@PathVariable Integer id,
+                                        @RequestBody TaButtonUriMap taButtonUriMap){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaButtonUriMapService.updateById(taButtonUriMap)){
+                responseBean.addSuccess(taButtonUriMap);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taButtonUriMap/{id}",method= RequestMethod.GET)
+    public ResponseBean taButtonUriMapGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaButtonUriMapService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaTagUserController.java

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@RestController
+@RequestMapping("/")
+public class TaTagUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaTagUserController.class);
+
+    @Autowired
+    public ITaTagUserService iTaTagUserService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taTagUser",method= RequestMethod.GET)
+    public ResponseBean taTagUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaTagUser> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaTagUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaTagUser> result = iTaTagUserService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taTagUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTagUser",method= RequestMethod.POST)
+    public ResponseBean taTagUserAdd(@RequestBody TaTagUser taTagUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagUserService.save(taTagUser)){
+                responseBean.addSuccess(taTagUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taTagUser/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taTagUserDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaTagUserService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taTagUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTagUser/{id}",method= RequestMethod.PUT)
+    public ResponseBean taTagUserUpdate(@PathVariable Integer id,
+                                        @RequestBody TaTagUser taTagUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagUserService.updateById(taTagUser)){
+                responseBean.addSuccess(taTagUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taTagUser/{id}",method= RequestMethod.GET)
+    public ResponseBean taTagUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaTagUserService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaTagsController.java

@@ -0,0 +1,150 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.service.ITaTagsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@RestController
+@RequestMapping("/api")
+public class TaTagsController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaTagsController.class);
+
+    @Autowired
+    public ITaTagsService iTaTagsService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taTags",method= RequestMethod.GET)
+    public ResponseBean taTagsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaTags> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaTags> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            IPage<TaTags> result = iTaTagsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taTags 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTags",method= RequestMethod.POST)
+    public ResponseBean taTagsAdd(@RequestBody TaTags taTags){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagsService.save(taTags)){
+                responseBean.addSuccess(taTags);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taTags/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taTagsDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaTagsService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taTags 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTags/{id}",method= RequestMethod.PUT)
+    public ResponseBean taTagsUpdate(@PathVariable Integer id,
+                                        @RequestBody TaTags taTags){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagsService.updateById(taTags)){
+                responseBean.addSuccess(taTags);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taTags/{id}",method= RequestMethod.GET)
+    public ResponseBean taTagsGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaTagsService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserAuthButtonController.java

@@ -0,0 +1,68 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthButtonController
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserAuthButtonController extends BaseController {
+
+    @Autowired
+    public ITaUserAuthButtonService iTaUserAuthButtonService;
+
+    /**
+     * 根据userId获取菜单列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/userAuthButton",method= RequestMethod.GET)
+    public ResponseBean getButtonByUserId(HttpServletRequest servletRequest,
+                                          @RequestParam("pageNum")Integer pageNum,
+                                          @RequestParam("pageSize")Integer pageSize){
+        Integer userId = getUserId(servletRequest);
+        return iTaUserAuthButtonService.getButtonByUserId(pageNum,pageSize,userId.toString(),getOrgId(servletRequest));
+    }
+
+
+    /**
+     * 获取所有的菜单按钮
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/buttonList",method= RequestMethod.GET)
+    public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
+                                      @RequestParam("pageSize")Integer pageSize){
+        return iTaUserAuthButtonService.getAllButton(pageNum, pageSize);
+    }
+
+    /**
+     * 用户授权按钮
+     * @return
+     */
+    @RequestMapping(value="/admin/updateAuthButton",method= RequestMethod.PUT)
+    public ResponseBean updateUserAuthMenu(HttpServletRequest request,
+                                           @RequestBody String sysButton){
+        Integer userId = getUserId(request);
+        JSONObject Object = JSONObject.parseObject(sysButton);
+        JSONArray JSONArray = Object.getJSONArray("sysButton");
+        List<SysButtonInMenu> sysButtonInMenuList = JSONArray.toJavaList(SysButtonInMenu.class);
+        return iTaUserAuthButtonService.updateUserAuthButton(userId, sysButtonInMenuList);
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserAuthMenuController.java

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuController
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserAuthMenuController extends BaseController {
+
+    @Autowired
+    public ITaUserAuthMenuService iTaUserAuthMenuService;
+
+    /**
+     * 根据userId获取菜单列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/userAuthMenu",method= RequestMethod.GET)
+    public ResponseBean  getMenuByUserId(@RequestParam("pageNum")Integer pageNum,
+                                         @RequestParam("pageSize")Integer pageSize,
+                                         HttpServletRequest request){
+        Integer userId = getUserId(request);
+        return iTaUserAuthMenuService.getMenuByUserId(pageNum,pageSize,userId.toString(), getOrgId(request));
+    }
+
+    /**
+     * 获取所有菜单
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/menuList",method= RequestMethod.GET)
+    public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
+                                      @RequestParam("pageSize")Integer pageSize, HttpServletRequest request){
+        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize, getOrgId(request), null);
+    }
+
+    /**
+     * 用户授权菜单
+     * @return
+     */
+    @RequestMapping(value="/admin/updateAuthMenu",method= RequestMethod.POST)
+    public ResponseBean updateUserAuthMenu(HttpServletRequest request,
+                                           @RequestBody String sysMenu){
+        JSONObject Object = JSONObject.parseObject(sysMenu);
+        String name = Object.getString("name");
+        Integer userId = Object.getInteger("id");
+        JSONArray JSONArray = Object.getJSONArray("sysMenu");
+        List<SysMenu> sysMenuList = JSONArray.toJavaList(SysMenu.class);
+
+        JSONArray buttonArray = Object.getJSONArray("sysButton");
+        List<SysButtonInMenu> sysButtonInMenuList = buttonArray.toJavaList(SysButtonInMenu.class);
+        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList,name,getOrgId(request),sysButtonInMenuList);
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -0,0 +1,566 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.service.*;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TaRoleMapper;
+import com.huiju.estateagents.service.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+    * 用户表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaUserController.class);
+
+    @Autowired
+    public ITaUserService iTaUserService;
+
+    @Autowired
+    public ITaOrgService iTaOrgService;
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+    @Autowired
+    private ITaRoleService iTaRoleService;
+
+    @Autowired
+    private ITaUserAuthMenuService iTaUserAuthMenuService;
+
+    @Autowired
+    private ITaUserAuthButtonService iTaUserAuthButtonService;
+    
+    @Autowired
+    private ITaTagUserService taTagUserService;
+    
+    @Autowired
+    private ITaPersonBuildingService taPersonBuildingService;
+    
+    @Autowired
+    private ITaUserRoleService taUserRoleService;
+
+    @Autowired
+    private TaRoleMapper taRoleMapper;
+
+    @Autowired
+    private ITaPersonService iTaPersonService;
+
+    @Autowired
+    private ITaMiniappService iTaMiniappService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taUser",method= RequestMethod.GET)
+    public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @RequestParam(value = "miniAppName", required = false) String miniAppName, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+
+        try {
+            //使用分页插件
+		    IPage pg = new Page<>(pageNum, pageSize);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, getChannelId(request), miniAppName);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taUser",method= RequestMethod.GET)
+    public ResponseBean taUserChannelList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage pg = new Page<>(pageNum, pageSize);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, null, null);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUser",method= RequestMethod.POST)
+    public ResponseBean taUserAdd(@RequestBody TaUser taUser, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer channelId = getChannelId(request);
+        try {
+            responseBean.addSuccess(iTaUserService.newUserAndOrg(taUser, channelId));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @PutMapping(value = "/{plat}/turn/taUser/{id}/{type}")
+    public ResponseBean turnUser(@PathVariable String type, @PathVariable Integer id, @PathVariable("plat")String plat) {
+        try {
+            iTaUserService.turnUserOnOrNot(id, "on".equals(type), plat);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success("ok");
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taUser/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taUserDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaUserService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUser/{id}",method= RequestMethod.PUT)
+    public ResponseBean taUserUpdate(@PathVariable Integer id,
+                                        @RequestBody TaUser taUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            iTaUserService.updateInfoWithOrg(taUser);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    /**
+     * 获取用户信息
+     */
+    @RequestMapping(value="/center/taUser/{id}",method= RequestMethod.GET)
+    public ResponseBean taUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserService.getInfoWithOrg(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+
+        return responseBean;
+    }
+
+    /**
+     * 重置密码
+     * @param plat
+     * @param id
+     * @return
+     */
+    @PutMapping(value = "/{plat}/password/taUser/{id}")
+    public ResponseBean resetPassword(@PathVariable String plat, @PathVariable Integer id, HttpServletRequest request) {
+        if (!"center".equals(plat) && !"admin".equals(plat)) {
+            return ResponseBean.error("您没有权限进行此操作", ResponseBean.ERROR_AUTH_EXPIRED);
+        }
+
+        String newPass = plat.equals("center") ? "abc@123" : "123456";
+        try {
+            iTaUserService.resetPassword(id, newPass);
+            return ResponseBean.success("新密码为: " + newPass);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+    /**
+     * 业务端  修改密码
+     * @return/
+     */
+    @PutMapping(value = "/admin/update/password")
+    public ResponseBean updatePassword( @RequestParam String originalPassword,
+                                        @RequestParam String newPassword,
+                                        HttpServletRequest request) {
+
+        if (org.apache.commons.lang3.StringUtils.isBlank(newPassword) || newPassword.length() < 6) {
+            return ResponseBean.error("新密不能小于6位", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        Integer userId = getUserId(request);
+
+        // 校验当前旧密码是否正确
+        String password = MD5Utils.md5(MD5Utils.md5(originalPassword));
+        TaUser taUser = iTaUserService.getById(userId);
+        if (!password.equals(taUser.getLoginPassword())){
+            return ResponseBean.error("旧密码错误,请重新输入", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        try {
+            iTaUserService.resetPassword(userId, newPassword);
+            return ResponseBean.success("操作成功！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 获取当前用户信息
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
+    public ResponseBean taUserGetCurrent(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Map userMap = new HashMap();
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        try {
+            TaUser taUser = iTaUserService.getById(map.get("userId").toString());
+            List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
+            ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
+            ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = iTaMiniappService.getOne(taMiniappQueryWrapper);
+            //
+            TaOrg taOrg = iTaOrgService.getById(taUser.getOrgId());
+
+            taUser.setMenus((List<SysMenu>) authMenu.getData());
+            taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
+            taUser.setRoles(roles);
+            taUser.setLoginPassword("");
+            taUser.setMiniAppName(taMiniapp.getName());
+            taUser.setOrgName(taOrg.getName());
+            taUser.setOrgThumb(taOrg.getThumb());
+            taUser.setOrgLogo(taOrg.getLogo());
+            taUser.setOrgDesc(taOrg.getOrgDesc());
+            taUser.setBossDisplay(taOrg.getBossDisplay());
+
+            //获取所有菜单
+            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
+            List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
+
+
+            userMap.put("taUser", taUser);
+            userMap.put("menuList", allMenus);
+            userMap.put("buttonList", allButtons);
+            responseBean.addSuccess(userMap);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 用户手机号登录
+     * @param paramStr
+     * @return
+     */
+    @PostMapping("/admin/taUser/signin")
+    public ResponseBean signin(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+    
+        String userName = params.getString("loginName");
+        String userPassword = params.getString("loginPassword");
+    
+        //验证用户名密码是否正确
+        QueryWrapper<TaUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("login_name",userName);
+        sysUserQueryWrapper.eq("login_password", MD5Utils.md5(userPassword));
+        TaUser taUser = iTaUserService.getOne(sysUserQueryWrapper);
+        if (taUser == null) {
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("org_id", taUser.getOrgId());
+        taUserQueryWrapper.eq("is_admin", 1);
+        TaUser taUserAdmin = iTaUserService.getOne(taUserQueryWrapper);
+
+        if (taUserAdmin.getExpDate().isBefore(LocalDateTime.now())){
+            return ResponseBean.error("该账号已经过期，请联系管理员", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
+            return ResponseBean.error("该账号已经停用，请联系管理员", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+
+        List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
+        taUser.setRoles(roles);
+        taUser.setLoginPassword("");
+        Map map = new HashMap();
+        map.put("userId",taUser.getUserId().toString());
+        map.put("orgId",taUser.getOrgId().toString());
+        String token = JWTUtils.newTokenByMap(map);
+
+        // 先尝试删除这个Token
+        // 因为偶尔出现了，Token插入失败，报的错就是主键重复
+        sysTokenService.removeById(token);
+
+        //保存token
+        sysTokenService.saveToken(token);
+    
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("user", taUser);
+
+        return ResponseBean.success(result);
+    }
+    
+    @PostMapping("/admin/taUser/signout")
+    public ResponseBean signout(HttpServletRequest request) {
+        String token = JWTUtils.getToken(request);
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
+        sysTokenQueryWrapper.eq("token",token);
+        sysTokenService.remove(sysTokenQueryWrapper);
+        return ResponseBean.success("成功退出");
+    }
+    
+    
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser",method= RequestMethod.GET)
+    public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @RequestParam(value ="userName",required = false) String userName,
+                                   @RequestParam(value ="phone",required = false) String phone,
+                                   @RequestParam(value ="status",required = false) Integer status,
+                                   @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
+                                   @RequestParam(value ="miniStatus",required = false) Integer miniStatus,
+                                   @RequestParam(value ="buildingId",required = false) String buildingId,
+                                   HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage pg = new Page<>(pageNum, pageSize);
+            TaUser taUser = new TaUser();
+            taUser.setOrgId(getOrgId(request));
+            taUser.setUserName(userName);
+            taUser.setPhone(phone);
+            taUser.setStatus(status);
+            taUser.setBuildingId(buildingId);
+            if(null != isConsultant && isConsultant == 1){
+                taUser.setIsConsultant(true);
+            }else if (null != isConsultant && isConsultant == 0){
+                taUser.setIsConsultant(false);
+            }
+            taUser.setMiniStatus(miniStatus);
+
+            IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
+            List<TaUser> taUserList = result.getRecords();
+            taUserList.forEach(e -> {
+                List<TaTags> taTagsList = iTaUserService.getTagsList(e);
+                e.setTaTagsList(taTagsList);
+
+//                Integer person = iTaPersonService.judgeBindStatusByCondition(e.getUserId(), getOrgId(request), e.getPhone());
+//                e.setMiniStatus(0 == person ? 0 : 1);
+            });
+            result.setRecords(taUserList);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    
+    /**
+     * 获取用户信息
+     */
+    @RequestMapping(value="/admin/taUser/{id}",method= RequestMethod.GET)
+    public ResponseBean adminUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaUser taUser = iTaUserService.getById(id);
+            QueryWrapper<TaTagUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("user_id",id);
+            List<TaTagUser> taTagUserList = taTagUserService.list(queryWrapper);
+            List<Integer> tags = new ArrayList<>();
+            taTagUserList.forEach(e -> {
+                tags.add(e.getTagId());
+            });
+            taUser.setTaTags(tags);
+            //获取角色信息
+            QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
+            taUserRoleQueryWrapper.eq("user_id",id);
+            List<TaUserRole> taUserRoleList = taUserRoleService.list(taUserRoleQueryWrapper);
+            List<Integer> ids = new ArrayList<>();
+            taUserRoleList.forEach(e -> {
+                ids.add(e.getRoleId());
+            });
+            taUser.setRoleIds(ids);
+            taUser.setLoginPassword("");
+            QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+            taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
+            List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+            //非置业顾问可以授权多个项目
+            if (taPersonBuildingList.size() > 0){
+                if (taUser.getIsConsultant()){
+                    taUser.setBuildingId(taPersonBuildingList.get(0).getBuildingId());
+                    QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+                    taPersonQueryWrapper.eq("user_id",id);
+                    taPersonQueryWrapper.eq("org_id",taUser.getOrgId());
+                    TaPerson taPerson = iTaPersonService.getOne(taPersonQueryWrapper);
+                    if (null != taPerson){
+                        taUser.setConsultantPersonId(taPerson.getPersonId());
+                    }
+                }else {
+                    List<String> buildings = new ArrayList<>();
+                    taPersonBuildingList.forEach(e -> {
+                        buildings.add(e.getBuildingId());
+                    });
+                    taUser.setBuildingIds(buildings);
+                }
+            }
+            responseBean.addSuccess(taUser);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        
+        return responseBean;
+    }
+    
+    /**
+     * 保存对象
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser",method= RequestMethod.POST)
+    public ResponseBean adminUserAdd(@RequestBody TaUser taUser,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taUser.setOrgId(getOrgId(request));
+            responseBean.addSuccess(iTaUserService.addAdminUser(taUser));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser/{id}",method= RequestMethod.PUT)
+    public ResponseBean adminUserUpdate(@PathVariable Integer id,
+                                     @RequestBody TaUser taUser,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taUser.setUserId(id);
+            taUser.setOrgId(getOrgId(request));
+            responseBean.addSuccess(iTaUserService.updateAdminUser(taUser));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    // 树形菜单
+    @RequestMapping(value="/center/taUser/city/tree",method= RequestMethod.GET)
+    public ResponseBean cityTree(){
+        ResponseBean taUser = iTaUserService.cityTree();
+        return taUser;
+    }
+
+    /**
+     * 员工离职
+     * @return
+     */
+    @RequestMapping(value = "/admin/user/departure/{userId}", method = RequestMethod.PUT)
+    public ResponseBean departureUser(@PathVariable("userId") Integer userId,
+                                      @RequestParam(value = "customerIdList", required = false) List<String> customerIdList,
+                                      @RequestParam(value = "consultantUserId", required = false) Integer consultantUserId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.departureUser(userId, customerIdList, consultantUserId);
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserRoleController.java

@@ -0,0 +1,178 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+    * 用户角色表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaUserRoleController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaUserRoleController.class);
+
+    @Autowired
+    public ITaUserRoleService iTaUserRoleService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRole",method= RequestMethod.GET)
+    public ResponseBean taUserRoleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaUserRole> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaUserRole> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaUserRole> result = iTaUserRoleService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taUserRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRole",method= RequestMethod.POST)
+    public ResponseBean taUserRoleAdd(@RequestBody TaUserRole taUserRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaUserRoleService.save(taUserRole)){
+                responseBean.addSuccess(taUserRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 批量保存用户角色
+     * @param taUserRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRoleList",method= RequestMethod.POST)
+    public ResponseBean taUserRoleListAdd(@RequestBody TaUserRole taUserRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<TaUserRole> taUserRoleList = new ArrayList<>();
+            List<Integer> roleIdList = taUserRole.getRoleIdList();
+            roleIdList.forEach(e -> {
+                TaUserRole taUserRoles = new TaUserRole();
+                taUserRoles.setRoleId(e);
+                taUserRole.setUserId(taUserRole.getUserId());
+                taUserRoleList.add(taUserRoles);
+            });
+            if (iTaUserRoleService.saveBatch(taUserRoleList)){
+                responseBean.addSuccess(taUserRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taUserRole/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taUserRoleDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaUserRoleService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taUserRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRole/{id}",method= RequestMethod.PUT)
+    public ResponseBean taUserRoleUpdate(@PathVariable Integer id,
+                                        @RequestBody TaUserRole taUserRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taUserRole.setRoleId(id);
+            if (iTaUserRoleService.updateById(taUserRole)){
+                responseBean.addSuccess(taUserRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taUserRole/{id}",method= RequestMethod.GET)
+    public ResponseBean taUserRoleGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserRoleService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/entity/TaButtonUriMap.java

@@ -0,0 +1,40 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 按钮路由映射表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaButtonUriMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 按钮
+     */
+    private String buttonCode;
+
+    /**
+     * uri
+     */
+    private String uri;
+
+    /**
+     * 说明
+     */
+    private String remark;
+
+
+}

src/main/java/com/huiju/estateagents/center/taUser/entity/TaTagUser.java

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaTagUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 人员id
+     */
+    private Integer userId;
+
+    /**
+     * 标签id
+     */
+    private Integer tagId;
+
+
+}

src/main/java/com/huiju/estateagents/center/taUser/entity/TaTags.java

@@ -0,0 +1,53 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaTags implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标签id
+     */
+    @TableId(value = "tag_id", type = IdType.AUTO)
+    private Integer tagId;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+    /**
+     * 标签颜色
+     */
+    private String tagColor;
+
+    /**
+     * 标签图表
+     */
+    private String tagIcon;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -0,0 +1,270 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.entity.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Integer userId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 登录账户
+     */
+    private String loginName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 登录密码
+     */
+    private String loginPassword;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 用户状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 账户过期时间
+     */
+    private LocalDateTime expDate;
+
+    /**
+     * 是否管理员
+     */
+    private Boolean isAdmin;
+
+    /**
+     * 公司名称
+     */
+    private String orgName;
+
+    /**
+     * 部门
+     */
+    private String department;
+
+    /**
+     * 职位
+     */
+    private String position;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 身份证号
+     */
+    private String idNo;
+    
+    private String address;
+    private String photo;
+    private String description;
+
+    /**
+     * 权重
+     */
+    @TableField(strategy= FieldStrategy.IGNORED)
+    private String weight;
+
+    /**
+     * 是否置业顾问
+     */
+    private Boolean isConsultant;
+
+    /**
+     * 公司水印
+     */
+    @TableField(exist = false)
+    private String waterMark;
+
+    /**
+     * 关联小程序
+     */
+    @TableField(exist = false)
+    private TaMiniapp miniapp;
+
+    /**
+     * 授权角色列表
+     */
+    @TableField(exist = false)
+    private List<TaRole> roles;
+
+    /**
+     * 授权菜单列表
+     */
+    @TableField(exist = false)
+    private List<SysMenu> menus;
+
+    /**
+     * 授权按钮列表
+     */
+    @TableField(exist = false)
+    private List<SysButtonInMenu> buttons;
+    
+    @TableField(exist = false)
+    private List<TaTags> taTagsList = new ArrayList<TaTags>();
+    
+    @TableField(exist = false)
+    private List<Integer> taTags = new ArrayList<Integer>();
+    
+    @TableField(exist = false)
+    private List<Integer> roleIds = new ArrayList<Integer>();
+    
+    @TableField(exist = false)
+    private String buildingId;
+
+    @TableField(exist = false)
+    private List<String> projects;
+
+    /**
+     * ta_org/orgNum楼盘最大数
+     */
+  @TableField(exist = false)
+    private int orgNum;
+
+    // 所有省份城市
+    @TableField(exist = false)
+    List<TdCity> tdCityList;
+
+    /**
+     * 前台传值城市
+     */
+    @TableField(exist = false)
+    private ArrayList<String> selectCityTree;
+
+    /**
+     * 城市ID
+     */
+    @TableField(exist = false)
+    private Integer cityId;
+
+    /**
+     * 默认城市
+     */
+    @TableField(exist = false)
+    private Integer defaultCityId;
+
+    /**
+     * 小程序绑定状态
+     *
+     * 0 未绑定 1 绑定
+     */
+    @TableField(exist = false)
+    private Integer miniStatus;
+
+    @TableField(exist = false)
+    private List<String> buildingIds = new ArrayList<String>();
+
+    /**
+     * 新密码
+     */
+    @TableField(exist = false)
+    private String newPassword;
+
+    /**
+     * 确认新密码
+     */
+    @TableField(exist = false)
+    private String confirmPassword;
+
+    /**
+     * 置业顾问的personid
+     */
+    @TableField(exist = false)
+    private String consultantPersonId;
+
+    /**
+     * personId集合
+     */
+    @TableField(exist = false)
+    private List<TaPerson> personIds;
+
+    /**
+     * customerId集合
+     */
+    @TableField(exist = false)
+    private List<TaRecommendCustomer> customerIds;
+
+    @TableField(exist = false)
+    private String miniAppName;
+
+    private Boolean notShow;
+
+    /**
+     * 公司封面
+     */
+    @TableField(exist = false)
+    private String orgThumb;
+
+    /**
+     * 公司描述
+     */
+    @TableField(exist = false)
+    private String orgDesc;
+
+    /**
+     * 公司Logo
+     */
+    @TableField(exist = false)
+    private String orgLogo;
+
+    /**
+     * BOSS 开屏图
+     */
+    @TableField(exist = false)
+    private String bossDisplay;
+}

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUserRole.java

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户角色表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+    
+    /**
+     * 角色ID集合
+     */
+    @TableField(exist = false)
+    private List<Integer> roleIdList = new ArrayList<>();
+
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaButtonUriMapMapper.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 按钮路由映射表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@Mapper
+public interface TaButtonUriMapMapper extends BaseMapper<TaButtonUriMap> {
+	
+	TaButtonUriMap getByURI(@Param("uri") String uri);
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaTagUserMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Mapper
+public interface TaTagUserMapper extends BaseMapper<TaTagUser> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaTagsMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Mapper
+public interface TaTagsMapper extends BaseMapper<TaTags> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserAuthButtonMapper.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: TaUserAuthButtonMapper
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@Mapper
+public interface TaUserAuthButtonMapper  extends BaseMapper<SysButtonInMenu> {
+    /**
+     * 根据用户Id查询按钮列表
+     * @param userId
+     * @return
+     */
+    List<SysButtonInMenu> sysButtonListByUserId(@Param("userId")String userId);
+
+
+    /**
+     * 根据角色Id查询按钮列表
+     * @param page
+     * @return
+     */
+    List<SysButtonInMenu> sysButtonListByRoleId();
+
+    void deleteUserAuthButton(@Param("userId") Integer userId);
+
+    void addUserAuthButton(@Param("userId") Integer userId, @Param("sysButtons") List<SysButtonInMenu> sysButtonInMenus);
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserAuthMenuMapper.java

@@ -0,0 +1,46 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.entity.SysMenu;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuMapper
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@Mapper
+public interface TaUserAuthMenuMapper extends BaseMapper<SysMenu> {
+    /**
+     * 根据用户Id查询菜单列表
+     * @param userId
+     * @return
+     */
+    List<SysMenu> sysMenuListByUserId(@Param("userId")String userId);
+
+
+    /**
+     * 查询菜单列表
+     * @return
+     */
+    List<SysMenu> sysMenuListByRoleId();
+
+    /**
+     * 删除授权的菜单
+     * @param userId
+     */
+    void deleteUserAuthMenu(@Param("userId") Integer userId);
+
+    /**
+     * 新增授权的菜单
+     * @param userId
+     */
+    void addUserAuthMenu(@Param("userId") Integer userId, @Param("sysMenus") List<SysMenu> sysMenuList);
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -0,0 +1,40 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaUserMapper extends BaseMapper<TaUser> {
+	
+	List<Map<String,Object>> getPageList(IPage<TaUser> pg, @Param("channelId") Integer channelId, @Param("miniAppName") String miniAppName);
+	
+	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
+	
+	List<TaUser> getUserList(@Param("phone") String phone,@Param("orgId") Integer orgId);
+
+    IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    Integer validateWeight(@Param("buildingIds") List<String> buildingIds, @Param("buildingId") String buildingId, @Param("weight") String weight, @Param("userId")Integer userId);
+
+    TaUser getAdminByAppID(@Param("appid") String appID);
+
+    List<String> getBuildingIdsOf(@Param("userId") Integer userId,@Param("buildingId") String buildingId);
+
+    TaUser getUserByPerson(@Param("orgId") Integer orgId, @Param("personId") String personId);
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserRoleMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户角色表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaUserRoleMapper extends BaseMapper<TaUserRole> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaButtonUriMapService.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+
+/**
+ * <p>
+ * 按钮路由映射表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+public interface ITaButtonUriMapService extends IService<TaButtonUriMap> {
+	
+	TaButtonUriMap getByURI(String uri);
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaTagUserService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+public interface ITaTagUserService extends IService<TaTagUser> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaTagsService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+public interface ITaTagsService extends IService<TaTags> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserAuthButtonService.java

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: ITaUserAuthButtonService
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+public interface ITaUserAuthButtonService extends IService<SysButtonInMenu> {
+
+    ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId);
+
+    ResponseBean getAllButton(Integer pageNum, Integer pageSize);
+
+    ResponseBean updateUserAuthButton(Integer userId, List<SysButtonInMenu> sysButtonInMenus);
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserAuthMenuService.java

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRole;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: ITaUserAuthMenuService
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+public interface ITaUserAuthMenuService extends IService<SysMenu> {
+
+    ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId);
+
+    ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId, List<TaRole> roles);
+
+    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList,String name,Integer orgid,List<SysButtonInMenu> sysButtonInMenuList);
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserRoleService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+
+/**
+ * <p>
+ * 用户角色表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaUserRoleService extends IService<TaUserRole> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -0,0 +1,78 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaUserService extends IService<TaUser> {
+
+    IPage<Map<String, Object>> getPageList(IPage<TaUser> pg, Integer channelId, String miniAppName);
+
+    TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception;
+
+    TaUser getInfoWithOrg(Integer id);
+
+    void updateInfoWithOrg(TaUser taUser) throws Exception;
+
+    void turnUserOnOrNot(Integer id, boolean isOn, String plat) throws Exception;
+
+    void resetPassword(Integer id, String newPass) throws Exception;
+
+    List<TaTags> getTagsList(TaUser e);
+
+    TaUser addAdminUser(TaUser taUser) throws Exception;
+
+    TaUser updateAdminUser(TaUser taUser) throws Exception;
+
+    TaUser getAdminByAppID(String appid);
+
+    /**
+     * 查询所有城市
+     *
+     * @return
+     */
+    ResponseBean cityTree();
+
+    /**
+     * 员工离职
+     *
+     * @param userId
+     * @param customerIdList
+     * @param consultantUserId 置业顾问的userId
+     * @return
+     */
+    ResponseBean departureUser(Integer userId, List<String> customerIdList, Integer consultantUserId);
+
+    /**
+     * 分页查询用户列表
+     *
+     * @param pg
+     * @param taUser
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 获取用户信息
+     *
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    TaUser getUserInfoById(Integer userId, Integer orgId);
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaButtonUriMapServiceImpl.java

@@ -0,0 +1,28 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+import com.huiju.estateagents.center.taUser.mapper.TaButtonUriMapMapper;
+import com.huiju.estateagents.center.taUser.service.ITaButtonUriMapService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 按钮路由映射表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@Service
+public class TaButtonUriMapServiceImpl extends ServiceImpl<TaButtonUriMapMapper, TaButtonUriMap> implements ITaButtonUriMapService {
+	
+	@Autowired
+	private TaButtonUriMapMapper taButtonUriMapMapper;
+	
+	@Override
+	public TaButtonUriMap getByURI(String uri) {
+		return taButtonUriMapMapper.getByURI(uri);
+	}
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaTagUserServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Service
+public class TaTagUserServiceImpl extends ServiceImpl<TaTagUserMapper, TaTagUser> implements ITaTagUserService {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaTagsServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.mapper.TaTagsMapper;
+import com.huiju.estateagents.center.taUser.service.ITaTagsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Service
+public class TaTagsServiceImpl extends ServiceImpl<TaTagsMapper, TaTags> implements ITaTagsService {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthButtonServiceImpl.java

@@ -0,0 +1,112 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserAuthButtonMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.SysAdvancedConfigRelation;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaAdvancedController;
+import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.entity.TaRoleButton;
+import com.huiju.estateagents.mapper.SysAdvancedConfigRelationMapper;
+import com.huiju.estateagents.mapper.TaAdvancedControllerMapper;
+import com.huiju.estateagents.mapper.TaRoleButtonMapper;
+import com.huiju.estateagents.mapper.TaRoleMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author admin
+ * @Title: TaUserAuthButtonServiceImpl
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@Service
+public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMapper, SysButtonInMenu> implements ITaUserAuthButtonService {
+
+    @Autowired
+    TaUserAuthButtonMapper taUserAuthButtonMapper;
+    @Autowired
+    TaRoleButtonMapper taRoleButtonMapper;
+    @Autowired
+    private TaUserMapper taUserMapper;
+    @Autowired
+    private TaRoleMapper taRoleMapper;
+    @Autowired
+    private TaAdvancedControllerMapper taAdvancedControllerMapper;
+    @Autowired
+    private SysAdvancedConfigRelationMapper sysAdvancedConfigRelationMapper;
+
+    @Override
+    public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId) {
+        List<SysButtonInMenu> records = new ArrayList<>();
+        List<SysButtonInMenu> menuList = taUserAuthButtonMapper.sysButtonListByUserId(userId);
+        records.addAll(menuList);
+        //添加高级配置的过滤条件
+        List<TaAdvancedController> taAdvancedControllerList = taAdvancedControllerMapper.selectList(new QueryWrapper<TaAdvancedController>().eq("org_id", orgId));
+
+        //需要过滤的菜单
+        QueryWrapper<SysAdvancedConfigRelation> sysAdvancedConfigRelationQueryWrapper = new QueryWrapper<>();
+        sysAdvancedConfigRelationQueryWrapper.eq("target_type", CommConstant.ADVANCED_TYPE_BUTTON);
+        sysAdvancedConfigRelationQueryWrapper.notIn(taAdvancedControllerList.size() > 0,"advanced_config_id",taAdvancedControllerList.stream().map(TaAdvancedController::getAdvancedConfigId).collect(Collectors.toList()));
+        List<SysAdvancedConfigRelation> sysAdvancedConfigRelations = sysAdvancedConfigRelationMapper.selectList(sysAdvancedConfigRelationQueryWrapper);
+        menuList.forEach(e -> {
+            sysAdvancedConfigRelations.forEach(s -> {
+                if ((e.getBtnId()).equals(Integer.valueOf(s.getTargetId()))){
+                    records.remove(e);
+                }
+            });
+        });
+        return ResponseBean.success(records);
+
+    }
+
+    @Override
+    public ResponseBean getAllButton(Integer pageNum, Integer pageSize) {
+        List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByRoleId();
+        records.forEach(e -> {
+            List<TaRole> taRoles = taRoleMapper.getRolesByBtnId(e.getBtnId());
+            e.setRolesList(taRoles);
+        });
+
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean updateUserAuthButton(Integer userId, List<SysButtonInMenu> sysButtonInMenus) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 人员
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (null == taUser) {
+            responseBean.addError("授权人不存在");
+            return responseBean;
+        }
+
+
+        try{
+            //授权菜单按钮，先删除在新增
+            taUserAuthButtonMapper.deleteUserAuthButton(userId);
+            taUserAuthButtonMapper.addUserAuthButton(userId, sysButtonInMenus);
+            responseBean.addSuccess("操作成功");
+            return  responseBean;
+        }catch (Exception e){
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return responseBean;
+        }
+
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

@@ -0,0 +1,199 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.mapper.TaUserAuthMenuMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuServiceImpl
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@Service
+public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper, SysMenu> implements ITaUserAuthMenuService {
+
+
+    @Autowired
+    private TaUserAuthMenuMapper taUserAuthMenuMapper;
+    @Autowired
+    private TaRoleMenuMapper taRoleMenuMapper;
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private  TaRoleMapper taRoleMapper;
+
+    @Autowired
+    private TaRoleButtonMapper taRoleButtonMapper;
+
+    @Autowired
+    private TaAdvancedControllerMapper taAdvancedControllerMapper;
+
+    @Autowired
+    private SysAdvancedConfigRelationMapper sysAdvancedConfigRelationMapper;
+
+    /**
+     * 根据用户id获取授权菜单
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId) {
+        List<SysMenu> records = new ArrayList<>();
+        List<SysMenu> menuList = taUserAuthMenuMapper.sysMenuListByUserId(userId);
+        records.addAll(menuList);
+        //添加高级配置的过滤条件
+        List<TaAdvancedController> taAdvancedControllerList = taAdvancedControllerMapper.selectList(new QueryWrapper<TaAdvancedController>().eq("org_id", orgId));
+
+        //需要过滤的菜单
+        QueryWrapper<SysAdvancedConfigRelation> sysAdvancedConfigRelationQueryWrapper = new QueryWrapper<>();
+        sysAdvancedConfigRelationQueryWrapper.eq("target_type",CommConstant.ADVANCED_TYPE_MENU);
+        sysAdvancedConfigRelationQueryWrapper.notIn(taAdvancedControllerList.size() > 0,"advanced_config_id",taAdvancedControllerList.stream().map(TaAdvancedController::getAdvancedConfigId).collect(Collectors.toList()));
+        List<SysAdvancedConfigRelation> sysAdvancedConfigRelations = sysAdvancedConfigRelationMapper.selectList(sysAdvancedConfigRelationQueryWrapper);
+        menuList.forEach(e -> {
+            sysAdvancedConfigRelations.forEach(s -> {
+                if (e.getMenuId() == Integer.valueOf(s.getTargetId())){
+                    records.remove(e);
+                }
+            });
+        });
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId, List<TaRole> userRoles) {
+        List<SysMenu> records = new ArrayList<>();
+        List<SysMenu> menuList = taUserAuthMenuMapper.sysMenuListByRoleId();
+        records.addAll(menuList);
+        //添加高级配置的过滤条件
+        List<TaAdvancedController> taAdvancedControllerList = taAdvancedControllerMapper.selectList(new QueryWrapper<TaAdvancedController>().eq("org_id", orgId));
+
+        //需要过滤的菜单
+        QueryWrapper<SysAdvancedConfigRelation> sysAdvancedConfigRelationQueryWrapper = new QueryWrapper<>();
+        sysAdvancedConfigRelationQueryWrapper.eq("target_type",CommConstant.ADVANCED_TYPE_MENU);
+        sysAdvancedConfigRelationQueryWrapper.notIn(taAdvancedControllerList.size() > 0,"advanced_config_id",taAdvancedControllerList.stream().map(TaAdvancedController::getAdvancedConfigId).collect(Collectors.toList()));
+        List<SysAdvancedConfigRelation> sysAdvancedConfigRelations = sysAdvancedConfigRelationMapper.selectList(sysAdvancedConfigRelationQueryWrapper);
+
+        List<TaRoleMenu> configRelationRoleMenuList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(userRoles) && CollectionUtils.isNotEmpty(sysAdvancedConfigRelations)){
+            QueryWrapper<TaRoleMenu> taRoleMenuQueryWrapper = new QueryWrapper<>();
+            taRoleMenuQueryWrapper.in("role_id", userRoles.stream().map(TaRole::getRoleId).collect(Collectors.toList()));
+            taRoleMenuQueryWrapper.in("menu_id", sysAdvancedConfigRelations.stream().map(SysAdvancedConfigRelation::getTargetId).collect(Collectors.toList()));
+            configRelationRoleMenuList = taRoleMenuMapper.selectList(taRoleMenuQueryWrapper);
+        }
+
+        QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper();
+        List<TaRoleMenu> taRoleMenus = taRoleMenuMapper.selectList(queryWrapper);
+
+        for (SysMenu sysMenu : records){
+            ArrayList<Integer> roles = new ArrayList<>();
+            for (TaRoleMenu taRoleMenu : taRoleMenus){
+                if (taRoleMenu.getMenuId().equals(sysMenu.getMenuId()) && !roles.contains(taRoleMenu.getRoleId())){
+                    roles.add(taRoleMenu.getRoleId());
+                }
+            }
+            for (TaRoleMenu taRoleMenu : configRelationRoleMenuList){
+                if (sysMenu.getMenuId().equals(taRoleMenu.getMenuId())){
+                    roles.remove(taRoleMenu.getRoleId());
+                }
+            }
+            sysMenu.setRoles(roles);
+        }
+
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
+        ResponseBean responseBean = new ResponseBean();
+        if (null == roleId){
+            addUserAuthMenu( sysMenuList,name,orgId,sysButtonInMenuList);
+            return responseBean;
+        }
+        try {
+            //授权菜单，先删除在新增
+            taRoleMenuMapper.deleteCurrentMenu(roleId);
+            for (SysMenu sysMenu: sysMenuList) {
+                TaRoleMenu taRoleMenu = new TaRoleMenu();
+                taRoleMenu.setRoleId(roleId);
+                taRoleMenu.setMenuId(sysMenu.getMenuId());
+                taRoleMenuMapper.insert(taRoleMenu);
+            }
+            // 更新Role
+            TaRole taRole = new TaRole();
+            taRole.setRoleId(roleId);
+            taRole.setRoleName(name);
+            taRoleMapper.updateById(taRole);
+
+            // 当前角色的所有按钮再重新插入
+
+            taRoleButtonMapper.deleteCurrentBut(roleId);
+            for (SysButtonInMenu sysButtonInMenu :sysButtonInMenuList) {
+                TaRoleButton taRoleButton = new TaRoleButton();
+                taRoleButton.setRoleId(taRole.getRoleId());
+                taRoleButton.setBtnId(sysButtonInMenu.getBtnId());
+                taRoleButtonMapper.insert(taRoleButton);
+            }
+                responseBean.addSuccess("操作成功");
+            return responseBean;
+        } catch (Exception e) {
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return responseBean;
+        }
+    }
+
+    public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
+        ResponseBean responseBean = new ResponseBean();
+        try{
+            // 新增角色
+            TaRole taRole = new TaRole();
+            taRole.setRoleName(name);
+            taRole.setOrgId(orgId);
+            taRole.setStatus(1);
+            taRole.setCreateDate(LocalDateTime.now());
+            taRoleMapper.insert(taRole);
+
+            // 新增角色需要的菜单
+          for (SysMenu sysMenu: sysMenuList){
+              TaRoleMenu taRoleMenu = new TaRoleMenu();
+              taRoleMenu.setRoleId(taRole.getRoleId());
+              taRoleMenu.setMenuId(sysMenu.getMenuId());
+              taRoleMenuMapper.insert(taRoleMenu);
+          }
+          // 新增角色按钮
+          for (SysButtonInMenu sysButtonInMenu :sysButtonInMenuList){
+              TaRoleButton  taRoleButton = new TaRoleButton();
+              taRoleButton.setRoleId(taRole.getRoleId());
+              taRoleButton.setBtnId(sysButtonInMenu.getBtnId());
+              taRoleButtonMapper.insert(taRoleButton);
+          }
+            responseBean.addSuccess("操作成功");
+            return  true;
+        }catch (Exception e){
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return false;
+        }
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserRoleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户角色表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaUserRoleServiceImpl extends ServiceImpl<TaUserRoleMapper, TaUserRole> implements ITaUserRoleService {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -0,0 +1,748 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.WxUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.service.*;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 用户表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TaOrgMapper taOrgMapper;
+
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    private TaMiniappTemplateMapper taMiniappTemplateMapper;
+
+    @Autowired
+    private TaTagUserMapper taTagUserMapper;
+
+    @Autowired
+    private TaPersonBuildingMapper taPersonBuildingMapper;
+
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
+    @Autowired
+    private TaUserRoleMapper taUserRoleMapper;
+
+    @Autowired
+    private TdPointsRulesMapper tdPointsRulesMapper;
+
+    @Autowired
+    private ITdReportService iTdReportService;
+
+    @Autowired
+    private ITaBuildingReportService iTaBuildingReportService;
+
+    @Autowired
+    private TdCityMapper tdCityMapper;
+
+    @Autowired
+    private TaOrgCityMapper taOrgCityMapper;
+
+    @Autowired
+    private ITaPersonService iTaPersonService;
+
+    @Autowired
+    private ITaRecommendCustomerService iTaRecommendCustomerService;
+
+    @Autowired
+    private ISysOrgParamsService iSysOrgParamsService;
+
+    @Autowired
+    private TaChannelAppRelationMapper taChannelAppRelationMapper;
+
+    @Autowired
+    private TaChannelProxyMapper taChannelProxyMapper;
+
+    @Autowired
+    private WxUtils wxUtils;
+
+    @Override
+    public IPage<Map<String, Object>> getPageList(IPage pg, Integer channelId, String miniAppName) {
+        List<Map<String, Object>> taUserList = taUserMapper.getPageList(pg, channelId, miniAppName);
+
+        for (Map map : taUserList) {
+            if (map.get("orgId") == null) {
+                map.put("userCount", 0);
+                map.put("registeredCount", 0);
+                continue;
+            }
+            Integer userCount = taPersonMapper.selectChannelUserCount(map.get("orgId").toString());
+            Integer registeredCount = taPersonMapper.selectChannelRegisteredCount(map.get("orgId").toString());
+            map.put("userCount", userCount);
+            map.put("registeredCount", registeredCount);
+        }
+        pg.setRecords(taUserList);
+        return pg;
+    }
+
+    @Override
+    public TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception {
+        if (StringUtils.isEmpty(taUser.getPhone())) {
+            throw new Exception("电话号码不能为空");
+        }
+        if (StringUtils.isEmpty(taUser.getUserName())) {
+            throw new Exception("用户名称不能为空");
+        }
+
+        if (StringUtils.isEmpty(taUser.getLoginName())) {
+            taUser.setLoginName(taUser.getPhone());
+        }
+
+        //判断默认城市是否在维护城市内
+        verificationCity(taUser.getSelectCityTree(), taUser.getDefaultCityId());
+
+        QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+        wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
+        List<TaUser> taUserList = this.list(wrapper);
+        if (null != taUserList && taUserList.size() > 0) {
+            throw new Exception("电话号码或登录名重复");
+        }
+
+        //判断渠道端新增小程序最大数
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+        taChannelProxyQueryWrapper.eq("channel_id", channelId);
+        TaChannelProxy taChannelProxy = taChannelProxyMapper.selectOne(taChannelProxyQueryWrapper);
+
+        QueryWrapper<TaChannelAppRelation> relationQueryWrapper = new QueryWrapper<>();
+        relationQueryWrapper.eq("channel_id", channelId);
+        Integer miniAppCount = taChannelAppRelationMapper.selectCount(relationQueryWrapper);
+        if (miniAppCount >= taChannelProxy.getAppMaxNum()) {
+            throw new Exception("当前系统仅供维护" + taChannelProxy.getAppMaxNum() + "个小程序，需要维护更多项目，请联系相关管理人员");
+        }
+
+        // 先插入 org
+        TaOrg taOrg = new TaOrg();
+        taOrg.setName(taUser.getOrgName());
+        taOrg.setLogo(taUser.getOrgLogo());
+        taOrg.setWaterMark(taUser.getWaterMark());
+        taOrg.setCreateDate(LocalDateTime.now());
+        taOrg.setBuildingNum(taUser.getOrgNum());
+        taOrg.setDefaultCityId(taUser.getDefaultCityId());
+        taOrg.setThumb(taUser.getOrgThumb());
+        taOrg.setOrgDesc(taUser.getOrgDesc());
+        taOrg.setBossDisplay(taUser.getBossDisplay());
+        if (taOrgMapper.insert(taOrg) < 1) {
+            throw new Exception("生成用户公司信息失败");
+        }
+
+        //维护渠道和小程序关系
+        TaChannelAppRelation taChannelAppRelation = new TaChannelAppRelation();
+        taChannelAppRelation.setChannelId(channelId);
+        taChannelAppRelation.setOrgId(taOrg.getOrgId());
+        taChannelAppRelation.setCreateTime(LocalDateTime.now());
+        taChannelAppRelationMapper.insert(taChannelAppRelation);
+
+        // 维护当前城市所在城市
+        addAndupdate(taUser.getSelectCityTree(), false, taOrg.getOrgId());
+
+        // 插入积分, 默认全部 1 积分
+        List<TdPointsRules> pointsRules = tdPointsRulesMapper.getTPLRules();
+        if (pointsRules != null) {
+            for (int i = 0; i < pointsRules.size(); i++) {
+                TdPointsRules rule = pointsRules.get(i);
+                rule.setOrgId(taOrg.getOrgId());
+                rule.setStatus(CommConstant.STATUS_NORMAL);
+                rule.setPointsAmount(1);    // 默认1积分
+                tdPointsRulesMapper.insert(rule);
+            }
+        }
+
+        // 插入统计，默认全部显示
+        QueryWrapper<TdReport> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("create_date");
+        queryWrapper.eq("status", 1);
+        List<TdReport> tdReportList = iTdReportService.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(tdReportList)) {
+            List<TaBuildingReport> buildingReportList = tdReportList.stream().map(e -> {
+                TaBuildingReport taBuildingReport = new TaBuildingReport();
+                taBuildingReport.setOrgId(taOrg.getOrgId());
+                taBuildingReport.setReportCode(e.getReportCode());
+                taBuildingReport.setCreateDate(LocalDateTime.now());
+
+                return taBuildingReport;
+            }).collect(Collectors.toList());
+
+            iTaBuildingReportService.saveBatch(buildingReportList);
+        }
+
+        taUser.setOrgId(taOrg.getOrgId());
+        taUser.setIsAdmin(true);
+        taUser.setLoginPassword(MD5Utils.md5(taUser.getLoginPassword()));
+        taUser.setStatus(CommConstant.STATUS_NORMAL);
+        taUser.setCreateDate(LocalDateTime.now());
+        if (!this.save(taUser)) {
+            throw new Exception("生成用户信息失败");
+        }
+
+        // 导入系统参数
+        iSysOrgParamsService.importParamsFromTemplate(taOrg.getOrgId());
+
+        return taUser;
+    }
+
+    // 维护公司所在城市
+    public void addAndupdate(ArrayList<String> selectCityTree, boolean isA, Integer orgid) {
+        // 查询当前所有的市
+        QueryWrapper<TdCity> tdCityQuery = new QueryWrapper<>();
+        tdCityQuery.eq("leveltype", 2);
+        List<TdCity> tdCityList = tdCityMapper.selectList(tdCityQuery);
+
+        // isA=true删除所有城市重新添加
+        if (isA == true) {
+            QueryWrapper<TaOrgCity> taOrgCity = new QueryWrapper<>();
+            taOrgCity.eq("org_id", orgid);
+            taOrgCityMapper.delete(taOrgCity);
+        }
+        TaOrgCity taOrgCity = new TaOrgCity();
+        // 对比现在的城市ID
+        for (String city : selectCityTree) {
+            for (TdCity tdCity : tdCityList) {
+                // 入库城市
+                if (city.equals(String.valueOf(tdCity.getId()))) {
+                    taOrgCity.setCityId(Integer.valueOf(city)).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+                    taOrgCityMapper.insert(taOrgCity);
+                    // 查询当前公司选择省份是否存在
+                    QueryWrapper<TaOrgCity> taOrgCityParent = new QueryWrapper<>();
+                    taOrgCityParent.eq("city_id", tdCity.getParentid());
+                    taOrgCityParent.eq("org_id", orgid);
+                    taOrgCityParent.last("limit 1");
+                    TaOrgCity taOrgParent = taOrgCityMapper.selectOne(taOrgCityParent);
+                    // 如果为空，查询行政表
+                    if (null == taOrgParent) {
+                        TdCity tdCityParent = tdCityMapper.selectById(tdCity.getParentid());
+                        taOrgCity.setCityId(tdCityParent.getId()).setName(tdCityParent.getName()).setOrgId(orgid).setStatus(1).setParentid(100000);
+                        taOrgCityMapper.insert(taOrgCity);
+                    }
+                }
+
+            }
+        }
+
+    }
+
+    // 判断当前城市是否存在
+    public void verificationCity(ArrayList<String> selectCityTree, Integer city) throws Exception {
+        for (String id : selectCityTree) {
+            if (id.equals(String.valueOf(city))) {
+                return;
+            }
+        }
+        throw new Exception("当前默认城市不在维护城市内");
+    }
+
+    @Override
+    public TaUser getInfoWithOrg(Integer id) {
+        TaUser taUser = this.getById(id);
+        if (null == taUser) {
+            return taUser;
+        }
+
+        TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
+        if (null != taOrg) {
+            taUser.setOrgName(taOrg.getName());
+            taUser.setWaterMark(taOrg.getWaterMark());
+            taUser.setOrgNum(taOrg.getBuildingNum());
+            taUser.setDefaultCityId(taOrg.getDefaultCityId());
+            taUser.setOrgThumb(taOrg.getThumb());
+            taUser.setOrgDesc(taOrg.getOrgDesc());
+            taUser.setOrgLogo(taOrg.getLogo());
+            taUser.setBossDisplay(taOrg.getBossDisplay());
+        }
+
+        TaMiniapp taMiniapp = getMiniappByOrg(taOrg);
+        if (null != taMiniapp) {
+            QueryWrapper<TaMiniappTemplate> query = new QueryWrapper<>();
+            query.eq("miniapp_id", taMiniapp.getMiniappId());
+            taMiniapp.setTpls(taMiniappTemplateMapper.selectList(query));
+        }
+
+        taUser.setMiniapp(taMiniapp);
+        taUser.setLoginPassword(null);
+        // 查询所有城市id
+        ArrayList<String> taOrgCityList = taOrgCityMapper.selectByIdCity(taUser.getOrgId());
+        taUser.setSelectCityTree(taOrgCityList);
+        return taUser;
+    }
+
+    @Override
+    public void updateInfoWithOrg(TaUser taUser) throws Exception {
+        //判断默认城市是否在维护城市内
+        verificationCity(taUser.getSelectCityTree(), taUser.getDefaultCityId());
+
+        TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
+        if (null != taOrg) {
+            taOrg.setName(taUser.getOrgName());
+            taOrg.setLogo(taUser.getOrgLogo());
+            taOrg.setWaterMark(taUser.getWaterMark());
+            taOrg.setBuildingNum(taUser.getOrgNum());
+            taOrg.setDefaultCityId(taUser.getDefaultCityId());
+            taOrg.setThumb(taUser.getOrgThumb());
+            taOrg.setOrgDesc(taUser.getOrgDesc());
+            taOrg.setBossDisplay(taUser.getBossDisplay());
+            if (taOrgMapper.updateById(taOrg) < 1) {
+                throw new Exception("更新用户公司信息失败");
+            }
+
+            addAndupdate(taUser.getSelectCityTree(), true, taOrg.getOrgId());
+        }
+
+        taUser.setLoginPassword(null);
+        if (taUserMapper.updateById(taUser) < 1) {
+            throw new Exception("更新用户信息失败");
+        }
+
+        // 如果服务未启动, 则启动服务
+        TaMiniapp miniapp = getMiniappByOrg(taOrg);
+        if (miniapp != null) {
+            WxMaService maService = wxUtils.getMiniApp(miniapp.getMiniappId());
+            if (null == maService) {
+                TaUser admin = taUserMapper.getAdminByAppID(miniapp.getMiniappId());
+
+                if (null != admin && CommConstant.STATUS_NORMAL == admin.getStatus() && LocalDateTime.now().isBefore(admin.getExpDate())) {
+                    wxUtils.newService(miniapp, true);
+                }
+            }
+        }
+    }
+
+    private TaMiniapp getMiniappByOrg(TaOrg taOrg) {
+        QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
+        wrapper.eq("org_id", taOrg.getOrgId());
+        wrapper.last("limit 1");
+
+        return taMiniappMapper.selectOne(wrapper);
+    }
+
+    @Override
+    public void turnUserOnOrNot(Integer id, boolean isOn, String plat) throws Exception {
+        TaUser taUser = this.getById(id);
+        if (null == taUser) {
+            throw new Exception("未找到有效的用户信息");
+        }
+
+        //停用
+        if (!isOn){
+            //查看是否置业顾问
+            if (taUser.getIsConsultant()){
+//                taUser.setIsConsultant(false);
+//                taUserMapper.updateById(taUser);
+                //小程序端调整为普通客户
+                QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+                taPersonQueryWrapper.eq("user_id",id);
+                taPersonQueryWrapper.eq("org_id",taUser.getOrgId());
+                TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+                if (null != taPerson){
+                    taPersonMapper.cancelConsulatant(taPerson.getPersonId());
+                }
+            }
+        }
+
+        Integer status = isOn ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_CLOSED;
+        TaUser user = new TaUser();
+        user.setStatus(status);
+        user.setWeight(taUser.getWeight());
+
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        if (CommConstant.LOGIN_TYPE_ADMIN.equals(plat)) {
+            taUserQueryWrapper.eq("user_id", id);
+        }
+        taUserQueryWrapper.eq("org_id", taUserMapper.selectById(id).getOrgId());
+
+        if (!this.update(user, taUserQueryWrapper)) {
+            throw new Exception("开启或禁用用户失败");
+        }
+    }
+
+    @Override
+    public void resetPassword(Integer id, String newPass) throws Exception {
+        TaUser taUser = this.getById(id);
+        if (null == taUser) {
+            throw new Exception("未找到有效的用户信息");
+        }
+
+        String encryptPass = MD5Utils.md5(MD5Utils.md5(newPass));
+        TaUser user = new TaUser();
+        user.setLoginPassword(encryptPass);
+        user.setUserId(id);
+
+        if (!this.updateById(user)) {
+            throw new Exception("重置用户密码失败");
+        }
+    }
+
+    @Override
+    public List<TaTags> getTagsList(TaUser e) {
+        return taUserMapper.getTagsList(e.getUserId(), e.getOrgId());
+    }
+
+    @Override
+    public TaUser addAdminUser(TaUser taUser) throws Exception {
+        if (StringUtils.isEmpty(taUser.getPhone())) {
+            throw new Exception("电话号码不能为空");
+        }
+        if (StringUtils.isEmpty(taUser.getUserName())) {
+            throw new Exception("用户名称不能为空");
+        }
+
+        if (!StringUtils.isEmpty(taUser.getLoginName())) {
+            QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+            wrapper.eq("login_name", taUser.getLoginName());
+            List<TaUser> taUserList = this.list(wrapper);
+            if (null != taUserList && taUserList.size() > 0) {
+                throw new Exception("登录名重复");
+            }
+        }
+
+        boolean weightCount = validateWeight(taUser, "add");
+        if (weightCount) {
+            throw new Exception("同一项目下权重值不能重复");
+        }
+
+        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getOrgId());
+        if (null != taUserList && taUserList.size() > 0) {
+            throw new Exception("电话号码重复");
+        }
+        taUser.setLoginPassword(MD5Utils.md5(MD5Utils.md5("123456")));
+        taUser.setStatus(CommConstant.STATUS_NORMAL);
+        taUser.setCreateDate(LocalDateTime.now());
+        if (taUser.getIsConsultant() == null) {
+            taUser.setIsConsultant(false);
+        }
+        if (taUserMapper.insert(taUser) < 1) {
+            throw new Exception("生成用户信息失败");
+        }
+
+        //保存标签
+        List<Integer> tags = taUser.getTaTags();
+        tags.forEach(e -> {
+            TaTagUser taTagUser = new TaTagUser();
+            taTagUser.setUserId(taUser.getUserId());
+            taTagUser.setTagId(e);
+            taTagUserMapper.insert(taTagUser);
+        });
+
+        //保存用户角色
+        List<Integer> roleIds = taUser.getRoleIds();
+        roleIds.forEach(e -> {
+            TaUserRole taUserRole = new TaUserRole();
+            taUserRole.setUserId(taUser.getUserId());
+            taUserRole.setRoleId(e);
+            taUserRoleMapper.insert(taUserRole);
+        });
+
+        //保存项目
+        if (taUser.getIsConsultant()) {
+            TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+            taPersonBuilding.setBuildingId(taUser.getBuildingId());
+            taPersonBuilding.setUserId(taUser.getUserId());
+            taPersonBuilding.setCreateDate(LocalDateTime.now());
+            taPersonBuildingMapper.insert(taPersonBuilding);
+        } else {
+            //非置业顾问可授权多个项目
+            List<String> buildingIdList = taUser.getBuildingIds();
+            LocalDateTime nowTime = LocalDateTime.now();
+            buildingIdList.forEach(e -> {
+                TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+                taPersonBuilding.setBuildingId(e);
+                taPersonBuilding.setUserId(taUser.getUserId());
+                taPersonBuilding.setCreateDate(nowTime);
+                taPersonBuildingMapper.insert(taPersonBuilding);
+            });
+        }
+
+        return taUser;
+    }
+
+    @Override
+    public TaUser updateAdminUser(TaUser taUser) throws Exception {
+        TaUser taUserBefore = taUserMapper.selectById(taUser.getUserId());
+        if (StringUtils.isEmpty(taUser.getPhone())) {
+            throw new Exception("电话号码不能为空");
+        }
+        if (StringUtils.isEmpty(taUser.getUserName())) {
+            throw new Exception("用户名称不能为空");
+        }
+        if (!StringUtils.isEmpty(taUser.getWeight()) && taUser.getWeight().length() > 11) {
+            throw new Exception("权重最大为11位");
+        }
+        if (StringUtils.isEmpty(taUser.getWeight())) {
+            taUser.setWeight(null);
+        }
+        if (!StringUtils.isEmpty(taUser.getLoginName()) && !taUser.getLoginName().equals(taUserBefore.getLoginName())) {
+            if (!StringUtils.isEmpty(taUser.getLoginName())) {
+                QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+                wrapper.eq("login_name", taUser.getLoginName());
+                List<TaUser> taUserList = this.list(wrapper);
+                if (null != taUserList && taUserList.size() > 0) {
+                    throw new Exception("登录名重复");
+                }
+            }
+        }
+
+        boolean weightCount = validateWeight(taUser, "update");
+        if (weightCount) {
+            throw new Exception("同一项目下权重值不能重复");
+        }
+
+        QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+//        wrapper.nested(q -> q.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName()));
+        wrapper.eq("phone", taUser.getPhone());
+        wrapper.eq("org_id", taUser.getOrgId());
+        wrapper.ne("user_id", taUser.getUserId());
+        List<TaUser> taUserList = this.list(wrapper);
+        if (null != taUserList && taUserList.size() > 0) {
+            throw new Exception("电话号码重复");
+        }
+        if (taUserMapper.updateById(taUser) < 1) {
+            throw new Exception("更新用户信息失败");
+        }
+        QueryWrapper<TaTagUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", taUser.getUserId());
+        taTagUserMapper.delete(queryWrapper);
+        //保存标签
+        List<Integer> tags = taUser.getTaTags();
+        tags.forEach(e -> {
+            TaTagUser taTagUser = new TaTagUser();
+            taTagUser.setUserId(taUser.getUserId());
+            taTagUser.setTagId(e);
+            taTagUserMapper.insert(taTagUser);
+        });
+
+        QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
+        taUserRoleQueryWrapper.eq("user_id", taUser.getUserId());
+        taUserRoleMapper.delete(taUserRoleQueryWrapper);
+        //保存用户角色
+        List<Integer> roleIds = taUser.getRoleIds();
+        roleIds.forEach(e -> {
+            TaUserRole taUserRole = new TaUserRole();
+            taUserRole.setUserId(taUser.getUserId());
+            taUserRole.setRoleId(e);
+            taUserRoleMapper.insert(taUserRole);
+        });
+
+        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+        taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);
+        //保存项目
+        if (taUser.getIsConsultant()) {
+            TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+            taPersonBuilding.setBuildingId(taUser.getBuildingId());
+            taPersonBuilding.setUserId(taUser.getUserId());
+            taPersonBuilding.setCreateDate(LocalDateTime.now());
+            taPersonBuildingMapper.insert(taPersonBuilding);
+        } else {
+            //非置业顾问可授权多个项目
+            List<String> buildingIdList = taUser.getBuildingIds();
+            LocalDateTime nowTime = LocalDateTime.now();
+            buildingIdList.forEach(e -> {
+                TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+                taPersonBuilding.setBuildingId(e);
+                taPersonBuilding.setUserId(taUser.getUserId());
+                taPersonBuilding.setCreateDate(nowTime);
+                taPersonBuildingMapper.insert(taPersonBuilding);
+            });
+        }
+
+        //更新person
+        TaPerson taPerson = new TaPerson();
+        taPerson.setAvatarurl(taUser.getAvatar());
+        taPerson.setCompany(taUser.getOrgName());
+        taPerson.setTel(taUser.getPhone());
+        taPerson.setName(taUser.getUserName());
+        taPerson.setAddress(taUser.getAddress());
+        taPerson.setIdNo(taUser.getIdNo());
+        taPerson.setDepartment(taUser.getDepartment());
+        taPerson.setPost(taUser.getPosition());
+        taPerson.setPhoto(taUser.getPhoto());
+        QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+        taPersonQueryWrapper.eq("user_id", taUser.getUserId());
+        taPersonMapper.update(taPerson, taPersonQueryWrapper);
+
+        return taUser;
+    }
+
+    @Override
+    public TaUser getAdminByAppID(String appid) {
+        return taUserMapper.getAdminByAppID(appid);
+    }
+
+    @Override
+    public ResponseBean cityTree() {
+        ResponseBean responseBean = new ResponseBean<>();
+        // 省份
+        TaUser taUser = new TaUser();
+        QueryWrapper<TdCity> tdCityQueryWrapper = new QueryWrapper<>();
+        tdCityQueryWrapper.eq("leveltype", 1);
+        List<TdCity> tdCityList = tdCityMapper.selectList(tdCityQueryWrapper);
+        taUser.setTdCityList(tdCityList);
+        for (TdCity tdCity : tdCityList) {
+            // 根据parentid查询城市
+            QueryWrapper<TdCity> tdCityQuery = new QueryWrapper<>();
+            tdCityQuery.eq("parentid", tdCity.getId());
+            List<TdCity> city = tdCityMapper.selectList(tdCityQuery);
+            tdCity.setChildren(city);
+        }
+        responseBean.addSuccess(taUser);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean departureUser(Integer userId, List<String> customerIdList, Integer consultantUserId) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUser user = this.getById(userId);
+        if (null == user) {
+            responseBean.addError("此员工不存在！");
+            return responseBean;
+        }
+
+        // 不是置业顾问
+        if (user.getIsConsultant() == false) {
+            // 设置员工离职
+            updateUserStatus(user);
+            return ResponseBean.success("操作成功！");
+        }
+        /**
+         * 是置业顾问
+         */
+
+        // 更改员工表的用户类型，清空关联关系user_id
+
+        QueryWrapper<TaPerson> userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.eq("user_id", consultantUserId);
+        TaPerson person = iTaPersonService.getOne(userQueryWrapper);
+        if (null == person) {
+            responseBean.addError("置业顾问未绑定小程序！");
+            return responseBean;
+        }
+
+        // 设置员工离职
+        updateUserStatus(user);
+
+        // 转移客户
+        UpdateWrapper<TaRecommendCustomer> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("customer_id", customerIdList);
+        updateWrapper.set("realty_consultant", person.getPersonId());
+        boolean update = iTaRecommendCustomerService.update(updateWrapper);
+        if (!update) {
+            return ResponseBean.error("操作失败!", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success("操作成功!");
+    }
+
+    /**
+     * 分页查询用户列表
+     *
+     * @param pg
+     * @param taUser
+     * @param personBuildingList
+     * @return
+     */
+    @Override
+    public IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> personBuildingList) {
+        return taUserMapper.seleUserList(pg, taUser, personBuildingList);
+    }
+
+    @Override
+    public TaUser getUserInfoById(Integer userId, Integer orgId) {
+        QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.eq("user_id", userId);
+        userQueryWrapper.eq("org_id", orgId);
+        userQueryWrapper.ne("status", -1);
+        return getOne(userQueryWrapper);
+    }
+
+    private boolean updateUserStatus(TaUser user) {
+        UpdateWrapper<TaUser> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("user_id", user.getUserId());
+        updateWrapper.set("status", 9);
+
+        QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+        taPersonQueryWrapper.eq("user_id", user.getUserId());
+        taPersonQueryWrapper.last("limit 1");
+        TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+        // 可能存在没有绑定小程序端
+        if (null != taPerson) {
+            UpdateWrapper<TaPerson> personUpdateWrapper = new UpdateWrapper<>();
+            personUpdateWrapper.eq("person_id", taPerson.getPersonId());
+
+            // 如果是置业顾问，设置为客户类型
+            if (user.getIsConsultant() == true) {
+                personUpdateWrapper.set("person_type", CommConstant.PERSON_ESTATE_CUSTOMER);
+            }
+
+            personUpdateWrapper.set("user_id", null);
+            iTaPersonService.update(personUpdateWrapper);
+        }
+
+        return this.update(updateWrapper);
+    }
+
+    public boolean validateWeight(TaUser taUser, String operateType) {
+        if (StringUtils.isEmpty(taUser.getWeight())) {
+            return false;
+        }
+
+        Integer count;
+        if (taUser.getIsConsultant() != null && taUser.getIsConsultant()) {
+            String buildingId = taUser.getBuildingId();
+            String weight = taUser.getWeight();
+            count = taUserMapper.validateWeight(null, buildingId, weight, operateType.equals("add") ? null : taUser.getUserId());
+        } else {
+            List<String> buildingIds = taUser.getBuildingIds();
+            String weight = taUser.getWeight();
+            count = taUserMapper.validateWeight(buildingIds, null, weight, operateType.equals("add") ? null : taUser.getUserId());
+        }
+
+        if (count > 0) {
+            return true;
+        }
+        return false;
+    }
+
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -0,0 +1,293 @@
+package com.huiju.estateagents.channel.sysUser.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import com.huiju.estateagents.service.ITaChannelAppRelationService;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+    * 系统用户 系统中心账户 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class SysUserChannelController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysUserChannelController.class);
+
+    @Autowired
+    public ISysUserService iSysUserService;
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+    @Autowired
+    private ITaUserService iTaUserService;
+
+    @Autowired
+    private ITaChannelProxyService iTaChannelProxyService;
+
+    @Autowired
+    private ITaChannelAppRelationService iTaChannelAppRelationService;
+
+    /**
+     * 修改对象
+     * @param sysUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channel/sysUser",method= RequestMethod.PUT)
+    public ResponseBean sysUserUpdate(@RequestBody SysUser sysUser, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String userName = JWTUtils.getSubject(request);
+            sysUser.setPassword(MD5Utils.md5(sysUser.getPassword()));
+            sysUser.setUserName(userName);
+            if (iSysUserService.updateById(sysUser)){
+                responseBean.addSuccess(sysUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @PostMapping("/channel/signin")
+    public ResponseBean signinChannel(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        String userName = params.getString("userName");
+        String userPassword = params.getString("password");
+
+        //验证用户名密码是否正确
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
+        sysUserQueryWrapper.eq("type", CommConstant.LOGIN_TYPE_CHANNEL);
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
+        if (sysUser == null) {
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (sysUser.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        Map map = new HashMap();
+        map.put("userName", sysUser.getUserName());
+        map.put("userId",sysUser.getUserId());
+
+        String token = JWTUtils.newTokenByMap(map);
+
+        //保存token
+        sysTokenService.saveToken(token);
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("user", sysUser);
+
+        return ResponseBean.success(result);
+    }
+
+    @PostMapping("/channel/signout")
+    public ResponseBean signoutChannel(HttpServletRequest request) {
+        String token = JWTUtils.getToken(request);
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
+        sysTokenQueryWrapper.eq("token",token);
+        sysTokenService.remove(sysTokenQueryWrapper);
+        return ResponseBean.success("成功退出");
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/current",method=RequestMethod.GET)
+    public ResponseBean currentChannelUser(HttpServletRequest request){
+        String userName = getSysUserName(request);
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        sysUserQueryWrapper.eq("type",CommConstant.LOGIN_TYPE_CHANNEL);
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
+        sysUser.setPassword(null);
+
+        return ResponseBean.success(sysUser);
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taChannel",method= RequestMethod.GET)
+    public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage pg = new Page<>(pageNum, pageSize);
+            IPage<TaChannelProxy> result = iTaChannelProxyService.getChannelList(pg);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 新增代理商
+     * @param taChannelProxy
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/channel/taChannel",method= RequestMethod.POST)
+    public ResponseBean taUserList(@RequestBody TaChannelProxy taChannelProxy, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taChannelProxy.getAppMaxNum() != null && taChannelProxy.getAppMaxNum() <= 0){
+                responseBean.addError("维护小程序数量不得小于0");
+                return responseBean;
+            }
+            if (StringUtils.isEmpty(taChannelProxy.getUserName())){
+                taChannelProxy.setUserName(taChannelProxy.getChannelTel());
+            }
+
+            QueryWrapper<TaChannelProxy> userNameQueryWrapper = new QueryWrapper<>();
+            userNameQueryWrapper.eq("user_name", taChannelProxy.getUserName());
+            Integer countUserName = iTaChannelProxyService.count(userNameQueryWrapper);
+            if (countUserName > 0){
+                responseBean.addError("账户名已存在");
+                return responseBean;
+            }
+
+
+            QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+            taChannelProxyQueryWrapper.eq("channel_tel", taChannelProxy.getChannelTel());
+            Integer countChannel = iTaChannelProxyService.count(taChannelProxyQueryWrapper);
+            if (countChannel > 0){
+                responseBean.addError("手机号已存在");
+                return responseBean;
+            }
+            taChannelProxy.setPassword(MD5Utils.md5(MD5Utils.md5("abc@123")));
+            taChannelProxy.setStatus(1);
+            taChannelProxy.setCreateTime(LocalDateTime.now());
+            iTaChannelProxyService.save(taChannelProxy);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/taChannel/{id}",method= RequestMethod.GET)
+    public ResponseBean getChannelProxyById(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaChannelProxy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("channel_id", id);
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(queryWrapper);
+        responseBean.addSuccess(taChannelProxy);
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id
+     * @param taChannelProxy
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/channel/taChannel/{id}",method= RequestMethod.PUT)
+    public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
+                                         @RequestBody TaChannelProxy taChannelProxy, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        if (taChannelProxy.getAppMaxNum() != null && taChannelProxy.getAppMaxNum() <= 0){
+            responseBean.addError("维护小程序数量不得小于0");
+            return responseBean;
+        }
+
+        if (StringUtils.isEmpty(taChannelProxy.getUserName())){
+            taChannelProxy.setUserName(taChannelProxy.getChannelTel());
+        }
+
+        QueryWrapper<TaChannelProxy> userNameQueryWrapper = new QueryWrapper<>();
+        userNameQueryWrapper.eq("user_name", taChannelProxy.getUserName());
+        userNameQueryWrapper.ne("channel_id", id);
+        Integer countUserName = iTaChannelProxyService.count(userNameQueryWrapper);
+        if (countUserName > 0){
+            responseBean.addError("账户名已存在");
+            return responseBean;
+        }
+
+        taChannelProxy.setExpireDate(taChannelProxy.getExpireDate().plusDays(1L));
+        //更新业务层的登录账号为禁用
+        if (taChannelProxy.getStatus() != null){
+            QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
+            taChannelAppRelationQueryWrapper.eq("channel_id", id);
+            List<TaChannelAppRelation> taChannelAppRelation = iTaChannelAppRelationService.list(taChannelAppRelationQueryWrapper);
+            List<Integer> orgIdList = new ArrayList<>();
+            taChannelAppRelation.forEach(e->{
+                orgIdList.add(e.getOrgId());
+            });
+            if (CollectionUtils.isNotEmpty(orgIdList)){
+                QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+                taUserQueryWrapper.in("org_id", orgIdList);
+                TaUser taUser = new TaUser();
+                taUser.setStatus(taChannelProxy.getStatus());
+                iTaUserService.update(taUser, taUserQueryWrapper);
+            }
+
+        }
+
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+        taChannelProxyQueryWrapper.eq("channel_id", id);
+        iTaChannelProxyService.update(taChannelProxy, taChannelProxyQueryWrapper);
+        return ResponseBean.success("更新成功");
+    }
+
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/entity/TaChannelProxy.java

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.channel.sysChannel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaChannelProxy {
+    @TableId(value = "channel_id", type = IdType.AUTO)
+    private Integer channelId;
+
+    private String channelProxyName;
+
+    private String channelImg;
+
+    private String channelContactName;
+
+    private String channelTel;
+
+    private String userName;
+
+    private String password;
+
+    private LocalDateTime expireDate;
+
+    private Integer status;
+
+    private Integer appMaxNum;
+
+    private LocalDateTime createTime;
+
+    @TableField(exist = false)
+    private Integer appCurrentNum;
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/mapper/TaChannelProxyMapper.java

@@ -0,0 +1,12 @@
+package com.huiju.estateagents.channel.sysChannel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaChannelProxyMapper extends BaseMapper<TaChannelProxy> {
+    IPage<TaChannelProxy> getChannelList(IPage page);
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/service/ITaChannelProxyService.java

@@ -0,0 +1,12 @@
+package com.huiju.estateagents.channel.sysChannel.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+
+
+public interface ITaChannelProxyService extends IService<TaChannelProxy> {
+    IPage<TaChannelProxy> getChannelList(IPage page);
+
+    void resetPassword(Integer id, String newPass) throws Exception;
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/service/impl/TaChannelProxyServiceImpl.java

@@ -0,0 +1,57 @@
+package com.huiju.estateagents.channel.sysChannel.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaChannelProxyServiceImpl extends ServiceImpl<TaChannelProxyMapper, TaChannelProxy>  implements ITaChannelProxyService {
+    @Autowired
+    private TaChannelProxyMapper taChannelProxyMapper;
+
+    @Autowired
+    private TaChannelAppRelationMapper taChannelAppRelationMapper;
+
+    @Override
+    public IPage<TaChannelProxy> getChannelList(IPage page) {
+        IPage<TaChannelProxy> taChannelProxyIPage = taChannelProxyMapper.getChannelList(page);
+        if (CollectionUtils.isNotEmpty(taChannelProxyIPage.getRecords())){
+            taChannelProxyIPage.getRecords().forEach(e->{
+                QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
+                taChannelAppRelationQueryWrapper.eq("channel_id", e.getChannelId());
+                taChannelAppRelationQueryWrapper.groupBy("channel_id");
+                e.setAppCurrentNum(taChannelAppRelationMapper.selectCount(taChannelAppRelationQueryWrapper));
+            });
+            taChannelProxyIPage.setRecords(taChannelProxyIPage.getRecords());
+        }
+        return taChannelProxyIPage;
+    }
+
+    @Override
+    public void resetPassword(Integer id, String newPass) throws Exception {
+        TaChannelProxy taChannelProxy = this.getById(id);
+        if (null == taChannelProxy) {
+            throw new Exception("未找到有效的渠道信息");
+        }
+
+        String encryptPass = MD5Utils.md5(MD5Utils.md5(newPass));
+        TaChannelProxy proxy = new TaChannelProxy();
+        proxy.setPassword(encryptPass);
+        proxy.setChannelId(id);
+
+        if (!this.updateById(proxy)) {
+            throw new Exception("重置渠道密码失败");
+        }
+    }
+}

src/main/java/com/huiju/estateagents/cleancode/CleanCode.java

@@ -0,0 +1,70 @@
+package com.huiju.estateagents.cleancode;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class CleanCode {
+
+    @Autowired
+    private ISysMenuService sysMenuService;
+
+    @Autowired
+    private ITaRoleService taRoleService;
+
+    @Autowired
+    private ITaRoleMenuService taRoleMenuService;
+
+    @Autowired
+    private ITaRoleButtonService taRoleButtonService;
+
+    @Autowired
+    private ISysButtonInMenuService sysButtonInMenuService;
+
+    @RequestMapping(value = "/admin/clean/menurole", method = RequestMethod.GET)
+    public void cleanMenu() {
+        List<SysMenu> sysMenuList = sysMenuService.list();
+
+        QueryWrapper<TaRole> roleQueryWrapper = new QueryWrapper<>();
+        roleQueryWrapper.eq("is_admin",1);
+        List<TaRole> roleList = taRoleService.list(roleQueryWrapper);
+
+        roleList.forEach(e -> {
+            sysMenuList.forEach(s -> {
+                TaRoleMenu taRoleMenu = new TaRoleMenu();
+                taRoleMenu.setRoleId(e.getRoleId());
+                taRoleMenu.setMenuId(s.getMenuId());
+                taRoleMenuService.save(taRoleMenu);
+            });
+        });
+    }
+
+    @RequestMapping(value = "/admin/clean/buttonrole", method = RequestMethod.GET)
+    public void cleanButton() {
+        List<SysButtonInMenu> buttlist = sysButtonInMenuService.list();
+
+        QueryWrapper<TaRole> roleQueryWrapper = new QueryWrapper<>();
+        roleQueryWrapper.eq("is_admin",1);
+        List<TaRole> roleList = taRoleService.list(roleQueryWrapper);
+
+        roleList.forEach(e -> {
+            buttlist.forEach(s -> {
+                TaRoleButton taRoleButton = new TaRoleButton();
+                taRoleButton.setBtnId(s.getBtnId());
+                taRoleButton.setRoleId(e.getRoleId());
+                taRoleButtonService.save(taRoleButton);
+            });
+        });
+    }
+}

src/main/java/com/huiju/estateagents/common/AliOSSUtils.java

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.common;
+
+import com.aliyun.oss.OSSClient;
+import com.huiju.estateagents.config.AliOSSProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.nio.channels.FileChannel;
+
+@Configuration
+@EnableConfigurationProperties(AliOSSProperties.class)
+public class AliOSSUtils {
+
+    /**
+     * 上传文件
+     * @param mf 上传的文件
+     * @param toDirs 上传到的目录
+     * @return
+     */
+    public static String putObject(MultipartFile mf, String ... toDirs) throws IOException {
+        String fName = StringUtils.ifNull(mf.getOriginalFilename(), StringUtils.random(16) + ".png");
+        String preFix = String.valueOf(System.currentTimeMillis());
+        String toDir = "/";
+        if (null != toDirs && toDirs.length > 0) {
+            toDir = toDirs[0];
+        }
+        String nwFName = toDir + preFix + "-" + fName;
+        nwFName = StringUtils.trim(nwFName,"/");
+
+        return putFile(nwFName, new ByteArrayInputStream(mf.getBytes()));
+    }
+
+    public static String putObject(File f, String ... toDirs) throws FileNotFoundException {
+        String fName = StringUtils.ifNull(f.getName(), StringUtils.random(16) + ".png");
+        String preFix = String.valueOf(System.currentTimeMillis());
+        String toDir = "/";
+        if (null != toDirs && toDirs.length > 0) {
+            toDir = toDirs[0];
+        }
+        String nwFName = toDir + preFix + "-" + fName;
+        nwFName = StringUtils.trim(nwFName,"/");
+
+        InputStream inputStream = new FileInputStream(f);
+        return putFile(nwFName, inputStream);
+    }
+
+    private static String putFile(String fname, InputStream input) {
+        OSSClient ossClient = new OSSClient(AliOSSProperties.oss.getEndpoint(), AliOSSProperties.accessKeyId, AliOSSProperties.accessKeySecret);
+        ossClient.putObject(AliOSSProperties.oss.getBucketName(), fname, input);
+        ossClient.shutdown();
+
+        // String url = ossClient.generatePresignedUrl(AliOSSUtils.oss.getBucketName(), fname, expiration).toString();
+
+        String preURL = AliOSSProperties.oss.getBucketURL();
+        if (!preURL.endsWith("/")) {
+            preURL += "/";
+        }
+
+        return preURL + fname;
+    }
+}

src/main/java/com/huiju/estateagents/common/BeanTools.java

@@ -0,0 +1,137 @@
+package com.huiju.estateagents.common;
+
+import jodd.bean.BeanCopy;
+import jodd.typeconverter.TypeConverterManager;
+import org.apache.commons.collections.BeanMap;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.*;
+
+@SuppressWarnings("deprecation")
+public final class BeanTools {
+
+    private static Map<String, Object> toBeanMethodMap = new HashMap<String, Object>();
+
+    /**
+     * <pre>
+     * 功能：实现BEAN的属性对拷
+     * 创建人：JokenWang
+     * </pre>
+     *
+     * @param fromBean        待转换的源bean
+     * @param toBeanClassName 转换成目标bean的名称 形如：ItemSeries.class.getName()
+     * @return 目标BEAN类
+     */
+    public static <T> T convertBean(Object fromBean, Class<T> toBeanClassName) {
+        T toBean = null;
+        try {
+            toBean = getBeanInstance(toBeanClassName.getName());
+            return convertBean(fromBean, toBean);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return toBean;
+    }
+
+    private static <T> T convertBean(Object fromBean, T toBean) {
+        TypeConverterManager.register(String.class, new StringConverter());
+        BeanCopy.beans(fromBean, toBean).copy();
+        return toBean;
+    }
+
+    public static Method getDeclaredMethod(Object object, String methodName, Class<?>... parameterTypes) {
+        Method method;
+        for (Class<?> clazz = object.getClass(); clazz != Object.class; clazz = clazz.getSuperclass()) {
+            try {
+                method = clazz.getDeclaredMethod(methodName, parameterTypes);
+                return method;
+            } catch (Exception ignored) {
+
+            }
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T getBeanInstance(String clazzName)
+            throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+
+        return (T) Class.forName(clazzName).newInstance();
+    }
+
+    public static Map<String, Object> toBeanMethodMap(String toBean)
+            throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+
+        Class<?> toBeanClazz = getBeanInstance(toBean).getClass();
+        Method[] toBeanMethods = toBeanClazz.getDeclaredMethods();
+        if (!toBeanClazz.isInstance(Object.class))// 非超类Object
+        {
+            for (Method method : toBeanMethods) {
+                String methodName = method.getName();
+                toBeanMethodMap.put(methodName, method);
+            }
+
+            Class<?> toBeanSuperclazz = toBeanClazz.getSuperclass();// 获取父类
+            toBeanMethodMap(toBeanSuperclazz.getName());
+        }
+
+        return toBeanMethodMap;
+    }
+
+    public static Map<String, Object> toMap(Object object) {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if (object == null) {
+            return map;
+        }
+
+        BeanMap beanMap;
+        beanMap = new BeanMap(object);
+        @SuppressWarnings("unchecked")
+        Iterator<String> it = beanMap.keyIterator();
+        while (it.hasNext()) {
+            String name = it.next();
+            Object value = beanMap.get(name);
+            // 转换时会将类名也转换成属性，此处去掉
+            if (value != null && !name.equals("class")) {
+                map.put(name, value);
+            }
+        }
+
+        return map;
+    }
+
+    public static Map<String, Object> toMap(Object... objs) {
+        Map<String, Object> map = new HashMap<>();
+        for (Object object : objs) {
+            if (object != null) {
+                map.putAll(toMap(object));
+            }
+        }
+        return map;
+    }
+
+    public static String[] getNullPropertyNames (Object source) {
+        final BeanWrapper src = new BeanWrapperImpl(source);
+        PropertyDescriptor[] pds = src.getPropertyDescriptors();
+
+        Set<String> emptyNames = new HashSet<String>();
+        for(PropertyDescriptor pd : pds) {
+            Object srcValue = src.getPropertyValue(pd.getName());
+            if (srcValue == null) {
+                emptyNames.add(pd.getName());
+            }
+        }
+        String[] result = new String[emptyNames.size()];
+        return emptyNames.toArray(result);
+    }
+
+    public static void copyProperties(Object src, Object target) {
+        BeanUtils.copyProperties(src, target, getNullPropertyNames(src));
+    }
+
+}

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -0,0 +1,919 @@
+package com.huiju.estateagents.common;
+
+public class CommConstant {
+    public final static String ALIOSS_DEFAULT_UPLOAD = "/miniapp/upload/images/";
+
+    /**
+     * 人员类型: 置业顾问
+     */
+    public final static String PERSON_REALTY_CONSULTANT = "Realty Consultant";
+
+    /**
+     * 人员类型: 销售主管
+     */
+    public final static String PERSON_SALES_EXECUTIVE = "Sales Executive";
+
+    /**
+     * 人员类型: 经纪人
+     */
+    public final static String PERSON_ESTATE_AGENT = "estate agent";
+
+    /**
+     * 人员类型: 客户
+     */
+    public final static String PERSON_ESTATE_CUSTOMER = "customer";
+
+    /**
+     * 人员类型: 渠道经纪人
+     */
+    public final static String PERSON_ESTATE_CHANNEL = "channel agent";
+
+    /**
+     * 人员类型: 游客
+     */
+    public final static String PERSON_ESTATE_DRIFT = "drift";
+
+    /**
+     * 状态: 正常
+     */
+    public final static Integer STATUS_NORMAL = 1;
+
+    /**
+     * 状态: 删除
+     */
+    public final static Integer STATUS_DELETE = -1;
+
+    /**
+     * 状态: 关闭、禁用
+     */
+    public final static Integer STATUS_CLOSED = 9;
+
+    /**
+     * 消息未读
+     */
+    public final static Integer MESSAGE_UNREAD = 0;
+
+    /**
+     * 消息已读
+     */
+    public final static Integer MESSAGE_READED = 1;
+
+    /**
+     * 点赞置业卡片
+     */
+    public final static String FAVOR_CONSULTANT = "consultant";
+
+    /**
+     * 点赞资讯
+     */
+    public final static String FAVOR_NEWS = "news";
+
+    /**
+     * 点赞项目
+     */
+    public final static String FAVOR_PROJECT = "project";
+
+    /**
+     * 活动点赞
+     */
+    public final static String FAVOR_ACTIVITY = "activity";
+
+
+    /**
+     * 兑换商品
+     */
+    public final static String POINTS_CHANGE_GOODS = "goods";
+
+    /**
+     * 签到
+     */
+    public final static String POINTS_CHANGE_CHECKIN = "checkin";
+
+    /**
+     * 分享
+     */
+    public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
+
+    /**
+     * 授权手机号
+     */
+    public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
+
+    /**
+     * 拼团
+     */
+    public final static String POINTS_CHANGE_GROUP = "group";
+
+    /**
+     * 拼团
+     */
+    public final static String POINTS_CHANGE_HELP = "help";
+
+    /**
+     * 推荐客户
+     */
+    public final static String POINTS_CHANGE_RECOMMEND_CUSTOMER = "recommend-customer";
+
+    /**
+     * 活动核销
+     */
+    public final static String POINTS_CHANGE_ACTIVITY_VERIFICATION = "activity_verification";
+
+    /**
+     * 资料审核
+     */
+    public final static String POINTS_CHANGE_DOCUMENT_VERIFY = "document_verify";
+
+    /**
+     * 活动签到
+     */
+    public final static String POINTS_CHANGE_ACTIVITY_CHECKIN = "activity_checkin";
+
+
+    /**
+     * 小程序默认首页
+     */
+    public final static String MINIAPP_INDEX = "/index/index";
+
+    public final static String MINIAPP_DEFAULT_AVATAR = "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/default_avatar.jpg";
+
+
+    /**
+     * 未领取
+     */
+    public static final Integer STATUS_UNACCALIMED = 0;
+
+    /**
+     * 成功
+     */
+    public static final String SUCCESS = "success";
+
+
+    /**
+     * 活动的当前状态1:进行中
+     */
+    public static final Integer ACTIVITY_CONDITION_PROCESSING = 1;
+
+    /**
+     * 活动的当前状态2:未开始
+     */
+    public static final Integer ACTIVITY_CONDITION_PREPARE = 2;
+
+    /**
+     * 活动的当前状态3:结束
+     */
+    public static final Integer ACTIVITY_CONDITION_FINISH = 3;
+
+    //=================  首屏广告 / 轮播图 start =======================
+
+    /**
+     * 首页 轮播图/广告 类型 ====  活动
+     */
+    public static final String CAROUSEL_ACTIVITY = "activity";
+
+    /**
+     * 首页 轮播图/广告 类型 ==== 项目
+     */
+    public static final String CAROUSEL_PROJECT = "project";
+
+    /**
+     * 首页轮播图/广告 类型 ==== 资讯
+     */
+    public static final String CAROUSEL_NEWS = "news";
+
+    /**
+     * 首页轮播图/广告 类型 ==== 其他
+     */
+    public static final String CAROUSEL_OTHER = "other";
+
+    /**
+     * 打开放式_开屏
+     */
+    public static final String OPEN_SCREEN = "screen";
+
+    /**
+     * 打开放式_首页轮播图
+     */
+    public static final String CAROUSEL = "banner";
+
+    /**
+     * 首屏广告_发布位置——商城
+     */
+    public static final String MALL = "mall";
+
+    /**
+     * 首屏广告_发布位置——首页
+     */
+    public static final String BANNER_INDEX = "index";
+
+    /**
+     * 首屏广告_发布位置——项目
+     */
+    public static final String BANNER_BUILDING = "building";
+
+    //首页资讯
+    public static final String INDEX_NEWS = "indexNews";
+
+    //首页分享类型
+    public static final String IMG_TYPE = "imgType";
+
+    //=================  首屏广告 / 轮播图 end =======================
+
+    /**
+     * 客户报备
+     */
+    public static final Integer CUSTOMER_REPORT = 1;
+
+    /**
+     * 客户到访
+     */
+    public static final Integer CUSTOMER_VISITE = 2;
+
+    /**
+     * 客户认购
+     */
+    public static final Integer CUSTOMER_PREORDER = 3;
+
+    /**
+     * 客户签约
+     */
+    public static final Integer CUSTOMER_SIGNED = 4;
+
+
+    /**
+     * 待审核
+     */
+    public static final Integer VERIFY_READY = 0;
+
+    /**
+     * 审核同意
+     */
+    public static final Integer VERIFY_AGREE = 1;
+
+    /**
+     * 审核不同意
+     */
+    public static final Integer VERIFY_DISAGREE = 2;
+
+    //=================  客户入口类型 start =======================
+    /*
+     * 自主进入
+     * */
+    public static final String ENTRY_VOLUNTEER = "volunteer";
+    /*
+    添加
+    */
+    public static final String ENTRY_INPUT = "input";
+    /*
+     * 报备
+     * */
+    public static final String ENTRY_VERIFY = "verify";
+    //=================  客户入口类型 end =======================
+
+    /**
+     * 积分规则开启
+     */
+    public static final Integer POINTS_RULE_ON = 1;
+
+    /**
+     * 积分规则关闭
+     */
+    public static final Integer POINTS_RULE_OFF = 0;
+
+    /**
+     * 签到积分规则
+     */
+    public static final Integer POINTS_RULE_CHECKIN = 1;
+
+    /**
+     * 分享海报积分规则
+     */
+    public static final Integer POINTS_RULE_SHARE_POSTER = 2;
+
+    /**
+     * 推荐客户积分规则
+     */
+    public static final Integer POINTS_RULE_RECOMMENDER_CUSTOMER = 3;
+
+    /**
+     * 注册经纪人积分规则
+     */
+    public static final Integer POINTS_RULE_SIGNUP_AGENT = 4;
+
+    /**
+     * 活动核销送积分规则
+     */
+    public static final Integer POINTS_RULE_ACTIVITY_VERIFICATION = 6;
+
+    /**
+     * 资料审核送积分规则
+     */
+    public static final Integer POINTS_RULE_DOCUMENT_VERIFY = 7;
+
+    /**
+     * 普通活动签到送积分规则
+     */
+    public static final Integer POINTS_RULE_ACTIVITY_CHECKIN = 8;
+
+    /**
+     * 平台积分
+     */
+    public static final String POINTS_RULE_PLATFORM = "platform";
+
+    /**
+     * 项目积分
+     */
+    public static final String POINTS_RULE_PROJECT = "project";
+
+
+    // ----   用户活跃数  查询条件 start ------
+
+    public static final String DAY = "day";
+
+    public static final String WEEK = "week";
+
+    public static final String MONTH = "month";
+
+    // ----     查询条件 end ------
+
+    // -----   转化率 start -------
+
+    /**
+     * 项目收藏
+     */
+    public static final String BUILDING_SAVE = "building_save";
+
+    /**
+     * 项目转发
+     */
+    public static final String BUILDING_SHARE = "building_share";
+
+    /**
+     * 活动收藏
+     */
+    public static final String ACTIVITY_SAVE = "activity_save";
+
+    /**
+     * 活动转发
+     */
+    public static final String ACTIVITY_SHARE = "activity_share";
+
+    /**
+     * 咨迅收藏
+     */
+    public static final String NEWS_SAVE = "news_save";
+
+    /**
+     * 咨迅转发
+     */
+    public static final String NEWS_SHARE = "news_share";
+
+    /**
+     * 活动报名
+     */
+    public static final String ACTIVITY_SIGN = "activity_sign";
+
+    /**
+     * 授权手机号
+     */
+    public static final String AUTHORIZATION_PHONE = "authorization_phone";
+
+    // ------   转化率 end ---------
+
+
+    // ------- 用户来源 查询条件 start ----------
+
+    public static final String REGISTERED_TYPE = "registered";
+
+    // ------- 用户来源 查询条件 end ----------
+
+    // ------- 性别 start -------
+    public static final Integer SEX_MALE = 1;
+    public static final Integer SEX_FEMALE = 2;
+    public static final Integer SEX_UNKNOWN = 3;
+    // ------- 性别 end -------
+
+    // ------- 推荐客户状态 start -------
+    // 到访
+    public static final Integer RECOMMEND_CUSTOMER_STATUS_ARRIVAL = 1;
+    // 签约
+    public static final Integer RECOMMEND_CUSTOMER_STATUS_SIGN = 2;
+    //
+    public static final Integer RECOMMEND_CUSTOMER_STATUS_PRE_ORDER = 2;
+    // ------- 推荐客户状态 end -------
+
+
+    // ------- 客户推荐报备状态 start -------
+    // 未报备，未推荐
+    public static final Integer READY = 0;
+    // 已报备
+    public static final Integer REPORTED = 1;
+    // 已推荐
+    public static final Integer RECOMMENDED = 2;
+    // ------- 客户推荐报备状态 end -------
+
+    // ------- 政策发布状态 start -------
+    // 已发布
+    public static final Integer IS_PUBLISH = 1;
+    // 未发布
+    public static final Integer NOT_PUBLISH = 0;
+    // ------- 政策发布状态 end -------
+
+    // 公客
+    public static final String CUTOMER_TYPE_PUBLIC = "public";
+    // 私客
+    public static final String CUTOMER_TYPE_PRIVATE = "private";
+
+
+    //项目
+    public static final String POSTER_CONTENT_TYPE_BUILDING = "building";
+    //活动
+    public static final String POSTER_CONTENT_TYPE_ACTIVITY = "activity";
+    //资讯
+    public static final String POSTER_CONTENT_TYPE_NEWS = "news";
+    //人员
+    public static final String POSTER_CONTENT_TYPE_PERSON = "person";
+
+
+    public static final String GD_KEY = "c9fc664a9030aed2ec2183508c2ca476";
+
+    //已参与微信端用
+    public static final Integer ACTIVITY_STATUS_PARTNER = 3;
+
+    //发起者
+    public static final String HELP_STATUS_INITIATE = "Initiate";
+
+    //助力活动
+    public static final Object HELP_ACTIVITY = "helpActivity";
+
+    //分享活动
+    public static final Object GROUP_ACTIVITY = "groupActivity";
+    public static final String TARGET_TYPE_H5 = "H5";
+    public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
+    public static final String LIVE_ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/live/index\"}";
+    public static final String DRAINAGE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
+    public static final String HOUSE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/houseList/index\"}";
+
+    /**
+     * 消息通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTENT_OF_NOTICE = "notice";
+
+    /**
+     * 需求通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTENT_OF_DEMAND = "demand";
+
+    /**
+     * 助力通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTENT_OF_HELP = "help-result";
+
+    /**
+     * 拼团通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTENT_OF_GROUP = "group-result";
+
+    /**
+     * 审核通知  预选/认筹
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTENT_OF_HOUSE = "house";
+
+    /**
+     * 合同签订通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTRACT_SIGNING = "contract-signing";
+
+    /**
+     * 官网推广
+     */
+    public static final String MESSAGE_CONTENT_OF_OFFICE_PROMOTION = "office-promotion";
+
+    /**
+     * 活动以结束
+     */
+    public static final Integer ACTIVITY_STATUS_FINISH = 2;
+
+    /**
+     * 客户统计类型：跟进客户
+     */
+    public static final String CUSTOMER_TYPE_FOLLOW = "follow";
+
+    /**
+     * 客户统计类型：新增客户
+     */
+    public static final String CUSTOMER_TYPE_NEW = "new";
+
+    /**
+     * 客户统计类型：到访客户
+     */
+    public static final String CUSTOMER_TYPE_VISITE = "visite";
+
+    // =================   项目图片类型 ==============
+
+    /**
+     * 项目banner
+     */
+    public static final String BUILDING_IMG_BANNER = "banner";
+
+    /**
+     * 项目列表图（现在是用于楼盘封面图）
+     */
+    public static final String BUILDING_IMG_LIST = "list";
+
+    /**
+     * 视频封面图
+     */
+    public static final String BUILDING_IMG_VIDEOIMAGE = "videoImage";
+
+    /**
+     * 户型图
+     */
+    public static final String BUILDING_IMG_APARMENT = "aparment";
+
+    /**
+     * 高德地图url
+     */
+    public static final String AMAP_HTTP = "https://restapi.amap.com/v3/geocode/regeo";
+
+    /**
+     * 高德地图key
+     */
+    public static final String AMAP_KEY = "14f05ce59c26364fd0674014dc0d8b1b";
+
+    /**
+     * 埋点类型h5
+     */
+    public static final String EVENT_H5 = "h5";
+
+    /**
+     * 房源分享
+     */
+    public static final String HOUSE = "house";
+
+
+    /**
+     * 首页分享
+     */
+    public static final String INDEX = "index";
+
+
+    /**
+     * 批量销售
+     */
+    public static final String SALES_BATCH = "salesBatch";
+
+    /**
+     * 直播分享
+     */
+    public static final String LIVE = "live";
+
+    /**
+     * 红包类型标识
+     */
+    public static final String RED_PACKET = "RedPacket";
+
+    /**
+     * 系统参数  通知消息次时间间隔
+     */
+    public static final String SYSPARAM_NOTICE_MESSAGE_INTERVAL = "notice_message_interval";
+
+    /**
+     * 任一消息, 可以是下面的任意一种
+     */
+    public static final String MESSAGE_TYPE_OF_SOMEWAY = "someway";
+
+    /**
+     * 短信消息
+     */
+    public static final String MESSAGE_TYPE_OF_SMS = "sms";
+
+    /**
+     * 小程序订阅消息
+     */
+    public static final String MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE = "miniapp_subscribe";
+
+    /**
+     * 小程序模板消息
+     */
+    public static final String MESSAGE_TYPE_OF_MINIAPP_TEMPLATE = "miniapp_template";
+
+    /**
+     * 进入小程序
+     */
+    public static final String BIZ_EVENT_START = "start";
+
+    /**
+     * 登录渠道端系统类型
+     */
+    public static final String LOGIN_TYPE_CHANNEL = "channel";
+
+    /**
+     * 登录业务端系统类型
+     */
+    public static final String LOGIN_TYPE_ADMIN = "admin";
+
+
+    /**
+     * 登录中心端系统类型
+     */
+    public static final String LOGIN_TYPE_CENTER = "center";
+
+
+    /**
+     * 查看分享者活动类型 h5
+     */
+    public static final String H5_SHARE = "h5_share";
+
+    /**
+     * 查看分享者活动类型 拼团
+     */
+    public static final String GROUP_SHARE = "group_share";
+
+    /**
+     * 查看分享者活动类型 助力
+     */
+    public static final String HELP_SHARE = "help_share";
+
+    /**
+     * 查看分享者活动类型 活动
+     */
+    public static final String DYNAMIC_SHARE = "dynamic_share";
+
+    /**
+     * 户型
+     */
+    public static final String APARTMENT_TYPR_APART = "apart";
+
+    /**
+     * 户型全景图
+     */
+    public static final String PANORAMA_TYPE_APARTMENT = "apartment";
+
+    /**
+     * 价格类型 均价
+     */
+    public static final String PRICE_TYPE_AVERAGE = "average";
+
+    /**
+     * excel后缀
+     */
+    public static final String SUFFIX_2003 = ".xls";
+    public static final String SUFFIX_2007 = ".xlsx";
+
+    /**
+     * 小程序房源详情路径
+     */
+    public static final String HOUSE_DETAIL_PATH = "onlineSelling/pages/detail/index?id=%s";
+
+    public static final String RAISE_DETAIL_PATH = "/onlineSelling/pages/raiseProfile/index?id=%s";
+
+    /**
+     * 已锁定
+     */
+    public static final String HOUSE_LOCKING_STATUS_LOCKED = "locked";
+
+    /**
+     * 未锁定
+     */
+    public static final String HOUSE_LOCKING_STATUS_UNLOCKED = "unlocked";
+
+    /**
+     * 房源订单
+     */
+    public static final String ORDER_TARGET_TYPE_HOUSE = "house";
+
+    /**
+     * 自动锁房
+     */
+    public static final String HOUSE_LOCKING_TYPE_AUTO = "auto";
+
+    /**
+     * 手动锁房
+     */
+    public static final String HOUSE_LOCKING_TYPE_MANUAL = "manual";
+
+    /**
+     * 正在缴费
+     */
+    public static final String PAY_STATUS_PAYING = "paying";
+
+    /**
+     * 未缴费
+     */
+    public static final String PAY_STATUS_UNPAID = "unpaid";
+
+    /**
+     * 已缴费
+     */
+    public static final String PAY_STATUS_PAID = "paid";
+
+    /**
+     * 已退费
+     */
+    public static final String PAY_STATUS_REFUNDED = "refunded";
+
+    /**
+     * 退款异常
+     */
+    public static final String PAY_STATUS_CHANGE = "change";
+
+
+    /**
+     * 已经取消支付
+     */
+    public static final String PAY_STATUS_CANCEL = "cancel";
+
+    /**
+     * 支付超时
+     */
+    public static final String PAY_STATUS_TIMEOUT = "timeout";
+
+    /**
+     * 最大认筹金额
+     */
+    public static final Integer MAX_RAISE_PRICE = 5000000;
+
+    /**
+     * 菜单
+     */
+    public static final Object ADVANCED_TYPE_MENU = "menu";
+
+    /**
+     * 菜单
+     */
+    public static final Object ADVANCED_TYPE_BUTTON = "button";
+
+    /**
+     * 线下缴费
+     */
+    public static final String PAY_TYPE_OFFLINE = "offLine";
+
+    /**
+     * 线下缴费
+     */
+    public static final String PAY_TYPE_ONLINE = "onLine";
+
+    /**
+     * 作废状态
+     */
+    public static final Integer DEMAND_STATUS_INVALID = 4;
+
+
+    /**
+     * 已提交
+     */
+    public static final Integer DEMAND_STATUS_SUBMIT = 1;
+
+    /**
+     * 样例类型H5
+     */
+    public static final String NOTICE_TYPE_H5 = "H5";
+
+    /**
+     * 法大大账户类型  2 企业
+     */
+    public static final String ACCOUNT_TYPE_COMPANY = "2";
+
+    /**
+     * 企业在法大大的状态  已注册
+     */
+    public static final String CERTIFIED_STATUS_REGISTERED = "registered";
+
+    /**
+     * 企业在法大大的状态  认证中
+     */
+    public static final String CERTIFIED_STATUS_CERTIFICATION = "certification";
+
+    /**
+     * 企业认证人员的身份 法人
+     */
+    public static final String COMPANY_MANAGER_TYPE_LEGAL = "legal";
+
+
+    /**
+     * 企业认证人员的身份 代理人
+     */
+    public static final String COMPANY_MANAGER_TYPE_AGENT = "agent";
+
+    /**
+     * 企业认证人员的身份 1 法人
+     */
+    public static final String COMPANY_PRINCIPAL_TYPE_LEGAL = "1";
+
+    /**
+     * 企业认证人员的身份 2 代理人
+     */
+    public static final String COMPANY_PRINCIPAL_TYPE_AGENT = "2";
+
+    /**
+     * 授权类型 1自动签
+     */
+    public static final Integer AUTH_TYPE = 1;
+
+    /**
+     * 合同关联业务类型
+     */
+    public static final String AUTH = "auth";
+
+    /**
+     * 接口线上授权
+     */
+    public static final String ONLINEAUTH = "onLine";
+
+    /**
+     * 企业实名状态
+     */
+    public static final Integer REAL_NAME_STATUS = 4;
+
+    /**
+     * 已授权自动签章
+     */
+    public static final String AUTO_AUTH_STATUS = "3000";
+
+    public static final String AUTO_UNAUTH_STATUS = "3001";
+
+    public static final String AUTH_SUCCESS_DESC = "签章成功";
+
+    /**
+     * 审核通过
+     */
+    public static final Integer STATUS_VERIFY_PASS = 4;
+
+    /**
+     * 充值操作
+     */
+    public static final String RECHARGE = "CZ";
+
+    /**
+     * 退款操作
+     */
+    public static final String REFUND = "TK";
+
+    /**
+     * 明细类型--充值
+     */
+    public static final String ITEM_TYPE_RECHARGE = "recharge";
+
+    /**
+     * 明细类型--退费
+     */
+    public static final String ITEM_TYPE_REFUND = "refund";
+
+    /**
+     * 明细类型--退费
+     */
+    public static final String ITEM_TYPE_REJECT = "reject";
+
+
+    /**
+     * 明细类型--红包
+     */
+    public static final String ITEM_TYPE_REDPACKAGE = "RedPacket";
+
+    /**
+     * 交易状态 成功
+     */
+    public static final String TRADING_STATUS_SUCCESS = "success";
+
+    /**
+     * 交易状态 失败
+     */
+    public static final String TRADING_STATUS_FAIL = "fail";
+
+    /**
+     * 交易状态 进行中
+     */
+    public static final String TRADING_STATUS_PROCESSING = "processing";
+
+    /**
+     * 人员类型---财务
+     */
+    public static final String CONTACT_FINANCE = "finance";
+
+    /**
+     * 人员类型---售前
+     */
+    public static final String CONTACT_PRESALE = "pre-sale";
+
+    /**
+     * 审核状态-审核中
+     */
+    public static final String CHECK_STATUS_CHECKING = "checking";
+
+    /**
+     * 微信商户手续费率
+     */
+    public static final Double WXMCH_PAY_RATE = 0.01;
+
+    /**
+     * 微信商户手续费率-前端展示
+     */
+    public static final String WXMCH_PAY_RATE_STRING = "1%";
+}

src/main/java/com/huiju/estateagents/common/CommonUtils.java

@@ -0,0 +1,86 @@
+package com.huiju.estateagents.common;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class CommonUtils {
+    /**
+     * 金额校验
+     *
+     * @param str
+     * @return
+     */
+    public static boolean isAmount(String str) {
+        Pattern pattern = Pattern.compile("^(([1-9]{1}\\d*)|([0]{1}))(\\.(\\d){0,2})?$"); // 判断小数点后2位的数字的正则表达式
+        Matcher match = pattern.matcher(str);
+        if (match.matches() == false) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+
+    /**
+     * 获取uuid
+     *
+     * @return
+     */
+    public static String getUUIDS() {
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        return uuid;
+    }
+
+    /**
+     * 生成订单号
+     *
+     * @param tradeType
+     * @return
+     */
+    public static String generateTradeNo(String tradeType) {
+        String sdf = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+        int randNum = (int) (new Random().nextDouble() * (9999 - 1000 + 1)) + 1000;// 获取5位随机数
+        return tradeType + sdf + randNum;
+    }
+
+    /**
+     * 元转分
+     *
+     * @param money
+     * @return
+     */
+    public static Integer yuanToFen(Double money) {
+        Double moneyd = money * 100;
+        Integer moneyi = moneyd.intValue();
+        return moneyi;
+    }
+
+    /**
+     * 元转分
+     *
+     * @param money
+     * @return
+     */
+    public static Double fenToYuan(Integer money) {
+        return Double.parseDouble(BigDecimal.valueOf(Long.valueOf(money)).divide(new BigDecimal(100)).toString());
+    }
+
+    /**
+     * double减法运算,防止直接相减失去精度
+     *
+     * @param m1 减数
+     * @param m2 被减数
+     * @return
+     */
+    public static Double subDouble(double m1, double m2) {
+        BigDecimal p1 = new BigDecimal(Double.toString(m1));
+        BigDecimal p2 = new BigDecimal(Double.toString(m2));
+        return p1.subtract(p2).doubleValue();
+    }
+
+}

src/main/java/com/huiju/estateagents/common/DBUtils.java

@@ -0,0 +1,15 @@
+package com.huiju.estateagents.common;
+
+import com.huiju.estateagents.mapper.TaSequenceMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DBUtils {
+    @Autowired
+    TaSequenceMapper taSequenceMapper;
+
+    public Integer nextVal(String seqName) {
+        return taSequenceMapper.nextval(seqName);
+    }
+}

src/main/java/com/huiju/estateagents/common/DateUtils.java

@@ -0,0 +1,117 @@
+package com.huiju.estateagents.common;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+public class DateUtils {
+    public static LocalDateTime date2LocalDateTime(Date date) {
+        Instant instant = date.toInstant();
+        ZoneId zone = ZoneId.systemDefault();
+        return LocalDateTime.ofInstant(instant, zone);
+    }
+
+    public static boolean sameDay(LocalDateTime d1, LocalDateTime d2) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return d1.format(formatter).equals(d2.format(formatter));
+    }
+
+    public static String cutSecond(LocalDateTime dt) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        return dt.format(formatter);
+    }
+
+    public static String today() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return LocalDateTime.now().format(formatter);
+    }
+
+    public static String todayCompact() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        return LocalDateTime.now().format(formatter);
+    }
+
+    public static String localDateTimeToString(LocalDateTime d) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return d.format(formatter);
+    }
+
+    public static LocalDateTime day2LocalDateime(String day) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(day + " 00:00:00", df);
+    }
+
+    public static LocalDateTime dayToLocalDateime(String day) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(day, df);
+    }
+
+    public static boolean checkTimeRange(LocalDateTime start, LocalDateTime end, LocalDateTime dt) {
+        if (dt == null) {
+            dt = LocalDateTime.now();
+        }
+
+        if (dt.isAfter(start) && dt.isBefore(end)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 当前时间是否早于指定时间
+     *
+     * @param target
+     * @return
+     */
+    public static boolean isBefore(String target) {
+        LocalDateTime dt = LocalDateTime.now();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime targetTime = LocalDateTime.parse(target, df);
+        if (dt.isBefore(targetTime)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 当前时间是否晚于指定时间
+     *
+     * @param target
+     * @return
+     */
+    public static boolean isAfter(String target) {
+        LocalDateTime dt = LocalDateTime.now();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime targetTime = LocalDateTime.parse(target, df);
+        if (dt.isAfter(targetTime)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 获取时间差
+     *
+     * @param dt1
+     * @param dt2 目标时间
+     * @return
+     */
+    public static String diffTime(LocalDateTime dt1, LocalDateTime dt2) {
+        Duration duration = Duration.between(dt1, dt2);
+        long minutes = duration.toMinutes();
+        int hours = (int) Math.floor(minutes / 60);
+        int minute = (int) minutes % 60;
+        int day = (int) Math.floor(hours / 24);
+        int hour = hours % 24;
+
+        return day + "天" + hour + "小时" + minute + "分钟";
+    }
+
+    public static LocalDateTime timeToLocalDateTime(String target){
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(target, df);
+    }
+}

src/main/java/com/huiju/estateagents/common/ExcelUtils.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.common;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.huiju.estateagents.excel.ConsultantKPIExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+
+public class ExcelUtils {
+
+    /**
+     * 发送 excel 到客户端
+     * 暂时只支持单 sheet 页
+     * @param response
+     * @param data
+     * @param fileName
+     * @throws IOException
+     */
+    public static void flush(HttpServletResponse response, Class dataClass, List data, String fileName) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename="+StringUtils.strToUnicode(fileName)+".xlsx");
+
+//        ParameterizedType type = (ParameterizedType) data.getClass().getGenericSuperclass();
+//        Class dataClass = (Class) type.getActualTypeArguments()[0];
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), dataClass).registerWriteHandler(new CustomCellWriteHandler()).build();
+        WriteSheet sheet1 = EasyExcel.writerSheet("sheet1").build();
+        excelWriter.write(data, sheet1);
+        excelWriter.finish();
+    }
+}

src/main/java/com/huiju/estateagents/common/JWTUtils.java

@@ -0,0 +1,109 @@
+package com.huiju.estateagents.common;
+
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+
+import javax.servlet.http.HttpServletRequest;
+import java.security.Key;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * JWTUtils
+ * jwt 辅助类
+ * https://github.com/jwtk/jjwt
+ */
+public class JWTUtils {
+    // 直接定义常量是不安全的
+    public final static Key key = Keys.hmacShaKeyFor("yansenisahero,2019-5-17 16:18:14".getBytes());
+    
+    /**
+     * getSubject 获取 jwt subject
+     * @param request
+     * @return
+     */
+    public static String getSubject(HttpServletRequest request) {
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
+
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) return null;
+
+        try {
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody().getSubject();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+    
+    /**
+     * getSubject 获取 jwt subject
+     * @param request
+     * @return
+     */
+    public static Map getUserIdAndOrgId(HttpServletRequest request) {
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
+        
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) return null;
+        
+        try {
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        return null;
+    }
+    
+    /**
+     * getSubject 获取 jwt subject
+     * @param request
+     * @return
+     */
+    public static String getToken(HttpServletRequest request) {
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) {
+            return null;
+        }
+        
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) {
+            return null;
+        }
+        
+        
+        return jwtAuths[1];
+    }
+
+    /**
+     * newToken 生成新的 token
+     * @param subject
+     * @return
+     */
+    public static String newToken(String subject) {
+        // 有效期 7 天
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
+        return Jwts.builder().setSubject(subject).setExpiration(calendar.getTime()).signWith(key).compact();
+    }
+    
+    /**
+     * newToken 生成新的 token
+     * @param subject
+     * @return
+     */
+    public static String newTokenByMap(Map subject) {
+        // 有效期 7 天
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
+
+        return Jwts.builder().setClaims(subject).setExpiration(calendar.getTime()).signWith(key).compact();
+    }
+}

src/main/java/com/huiju/estateagents/common/MD5Utils.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.common;
+
+import org.springframework.util.DigestUtils;
+
+public class MD5Utils {
+    public static String md5(String str, String ...slats) {
+        String slat = "";
+        if (null != slats && slats.length > 0) {
+            slat = slats[0];
+        }
+
+        String base = str + slat;
+        String md5 = DigestUtils.md5DigestAsHex(base.getBytes());
+        return md5;
+    }
+}

src/main/java/com/huiju/estateagents/common/MiniAppPageEnum.java

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.common;
+
+/**
+ * 小程序页面枚举
+ *
+ * @author gusy
+ * @date 2020/5/21 15:58
+ */
+public enum MiniAppPageEnum {
+
+    /**
+     * 项目
+     */
+    PROJECT("project", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/detail/index"),
+
+    /**
+     * 报名活动
+     */
+    ACTIVITY("activity", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/index"),
+
+    /**
+     * 助力活动
+     */
+    HELP("help", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assistance"),
+
+    /**
+     * 拼团活动
+     */
+    GROUP("group", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assemble"),
+
+    /**
+     * h5活动
+     */
+    H5("h5", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/h5Page"),
+
+    /**
+     * 直播活动
+     */
+    LIVE("live", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/live/index"),
+
+    /**
+     * 资讯
+     */
+    NEWS("news", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/news/detail/index"),
+
+    /**
+     * 在线选房
+     */
+    SALESBATCH("salesBatch", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/houseList/index");
+
+    private String type;
+    private String scene;
+    private String page;
+
+    MiniAppPageEnum(String type, String scene, String page) {
+        this.type = type;
+        this.scene = scene;
+        this.page = page;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getScene() {
+        return scene;
+    }
+
+    public String getPage() {
+        return page;
+    }
+
+    public static String getSceneByType(String type) {
+        for (MiniAppPageEnum pageEnum : MiniAppPageEnum.values()) {
+            if (type.equals(pageEnum.getType())) {
+                return pageEnum.getScene();
+            }
+        }
+        return null;
+    }
+
+    public static String getPageByType(String type) {
+        for (MiniAppPageEnum pageEnum : MiniAppPageEnum.values()) {
+            if (type.equals(pageEnum.getType())) {
+                return pageEnum.getPage();
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/huiju/estateagents/common/NumberUtils.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.common;
+
+import java.math.BigDecimal;
+
+public class NumberUtils {
+    /**
+     * 元转分（乘以100）
+     * @param amount 金额 分（支持大数字，16位以上）
+     * @return
+     */
+    public static Integer yuanToFen(String amount){
+        return new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
+    }
+
+    public static String  fenToYuan(String price) {
+        return BigDecimal.valueOf(Long.valueOf(price)).divide(new BigDecimal(100)).toString();
+    }
+}

src/main/java/com/huiju/estateagents/common/SMSUtils.java

@@ -0,0 +1,165 @@
+package com.huiju.estateagents.common;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.config.SMSProperties;
+import com.huiju.estateagents.entity.SysSmsSetting;
+import com.huiju.estateagents.mapper.SysSmsSettingMapper;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.*;
+import org.springframework.web.client.RestTemplate;
+
+import java.time.LocalDateTime;
+import java.util.*;
+
+@Slf4j
+@Configuration
+@EnableConfigurationProperties(SMSProperties.class)
+public class SMSUtils {
+    // 短信服务配置
+    SMSProperties smsProperties;
+
+    Hashtable<String, Phone> allPhones;
+
+    @Autowired
+    SysSmsSettingMapper sysSmsSettingMapper;
+
+    @Autowired
+    public SMSUtils(SMSProperties properties) {
+        smsProperties = properties;
+        allPhones = new Hashtable<>();
+    }
+
+    /**
+     * 发送验证码到 tel
+     * @param tel
+     * @return
+     */
+    public boolean sendCaptcha(String tel) {
+        Phone phone = allPhones.get(tel);
+        if (null == phone) {
+            phone = new Phone();
+            phone.setTel(tel);
+        }
+
+        phone.setCaptcha(genCaptcha(smsProperties.getCaptcha().getSize()));
+        phone.setExpire(LocalDateTime.now().plusSeconds(smsProperties.getCaptcha().getExpire()));
+        allPhones.put(tel, phone);
+
+        log.info("发送手机 {} 验证码 {}", tel, phone.getCaptcha());
+
+        String[] params = { phone.getCaptcha(), smsProperties.getCaptcha().getSign() };
+        return sendMessage(smsProperties.getCaptcha().getCode(), tel, params);
+    }
+
+    /**
+     * 校验验证码
+     * @param tel
+     * @param smsCaptcha
+     * @return
+     */
+    public boolean checkCaptcha(String tel, String smsCaptcha) {
+        Phone phone = allPhones.get(tel);
+        if (null == phone) {
+            log.error("手机号 {} 的验证码未找到", tel);
+            return false;
+        }
+
+        if (null == smsCaptcha || !smsCaptcha.equals(phone.getCaptcha())) {
+            log.error("手机号 {} 校验验证码出错, 正确: {}, 错误: {}", tel, phone.getCaptcha(), smsCaptcha);
+            return false;
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        if (now.isAfter(phone.getExpire())) {
+            log.error("手机号 {} 的验证码已过期", tel);
+            return false;
+        }
+
+        // 如果验证成功, 则从缓存中删除
+        allPhones.remove(tel);
+        return true;
+    }
+
+    public boolean sendVisitor(String tel, String name) {
+        log.info("发送手机 {} 客户名称 {}", tel, name);
+
+        String[] params = { name };
+        return sendMessage(smsProperties.getVisitor().getCode(), tel, params);
+    }
+
+    private String genCaptcha(int length) {
+        List<String> nums = new ArrayList<>();
+        for (int i = 0; i < length; i ++) {
+            int rand = (new Random()).nextInt(10);
+            nums.add(String.valueOf(rand));
+        }
+        return String.join("", nums);
+    }
+
+    public boolean sendMessage(String code, String tel, String[] params) {
+        // 发送内容
+        SMSProperties.Template message = new SMSProperties.Template();
+        message.setCode(code);
+        message.setTel(tel);
+        message.setParams(params);
+
+        // 构造 request
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.parseMediaType(smsProperties.getContentType()));
+//        String body = JSONObject.toJSONString(message);
+        HttpMethod method = HttpMethod.resolve(smsProperties.getMethod());
+        HttpEntity requestEntity = new HttpEntity(message, headers);
+
+        RestTemplate template = new RestTemplate();
+        HttpEntity<String> response = template.exchange(
+                smsProperties.getUrl(),
+                method,
+                requestEntity,
+                String.class,
+                new Object()
+        );
+
+        if (((ResponseEntity<String>) response).getStatusCodeValue() != HttpStatus.OK.value()) {
+            log.error("请求发送短信失败: {}", response.toString());
+            return false;
+        }
+
+        return true;
+    }
+
+    public void sendMessage(String tel, List<String> params, String type) throws Exception {
+        if (StringUtils.isEmpty(tel) || StringUtils.isEmpty(type)) {
+            throw new Exception("短信发送失败: 没有手机号或者短信模板");
+        }
+
+        QueryWrapper<SysSmsSetting> query = new QueryWrapper<>();
+        query.eq("sms_type", type);
+        query.eq("status", CommConstant.STATUS_NORMAL);
+        query.last("limit 1");
+
+        SysSmsSetting smsSetting = sysSmsSettingMapper.selectOne(query);
+        if (null == smsSetting) {
+            throw new Exception("没有设置有效的【" + type + "】短信模板");
+        }
+
+        params.add("橙蕉"); // 短信签名
+        String[] paramArr = new String[params.size()];
+        params.toArray(paramArr);
+
+        boolean success = sendMessage(smsSetting.getTplCode(), tel, paramArr);
+        if (!success) {
+            throw new Exception("短信发送失败");
+        }
+    }
+
+    @Data
+    public static class Phone {
+        String tel;
+        String captcha;
+        LocalDateTime expire;
+    }
+}

src/main/java/com/huiju/estateagents/common/StringConverter.java

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.common;
+
+import jodd.typeconverter.TypeConversionException;
+import jodd.typeconverter.TypeConverter;
+import jodd.util.ArraysUtil;
+
+import java.sql.Clob;
+import java.sql.SQLException;
+import java.util.Date;
+
+public class StringConverter implements TypeConverter<String> {
+
+    public String convert(Object value) {
+        if (value == null) {
+            return null;
+        }
+
+        if (value instanceof CharSequence) { // for speed
+            return value.toString();
+        }
+        Class<?> type = value.getClass();
+        if (type == Class.class) {
+            return ((Class<?>) value).getName();
+        }
+        if (type.isArray()) {
+            if (type == char[].class) {
+                char[] charArray = (char[]) value;
+                return new String(charArray);
+            }
+            if (type == int[].class) {
+                return ArraysUtil.toString((int[]) value);
+            }
+            if (type == long[].class) {
+                return ArraysUtil.toString((long[]) value);
+            }
+            if (type == byte[].class) {
+                return ArraysUtil.toString((byte[]) value);
+            }
+            if (type == float[].class) {
+                return ArraysUtil.toString((float[]) value);
+            }
+            if (type == double[].class) {
+                return ArraysUtil.toString((double[]) value);
+            }
+            if (type == short[].class) {
+                return ArraysUtil.toString((short[]) value);
+            }
+            if (type == boolean[].class) {
+                return ArraysUtil.toString((boolean[]) value);
+            }
+            return ArraysUtil.toString((Object[]) value);
+        }
+        if (value instanceof Clob) {
+            Clob clob = (Clob) value;
+            try {
+                long length = clob.length();
+                if (length > Integer.MAX_VALUE) {
+                    throw new TypeConversionException("Clob is too big.");
+                }
+                return clob.getSubString(1, (int) length);
+            } catch (SQLException sex) {
+                throw new TypeConversionException(value, sex);
+            }
+        }
+        if (value instanceof Date) {
+            java.text.DateFormat format1 = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            return format1.format(value);
+        }
+
+        return value.toString();
+    }
+}

src/main/java/com/huiju/estateagents/common/StringUtils.java

@@ -0,0 +1,108 @@
+package com.huiju.estateagents.common;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class StringUtils {
+    private static Pattern humpPattern = Pattern.compile("[A-Z]");
+
+    public static boolean isEmpty(String str) {
+        return null == str || "".equals(str.trim()) || "null".equals(str) || "undefined".equals(str);
+    }
+
+    public static String trim(String src, String ...st) {
+        if (null == src) return src;
+        if (null == st || st.length == 0) return src.trim();
+
+        String start = st[0];
+        if (!src.startsWith(start)) {
+            return src;
+        }
+
+        return src.substring(start.length());
+    }
+
+    public static String ifNull(String src, String defaultVal) {
+        return isEmpty(src) ? defaultVal : src;
+    }
+
+    public static String random(int length) {
+        String str="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for(int i=0;i<length;i++){
+            int number=random.nextInt(62);
+            sb.append(str.charAt(number));
+        }
+        return sb.toString();
+    }
+
+    public static String urlEncode(String str) {
+        try {
+            return URLEncoder.encode(str, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return str;
+        }
+    }
+
+    public static String humpToLine(String str) {
+        if (null == str || "".equals(str)) return "";
+
+        Matcher matcher = humpPattern.matcher(str);
+        StringBuffer sb = new StringBuffer();
+        while (matcher.find()) {
+            matcher.appendReplacement(sb, "_" + matcher.group(0).toLowerCase());
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
+    public static String strToUnicode(String str) {
+        char[] chars = str.toCharArray();
+        String returnStr = "";
+        for (int i = 0; i < chars.length; i++) {
+            returnStr += "\\u" + Integer.toString(chars[i], 16);
+        }
+        return returnStr;
+    }
+
+    public static String repeat(String src, int len) {
+        if (null == src) {
+            return null;
+        }
+
+        if (len <= 0) {
+            return src;
+        }
+
+        String res = "";
+        for (int i = 0; i < len; i ++) {
+            res += src;
+        }
+
+        return res;
+    }
+
+    public static String lpad(String src, String padStr, int len) {
+        if (null == src) {
+            return null;
+        }
+
+        if (len <= 0 || src.length() >= len) {
+            return src;
+        }
+
+        if (null == padStr) {
+            padStr = "";
+        }
+
+        int padLen = len - src.length();
+        String prefix = repeat(padStr, padLen);
+        prefix = prefix.substring(0, padLen);
+        return prefix + src;
+    }
+}

src/main/java/com/huiju/estateagents/common/WxQrCodeUtils.java

@@ -0,0 +1,33 @@
+package com.huiju.estateagents.common;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 微信二维码生成工具类
+ *
+ * @author gusy
+ * @date 2020/5/21 15:40
+ */
+public class WxQrCodeUtils {
+
+    /**
+     * 生成scene和页面
+     *
+     * @param type
+     * @param scene  为空则使用配置的通用模板
+     * @param params scene为空是必须按照模板内容填写
+     * @return
+     */
+    public static String generateSceneAndPage(String type, String scene, String... params) {
+        if (StringUtils.isBlank(scene)) {
+            String sceneTemplate = MiniAppPageEnum.getSceneByType(type);
+            scene = String.format(sceneTemplate, params);
+        }
+
+        JSONObject obj = new JSONObject();
+        obj.put("scene", scene);
+        obj.put("page", MiniAppPageEnum.getPageByType(type));
+        return obj.toJSONString();
+    }
+}

src/main/java/com/huiju/estateagents/common/WxUtils.java

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.common;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.service.IMiniAppService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+public class WxUtils {
+    private ConcurrentHashMap<String, WxMaService> serives = new ConcurrentHashMap();
+
+    @Autowired
+    IMiniAppService iMiniAppService;
+
+    public WxMaService getMiniApp(String appid) {
+        return serives.get(appid);
+    }
+
+    @PostConstruct
+    public void init() {
+        System.out.println("-------------PostConstruct----------------");
+
+        List<TaMiniapp> taMiniappList = iMiniAppService.getAllAvaliableMiniapps();
+        if (null == taMiniappList) {
+            return;
+        }
+
+        for (TaMiniapp taMiniapp : taMiniappList) {
+            WxMaService service = newService(taMiniapp);
+            serives.put(taMiniapp.getMiniappId(), service);
+        }
+    }
+
+    public WxMaService newService(TaMiniapp taMiniapp, boolean ...changeServices) {
+        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+        config.setAppid(taMiniapp.getMiniappId());
+        config.setSecret(taMiniapp.getSecret());
+        config.setToken(taMiniapp.getToken());
+        config.setAesKey(taMiniapp.getAesKey());
+        config.setMsgDataFormat("JSON");
+
+        WxMaService service = new WxMaServiceImpl();
+        service.setWxMaConfig(config);
+
+        if (changeServices.length > 0 && changeServices[0]) {
+            serives.remove(taMiniapp.getMiniappId());
+            serives.put(taMiniapp.getMiniappId(), service);
+        }
+
+        return service;
+    }
+}

src/main/java/com/huiju/estateagents/common/wxpay/IWXPayDomain.java

@@ -0,0 +1,42 @@
+package com.huiju.estateagents.common.wxpay;
+
+/**
+ * 域名管理，实现主备域名自动切换
+ */
+public abstract interface IWXPayDomain {
+    /**
+     * 上报域名网络状况
+     * @param domain 域名。 比如：api.mch.weixin.qq.com
+     * @param elapsedTimeMillis 耗时
+     * @param ex 网络请求中出现的异常。
+     *           null表示没有异常
+     *           ConnectTimeoutException，表示建立网络连接异常
+     *           UnknownHostException， 表示dns解析异常
+     */
+    abstract void report(final String domain, long elapsedTimeMillis, final Exception ex);
+
+    /**
+     * 获取域名
+     * @param config 配置
+     * @return 域名
+     */
+    abstract DomainInfo getDomain(final WXPayConfig config);
+
+    static class DomainInfo{
+        public String domain;       //域名
+        public boolean primaryDomain;     //该域名是否为主域名。例如:api.mch.weixin.qq.com为主域名
+        public DomainInfo(String domain, boolean primaryDomain) {
+            this.domain = domain;
+            this.primaryDomain = primaryDomain;
+        }
+
+        @Override
+        public String toString() {
+            return "DomainInfo{" +
+                    "domain='" + domain + '\'' +
+                    ", primaryDomain=" + primaryDomain +
+                    '}';
+        }
+    }
+
+}

src/main/java/com/huiju/estateagents/common/wxpay/WXPay.java

@@ -0,0 +1,689 @@
+package com.huiju.estateagents.common.wxpay;
+
+
+import java.util.HashMap;
+import java.util.Map;
+import com.huiju.estateagents.common.wxpay.WXPayConstants.SignType;
+
+public class WXPay {
+
+    private WXPayConfig config;
+    private SignType signType;
+    private boolean autoReport;
+    private boolean useSandbox;
+    private String notifyUrl;
+    private WXPayRequest wxPayRequest;
+
+    public WXPay(final WXPayConfig config) throws Exception {
+        this(config, null, true, false);
+    }
+
+    public WXPay(final WXPayConfig config, final boolean autoReport) throws Exception {
+        this(config, null, autoReport, false);
+    }
+
+
+    public WXPay(final WXPayConfig config, final boolean autoReport, final boolean useSandbox) throws Exception{
+        this(config, null, autoReport, useSandbox);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl) throws Exception {
+        this(config, notifyUrl, true, false);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl, final boolean autoReport) throws Exception {
+        this(config, notifyUrl, autoReport, false);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl, final boolean autoReport, final boolean useSandbox) throws Exception {
+        this.config = config;
+        this.notifyUrl = notifyUrl;
+        this.autoReport = autoReport;
+        this.useSandbox = useSandbox;
+        //if (useSandbox) {
+            this.signType = SignType.MD5;
+        //}
+        //else {
+        //    this.signType = SignType.HMACSHA256;
+        //}
+        this.wxPayRequest = new WXPayRequest(config);
+    }
+
+    private void checkWXPayConfig() throws Exception {
+        if (this.config == null) {
+            throw new Exception("config is null");
+        }
+        if (this.config.getAppID() == null || this.config.getAppID().trim().length() == 0) {
+            throw new Exception("appid in config is empty");
+        }
+        if (this.config.getMchID() == null || this.config.getMchID().trim().length() == 0) {
+            throw new Exception("appid in config is empty");
+        }
+        if (this.config.getCertStream() == null) {
+            throw new Exception("cert stream in config is empty");
+        }
+        if (this.config.getWXPayDomain() == null){
+            throw new Exception("config.getWXPayDomain() is null");
+        }
+
+        if (this.config.getHttpConnectTimeoutMs() < 10) {
+            throw new Exception("http connect timeout is too small");
+        }
+        if (this.config.getHttpReadTimeoutMs() < 10) {
+            throw new Exception("http read timeout is too small");
+        }
+
+    }
+
+    /**
+     * 向 Map 中添加 appid、mch_id、nonce_str、sign_type、sign <br>
+     * 该函数适用于商户适用于统一下单等接口，不适用于红包、代金券接口
+     *
+     * @param reqData
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> fillRequestData(Map<String, String> reqData) throws Exception {
+        reqData.put("appid", config.getAppID());
+        reqData.put("mch_id", config.getMchID());
+        reqData.put("nonce_str", WXPayUtil.generateNonceStr());
+        if (SignType.MD5.equals(this.signType)) {
+            reqData.put("sign_type", WXPayConstants.MD5);
+        }
+        else if (SignType.HMACSHA256.equals(this.signType)) {
+            reqData.put("sign_type", WXPayConstants.HMACSHA256);
+        }
+        reqData.put("sign", WXPayUtil.generateSignature(reqData, config.getKey(), this.signType));
+        return reqData;
+    }
+
+    /**
+     * 判断xml数据的sign是否有效，必须包含sign字段，否则返回false。
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return 签名是否有效
+     * @throws Exception
+     */
+    public boolean isResponseSignatureValid(Map<String, String> reqData) throws Exception {
+        // 返回数据的签名方式和请求中给定的签名方式是一致的
+        return WXPayUtil.isSignatureValid(reqData, this.config.getKey(), this.signType);
+    }
+
+    /**
+     * 判断支付结果通知中的sign是否有效
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return 签名是否有效
+     * @throws Exception
+     */
+    public boolean isPayResultNotifySignatureValid(Map<String, String> reqData) throws Exception {
+        String signTypeInData = reqData.get(WXPayConstants.FIELD_SIGN_TYPE);
+        SignType signType;
+        if (signTypeInData == null) {
+            signType = SignType.MD5;
+        }
+        else {
+            signTypeInData = signTypeInData.trim();
+            if (signTypeInData.length() == 0) {
+                signType = SignType.MD5;
+            }
+            else if (WXPayConstants.MD5.equals(signTypeInData)) {
+                signType = SignType.MD5;
+            }
+            else if (WXPayConstants.HMACSHA256.equals(signTypeInData)) {
+                signType = SignType.HMACSHA256;
+            }
+            else {
+                throw new Exception(String.format("Unsupported sign_type: %s", signTypeInData));
+            }
+        }
+        return WXPayUtil.isSignatureValid(reqData, this.config.getKey(), signType);
+    }
+
+
+    /**
+     * 不需要证书的请求
+     * @param urlSuffix String
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 超时时间，单位是毫秒
+     * @param readTimeoutMs 超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public String requestWithoutCert(String urlSuffix, Map<String, String> reqData,
+                                     int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String msgUUID = reqData.get("nonce_str");
+        String reqBody = WXPayUtil.mapToXml(reqData);
+
+        String resp = this.wxPayRequest.requestWithoutCert(urlSuffix, msgUUID, reqBody, connectTimeoutMs, readTimeoutMs, autoReport);
+        return resp;
+    }
+
+
+    /**
+     * 需要证书的请求
+     * @param urlSuffix String
+     * @param reqData 向wxpay post的请求数据  Map
+     * @param connectTimeoutMs 超时时间，单位是毫秒
+     * @param readTimeoutMs 超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public String requestWithCert(String urlSuffix, Map<String, String> reqData,
+                                  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String msgUUID= reqData.get("nonce_str");
+        String reqBody = WXPayUtil.mapToXml(reqData);
+
+        String resp = this.wxPayRequest.requestWithCert(urlSuffix, msgUUID, reqBody, connectTimeoutMs, readTimeoutMs, this.autoReport);
+        return resp;
+    }
+
+    /**
+     * 处理 HTTPS API返回数据，转换成Map对象。return_code为SUCCESS时，验证签名。
+     * @param xmlStr API返回的XML格式数据
+     * @return Map类型数据
+     * @throws Exception
+     */
+    public Map<String, String> processResponseXml(String xmlStr) throws Exception {
+        String RETURN_CODE = "return_code";
+        String return_code;
+        Map<String, String> respData = WXPayUtil.xmlToMap(xmlStr);
+        if (respData.containsKey(RETURN_CODE)) {
+            return_code = respData.get(RETURN_CODE);
+        }
+        else {
+            throw new Exception(String.format("No `return_code` in XML: %s", xmlStr));
+        }
+
+        if (return_code.equals(WXPayConstants.FAIL)) {
+            return respData;
+        }
+        else if (return_code.equals(WXPayConstants.SUCCESS)) {
+           if (this.isResponseSignatureValid(respData)) {
+               return respData;
+           }
+           else {
+               throw new Exception(String.format("Invalid sign value in XML: %s", xmlStr));
+           }
+        }
+        else {
+            throw new Exception(String.format("return_code value %s is invalid in XML: %s", return_code, xmlStr));
+        }
+    }
+
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> microPay(Map<String, String> reqData) throws Exception {
+        return this.microPay(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> microPay(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_MICROPAY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.MICROPAY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+    /**
+     * 提交刷卡支付，针对软POS，尽可能做成功
+     * 内置重试机制，最多60s
+     * @param reqData
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> microPayWithPos(Map<String, String> reqData) throws Exception {
+        return this.microPayWithPos(reqData, this.config.getHttpConnectTimeoutMs());
+    }
+
+    /**
+     * 提交刷卡支付，针对软POS，尽可能做成功
+     * 内置重试机制，最多60s
+     * @param reqData
+     * @param connectTimeoutMs
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> microPayWithPos(Map<String, String> reqData, int connectTimeoutMs) throws Exception {
+        int remainingTimeMs = 60*1000;
+        long startTimestampMs = 0;
+        Map<String, String> lastResult = null;
+        Exception lastException = null;
+
+        while (true) {
+            startTimestampMs = WXPayUtil.getCurrentTimestampMs();
+            int readTimeoutMs = remainingTimeMs - connectTimeoutMs;
+            if (readTimeoutMs > 1000) {
+                try {
+                    lastResult = this.microPay(reqData, connectTimeoutMs, readTimeoutMs);
+                    String returnCode = lastResult.get("return_code");
+                    if (returnCode.equals("SUCCESS")) {
+                        String resultCode = lastResult.get("result_code");
+                        String errCode = lastResult.get("err_code");
+                        if (resultCode.equals("SUCCESS")) {
+                            break;
+                        }
+                        else {
+                            // 看错误码，若支付结果未知，则重试提交刷卡支付
+                            if (errCode.equals("SYSTEMERROR") || errCode.equals("BANKERROR") || errCode.equals("USERPAYING")) {
+                                remainingTimeMs = remainingTimeMs - (int)(WXPayUtil.getCurrentTimestampMs() - startTimestampMs);
+                                if (remainingTimeMs <= 100) {
+                                    break;
+                                }
+                                else {
+                                    WXPayUtil.getLogger().info("microPayWithPos: try micropay again");
+                                    if (remainingTimeMs > 5*1000) {
+                                        Thread.sleep(5*1000);
+                                    }
+                                    else {
+                                        Thread.sleep(1*1000);
+                                    }
+                                    continue;
+                                }
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                    }
+                    else {
+                        break;
+                    }
+                }
+                catch (Exception ex) {
+                    lastResult = null;
+                    lastException = ex;
+                }
+            }
+            else {
+                break;
+            }
+        }
+
+        if (lastResult == null) {
+            throw lastException;
+        }
+        else {
+            return lastResult;
+        }
+    }
+
+
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> unifiedOrder(Map<String, String> reqData) throws Exception {
+        return this.unifiedOrder(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> unifiedOrder(Map<String, String> reqData,  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_UNIFIEDORDER_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.UNIFIEDORDER_URL_SUFFIX;
+        }
+        if(this.notifyUrl != null) {
+            reqData.put("notify_url", this.notifyUrl);
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> orderQuery(Map<String, String> reqData) throws Exception {
+        return this.orderQuery(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据 int
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> orderQuery(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_ORDERQUERY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.ORDERQUERY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> reverse(Map<String, String> reqData) throws Exception {
+        return this.reverse(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付<br>
+     * 其他：需要证书
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> reverse(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REVERSE_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REVERSE_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> closeOrder(Map<String, String> reqData) throws Exception {
+        return this.closeOrder(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> closeOrder(Map<String, String> reqData,  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_CLOSEORDER_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.CLOSEORDER_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refund(Map<String, String> reqData) throws Exception {
+        return this.refund(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：需要证书
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refund(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REFUND_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REFUND_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refundQuery(Map<String, String> reqData) throws Exception {
+        return this.refundQuery(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refundQuery(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REFUNDQUERY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REFUNDQUERY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：对账单下载（成功时返回对账单数据，失败时返回XML格式数据）<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> downloadBill(Map<String, String> reqData) throws Exception {
+        return this.downloadBill(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：对账单下载<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：无论是否成功都返回Map。若成功，返回的Map中含有return_code、return_msg、data，
+     *      其中return_code为`SUCCESS`，data为对账单数据。
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return 经过封装的API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> downloadBill(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_DOWNLOADBILL_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.DOWNLOADBILL_URL_SUFFIX;
+        }
+        String respStr = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs).trim();
+        Map<String, String> ret;
+        // 出现错误，返回XML数据
+        if (respStr.indexOf("<") == 0) {
+            ret = WXPayUtil.xmlToMap(respStr);
+        }
+        else {
+            // 正常返回csv数据
+            ret = new HashMap<String, String>();
+            ret.put("return_code", WXPayConstants.SUCCESS);
+            ret.put("return_msg", "ok");
+            ret.put("data", respStr);
+        }
+        return ret;
+    }
+
+
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> report(Map<String, String> reqData) throws Exception {
+        return this.report(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> report(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REPORT_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REPORT_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return WXPayUtil.xmlToMap(respXml);
+    }
+
+
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> shortUrl(Map<String, String> reqData) throws Exception {
+        return this.shortUrl(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> shortUrl(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_SHORTURL_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.SHORTURL_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> authCodeToOpenid(Map<String, String> reqData) throws Exception {
+        return this.authCodeToOpenid(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> authCodeToOpenid(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_AUTHCODETOOPENID_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.AUTHCODETOOPENID_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+} // end class

src/main/java/com/huiju/estateagents/common/wxpay/WXPayConfig.java

@@ -0,0 +1,103 @@
+package com.huiju.estateagents.common.wxpay;
+
+import java.io.InputStream;
+
+public abstract class WXPayConfig {
+
+
+
+    /**
+     * 获取 App ID
+     *
+     * @return App ID
+     */
+    abstract String getAppID();
+
+
+    /**
+     * 获取 Mch ID
+     *
+     * @return Mch ID
+     */
+    abstract String getMchID();
+
+
+    /**
+     * 获取 API 密钥
+     *
+     * @return API密钥
+     */
+    abstract String getKey();
+
+
+    /**
+     * 获取商户证书内容
+     *
+     * @return 商户证书内容
+     */
+    abstract InputStream getCertStream();
+
+    /**
+     * HTTP(S) 连接超时时间，单位毫秒
+     *
+     * @return
+     */
+    public int getHttpConnectTimeoutMs() {
+        return 6*1000;
+    }
+
+    /**
+     * HTTP(S) 读数据超时时间，单位毫秒
+     *
+     * @return
+     */
+    public int getHttpReadTimeoutMs() {
+        return 8*1000;
+    }
+
+    /**
+     * 获取WXPayDomain, 用于多域名容灾自动切换
+     * @return
+     */
+    abstract IWXPayDomain getWXPayDomain();
+
+    /**
+     * 是否自动上报。
+     * 若要关闭自动上报，子类中实现该函数返回 false 即可。
+     *
+     * @return
+     */
+    public boolean shouldAutoReport() {
+        return true;
+    }
+
+    /**
+     * 进行健康上报的线程的数量
+     *
+     * @return
+     */
+    public int getReportWorkerNum() {
+        return 6;
+    }
+
+
+    /**
+     * 健康上报缓存消息的最大数量。会有线程去独立上报
+     * 粗略计算：加入一条消息200B，10000消息占用空间 2000 KB，约为2MB，可以接受
+     *
+     * @return
+     */
+    public int getReportQueueMaxSize() {
+        return 10000;
+    }
+
+    /**
+     * 批量上报，一次最多上报多个数据
+     *
+     * @return
+     */
+    public int getReportBatchSize() {
+        return 10;
+    }
+
+}

src/main/java/com/huiju/estateagents/common/wxpay/WXPayConstants.java

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.common.wxpay;
+
+import org.apache.http.client.HttpClient;
+
+/**
+ * 常量
+ */
+public class WXPayConstants {
+
+    public enum SignType {
+        MD5, HMACSHA256
+    }
+
+    public static final String DOMAIN_API = "api.mch.weixin.qq.com";
+    public static final String DOMAIN_API2 = "api2.mch.weixin.qq.com";
+    public static final String DOMAIN_APIHK = "apihk.mch.weixin.qq.com";
+    public static final String DOMAIN_APIUS = "apius.mch.weixin.qq.com";
+
+
+    public static final String FAIL     = "FAIL";
+    public static final String SUCCESS  = "SUCCESS";
+    public static final String HMACSHA256 = "HMAC-SHA256";
+    public static final String MD5 = "MD5";
+
+    public static final String FIELD_SIGN = "sign";
+    public static final String FIELD_SIGN_TYPE = "sign_type";
+
+    public static final String WXPAYSDK_VERSION = "WXPaySDK/3.0.9";
+    public static final String USER_AGENT = WXPAYSDK_VERSION +
+            " (" + System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " + System.getProperty("os.version") +
+            ") Java/" + System.getProperty("java.version") + " HttpClient/" + HttpClient.class.getPackage().getImplementationVersion();
+
+    public static final String MICROPAY_URL_SUFFIX     = "/pay/micropay";
+    public static final String UNIFIEDORDER_URL_SUFFIX = "/pay/unifiedorder";
+    public static final String ORDERQUERY_URL_SUFFIX   = "/pay/orderquery";
+    public static final String REVERSE_URL_SUFFIX      = "/secapi/pay/reverse";
+    public static final String CLOSEORDER_URL_SUFFIX   = "/pay/closeorder";
+    public static final String REFUND_URL_SUFFIX       = "/secapi/pay/refund";
+    public static final String REFUNDQUERY_URL_SUFFIX  = "/pay/refundquery";
+    public static final String DOWNLOADBILL_URL_SUFFIX = "/pay/downloadbill";
+    public static final String REPORT_URL_SUFFIX       = "/payitil/report";
+    public static final String SHORTURL_URL_SUFFIX     = "/tools/shorturl";
+    public static final String AUTHCODETOOPENID_URL_SUFFIX = "/tools/authcodetoopenid";
+
+    // sandbox
+    public static final String SANDBOX_MICROPAY_URL_SUFFIX     = "/sandboxnew/pay/micropay";
+    public static final String SANDBOX_UNIFIEDORDER_URL_SUFFIX = "/sandboxnew/pay/unifiedorder";
+    public static final String SANDBOX_ORDERQUERY_URL_SUFFIX   = "/sandboxnew/pay/orderquery";
+    public static final String SANDBOX_REVERSE_URL_SUFFIX      = "/sandboxnew/secapi/pay/reverse";
+    public static final String SANDBOX_CLOSEORDER_URL_SUFFIX   = "/sandboxnew/pay/closeorder";
+    public static final String SANDBOX_REFUND_URL_SUFFIX       = "/sandboxnew/secapi/pay/refund";
+    public static final String SANDBOX_REFUNDQUERY_URL_SUFFIX  = "/sandboxnew/pay/refundquery";
+    public static final String SANDBOX_DOWNLOADBILL_URL_SUFFIX = "/sandboxnew/pay/downloadbill";
+    public static final String SANDBOX_REPORT_URL_SUFFIX       = "/sandboxnew/payitil/report";
+    public static final String SANDBOX_SHORTURL_URL_SUFFIX     = "/sandboxnew/tools/shorturl";
+    public static final String SANDBOX_AUTHCODETOOPENID_URL_SUFFIX = "/sandboxnew/tools/authcodetoopenid";
+
+}
+

src/main/java/com/huiju/estateagents/common/wxpay/WXPayRefundReason.java

@@ -0,0 +1,106 @@
+package com.huiju.estateagents.common.wxpay;
+
+public enum WXPayRefundReason {
+    SYSTEMERROR("SYSTEMERROR","系统超时等"),
+    BIZERR_NEED_RETRY("BIZERR_NEED_RETRY","并发情况下，业务被拒绝，商户重试即可解决"),
+    TRADE_OVERDUE("TRADE_OVERDUE","订单已经超过可退款的最大期限(支付后一年内可退款)"),
+    ERROR("ERROR","申请退款业务发生错误"),
+    USER_ACCOUNT_ABNORMAL("USER_ACCOUNT_ABNORMAL","用户帐号注销"),
+    INVALID_REQ_TOO_MUCH("INVALID_REQ_TOO_MUCH","连续错误请求数过多被系统短暂屏蔽"),
+    NOTENOUGH("NOTENOUGH","商户可用退款余额不足"),
+    INVALID_TRANSACTIONID("INVALID_TRANSACTIONID","请求参数未按指引进行填写"),
+    PARAM_ERROR("PARAM_ERROR","请求参数未按指引进行填写"),
+    APPID_NOT_EXIST("APPID_NOT_EXIST","参数中缺少APPID"),
+    MCHID_NOT_EXIST("MCHID_NOT_EXIST","参数中缺少MCHID"),
+    ORDERNOTEXIST("ORDERNOTEXIST","缺少有效的订单号"),
+    REQUIRE_POST_METHOD("REQUIRE_POST_METHOD","未使用post传递参数 "),
+    SIGNERROR("SIGNERROR","参数签名结果不正确"),
+    XML_FORMAT_ERROR("XML_FORMAT_ERROR","XML格式错误"),
+    FREQUENCY_LIMITED("FREQUENCY_LIMITED","2个月之前的订单申请退款有频率限制"),
+    NOAUTH("NOAUTH","请求ip异常"),
+    ;
+
+    WXPayRefundReason(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    private String code;
+
+    private String message;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+
+    public static String getMsg(String code) {
+        String message = "";
+       switch (code){
+           case "SYSTEMERROR":
+               message = SYSTEMERROR.getMessage();
+               break;
+           case "BIZERR_NEED_RETRY":
+               message = BIZERR_NEED_RETRY.getMessage();
+               break;
+           case "TRADE_OVERDUE":
+               message = TRADE_OVERDUE.getMessage();
+               break;
+           case "ERROR":
+               message = ERROR.getMessage();
+               break;
+           case "USER_ACCOUNT_ABNORMAL":
+               message = USER_ACCOUNT_ABNORMAL.getMessage();
+               break;
+           case "INVALID_REQ_TOO_MUCH":
+               message = INVALID_REQ_TOO_MUCH.getMessage();
+               break;
+           case "NOTENOUGH":
+               message = NOTENOUGH.getMessage();
+               break;
+           case "INVALID_TRANSACTIONID":
+               message = INVALID_TRANSACTIONID.getMessage();
+               break;
+           case "PARAM_ERROR":
+               message = PARAM_ERROR.getMessage();
+               break;
+           case "APPID_NOT_EXIST":
+               message = APPID_NOT_EXIST.getMessage();
+               break;
+           case "MCHID_NOT_EXIST":
+               message = MCHID_NOT_EXIST.getMessage();
+               break;
+           case "REQUIRE_POST_METHOD":
+               message = REQUIRE_POST_METHOD.getMessage();
+               break;
+           case "SIGNERROR":
+               message = SIGNERROR.getMessage();
+               break;
+           case "XML_FORMAT_ERROR":
+               message = XML_FORMAT_ERROR.getMessage();
+               break;
+           case "FREQUENCY_LIMITED":
+               message = FREQUENCY_LIMITED.getMessage();
+               break;
+           case "NOAUTH":
+               message = NOAUTH.getMessage();
+               break;
+           case "ORDERNOTEXIST":
+               message = ORDERNOTEXIST.getMessage();
+               break;
+       }
+        return message;
+    }
+}

src/main/java/com/huiju/estateagents/common/wxpay/WXPayReport.java

@@ -0,0 +1,265 @@
+package com.huiju.estateagents.common.wxpay;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * 交易保障
+ */
+public class WXPayReport {
+
+    public static class ReportInfo {
+
+        /**
+         * 布尔变量使用int。0为false， 1为true。
+         */
+
+        // 基本信息
+        private String version = "v1";
+        private String sdk = WXPayConstants.WXPAYSDK_VERSION;
+        private String uuid;  // 交易的标识
+        private long timestamp;   // 上报时的时间戳，单位秒
+        private long elapsedTimeMillis; // 耗时，单位 毫秒
+
+        // 针对主域名
+        private String firstDomain;  // 第1次请求的域名
+        private boolean primaryDomain; //是否主域名
+        private int firstConnectTimeoutMillis;  // 第1次请求设置的连接超时时间，单位 毫秒
+        private int firstReadTimeoutMillis;  // 第1次请求设置的读写超时时间，单位 毫秒
+        private int firstHasDnsError;  // 第1次请求是否出现dns问题
+        private int firstHasConnectTimeout; // 第1次请求是否出现连接超时
+        private int firstHasReadTimeout; // 第1次请求是否出现连接超时
+
+        public ReportInfo(String uuid, long timestamp, long elapsedTimeMillis, String firstDomain, boolean primaryDomain, int firstConnectTimeoutMillis, int firstReadTimeoutMillis, boolean firstHasDnsError, boolean firstHasConnectTimeout, boolean firstHasReadTimeout) {
+            this.uuid = uuid;
+            this.timestamp = timestamp;
+            this.elapsedTimeMillis = elapsedTimeMillis;
+            this.firstDomain = firstDomain;
+            this.primaryDomain = primaryDomain;
+            this.firstConnectTimeoutMillis = firstConnectTimeoutMillis;
+            this.firstReadTimeoutMillis = firstReadTimeoutMillis;
+            this.firstHasDnsError = firstHasDnsError?1:0;
+            this.firstHasConnectTimeout = firstHasConnectTimeout?1:0;
+            this.firstHasReadTimeout = firstHasReadTimeout?1:0;
+         }
+
+        @Override
+        public String toString() {
+            return "ReportInfo{" +
+                    "version='" + version + '\'' +
+                    ", sdk='" + sdk + '\'' +
+                    ", uuid='" + uuid + '\'' +
+                    ", timestamp=" + timestamp +
+                    ", elapsedTimeMillis=" + elapsedTimeMillis +
+                    ", firstDomain='" + firstDomain + '\'' +
+                    ", primaryDomain=" + primaryDomain +
+                    ", firstConnectTimeoutMillis=" + firstConnectTimeoutMillis +
+                    ", firstReadTimeoutMillis=" + firstReadTimeoutMillis +
+                    ", firstHasDnsError=" + firstHasDnsError +
+                    ", firstHasConnectTimeout=" + firstHasConnectTimeout +
+                    ", firstHasReadTimeout=" + firstHasReadTimeout +
+                    '}';
+        }
+
+        /**
+         * 转换成 csv 格式
+         *
+         * @return
+         */
+        public String toLineString(String key) {
+            String separator = ",";
+            Object[] objects = new Object[] {
+                version, sdk, uuid, timestamp, elapsedTimeMillis,
+                    firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
+                    firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout
+            };
+            StringBuffer sb = new StringBuffer();
+            for(Object obj: objects) {
+                sb.append(obj).append(separator);
+            }
+            try {
+                String sign = WXPayUtil.HMACSHA256(sb.toString(), key);
+                sb.append(sign);
+                return sb.toString();
+            }
+            catch (Exception ex) {
+                return null;
+            }
+
+        }
+
+    }
+
+    private static final String REPORT_URL = "http://report.mch.weixin.qq.com/wxpay/report/default";
+    // private static final String REPORT_URL = "http://127.0.0.1:5000/test";
+
+
+    private static final int DEFAULT_CONNECT_TIMEOUT_MS = 6*1000;
+    private static final int DEFAULT_READ_TIMEOUT_MS = 8*1000;
+
+    private LinkedBlockingQueue<String> reportMsgQueue = null;
+    private WXPayConfig config;
+    private ExecutorService executorService;
+
+    private volatile static WXPayReport INSTANCE;
+
+    private WXPayReport(final WXPayConfig config) {
+        this.config = config;
+        reportMsgQueue = new LinkedBlockingQueue<String>(config.getReportQueueMaxSize());
+
+        // 添加处理线程
+        executorService = Executors.newFixedThreadPool(config.getReportWorkerNum(), new ThreadFactory() {
+            public Thread newThread(Runnable r) {
+                Thread t = Executors.defaultThreadFactory().newThread(r);
+                t.setDaemon(true);
+                return t;
+            }
+        });
+
+        if (config.shouldAutoReport()) {
+            WXPayUtil.getLogger().info("report worker num: {}", config.getReportWorkerNum());
+            for (int i = 0; i < config.getReportWorkerNum(); ++i) {
+                executorService.execute(new Runnable() {
+                    public void run() {
+                        while (true) {
+                            // 先用 take 获取数据
+                            try {
+                                StringBuffer sb = new StringBuffer();
+                                String firstMsg = reportMsgQueue.take();
+                                WXPayUtil.getLogger().info("get first report msg: {}", firstMsg);
+                                String msg = null;
+                                sb.append(firstMsg); //会阻塞至有消息
+                                int remainNum = config.getReportBatchSize() - 1;
+                                for (int j=0; j<remainNum; ++j) {
+                                    WXPayUtil.getLogger().info("try get remain report msg");
+                                    // msg = reportMsgQueue.poll();  // 不阻塞了
+                                    msg = reportMsgQueue.take();
+                                    WXPayUtil.getLogger().info("get remain report msg: {}", msg);
+                                    if (msg == null) {
+                                        break;
+                                    }
+                                    else {
+                                        sb.append("\n");
+                                        sb.append(msg);
+                                    }
+                                }
+                                // 上报
+                                WXPayReport.httpRequest(sb.toString(), DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+                            }
+                            catch (Exception ex) {
+                                WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
+                            }
+                        }
+                    }
+                });
+            }
+        }
+
+    }
+
+    /**
+     * 单例，双重校验，请在 JDK 1.5及更高版本中使用
+     *
+     * @param config
+     * @return
+     */
+    public static WXPayReport getInstance(WXPayConfig config) {
+        if (INSTANCE == null) {
+            synchronized (WXPayReport.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new WXPayReport(config);
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    public void report(String uuid, long elapsedTimeMillis,
+                       String firstDomain, boolean primaryDomain, int firstConnectTimeoutMillis, int firstReadTimeoutMillis,
+                       boolean firstHasDnsError, boolean firstHasConnectTimeout, boolean firstHasReadTimeout) {
+        long currentTimestamp = WXPayUtil.getCurrentTimestamp();
+        ReportInfo reportInfo = new ReportInfo(uuid, currentTimestamp, elapsedTimeMillis,
+                firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
+                firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout);
+        String data = reportInfo.toLineString(config.getKey());
+        WXPayUtil.getLogger().info("report {}", data);
+        if (data != null) {
+            reportMsgQueue.offer(data);
+        }
+    }
+
+
+    @Deprecated
+    private void reportSync(final String data) throws Exception {
+        httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+    }
+
+    @Deprecated
+    private void reportAsync(final String data) throws Exception {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+                }
+                catch (Exception ex) {
+                    WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
+                }
+            }
+        }).start();
+    }
+
+    /**
+     * http 请求
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     * @throws Exception
+     */
+    private static String httpRequest(String data, int connectTimeoutMs, int readTimeoutMs) throws Exception{
+        BasicHttpClientConnectionManager connManager;
+        connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        HttpPost httpPost = new HttpPost(REPORT_URL);
+
+        RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(readTimeoutMs).setConnectTimeout(connectTimeoutMs).build();
+        httpPost.setConfig(requestConfig);
+
+        StringEntity postEntity = new StringEntity(data, "UTF-8");
+        httpPost.addHeader("Content-Type", "text/xml");
+        httpPost.addHeader("User-Agent", WXPayConstants.USER_AGENT);
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        return EntityUtils.toString(httpEntity, "UTF-8");
+    }
+
+}