香颂蔚澜初始化

.gitignore

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

app-api/.gitignore

@@ -0,0 +1,25 @@
+/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/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/

app-api/.mvn/wrapper/maven-wrapper.properties

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

app-api/mvnw

@@ -0,0 +1,225 @@
+#!/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
+#
+#    http://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 Migwn, 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
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+echo $MAVEN_PROJECTBASEDIR
+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 "$@"

app-api/mvnw.cmd

@@ -0,0 +1,143 @@
+@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    http://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 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
+
+%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%

app-api/pom.xml

@@ -0,0 +1,281 @@
+<?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>
+
+	<groupId>com.community</groupId>
+	<artifactId>app-api</artifactId>
+	<version>0.0.1</version>
+	<packaging>jar</packaging>
+
+	<name>app-api</name>
+	<description>app-api</description>
+
+	<parent>
+		<groupId>com.community</groupId>
+		<artifactId>smart-community</artifactId>
+		<version>0.0.1</version>
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
+		<spring-session-jdbc.version>2.0.5.RELEASE</spring-session-jdbc.version>
+		<logback.version>1.1.6</logback.version>
+		<logback.access.version>1.1.2</logback.access.version>
+		<commons.logging.version>1.2</commons.logging.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
+
+		<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>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.community</groupId>
+			<artifactId>community-common</artifactId>
+			<version>0.0.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-jdbc</artifactId>
+			<version>${spring-session-jdbc.version}</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.2</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.alipay.sdk/alipay-sdk-java -->
+		<dependency>
+			<groupId>com.alipay.sdk</groupId>
+			<artifactId>alipay-sdk-java</artifactId>
+			<version>3.3.49.ALL</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.github.sd4324530</groupId>
+			<artifactId>fastweixin</artifactId>
+			<version>1.3.6</version>
+		</dependency>
+
+		<!-- log4j -->
+
+		<!--<dependency>-->
+			<!--<groupId>org.springframework.boot</groupId>-->
+			<!--<artifactId>spring-boot-starter-log4j</artifactId>-->
+		<!--</dependency>-->
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+
+
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>${commons.logging.version}</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/org.apache.commons/commons-lang3 -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.8.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.11.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>net.coobird</groupId>
+			<artifactId>thumbnailator</artifactId>
+			<version>0.4.2</version>
+		</dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+		<dependency>
+			<groupId>io.github.openfeign.form</groupId>
+			<artifactId>feign-form</artifactId>
+			<version>3.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>io.github.openfeign.form</groupId>
+			<artifactId>feign-form-spring</artifactId>
+			<version>3.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.3.3</version>
+		</dependency>
+
+    </dependencies>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.7.0</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<encoding>UTF-8</encoding>
+					<compilerArguments>
+						<extdirs>${project.basedir}/lib</extdirs>
+					</compilerArguments>
+				</configuration>
+			</plugin>
+			<!--服务化打包工具-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/main/assembly/assembly.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.4.2</version>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>

app-api/src/main/assembly/assembly.xml

@@ -0,0 +1,30 @@
+<assembly>
+    <id>assembly</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>src/main/assembly/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory>conf</outputDirectory>
+            <includes>
+                <include>META-INF/**</include>
+                <include>*.yml</include>
+                <include>conf/**</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </fileSet>
+    </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>true</useProjectArtifact>
+            <outputDirectory>lib</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+</assembly>

app-api/src/main/assembly/bin/start.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+SERVER_NAME='app-api'
+# jar名称
+JAR_NAME='app-api-0.0.1.jar'
+cd `dirname $0`
+BIN_DIR=`pwd`
+cd ..
+DEPLOY_DIR=`pwd`
+CONF_DIR=$DEPLOY_DIR/conf
+# 获取应用的端口号
+SERVER_PORT=`sed -nr '/port: [0-9]+/ s/.*port: +([0-9]+).*/\1/p' conf/bootstrap.yml`
+
+PIDS=`ps -f | grep java | grep "$CONF_DIR" |awk '{print $2}'`
+if [ "$1" = "status" ]; then
+    if [ -n "$PIDS" ]; then
+        echo "The $SERVER_NAME is running...!"
+        echo "PID: $PIDS"
+        exit 0
+    else
+        echo "The $SERVER_NAME is stopped"
+        exit 0
+    fi
+fi
+
+if [ -n "$PIDS" ]; then
+    echo "ERROR: The $SERVER_NAME already started!"
+    echo "PID: $PIDS"
+    exit 1
+fi
+
+if [ -n "$SERVER_PORT" ]; then
+    SERVER_PORT_COUNT=`netstat -tln | grep $SERVER_PORT | wc -l`
+    if [ $SERVER_PORT_COUNT -gt 0 ]; then
+        echo "ERROR: The $SERVER_NAME port $SERVER_PORT already used!"
+        exit 1
+    fi
+fi
+
+LOGS_DIR=$DEPLOY_DIR/logs
+if [ ! -d $LOGS_DIR ]; then
+    mkdir $LOGS_DIR
+fi
+STDOUT_FILE=$LOGS_DIR/stdout.log
+
+JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
+JAVA_DEBUG_OPTS=""
+if [ "$1" = "debug" ]; then
+    JAVA_DEBUG_OPTS=" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n "
+fi
+
+JAVA_JMX_OPTS=""
+if [ "$1" = "jmx" ]; then
+    JAVA_JMX_OPTS=" -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false "
+fi
+
+JAVA_MEM_OPTS=""
+BITS=`java -version 2>&1 | grep -i 64-bit`
+if [ -n "$BITS" ]; then
+    JAVA_MEM_OPTS=" -server -Xmx512m -Xms512m -Xmn256m -XX:PermSize=128m -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
+else
+    JAVA_MEM_OPTS=" -server -Xms512m -Xmx512m -XX:PermSize=128m -XX:SurvivorRatio=2 -XX:+UseParallelGC "
+fi
+
+CONFIG_FILES=" -Dspring.config.location=$CONF_DIR/ "
+echo -e "Starting the $SERVER_NAME ..."
+nohup java $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS $CONFIG_FILES -jar $DEPLOY_DIR/lib/$JAR_NAME > $STDOUT_FILE 2>&1 &
+
+COUNT=0
+while [ $COUNT -lt 1 ]; do
+    echo -e ".\c"
+    sleep 1
+    if [ -n "$SERVER_PORT" ]; then
+        COUNT=`netstat -an | grep $SERVER_PORT | wc -l`
+    else
+        COUNT=`ps -f | grep java | grep "$DEPLOY_DIR" | awk '{print $2}' | wc -l`
+    fi
+    if [ $COUNT -gt 0 ]; then
+        break
+    fi
+done
+
+echo "OK!"
+PIDS=`ps -f | grep java | grep "$DEPLOY_DIR" | awk '{print $2}'`
+echo "PID: $PIDS"
+echo "STDOUT: $STDOUT_FILE"

app-api/src/main/java/com/community/huiju/AppApplication.java

@@ -0,0 +1,54 @@
+package com.community.huiju;
+
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.boot.web.servlet.MultipartConfigFactory;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.client.RestTemplate;
+
+import javax.servlet.MultipartConfigElement;
+
+@EnableDiscoveryClient
+@SpringBootApplication
+@EnableFeignClients
+@EnableTransactionManagement
+public class AppApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AppApplication.class, args);
+	}
+
+	@Bean
+	public RestTemplate restTemplate(){
+		return new RestTemplate();
+	}
+
+	@Bean
+	public HttpMessageConverters fastJsonConfigure(){
+		FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
+		FastJsonConfig fastJsonConfig = new FastJsonConfig();
+		fastJsonConfig.setSerializerFeatures(SerializerFeature.BrowserCompatible,SerializerFeature.PrettyFormat,SerializerFeature.DisableCircularReferenceDetect,SerializerFeature.WriteMapNullValue);
+		//日期格式化
+		//fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+		converter.setFastJsonConfig(fastJsonConfig);
+		return new HttpMessageConverters(converter);
+	}
+
+	/**
+	 * 文件上传临时路径
+	 */
+//	@Bean
+//	public MultipartConfigElement multipartConfigElement() {
+//		MultipartConfigFactory factory = new MultipartConfigFactory();
+//		factory.setLocation("/tmp/smart-community");
+//		return factory.createMultipartConfig();
+//	}
+
+}

app-api/src/main/java/com/community/huiju/Swagger2.java

@@ -0,0 +1,40 @@
+package com.community.huiju;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @author FXF
+ * @date 2018-09-27
+ */
+@Configuration
+@EnableSwagger2
+public class Swagger2 {
+    @Bean
+    public Docket docket(){
+        return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
+                .apis(RequestHandlerSelectors.basePackage("com.community.huiju.controller"))
+                .paths(PathSelectors.any()).build();
+    }
+    //构建api文档的详细信息函数
+    private ApiInfo apiInfo(){
+        return new ApiInfoBuilder()
+                //页面标题
+                .title("app端的 RESTful API")
+                //创建人
+                .contact(new Contact("fuxingfan","","fuxingfan@dingtalk.com"))
+                //版本号
+                .version("1.0")
+                //描述
+                .description("API 描述")
+                .build();
+    }
+}

app-api/src/main/java/com/community/huiju/aop/LogAOP.java

@@ -0,0 +1,91 @@
+package com.community.huiju.aop;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.fushi.error.FuShiException;
+import com.community.huiju.log.LogAnnotation;
+import com.community.huiju.log.LogEnums;
+import com.community.huiju.log.LogFactory;
+import com.community.huiju.log.LogFileManager;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+@Aspect
+@Component
+@Slf4j
+public class LogAOP {
+
+    @Pointcut("@annotation(com.community.huiju.log.LogAnnotation)")
+    public void pointLog() {
+
+    }
+
+    @Around("pointLog()")
+    public Object logAround(ProceedingJoinPoint point) throws Throwable {
+
+        // 获取切面的点的实例
+        Object target = point.getTarget();
+        // 获取反射对象
+        Class<?> zClass = target.getClass();
+        // 获取切面点
+        Signature signature = point.getSignature();
+
+        // 判断日志注解是否用在方法上
+        if (!(signature instanceof MethodSignature)) {
+            throw new RuntimeException("该注解只允许在方法上使用！");
+        }
+
+        // 方法名称
+        String methodName = signature.getName();
+        // 获取方法参数类型
+        Class<?>[] parameterTypes = ((MethodSignature) signature).getMethod().getParameterTypes();
+
+        // 通过方法名称和方法参数类型
+        // 获取当前正在执行切面的方法
+        Method method = zClass.getMethod(methodName, parameterTypes);
+
+        // 所有方法输入参数
+        Object[] args = point.getArgs();
+        // 执行方法的返回值
+        Object result = null;
+        if (null != method && method.isAnnotationPresent(LogAnnotation.class)) {
+
+            // 获取这个注解
+            LogAnnotation logAnnotation = method.getAnnotation(LogAnnotation.class);
+            // 大苏操作
+            if (logAnnotation.record() && logAnnotation.value() == LogEnums.DA_SU) {
+                String alias = "".equals(logAnnotation.alias()) ? "未设置别名" : logAnnotation.alias();
+                    log.info("AOP拦截----大苏操作----执行方法:{}，方法别名:{}, 请求参数:{}", methodName, alias,args);
+                    // 方法返回值
+                    result = point.proceed();
+                    log.info("AOP拦截----大苏操作----执行方法:{}，方法别名:{},请求参数:{}，返回结果:{}", methodName, alias,args, result);
+
+                    String strPararmeter = String.format( "AOP拦截----大苏操作----执行方法:%s，方法别名:%s,请求参数:%s", methodName, alias,JSONObject.toJSONString(args));
+                    String strReturn = String.format("AOP拦截----大苏操作----执行方法:%s，方法别名:%s, 请求参数:%s，返回结果:%s", methodName, alias ,JSONObject.toJSONString(args), JSONObject.toJSONString(result));
+
+                    LogFileManager.getInstance().executeLog(LogFactory.parametersAndReturn(strPararmeter, strReturn));
+
+            }
+
+        }
+
+        return result;
+    }
+
+    @AfterThrowing(value = "pointLog()", throwing = "cause")
+    public void doException(JoinPoint joinPoint, Throwable cause) {
+        if (null != cause) {
+            throw new FuShiException(cause.getMessage());
+        }
+    }
+
+}

app-api/src/main/java/com/community/huiju/common/PicUtils.java

@@ -0,0 +1,246 @@
+package com.community.huiju.common;
+
+import com.community.commom.utils.FileUtils;
+import net.coobird.thumbnailator.Thumbnails;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItem;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import sun.misc.BASE64Encoder;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.math.BigDecimal;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.file.Files;
+
+/**
+ * 图片压缩Utils
+ *
+ * @author worstEzreal
+ * @version V1.1.0
+ * @date 2018/3/12
+ */
+public class PicUtils {
+
+    private static Logger logger = LoggerFactory.getLogger(PicUtils.class);
+
+    /**
+     * 根据指定大小压缩图片
+     *
+     * @param imageBytes  源图片字节数组
+     * @param desFileSize 指定图片大小，单位kb
+     * @param imageId     影像编号
+     * @return 压缩质量后的图片字节数组
+     */
+    public static byte[] compressPicForScale(byte[] imageBytes, long desFileSize, String imageId) {
+        if (imageBytes == null || imageBytes.length <= 0 || imageBytes.length < desFileSize * 1024) {
+            return imageBytes;
+        }
+        long srcSize = imageBytes.length;
+        double accuracy = getAccuracy(srcSize / 1024);
+        try {
+            while (imageBytes.length > desFileSize * 1024) {
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(imageBytes);
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream(imageBytes.length);
+                Thumbnails.of(inputStream)
+                        .scale(accuracy)
+                        .outputQuality(accuracy)
+                        .toOutputStream(outputStream);
+                imageBytes = outputStream.toByteArray();
+            }
+            logger.info("【图片压缩】imageId={} | 图片原大小={}kb | 压缩后大小={}kb",
+                    imageId, srcSize / 1024, imageBytes.length / 1024);
+        } catch (Exception e) {
+            logger.error("【图片压缩】msg=图片压缩失败!", e);
+        }
+        return imageBytes;
+    }
+
+    /**
+     * 自动调节精度(经验数值)
+     *
+     * @param size 源图片大小
+     * @return 图片压缩质量比
+     */
+    private static double getAccuracy(long size) {
+        double accuracy;
+        if (size < 900) {
+            accuracy = 0.85;
+        } else if (size < 2047) {
+            accuracy = 0.6;
+        } else if (size < 3275) {
+            accuracy = 0.44;
+        } else {
+            accuracy = 0.4;
+        }
+        return accuracy;
+    }
+    
+    /**
+     * 图片进行Base64位编码
+     * @param fileBytes
+     * @return
+     */
+      public static String getImgStr(byte [] fileBytes) {
+        return new String(org.apache.commons.codec.binary.Base64.encodeBase64(fileBytes));
+    }
+
+    /**
+     * 图片进行Base64位编码
+     * @param imgFile
+     * @return
+     */
+   /* public static String getImgStr(MultipartFile imgFile){
+        byte[] data = null;
+        try
+        {
+            data = imgFile.getBytes();
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+        return new String(org.apache.commons.codec.binary.Base64.encodeBase64(data));
+    }*/
+
+    /**
+     * 把URL 图片转换为 Base64
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    public static String encodeImageToBase64(URL url) {
+        //将图片文件转化为字节数组字符串，并对其进行Base64编码处理
+        System.out.println("图片的路径为:" + url.toString());
+        try {
+            byte[] data = encodeImageToOutputStream(url);
+            //对字节数组Base64编码
+            BASE64Encoder encoder = new BASE64Encoder();
+            String base64 = encoder.encode(data);
+            System.out.println("网络文件[{}]编码成base64字符串:[{}]"+url.toString()+base64);
+            return base64;//返回Base64编码过的字节数组字符串
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    /**
+     * 把 URL 图片转换为 byte[]
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    public static byte[] encodeImageToOutputStream(URL url) throws Exception {
+        byte[] data = null;
+        //将图片文件转化为字节数组字符串，并对其进行Base64编码处理
+        System.out.println("图片的路径为:" + url.toString());
+        //打开链接
+        HttpURLConnection conn = null;
+        try {
+            conn = (HttpURLConnection) url.openConnection();
+            //设置请求方式为"GET"
+            conn.setRequestMethod("GET");
+            //超时响应时间为5秒
+            conn.setConnectTimeout(5 * 1000);
+            //通过输入流获取图片数据
+            InputStream inStream = conn.getInputStream();
+            //得到图片的二进制数据，以二进制封装得到数据，具有通用性
+            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+            //创建一个Buffer字符串
+            byte[] buffer = new byte[1024];
+            //每次读取的字符串长度，如果为-1，代表全部读取完毕
+            int len = 0;
+            //使用一个输入流从buffer里把数据读取出来
+            while ((len = inStream.read(buffer)) != -1) {
+                //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                outStream.write(buffer, 0, len);
+            }
+            //关闭输入流
+            inStream.close();
+            data = outStream.toByteArray();
+            outStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new Exception("图片上传失败,请联系客服!");
+        }
+
+       return data;
+    }
+
+
+    /**
+     * byte 转换为 MultipartFile
+     * @param bytes
+     * @return
+     */
+    public static MultipartFile encodeToMultipartFile(byte [] bytes) {
+        MultipartFile multipartFile = null;
+        InputStream input = null;
+        OutputStream outputStream = null;
+        File tempFile = null;
+        try {
+            String path = "";
+            String os = System.getProperty("os.name");
+            if(os.toLowerCase().startsWith("win")){
+                path = "E:" + File.separator + "file" + File.separator + "app-file" + File.separator;
+            } else {
+                path = "/home/fxf/smart-community" + File.separator + "file" + File.separator + "app-file" + File.separator;
+            }
+
+            File file = new File(path);
+            file.mkdirs();
+            path = path + System.currentTimeMillis() + ".png";
+            tempFile = new File(path);
+            tempFile.createNewFile();
+
+            // 把 byte 转换为 File 文件
+            FileUtils.getFileByBytes(bytes, path);
+
+            // 第一个参数 fieldName 就是文件上传的 name, 这里我写的是 uploadFile
+            FileItem fileItem = new DiskFileItem("uploadFile", Files.probeContentType(tempFile.toPath()), false, tempFile.getName(), (int) tempFile.length(), tempFile.getParentFile());
+            input = new FileInputStream(tempFile);
+            outputStream = fileItem.getOutputStream();
+            IOUtils.copy(input, outputStream);
+
+            multipartFile = new CommonsMultipartFile(fileItem);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                input.close();
+                outputStream.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        }
+
+        // 删除这个 File
+        if (tempFile.exists()) {
+            tempFile.delete();
+        }
+
+        return multipartFile;
+    }
+
+
+}
+
+
+
+
+
+
+
+

app-api/src/main/java/com/community/huiju/common/code/ICode.java

@@ -0,0 +1,54 @@
+package com.community.huiju.common.code;
+
+
+import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.code.cache.AppkeyCache;
+import com.community.huiju.exception.WisdomException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 验证码接口
+ * @author weiximei
+ */
+public interface ICode {
+
+    Logger log = LoggerFactory.getLogger(ICode.class);
+
+    /**
+     * 验证码
+     */
+    boolean sendCode(String phone,String code);
+
+    /**
+     * 校验手机号和验证码
+     * @param phone
+     * @param code
+     */
+    default void checkPhoneAndCode(String phone,String code) {
+        checkPhone(phone);
+        String phoneCode = (String) AppkeyCache.getCache(phone);
+        if (StringUtils.isBlank(code)) {
+            throw new WisdomException("请输入验证码!");
+        } else if (!code.equals(phoneCode)) {
+            throw new WisdomException("验证码错误!");
+        }
+        // 设置验证码为null字符
+        // AppkeyCache.setCache(phone,"null");
+
+    }
+
+    /**
+     * 检验手机号
+     * @param phone
+     */
+    default void checkPhone(String phone) {
+        log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
+        if (!AccountValidatorUtil.isPhone(phone)){
+            throw new WisdomException("请输入正确的手机号!");
+        }
+    }
+
+}

app-api/src/main/java/com/community/huiju/common/code/cache/AppkeyCache.java

@@ -0,0 +1,46 @@
+package com.community.huiju.common.code.cache;
+import com.community.commom.constant.Constant;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import lombok.extern.slf4j.Slf4j;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 缓存
+ * @author weiximei
+ */
+@Slf4j
+public class AppkeyCache {
+
+    // .refreshAfterWrite(3, TimeUnit.HOURS)// 给定时间内没有被读/写访问，则回收。
+    static LoadingCache<String, Object> cache = CacheBuilder.newBuilder()
+            .expireAfterAccess(Constant.CACHE_EXPIRE, TimeUnit.HOURS)// 缓存过期时间和redis缓存时长一样
+            .maximumSize(Constant.CACHE_SIZE).// 设置缓存个数
+            build(new CacheLoader<String, Object>() {
+            @Override
+            /** 当本地缓存命没有中时，调用load方法获取结果并将结果缓存 **/
+            public String load(String appKey) throws Exception {
+                return null;
+            }
+
+    });
+
+    public static Object getCache(String appKey) {
+        Object value = null;
+        try {
+            value = cache.get(appKey);
+        } catch (Exception e) {
+            //e.printStackTrace();
+            value = null;
+        }
+        return value;
+    }
+
+    public static void setCache(String appKey,Object appValue){
+        log.info("缓存的key-value: {}-{}", appKey,appValue);
+        cache.put(appKey,appValue);
+    }
+
+
+}

app-api/src/main/java/com/community/huiju/common/code/entity/CodeEntity.java

@@ -0,0 +1,23 @@
+package com.community.huiju.common.code.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CodeEntity {
+
+   private String code;
+
+   private String tel;
+
+    /**
+     * 参数 格式 String params = "["xxx"]"
+     */
+   private String params;
+
+
+
+}

app-api/src/main/java/com/community/huiju/common/code/impl/ImgCodeImpl.java

@@ -0,0 +1,12 @@
+package com.community.huiju.common.code.impl;
+
+
+/**
+ * 图片验证码
+ * @author weiximei
+ */
+public class ImgCodeImpl {
+
+
+
+}

app-api/src/main/java/com/community/huiju/common/code/impl/PhoneCodeImpl.java

@@ -0,0 +1,74 @@
+package com.community.huiju.common.code.impl;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.code.ICode;
+import com.community.huiju.common.code.cache.AppkeyCache;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 手机验证码
+ * @author weiximei
+ */
+@Service("phoneCodeImpl")
+@Slf4j
+public class PhoneCodeImpl implements ICode {
+
+    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    public OkHttpClient getClient() {
+        OkHttpClient client  = new OkHttpClient.Builder()
+                .connectTimeout(10, TimeUnit.SECONDS)
+                .writeTimeout(10,TimeUnit.SECONDS)
+                .readTimeout(20, TimeUnit.SECONDS)
+                .build();
+        return client;
+    }
+
+    @Override
+    public boolean sendCode(String phone, String code) {
+        boolean bool = false;
+
+        try {
+            String result = null;
+            OkHttpClient client = getClient();
+            RequestBody body = RequestBody.create(JSON, "{\"code\":\""+Constant.CODE+"\"," + "\"tel\":\""+phone+"\"," + "\"params\":[\""+code+"\",\"银城慧家\"]}");
+            Request request = new Request.Builder()
+                    .url(Constant.REQUEST_URL)
+                    .post(body)
+                    .build();
+            Response response = client.newCall(request).execute();
+            if (response.isSuccessful()) {
+                result = response.body().string();
+            } else {
+                throw new IOException("Unexpected code " + response);
+            }
+
+
+
+            if ("发送成功".equals(result)) {
+                bool = true;
+                log.info("手机号 {} 验证码 {} 发送成功!",phone,code);
+            }else {
+                bool = false;
+                log.error("短信发送验证码失败!{}", result);
+            }
+        } catch (Exception e){
+            e.printStackTrace();
+            log.error("短信发送错误!",e);
+            bool = false;
+        }
+
+        return bool;
+    }
+}

app-api/src/main/java/com/community/huiju/common/fushi/Base64.java

@@ -0,0 +1,268 @@
+package com.community.huiju.common.fushi;
+
+public final class Base64 {
+
+	private static final int BASELENGTH = 128;
+	private static final int LOOKUPLENGTH = 64;
+	private static final int TWENTYFOURBITGROUP = 24;
+	private static final int EIGHTBIT = 8;
+	private static final int SIXTEENBIT = 16;
+	private static final int FOURBYTE = 4;
+	private static final int SIGN = -128;
+	private static char PAD = '=';
+	private static byte[] base64Alphabet = new byte[BASELENGTH];
+	private static char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
+
+	static {
+		for (int i = 0; i < BASELENGTH; ++i) {
+			base64Alphabet[i] = -1;
+		}
+		for (int i = 'Z'; i >= 'A'; i--) {
+			base64Alphabet[i] = (byte) (i - 'A');
+		}
+		for (int i = 'z'; i >= 'a'; i--) {
+			base64Alphabet[i] = (byte) (i - 'a' + 26);
+		}
+
+		for (int i = '9'; i >= '0'; i--) {
+			base64Alphabet[i] = (byte) (i - '0' + 52);
+		}
+
+		base64Alphabet['+'] = 62;
+		base64Alphabet['/'] = 63;
+
+		for (int i = 0; i <= 25; i++) {
+			lookUpBase64Alphabet[i] = (char) ('A' + i);
+		}
+
+		for (int i = 26, j = 0; i <= 51; i++, j++) {
+			lookUpBase64Alphabet[i] = (char) ('a' + j);
+		}
+
+		for (int i = 52, j = 0; i <= 61; i++, j++) {
+			lookUpBase64Alphabet[i] = (char) ('0' + j);
+		}
+		lookUpBase64Alphabet[62] = (char) '+';
+		lookUpBase64Alphabet[63] = (char) '/';
+
+	}
+
+	private static boolean isWhiteSpace(char octect) {
+		return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
+	}
+
+	private static boolean isPad(char octect) {
+		return (octect == PAD);
+	}
+
+	private static boolean isData(char octect) {
+		return (octect < BASELENGTH && base64Alphabet[octect] != -1);
+	}
+
+	/**
+	 * Encodes hex octects into Base64
+	 * 
+	 * @param binaryData
+	 *            Array containing binaryData
+	 * @return Encoded Base64 array
+	 */
+	public static String encode(byte[] binaryData) {
+
+		if (binaryData == null) {
+			return null;
+		}
+
+		int lengthDataBits = binaryData.length * EIGHTBIT;
+		if (lengthDataBits == 0) {
+			return "";
+		}
+
+		int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
+		int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
+		int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1
+				: numberTriplets;
+		char encodedData[] = null;
+
+		encodedData = new char[numberQuartet * 4];
+
+		byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
+
+		int encodedIndex = 0;
+		int dataIndex = 0;
+
+		for (int i = 0; i < numberTriplets; i++) {
+			b1 = binaryData[dataIndex++];
+			b2 = binaryData[dataIndex++];
+			b3 = binaryData[dataIndex++];
+
+			l = (byte) (b2 & 0x0f);
+			k = (byte) (b1 & 0x03);
+
+			byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2)
+					: (byte) ((b1) >> 2 ^ 0xc0);
+			byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4)
+					: (byte) ((b2) >> 4 ^ 0xf0);
+			byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6)
+					: (byte) ((b3) >> 6 ^ 0xfc);
+
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
+		}
+
+		// form integral number of 6-bit groups
+		if (fewerThan24bits == EIGHTBIT) {
+			b1 = binaryData[dataIndex];
+			k = (byte) (b1 & 0x03);
+			
+			byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2)
+					: (byte) ((b1) >> 2 ^ 0xc0);
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
+			encodedData[encodedIndex++] = PAD;
+			encodedData[encodedIndex++] = PAD;
+		} else if (fewerThan24bits == SIXTEENBIT) {
+			b1 = binaryData[dataIndex];
+			b2 = binaryData[dataIndex + 1];
+			l = (byte) (b2 & 0x0f);
+			k = (byte) (b1 & 0x03);
+
+			byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2)
+					: (byte) ((b1) >> 2 ^ 0xc0);
+			byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4)
+					: (byte) ((b2) >> 4 ^ 0xf0);
+
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
+			encodedData[encodedIndex++] = PAD;
+		}
+
+		return new String(encodedData);
+	}
+
+	/**
+	 * Decodes Base64 data into octects
+	 * 
+	 * @param encoded
+	 *            string containing Base64 data
+	 * @return Array containind decoded data.
+	 */
+	public static byte[] decode(String encoded) {
+
+		if (encoded == null) {
+			return null;
+		}
+
+		char[] base64Data = encoded.toCharArray();
+		// remove white spaces
+		int len = removeWhiteSpace(base64Data);
+
+		if (len % FOURBYTE != 0) {
+			return null;// should be divisible by four
+		}
+
+		int numberQuadruple = (len / FOURBYTE);
+
+		if (numberQuadruple == 0) {
+			return new byte[0];
+		}
+
+		byte decodedData[] = null;
+		byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+		char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
+
+		int i = 0;
+		int encodedIndex = 0;
+		int dataIndex = 0;
+		decodedData = new byte[(numberQuadruple) * 3];
+
+		for (; i < numberQuadruple - 1; i++) {
+
+			if (!isData((d1 = base64Data[dataIndex++]))
+					|| !isData((d2 = base64Data[dataIndex++]))
+					|| !isData((d3 = base64Data[dataIndex++]))
+					|| !isData((d4 = base64Data[dataIndex++]))) {
+				return null;
+			}// if found "no data" just return null
+
+			b1 = base64Alphabet[d1];
+			b2 = base64Alphabet[d2];
+			b3 = base64Alphabet[d3];
+			b4 = base64Alphabet[d4];
+
+			decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+			decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+			decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+		}
+
+		if (!isData((d1 = base64Data[dataIndex++]))
+				|| !isData((d2 = base64Data[dataIndex++]))) {
+			return null;// if found "no data" just return null
+		}
+
+		b1 = base64Alphabet[d1];
+		b2 = base64Alphabet[d2];
+
+		d3 = base64Data[dataIndex++];
+		d4 = base64Data[dataIndex++];
+		if (!isData((d3)) || !isData((d4))) {// Check if they are PAD characters
+			if (isPad(d3) && isPad(d4)) {
+				if ((b2 & 0xf) != 0)// last 4 bits should be zero
+				{
+					return null;
+				}
+				byte[] tmp = new byte[i * 3 + 1];
+				System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+				tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+				return tmp;
+			} else if (!isPad(d3) && isPad(d4)) {
+				b3 = base64Alphabet[d3];
+				if ((b3 & 0x3) != 0)// last 2 bits should be zero
+				{
+					return null;
+				}
+				byte[] tmp = new byte[i * 3 + 2];
+				System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+				tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+				tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+				return tmp;
+			} else {
+				return null;
+			}
+		} else { // No PAD e.g 3cQl
+			b3 = base64Alphabet[d3];
+			b4 = base64Alphabet[d4];
+			decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+			decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+			decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+
+		}
+
+		return decodedData;
+	}
+
+	/**
+	 * remove WhiteSpace from MIME containing encoded Base64 data.
+	 * 
+	 * @param data
+	 *            the byte array of base64 data (with WS)
+	 * @return the new length
+	 */
+	private static int removeWhiteSpace(char[] data) {
+		if (data == null) {
+			return 0;
+		}
+
+		// count characters that's not whitespace
+		int newSize = 0;
+		int len = data.length;
+		for (int i = 0; i < len; i++) {
+			if (!isWhiteSpace(data[i])) {
+				data[newSize++] = data[i];
+			}
+		}
+		return newSize;
+	}
+}

app-api/src/main/java/com/community/huiju/common/fushi/FSApi.java

@@ -0,0 +1,166 @@
+package com.community.huiju.common.fushi;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+public class FSApi {
+
+    //	private static String url = "http://mops-test.fujica.com.cn:8021/Api/Park/GetParkInfoByCarNo";
+    private static String url = "http://api.mops.fujica.com.cn/v2/Api/Park/GetParkInfoByCarNo";
+    private static String appid = "fujica_89aa0f62d7ec77fc";
+    private static String appSecret = "cef36935e0954f40afc519a43a0c857c";
+    private static String privateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALATu5WNNx+XcrAS\n" +
+            "NJieGRsY7VryQjcs+pABXGh4BOCqAW3FgAAc21aIG0uxvYHdQUw1I7J80RiQJ506\n" +
+            "aIktGTmZKJTjez7JNF7GO4ieGmLMI3ds8iXyJrfUMp/1U3Cq6vja8vuRIKYVQCxZ\n" +
+            "e8un98Nr03F7oMlKpBydJQKVdlAHAgMBAAECgYBPcqfqhAyCWbCrF5vZ3URQwL+g\n" +
+            "kL0l7kqknaiXjsgMo0j/weTOqDaj5cgDMJDkvvPOsg+IYt9qKOlm/Urb0piVb9v9\n" +
+            "iAnp6gIppcyHrPUesgYRSbqR/HhdGtnzn/4f45YpkXA6URMfc04xBrIUCw5Dmnqo\n" +
+            "nJZJkjd6jjXiL65rYQJBAN8eg99yFH45D2cdlPBTN0LVWXgqy3N22byYh0j6kgo2\n" +
+            "5WOPMcuIZPM/XdSoTfhYeHixvEwrmCAkCmSkf524prECQQDKBnzZRj3eCij1z2SZ\n" +
+            "JCRZhRQUhFmK0AYYTXw9R0DfEaZNrEAe8PEypS94lYROvNV3TnSnK2FHKeH8YhHX\n" +
+            "EoA3AkBRHzMrRrsUuYJUJ3lDd74b2p5RBp46OPgpjfuCGTiH5jW44RNlwQ2TM3LW\n" +
+            "IutWZDRJDbY8q40AApqUxQpxOfXBAkA8bB5RGZoNW7qOcj3jM5UPlSbBUCg7xSXd\n" +
+            "hOdAqJv1W6ECoB75YhSxkggVp5pPtlid+0AWc3n/v74QLwCo86aXAkEAlxY3hoxQ\n" +
+            "jJiCjD2PbL0GLkMKNBqJgLcDWqeoHcal+iY2Fpr3U/iCJZNoBuovC2Qvc5J1y61P\n" +
+            "ojrvFNyFMEkWTQ==";
+    private static String sign = "";
+    private static String time;
+
+    public static void main(String[] args) {
+        time = getTimestamp();
+        String jsonString = "{'ParkingCode':'19000100250504','CarNo':'苏A8M6B2'}";
+
+        TreeMap<String, String> map = new TreeMap();
+        map.put("param", jsonString);
+        map.put("secret", appSecret);
+        map.put("timestamp", time);
+        sign = signWithoutMD5(map);
+        sign = sign(sign, privateKey);
+
+        doJsonPost(url, jsonString);
+    }
+
+    public static String doJsonPost(String urlPath, String Json) {
+        String result = "";
+        BufferedReader reader = null;
+        try {
+            URL url = new URL(urlPath);
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("POST");
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            conn.setUseCaches(false);
+            conn.setRequestProperty("Connection", "Keep-Alive");
+            conn.setRequestProperty("Charset", "UTF-8");
+            conn.setRequestProperty("appid", appid);
+            conn.setRequestProperty("appSecret", appSecret);
+            conn.setRequestProperty("sign", sign);
+            conn.setRequestProperty("timestamp", time);
+            // 设置文件类型:
+            conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+            // 设置接收类型否则返回415错误
+            conn.setRequestProperty("accept", "*/*");// 此处为暴力方法设置接受所有类型，以此来防范返回415;
+            conn.setRequestProperty("accept", "application/json");
+            // 往服务器里面发送数据
+            if (Json != null && !("").equals(Json)) {
+                byte[] writebytes = Json.getBytes();
+                // 设置文件长度
+                conn.setRequestProperty("Content-Length", String.valueOf(writebytes.length));
+                OutputStream outwritestream = (OutputStream) conn.getOutputStream();
+                outwritestream.write(Json.getBytes());
+                outwritestream.flush();
+                outwritestream.close();
+
+            }
+            if (conn.getResponseCode() == 200) {
+                reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+                result = reader.readLine();
+                System.out.println(result);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+
+    public static String getTimestamp() {
+        String time = "";
+        long timestamp = System.currentTimeMillis();
+        time = String.valueOf(timestamp);
+        time = time.substring(0, 10);
+        return time;
+    }
+
+    public static String signWithoutMD5(SortedMap<String, String> params) {
+        String restul = "";
+        if (params == null) {
+            return restul;
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> me : params.entrySet()) {
+
+            sb.append(me.getKey());
+            sb.append('=');
+            sb.append(me.getValue());
+            sb.append('&');
+
+        }
+        int lastIndexOf = sb.lastIndexOf("&");
+        if (lastIndexOf != -1) {
+            sb.deleteCharAt(lastIndexOf);
+        }
+        restul = new String(sb);
+
+        return restul;
+    }
+
+    private static final String ALGORITHM = "RSA";
+    private static final String SIGN_ALGORITHMS = "SHA1WithRSA";
+
+    private static final String DEFAULT_CHARSET = "UTF-8";
+
+    public static String sign(String content, String privateKey) {
+        try {
+            PKCS8EncodedKeySpec priPKCS8 = new PKCS8EncodedKeySpec(Base64.decode(privateKey));
+            KeyFactory keyf = KeyFactory.getInstance(ALGORITHM);
+
+            PrivateKey priKey = keyf.generatePrivate(priPKCS8);
+
+            java.security.Signature signature = java.security.Signature.getInstance(SIGN_ALGORITHMS);
+
+            signature.initSign(priKey);
+            signature.update(content.getBytes(DEFAULT_CHARSET));
+
+            byte[] signed = signature.sign();
+
+            return Base64.encode(signed);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+
+}

app-api/src/main/java/com/community/huiju/common/messagePush.java

@@ -0,0 +1,35 @@
+package com.community.huiju.common;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/4/18
+ **/
+public class messagePush {
+    public String[]  messagePushAll() {
+        String[] messageArr= new String[13];
+        messageArr[0] = "账号已审核通过，看看下面的消息了解下APP如何使用吧！";
+        messageArr[1] = "点击顶部小区名称，切换到其他房产或小区，或关联更多房产";
+        messageArr[2] = "点击上方 人脸录入，为自己或家人录入人脸信息，家人未注册可先替TA注册";
+        messageArr[3] = "点击上方 访客邀请，将生成的二维码发送给访客，访客即可使用二维码开门";
+        messageArr[4] = "点击上方 公区监控，查看小区公共区域视频直播，看看大家都在干什么";
+        messageArr[5] = "点击上方 智能家居，安装APP玩转室内智能家居设备";
+        messageArr[6] = "想知道物业公告和社区活动？点击底部 论坛 查看";
+        messageArr[7] = "参与社区议事，发布二手/求购/租赁等热门话题，点击底部 论坛 话题";
+        messageArr[8] = "点击底部开锁图标，获取开门二维码，即可扫码开门";
+        messageArr[9] = "楼道灯不亮，电梯坏了，通下水道，找保洁？点击底部 服务 报修";
+        messageArr[10] = "想投诉施工扰民、乱搭乱建、乱停车？点击底部 服务 投诉";
+        messageArr[11] = "有很急的事需要马上联系物业？点击底部 服务 物业 电话联系物业";
+        messageArr[12] = "家人想刷脸进门不会操作？点击底部 个人 房屋成员管理 邀请新成员为TA录入人脸";
+        return  messageArr;
+    }
+}

app-api/src/main/java/com/community/huiju/common/perproties/DaSuProperties.java

@@ -0,0 +1,26 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 提供给 大苏 的 appid 和 appsecret
+ * @author weiximei
+ */
+@Component
+@ConfigurationProperties(prefix = "da-su")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DaSuProperties {
+
+    private String appid;
+
+    private String appSecret;
+
+    private String communityId;
+
+}

app-api/src/main/java/com/community/huiju/common/perproties/FuShiProperties.java

@@ -0,0 +1,44 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 富士配置类
+ * @author weiximei
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Component
+@ConfigurationProperties(prefix = "fu-shi")
+public class FuShiProperties {
+
+    /**
+     * 富士云 请求地址
+     */
+    private String url;
+
+    /**
+     * 富士云 appid
+     */
+    private String appid;
+
+    /**
+     * 富士云 appSecret
+     */
+    private String appSecret;
+
+    /**
+     * 富士云 私钥 privateKey
+     */
+    private String privateKey;
+
+    /**
+     * 停车场编码
+     */
+    private String parkingCode;
+}

app-api/src/main/java/com/community/huiju/common/perproties/LoginCodePerproties.java

@@ -0,0 +1,37 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 登陆的状态跳转url配置
+ * @author weiximei
+ */
+@ConfigurationProperties(prefix = "login-code-perproties")
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoginCodePerproties {
+
+    /**
+     * 状态url集合
+     */
+    private Map<String, String> loginCode;
+
+    /**
+     * app 请求地址
+     */
+    private String appUrl;
+
+    /**
+     * 默认的演示账号
+     */
+    private String phone;
+
+}

app-api/src/main/java/com/community/huiju/common/perproties/PayNotifyPerproties.java

@@ -0,0 +1,47 @@
+package com.community.huiju.common.perproties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+
+/**
+ * 支付回调地址配置
+ * @author weiximei
+ */
+@Component
+@ConfigurationProperties(prefix = "pay-notify")
+@Data
+public class PayNotifyPerproties {
+
+    /**
+     * 微信回调 物业缴费
+     */
+    private String wxBillNotify;
+
+    /**
+     * 支付宝回调 物业缴费
+     */
+    private String aliBillNotify;
+
+    /**
+     * 微信回调 车缴费
+     */
+    private String wxCarNotify;
+
+    /**
+     * 支付宝回调 车缴费
+     */
+    private String aliCarNotify;
+    
+    /**
+     * 微信临时车回调
+     */
+    private String wxTmpNotify;
+    
+    /**
+     * 支付宝临时车回调
+     */
+    private String aliTmpNotify;
+}

app-api/src/main/java/com/community/huiju/common/perproties/WeiXinPerproties.java

@@ -0,0 +1,23 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 微信信息
+ */
+@Component
+@ConfigurationProperties(prefix = "weixin")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WeiXinPerproties {
+
+    private String appid;
+
+    private String secret;
+
+}

app-api/src/main/java/com/community/huiju/common/perproties/YinShiProperties.java

@@ -0,0 +1,24 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 萤石 开放平台
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ConfigurationProperties(prefix = "ying-shi")
+@Component
+public class YinShiProperties {
+
+    /**
+     * 获取视频流 token 地址
+     */
+    public String videoTokenUrl;
+
+}

app-api/src/main/java/com/community/huiju/common/sign/DaSuSign.java

@@ -0,0 +1,83 @@
+package com.community.huiju.common.sign;
+
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+/**
+ * 大苏签名校验
+ */
+@Slf4j
+public class DaSuSign {
+
+    /**
+     * 校验签名是否相等
+     * @param val_1
+     * @param val_2
+     * @return true 相等  false 不相等
+     */
+    public static boolean isMD5Sign(String val_1, String val_2) {
+        return StringUtils.equals(val_1, val_2);
+    }
+
+    /**
+     *
+     * 创建签名
+     *
+     * @param appid
+     * @param appSecret
+     * @param datetime 时间戳
+     * @param encrypt 加密方式(目前就 MD5)
+     * @param communityId 小区id
+     * @return
+     */
+    public static String createSign(String appid, String appSecret, String datetime, String encrypt, String communityId, String phone){
+        TreeMap<String ,Object> treeMap = Maps.newTreeMap();
+        treeMap.put("appid", appid);
+        treeMap.put("datetime", datetime);
+        treeMap.put("encrypt", encrypt);
+        treeMap.put("communityid", communityId);
+        treeMap.put("phone", phone);
+
+        String sign = "";
+
+        StringBuilder sb = new StringBuilder();
+        Set<Map.Entry<String, Object>> entries = treeMap.entrySet();
+        entries.forEach(e-> {
+            sb.append(e.getKey());
+            sb.append("=");
+            sb.append(e.getValue());
+            sb.append("&");
+        });
+
+        sign = sb.toString();
+        sign = sign.substring(0, sign.lastIndexOf("&"));
+
+        log.info("签名之前参数: {}" , sign);
+
+        try {
+            String str = new String(sign.getBytes("UTF-8"), "UTF-8");
+            sign = DigestUtils.md5Hex( str + appSecret);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        log.info("签名: {}" , sign);
+
+        return sign;
+    }
+
+    public static void main(String[] args) {
+
+        Long timeMillis = System.currentTimeMillis();
+        System.out.println(timeMillis);
+        String sign = createSign("dssdw2576sd997", "fgexhd855sf4", timeMillis + "", "md5", "101", "15850791953");
+    }
+
+}

app-api/src/main/java/com/community/huiju/common/welcome/OkHttpRequestUtils.java

@@ -0,0 +1,236 @@
+package com.community.huiju.common.welcome;
+
+import com.beust.jcommander.internal.Maps;
+import com.fasterxml.jackson.databind.util.ByteBufferBackedInputStream;
+import okhttp3.*;
+
+import java.io.*;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * 封装请求
+ * @author weiximei
+ */
+public class OkHttpRequestUtils {
+
+    // 定义请求客户端
+    private static OkHttpClient client = new OkHttpClient();
+
+    /**
+     * get 请求
+     * @param url 请求URL
+     * @return
+     * @throws Exception
+     */
+    public static String doGet(String url) throws Exception {
+       return doGet(url, Maps.newHashMap());
+    }
+
+
+    /**
+     * get 请求
+     * @param url 请求URL
+     * @param query 携带参数参数
+     * @return
+     * @throws Exception
+     */
+    public static String doGet(String url, Map<String, Object> query) throws Exception {
+
+        return doGet(url, Maps.newHashMap(), query);
+    }
+
+    /**
+     * get 请求
+     * @param url url
+     * @param header 请求头参数
+     * @param query 参数
+     * @return
+     */
+    public static String doGet(String url, Map<String, Object> header, Map<String, Object> query) throws Exception {
+
+        // 创建一个请求 Builder
+        Request.Builder builder = new Request.Builder();
+        // 创建一个 request
+        Request request = builder.url(url).build();
+
+        // 创建一个 HttpUrl.Builder
+        HttpUrl.Builder urlBuilder = request.url().newBuilder();
+        // 创建一个 Headers.Builder
+        Headers.Builder headerBuilder = request.headers().newBuilder();
+
+        // 装载请求头参数
+        Iterator<Map.Entry<String, Object>> headerIterator = header.entrySet().iterator();
+        headerIterator.forEachRemaining(e -> {
+            headerBuilder.add(e.getKey(), (String) e.getValue());
+        });
+
+        // 装载请求的参数
+        Iterator<Map.Entry<String, Object>> queryIterator = query.entrySet().iterator();
+        queryIterator.forEachRemaining(e -> {
+            urlBuilder.addQueryParameter(e.getKey(), (String) e.getValue());
+        });
+
+        // 设置自定义的 builder
+        builder.url(urlBuilder.build()).headers(headerBuilder.build());
+
+        try (Response execute = client.newCall(builder.build()).execute()) {
+            return execute.body().string();
+        }
+    }
+
+    /**
+     * post 请求， 请求参数 并且 携带文件上传
+     * @param url
+     * @param header
+     * @param parameter
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String url, Map<String, Object> header, Map<String, Object> parameter, File file) throws Exception {
+
+        // 创建一个请求 Builder
+        Request.Builder builder = new Request.Builder();
+        // 创建一个 request
+        Request request = builder.url(url).build();
+
+        // 创建一个 Headers.Builder
+        Headers.Builder headerBuilder = request.headers().newBuilder();
+
+        // 装载请求头参数
+        Iterator<Map.Entry<String, Object>> headerIterator = header.entrySet().iterator();
+        headerIterator.forEachRemaining(e -> {
+            headerBuilder.add(e.getKey(), (String) e.getValue());
+        });
+
+        MultipartBody.Builder requestBuilder = new MultipartBody.Builder();
+
+        // 状态请求参数
+        Iterator<Map.Entry<String, Object>> queryIterator = parameter.entrySet().iterator();
+        queryIterator.forEachRemaining(e -> {
+            requestBuilder.addFormDataPart(e.getKey(), (String) e.getValue());
+        });
+
+        if (null != file) {
+            // application/octet-stream
+            requestBuilder.addFormDataPart("uploadFiles", file.getName(), RequestBody.create(MediaType.parse("application/octet-stream"), file));
+        }
+
+        // 设置自定义的 builder
+        builder.headers(headerBuilder.build()).post(requestBuilder.build());
+
+        // 然后再 build 一下
+        try (Response execute = client.newCall(builder.build()).execute()) {
+            return execute.body().string();
+        }
+    }
+
+    /**
+     * post 请求， 请求参数 并且 携带文件上传二进制流
+     * @param url
+     * @param header
+     * @param parameter
+     * @param fileName 文件名
+     * @param fileByte 文件的二进制流
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String url, Map<String, Object> header, Map<String, Object> parameter, String fileName, byte [] fileByte) throws Exception {
+// 创建一个请求 Builder
+        Request.Builder builder = new Request.Builder();
+        // 创建一个 request
+        Request request = builder.url(url).build();
+
+        // 创建一个 Headers.Builder
+        Headers.Builder headerBuilder = request.headers().newBuilder();
+
+        // 装载请求头参数
+        Iterator<Map.Entry<String, Object>> headerIterator = header.entrySet().iterator();
+        headerIterator.forEachRemaining(e -> {
+            headerBuilder.add(e.getKey(), (String) e.getValue());
+        });
+
+        MultipartBody.Builder requestBuilder = new MultipartBody.Builder();
+
+        // 状态请求参数
+        Iterator<Map.Entry<String, Object>> queryIterator = parameter.entrySet().iterator();
+        queryIterator.forEachRemaining(e -> {
+            requestBuilder.addFormDataPart(e.getKey(), (String) e.getValue());
+        });
+
+        if (fileByte.length > 0) {
+            // application/octet-stream
+            requestBuilder.addFormDataPart("uploadFiles", fileName, RequestBody.create(MediaType.parse("application/octet-stream"), fileByte));
+        }
+
+        // 设置自定义的 builder
+        builder.headers(headerBuilder.build()).post(requestBuilder.build());
+
+        try (Response execute = client.newCall(builder.build()).execute()) {
+            return execute.body().string();
+        }
+    }
+
+
+    /**
+     * post 请求  携带文件上传
+     * @param url
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String url, File file) throws Exception {
+        return doPost(url, Maps.newHashMap(), Maps.newHashMap(), file);
+    }
+
+    /**
+     * post 请求
+     * @param url
+     * @param header 请求头
+     * @param parameter 参数
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String url, Map<String, Object> header, Map<String, Object> parameter) throws Exception {
+        return doPost(url, header, parameter, null);
+    }
+
+    /**
+     * post 请求
+     * @param url
+     * @param parameter 参数
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String url, Map<String, Object> parameter) throws Exception {
+        return doPost(url, Maps.newHashMap(), parameter, null);
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        byte [] fileByte = null;
+
+        File file = new File("C:\\Users\\szc\\Pictures\\file-read-4182.jpg");
+        FileInputStream fileInputStream = new FileInputStream(file);
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        byte[] b = new byte[1024];
+        int n;
+        while ((n = fileInputStream.read(b)) != -1)
+        {
+            bos.write(b, 0, n);
+        }
+        fileInputStream.close();
+        bos.close();
+        fileByte = bos.toByteArray();
+
+
+        Map<String, Object> queryMap = Maps.newHashMap();
+        queryMap.put("pageNum","2");
+        queryMap.put("pageSize","50");
+        System.out.println(OkHttpRequestUtils.doPost("http://localhost:8566/uploadImage" , Maps.newHashMap(), Maps.newHashMap(),file.getName(), fileByte));
+
+    }
+
+}

app-api/src/main/java/com/community/huiju/common/welcome/WelcomeProperties.java

@@ -0,0 +1,26 @@
+package com.community.huiju.common.welcome;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 迎宾系统配置
+ * @author weiximei
+ */
+@ConfigurationProperties(prefix = "welcome")
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WelcomeProperties {
+
+    /** 小区 **/
+    private Integer communityId;
+
+    /** 请求url **/
+    private String url;
+
+}

app-api/src/main/java/com/community/huiju/common/wxmp/WxMPConst.java

@@ -0,0 +1,15 @@
+package com.community.huiju.common.wxmp;
+
+/**
+ * @author FXF
+ * @date 2019-07-08
+ */
+public class WxMPConst {
+	
+	/**
+	 * 用code换取oauth2的access token.
+	 */
+	static String OAUTH2_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code";
+	
+	static String WX_USERINFO_URL = "http://47.101.36.130:9000/wx/userinfo?appid=%s&code=%s";
+}

app-api/src/main/java/com/community/huiju/common/wxmp/WxMPUtil.java

@@ -0,0 +1,21 @@
+package com.community.huiju.common.wxmp;
+
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author FXF
+ * @date 2019-07-08
+ */
+public class WxMPUtil {
+	/**
+	 * 通过CODE拿取用户openid
+	 * @param code
+	 * @param appId
+	 * @return
+	 */
+	public static String getWxMPUserInfo(String code, String appId, String secret) {
+		String url = String.format(WxMPConst.OAUTH2_ACCESS_TOKEN_URL, appId, secret,code);
+		RestTemplate restTemplate = new RestTemplate();
+		return restTemplate.getForObject(url,String.class);
+	}
+}

app-api/src/main/java/com/community/huiju/common/wxpay/HfWxConfig.java

@@ -0,0 +1,72 @@
+package com.community.huiju.common.wxpay;
+
+import java.io.InputStream;
+
+/**
+ * 监控 控制器
+ * @author fxf
+ */
+public class HfWxConfig extends WXPayConfig {
+	
+	/**
+	 * 获取 App ID
+	 *
+	 * @return App ID
+	 */
+	@Override
+	public String getAppID() {
+		//银城慧家
+		return "wx6070fd3e8ef854e4";
+	}
+	
+	/**
+	 * 获取 Mch ID
+	 *
+	 * @return Mch ID
+	 */
+	@Override
+	public String getMchID() {
+		return "1525909671";
+	}
+	
+	/**
+	 * 获取 API 密钥
+	 *
+	 * @return API密钥
+	 */
+	@Override
+	public String getKey() {
+		return "HUIJU999999999999999999999999999";
+	}
+	
+	/**
+	 * 获取商户证书内容
+	 *
+	 * @return 商户证书内容
+	 */
+	@Override
+	public InputStream getCertStream() {
+		return null;
+	}
+	
+	/**
+	 * 获取WXPayDomain, 用于多域名容灾自动切换
+	 *
+	 * @return
+	 */
+	@Override
+	IWXPayDomain getWXPayDomain() {
+		IWXPayDomain iwxPayDomain = new IWXPayDomain() {
+			@Override
+			public void report(String domain, long elapsedTimeMillis, Exception ex) {
+			
+			}
+			@Override
+			public DomainInfo getDomain(WXPayConfig config) {
+				return new IWXPayDomain.DomainInfo(WXPayConstants.DOMAIN_API, true);
+			}
+		};
+		return iwxPayDomain;
+	}
+}
+

app-api/src/main/java/com/community/huiju/common/wxpay/IWXPayDomain.java

@@ -0,0 +1,42 @@
+package com.community.huiju.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 +
+                    '}';
+        }
+    }
+
+}

app-api/src/main/java/com/community/huiju/common/wxpay/QaddWxConfig.java

@@ -0,0 +1,72 @@
+package com.community.huiju.common.wxpay;
+
+import java.io.InputStream;
+
+/**
+ * 监控 控制器
+ * @author fxf
+ */
+public class QaddWxConfig extends WXPayConfig {
+	
+	/**
+	 * 获取 App ID
+	 *
+	 * @return App ID
+	 */
+	@Override
+	public String getAppID() {
+		//公众号
+		return "wx00a5778cb013ded9";
+	}
+	
+	/**
+	 * 获取 Mch ID
+	 *
+	 * @return Mch ID
+	 */
+	@Override
+	public String getMchID() {
+		return "1525909671";
+	}
+	
+	/**
+	 * 获取 API 密钥
+	 *
+	 * @return API密钥
+	 */
+	@Override
+	public String getKey() {
+		return "HUIJU999999999999999999999999999";
+	}
+	
+	/**
+	 * 获取商户证书内容
+	 *
+	 * @return 商户证书内容
+	 */
+	@Override
+	public InputStream getCertStream() {
+		return null;
+	}
+	
+	/**
+	 * 获取WXPayDomain, 用于多域名容灾自动切换
+	 *
+	 * @return
+	 */
+	@Override
+	IWXPayDomain getWXPayDomain() {
+		IWXPayDomain iwxPayDomain = new IWXPayDomain() {
+			@Override
+			public void report(String domain, long elapsedTimeMillis, Exception ex) {
+			
+			}
+			@Override
+			public DomainInfo getDomain(WXPayConfig config) {
+				return new DomainInfo(WXPayConstants.DOMAIN_API, true);
+			}
+		};
+		return iwxPayDomain;
+	}
+}
+

app-api/src/main/java/com/community/huiju/common/wxpay/WXPay.java

@@ -0,0 +1,689 @@
+package com.community.huiju.common.wxpay;
+
+import com.community.huiju.common.wxpay.WXPayConstants.SignType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+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

app-api/src/main/java/com/community/huiju/common/wxpay/WXPayConfig.java

@@ -0,0 +1,103 @@
+package com.community.huiju.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;
+    }
+
+}

app-api/src/main/java/com/community/huiju/common/wxpay/WXPayConstants.java

@@ -0,0 +1,59 @@
+package com.community.huiju.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";
+
+}
+

app-api/src/main/java/com/community/huiju/common/wxpay/WXPayReport.java

@@ -0,0 +1,265 @@
+package com.community.huiju.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");
+    }
+
+}

app-api/src/main/java/com/community/huiju/common/wxpay/WXPayRequest.java

@@ -0,0 +1,258 @@
+package com.community.huiju.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.ConnectTimeoutException;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.DefaultHostnameVerifier;
+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 javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import java.io.InputStream;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+
+import static com.community.huiju.common.wxpay.WXPayConstants.USER_AGENT;
+
+public class WXPayRequest {
+    private WXPayConfig config;
+    public WXPayRequest(WXPayConfig config) throws Exception{
+
+        this.config = config;
+    }
+
+    /**
+     * 请求，只请求一次，不做重试
+     * @param domain
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @param useCert 是否使用证书，针对退款、撤销等操作
+     * @return
+     * @throws Exception
+     */
+    private String requestOnce(final String domain, String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean useCert) throws Exception {
+        BasicHttpClientConnectionManager connManager;
+        if (useCert) {
+            // 证书
+            char[] password = config.getMchID().toCharArray();
+            InputStream certStream = config.getCertStream();
+            KeyStore ks = KeyStore.getInstance("PKCS12");
+            ks.load(certStream, password);
+
+            // 实例化密钥库 & 初始化密钥工厂
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+            kmf.init(ks, password);
+
+            // 创建 SSLContext
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(kmf.getKeyManagers(), null, new SecureRandom());
+
+            SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
+                    sslContext,
+                    new String[]{"TLSv1"},
+                    null,
+                    new DefaultHostnameVerifier());
+
+            connManager = new BasicHttpClientConnectionManager(
+                    RegistryBuilder.<ConnectionSocketFactory>create()
+                            .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                            .register("https", sslConnectionSocketFactory)
+                            .build(),
+                    null,
+                    null,
+                    null
+            );
+        }
+        else {
+            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();
+
+        String url = "https://" + domain + urlSuffix;
+        HttpPost httpPost = new HttpPost(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", USER_AGENT + " " + config.getMchID());
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        return EntityUtils.toString(httpEntity, "UTF-8");
+
+    }
+
+
+    private String request(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean useCert, boolean autoReport) throws Exception {
+        Exception exception = null;
+        long elapsedTimeMillis = 0;
+        long startTimestampMs = WXPayUtil.getCurrentTimestampMs();
+        boolean firstHasDnsErr = false;
+        boolean firstHasConnectTimeout = false;
+        boolean firstHasReadTimeout = false;
+        IWXPayDomain.DomainInfo domainInfo = config.getWXPayDomain().getDomain(config);
+        if(domainInfo == null){
+            throw new Exception("WXPayConfig.getWXPayDomain().getDomain() is empty or null");
+        }
+        try {
+            String result = requestOnce(domainInfo.domain, urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, useCert);
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            config.getWXPayDomain().report(domainInfo.domain, elapsedTimeMillis, null);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+            return result;
+        }
+        catch (UnknownHostException ex) {  // dns 解析错误，或域名不存在
+            exception = ex;
+            firstHasDnsErr = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("UnknownHostException for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout
+            );
+        }
+        catch (ConnectTimeoutException ex) {
+            exception = ex;
+            firstHasConnectTimeout = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("connect timeout happened for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout
+            );
+        }
+        catch (SocketTimeoutException ex) {
+            exception = ex;
+            firstHasReadTimeout = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("timeout happened for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+        }
+        catch (Exception ex) {
+            exception = ex;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+        }
+        config.getWXPayDomain().report(domainInfo.domain, elapsedTimeMillis, exception);
+        throw exception;
+    }
+
+
+    /**
+     * 可重试的，非双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @return
+     */
+    public String requestWithoutCert(String urlSuffix, String uuid, String data, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs(), false, autoReport);
+    }
+
+    /**
+     * 可重试的，非双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     */
+    public String requestWithoutCert(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs,  boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, false, autoReport);
+    }
+
+    /**
+     * 可重试的，双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @return
+     */
+    public String requestWithCert(String urlSuffix, String uuid, String data, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs(), true, autoReport);
+    }
+
+    /**
+     * 可重试的，双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     */
+    public String requestWithCert(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, true, autoReport);
+    }
+}

app-api/src/main/java/com/community/huiju/common/wxpay/WXPayUtil.java

@@ -0,0 +1,299 @@
+package com.community.huiju.common.wxpay;
+
+import com.community.huiju.common.wxpay.WXPayConstants.SignType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
+
+public class WXPayUtil {
+
+    private static final String SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    private static final Random RANDOM = new SecureRandom();
+
+    /**
+     * XML格式字符串转换为Map
+     *
+     * @param strXML XML字符串
+     * @return XML数据转换后的Map
+     * @throws Exception
+     */
+    public static Map<String, String> xmlToMap(String strXML) throws Exception {
+        try {
+            Map<String, String> data = new HashMap<String, String>();
+            DocumentBuilder documentBuilder = WXPayXmlUtil.newDocumentBuilder();
+            InputStream stream = new ByteArrayInputStream(strXML.getBytes("UTF-8"));
+            org.w3c.dom.Document doc = documentBuilder.parse(stream);
+            doc.getDocumentElement().normalize();
+            NodeList nodeList = doc.getDocumentElement().getChildNodes();
+            for (int idx = 0; idx < nodeList.getLength(); ++idx) {
+                Node node = nodeList.item(idx);
+                if (node.getNodeType() == Node.ELEMENT_NODE) {
+                    org.w3c.dom.Element element = (org.w3c.dom.Element) node;
+                    data.put(element.getNodeName(), element.getTextContent());
+                }
+            }
+            try {
+                stream.close();
+            } catch (Exception ex) {
+                // do nothing
+            }
+            return data;
+        } catch (Exception ex) {
+            WXPayUtil.getLogger().warn("Invalid XML, can not convert to map. Error message: {}. XML content: {}", ex.getMessage(), strXML);
+            throw ex;
+        }
+
+    }
+
+    /**
+     * 将Map转换为XML格式的字符串
+     *
+     * @param data Map类型数据
+     * @return XML格式的字符串
+     * @throws Exception
+     */
+    public static String mapToXml(Map<String, String> data) throws Exception {
+        org.w3c.dom.Document document = WXPayXmlUtil.newDocument();
+        org.w3c.dom.Element root = document.createElement("xml");
+        document.appendChild(root);
+        for (String key: data.keySet()) {
+            String value = data.get(key);
+            if (value == null) {
+                value = "";
+            }
+            value = value.trim();
+            org.w3c.dom.Element filed = document.createElement(key);
+            filed.appendChild(document.createTextNode(value));
+            root.appendChild(filed);
+        }
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer transformer = tf.newTransformer();
+        DOMSource source = new DOMSource(document);
+        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        StringWriter writer = new StringWriter();
+        StreamResult result = new StreamResult(writer);
+        transformer.transform(source, result);
+        String output = writer.getBuffer().toString(); //.replaceAll("\n|\r", "");
+        try {
+            writer.close();
+        }
+        catch (Exception ex) {
+        }
+        return output;
+    }
+
+
+    /**
+     * 生成带有 sign 的 XML 格式字符串
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @return 含有sign字段的XML
+     */
+    public static String generateSignedXml(final Map<String, String> data, String key) throws Exception {
+        return generateSignedXml(data, key, SignType.MD5);
+    }
+
+    /**
+     * 生成带有 sign 的 XML 格式字符串
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @param signType 签名类型
+     * @return 含有sign字段的XML
+     */
+    public static String generateSignedXml(final Map<String, String> data, String key, SignType signType) throws Exception {
+        String sign = generateSignature(data, key, signType);
+        data.put(WXPayConstants.FIELD_SIGN, sign);
+        return mapToXml(data);
+    }
+
+
+    /**
+     * 判断签名是否正确
+     *
+     * @param xmlStr XML格式数据
+     * @param key API密钥
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(String xmlStr, String key) throws Exception {
+        Map<String, String> data = xmlToMap(xmlStr);
+        if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+            return false;
+        }
+        String sign = data.get(WXPayConstants.FIELD_SIGN);
+        return generateSignature(data, key).equals(sign);
+    }
+
+    /**
+     * 判断签名是否正确，必须包含sign字段，否则返回false。使用MD5签名。
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(Map<String, String> data, String key) throws Exception {
+        return isSignatureValid(data, key, SignType.MD5);
+    }
+
+    /**
+     * 判断签名是否正确，必须包含sign字段，否则返回false。
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(Map<String, String> data, String key, SignType signType) throws Exception {
+        if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+            return false;
+        }
+        String sign = data.get(WXPayConstants.FIELD_SIGN);
+        return generateSignature(data, key, signType).equals(sign);
+    }
+
+    /**
+     * 生成签名
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key) throws Exception {
+        return generateSignature(data, key, SignType.MD5);
+    }
+
+    /**
+     * 生成签名. 注意，若含有sign_type字段，必须和signType参数保持一致。
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key, SignType signType) throws Exception {
+        Set<String> keySet = data.keySet();
+        String[] keyArray = keySet.toArray(new String[keySet.size()]);
+        Arrays.sort(keyArray);
+        StringBuilder sb = new StringBuilder();
+        for (String k : keyArray) {
+            if (k.equals(WXPayConstants.FIELD_SIGN)) {
+                continue;
+            }
+            if (data.get(k).trim().length() > 0) // 参数值为空，则不参与签名
+                sb.append(k).append("=").append(data.get(k).trim()).append("&");
+        }
+        sb.append("key=").append(key);
+        if (SignType.MD5.equals(signType)) {
+            return MD5(sb.toString()).toUpperCase();
+        }
+        else if (SignType.HMACSHA256.equals(signType)) {
+            return HMACSHA256(sb.toString(), key);
+        }
+        else {
+            throw new Exception(String.format("Invalid sign_type: %s", signType));
+        }
+    }
+
+
+    /**
+     * 获取随机字符串 Nonce Str
+     *
+     * @return String 随机字符串
+     */
+    public static String generateNonceStr() {
+        char[] nonceChars = new char[32];
+        for (int index = 0; index < nonceChars.length; ++index) {
+            nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
+        }
+        return new String(nonceChars);
+    }
+
+
+    /**
+     * 生成 MD5
+     *
+     * @param data 待处理数据
+     * @return MD5结果
+     */
+    public static String MD5(String data) throws Exception {
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        byte[] array = md.digest(data.getBytes("UTF-8"));
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    /**
+     * 生成 HMACSHA256
+     * @param data 待处理数据
+     * @param key 密钥
+     * @return 加密结果
+     * @throws Exception
+     */
+    public static String HMACSHA256(String data, String key) throws Exception {
+        Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+        SecretKeySpec secret_key = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA256");
+        sha256_HMAC.init(secret_key);
+        byte[] array = sha256_HMAC.doFinal(data.getBytes("UTF-8"));
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    /**
+     * 日志
+     * @return
+     */
+    public static Logger getLogger() {
+        Logger logger = LoggerFactory.getLogger("wxpay java sdk");
+        return logger;
+    }
+
+    /**
+     * 获取当前时间戳，单位秒
+     * @return
+     */
+    public static long getCurrentTimestamp() {
+        return System.currentTimeMillis()/1000;
+    }
+
+    /**
+     * 获取当前时间戳，单位毫秒
+     * @return
+     */
+    public static long getCurrentTimestampMs() {
+        return System.currentTimeMillis();
+    }
+
+}

app-api/src/main/java/com/community/huiju/common/wxpay/WXPayXmlUtil.java

@@ -0,0 +1,30 @@
+package com.community.huiju.common.wxpay;
+
+import org.w3c.dom.Document;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+/**
+ * 2018/7/3
+ */
+public final class WXPayXmlUtil {
+    public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        documentBuilderFactory.setXIncludeAware(false);
+        documentBuilderFactory.setExpandEntityReferences(false);
+
+        return documentBuilderFactory.newDocumentBuilder();
+    }
+
+    public static Document newDocument() throws ParserConfigurationException {
+        return newDocumentBuilder().newDocument();
+    }
+}

app-api/src/main/java/com/community/huiju/config/BillQuartz.java

@@ -0,0 +1,66 @@
+package com.community.huiju.config;
+
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
+import com.community.huiju.dao.TpBillInvoiceMapper;
+import com.community.huiju.dao.TpBillOrderMapper;
+import com.community.huiju.model.TaUserLicenseOrder;
+import com.community.huiju.model.TpBillInvoice;
+import com.community.huiju.model.TpBillOrder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 定时器
+ * @author weiximei
+ */
+//@Component
+@Slf4j
+public class BillQuartz {
+
+    @Autowired
+    private TpBillOrderMapper tpBillOrderMapper;
+
+    @Autowired
+    private TpBillInvoiceMapper tpBillInvoiceMapper;
+
+    @Autowired
+    private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
+
+    //@Scheduled(cron = "0 0/10 * * * ?")
+    public void billInvoice() {
+        log.info("定时任务，扫描订单，超过 10 分未付款则，关闭订单！");
+        // 物业缴费
+        List<TpBillOrder> billOrderList = tpBillOrderMapper.selectCloseOrder();
+        if (!billOrderList.isEmpty()) {
+            // 把缴费单变为未交费
+            billOrderList.forEach(e->{
+                TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByPrimaryKey(e.getTpBillInvoiceId());
+                tpBillInvoice.setBillStatus("0");
+                tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
+            });
+
+            // 关闭订单
+            billOrderList.forEach(e -> {
+                e.setOrderStatus("3");
+                tpBillOrderMapper.updateByPrimaryKeySelective(e);
+            });
+
+        }
+
+        // 车缴费订单
+        List<TaUserLicenseOrder> userLicenseOrders = taUserLicenseOrderMapper.selectCloseOrder();
+        if (!userLicenseOrders.isEmpty()) {
+            userLicenseOrders.forEach(e-> {
+                e.setOrderStatus("3");
+                taUserLicenseOrderMapper.updateByPrimaryKeySelective(e);
+            });
+        }
+
+
+    }
+
+}

app-api/src/main/java/com/community/huiju/config/FeignUploadConfig.java

@@ -0,0 +1,29 @@
+package com.community.huiju.config;
+
+import feign.Logger;
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FeignUploadConfig {
+
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+    @Bean
+    public Encoder feignEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+
+    @Bean
+    public Logger.Level feignLoggerLevel() {
+        //这里记录所有，根据实际情况选择合适的日志level
+        return Logger.Level.FULL;
+    }
+
+}

app-api/src/main/java/com/community/huiju/config/FuShiConfig.java

@@ -0,0 +1,40 @@
+package com.community.huiju.config;
+
+import com.community.commom.fushi.FuShiHttpClient;
+import com.community.commom.fushi.FuShiRequestAPI;
+import com.community.huiju.common.perproties.FuShiProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 富士配置类
+ * @author weiximei
+ */
+@Configuration
+public class FuShiConfig {
+
+    @Autowired
+    private FuShiProperties fuShiProperties;
+
+
+    /**
+     * 初始化富士HTTP客户端
+     * @return FuShiHttpClient
+     */
+    @Bean
+    public FuShiHttpClient fuShiHttpClient() {
+        return new FuShiHttpClient(fuShiProperties.getUrl(), fuShiProperties.getAppid(), fuShiProperties.getAppSecret(), fuShiProperties.getPrivateKey());
+    }
+
+    /**
+     * 初始化富士请求 API
+     * @param fuShiHttpClient
+     * @return
+     */
+    @Bean
+    public FuShiRequestAPI fuShiRequestAPI(FuShiHttpClient fuShiHttpClient) {
+        return new FuShiRequestAPI(fuShiHttpClient);
+    }
+
+}

app-api/src/main/java/com/community/huiju/config/HttpSessionConfig.java

@@ -0,0 +1,22 @@
+package com.community.huiju.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.session.MapSession;
+import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
+import org.springframework.session.web.http.HeaderHttpSessionIdResolver;
+import org.springframework.session.web.http.HttpSessionIdResolver;
+
+/**
+ * @author weiximei
+ */
+@Configuration
+@EnableJdbcHttpSession(maxInactiveIntervalInSeconds = MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS*48*7)
+public class HttpSessionConfig {
+
+    @Bean
+    public HttpSessionIdResolver httpSessionIdResolver() {
+        return HeaderHttpSessionIdResolver.xAuthToken();
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/AgreementController.java

@@ -0,0 +1,46 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TaAgreement;
+import com.community.huiju.service.AgreementServicel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2018/10/22
+ **/
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "协议相关的API", description = "协议相关的API")
+public class AgreementController {
+
+    @Autowired
+    private AgreementServicel agreementService;
+
+    @ApiOperation(value = "获取所有协议", notes = "获取所有协议")
+    @RequestMapping(value = "/agreement",method = RequestMethod.GET)
+    public ResponseBean getAgreement(){
+        ResponseBean responseBean = new ResponseBean();
+        TaAgreement agreement = agreementService.getAgreement();
+        responseBean.addSuccess(agreement);
+        return responseBean;
+    }
+
+
+}

app-api/src/main/java/com/community/huiju/controller/AliMPUserController.java

@@ -0,0 +1,179 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.wxpay.WXPayConstants;
+import com.community.huiju.common.wxpay.WXPayUtil;
+import com.community.huiju.feign.IFuShiServer;
+import com.community.huiju.service.AliMPUserServiceI;
+import com.community.huiju.service.WxMPUserServiceI;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+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 javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
+
+/**
+ * @author FXF
+ * @date 2019-07-08
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "支付宝生活号API", description = "支付宝生活号API")
+public class AliMPUserController {
+	
+	private Logger log = LoggerFactory.getLogger(AliMPUserController.class);
+	
+	@Value("${ali.mp.configs.appId}")
+	private String appId;
+	
+	@Value("${ali.mp.configs.secret}")
+	private String secret;
+	
+	@Value("${alipay.ALIPAY_PUBLIC_KEY}")
+	private String ALIPAY_PUBLIC_KEY;
+	
+	@Autowired
+	private AliMPUserServiceI aliMPUserService;
+	
+	@Autowired
+	private IFuShiServer fuShiServer;
+
+	@RequestMapping(value = "/alimp/info", method = RequestMethod.GET)
+	@ApiOperation(value = "获取支付宝生活号相关信息", notes = "获取支付宝生活号相关信息")
+	@ApiImplicitParams({})
+	public ResponseBean getAliMPinfo(){
+		ResponseBean responseBean = new ResponseBean();
+		Map<String,Object> map = Maps.newHashMap();
+		map.put("appId",appId);
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+	
+	@RequestMapping(value = "/{communityId}/alimp", method = RequestMethod.GET)
+	@ApiOperation(value = "根据CODE获取OPENID并判断是否第一次来,并返回数据", notes = "根据CODE获取OPENID并判断是否第一次来,并返回数据")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "支付宝code")})
+	public ResponseBean getUseridByCode(@PathVariable Integer communityId, @RequestParam String code){
+		ResponseBean responseBean = aliMPUserService.getTemporaryData(code,appId,secret,communityId);
+		return responseBean;
+	}
+	
+	
+	@RequestMapping(value = "/{communityId}/alimp/records", method = RequestMethod.GET)
+	@ApiOperation(value = "根据openid获取缴费记录", notes = "根据openid获取缴费记录")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "opneid", value = "支付宝opneid")})
+	public ResponseBean getRecordsByOpenid(@PathVariable Integer communityId, @RequestParam String opneid){
+		ResponseBean responseBean = aliMPUserService.getRecordsByOpenid(opneid,communityId);
+		return responseBean;
+	}
+	
+	@RequestMapping(value = "/{communityId}/alimp/car", method = RequestMethod.GET)
+	@ApiOperation(value = "根据车牌获取数据", notes = "根据车牌获取数据")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "carNo", value = "车牌号")})
+	public ResponseBean getParkInfoByCarNo(@PathVariable Integer communityId, @RequestParam String carNo){
+		ResponseBean responseBean = new ResponseBean();
+		String parkInfoByCarNo = fuShiServer.getParkInfoByCarNo(carNo);
+		JSONObject carNoJson = JSONObject.parseObject(parkInfoByCarNo);
+		//车辆不在停车场
+		if (carNoJson.getInteger("code") == 1){
+			responseBean.addError(carNoJson.getString("message"));
+			return responseBean;
+		}
+		
+		if (carNoJson.getInteger("code") == 0 ){
+			if (carNoJson.getJSONObject("data").getInteger("DataType") != 3){
+				responseBean.addSuccess("储值车不支持在线缴费，月卡车请使用银城慧家APP延期续费");
+				return responseBean;
+			}
+			//返回查询的金额
+			JSONObject jsonParam = carNoJson.getJSONObject("data").getJSONObject("JsonParam");
+			Map<String,Object> resultMap = Maps.newHashMap();
+			resultMap.put("ActualAmount",jsonParam.get("ActualAmount"));
+			responseBean.addSuccess(resultMap);
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "临时车统一下单", notes = "临时车统一下单")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "carNo", value = "车牌号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "支付宝openid")
+	})
+	@RequestMapping(value = "/{communityId}/alimp/order",method = RequestMethod.GET)
+	public ResponseBean aliTmpOrder(@PathVariable Integer communityId,
+	                               @RequestParam("carNo") String carNo,
+	                               @RequestParam("openid") String openid){
+		ResponseBean responseBean = new ResponseBean();
+		
+		//String parkInfoByCarNo = fuShiServer.getParkInfoByCarNo(carNo);
+		//JSONObject carNoJson = JSONObject.parseObject(parkInfoByCarNo);
+		//String actualAmount = String.valueOf(Double.valueOf(((BigDecimal) carNoJson.getJSONObject("JsonParam").get("ActualAmount")).toString()) * 100);
+		//actualAmount = actualAmount.substring(0, actualAmount.lastIndexOf("."));
+		//String resp = wxMPUserService.wxTmpOrder(carNo,actualAmount,communityId,openid,(BigDecimal) carNoJson.getJSONObject("JsonParam").get("ActualAmount"));
+		String resp = aliMPUserService.aliTmpOrder(carNo,"1",communityId,openid,new BigDecimal("0.1"));
+		
+		responseBean.addSuccess(resp);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "手机订单支付完成后回调临时车缴费", notes = "手机订单支付完成后回调临时车缴费")
+	@RequestMapping(value = "/aliTmpNotify",method = RequestMethod.POST)
+	public void wxBillNotify(HttpServletRequest request, HttpServletResponse response){
+		log.info("支付宝 alipay result  start =======");
+		Map<String,String> params = new HashMap<String,String>();
+		Map requestParams = request.getParameterMap();
+		for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {
+			String name = (String) iter.next();
+			String[] values = (String[]) requestParams.get(name);
+			String valueStr = "";
+			for (int i = 0; i < values.length; i++) {
+				valueStr = (i == values.length - 1) ? valueStr + values[i]
+						: valueStr + values[i] + ",";
+			}
+			//乱码解决，这段代码在出现乱码时使用。
+			//valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
+			params.put(name, valueStr);
+		}
+		//切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
+		try {
+			boolean flag = AlipaySignature.rsaCheckV1(params, ALIPAY_PUBLIC_KEY, CHARSET_UTF8,"RSA2");
+			if (flag){
+				aliMPUserService.updateTmpOrder(params.get("out_trade_no"));
+			}
+		} catch (AlipayApiException e) {
+			e.printStackTrace();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+	}
+}

app-api/src/main/java/com/community/huiju/controller/AliPayController.java

@@ -0,0 +1,132 @@
+package com.community.huiju.controller;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.wxpay.WXPayConstants;
+import com.community.huiju.common.wxpay.WXPayUtil;
+import com.community.huiju.service.AliPayServiceI;
+import com.community.huiju.service.WxPayServiceI;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
+
+/**
+ * @author FXF
+ * @date 2019-03-12
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "支付宝支付 API", description = "支付宝支付 API")
+public class AliPayController {
+	
+	private Logger log = LoggerFactory.getLogger(AliPayController.class);
+	
+	@Autowired
+	private AliPayServiceI aliPayService;
+	
+	@Autowired
+	private WxPayServiceI wxPayService;
+	
+	@Value("${alipay.ALIPAY_PUBLIC_KEY}")
+	private String ALIPAY_PUBLIC_KEY;
+	
+	@ApiOperation(value = "统一下单", notes = "统一下单")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "String", name = "outTradeNo", value = "订单号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "订单类型：type: 类型(car 车缴费, bill 物业缴费)"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
+	@RequestMapping(value = "/aliPayOrder/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, @RequestParam("type") String type, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		String resp = "";
+		try {
+			resp = aliPayService.AliPayOrder(outTradeNo, type,userElement);
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		responseBean.addSuccess(resp);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "支付宝手机订单支付完成后回调 物业缴费", notes = "支付宝手机订单支付完成后回调")
+	@RequestMapping(value = "/aliPayBillNotify",method = RequestMethod.POST)
+	public void aliPayBillNotify(HttpServletRequest request, HttpServletResponse response){
+		log.info("支付宝手机订单支付完成后回调 物业缴费");
+		wxNotify(request, Constant.PAY_TYPE_BILL);
+	}
+
+	@ApiOperation(value = "支付宝手机订单支付完成后回调 车缴费", notes = "支付宝手机订单支付完成后回调 车缴费")
+	@RequestMapping(value = "/aliPayCarNotify",method = RequestMethod.POST)
+	public void aliPayCarNotify(HttpServletRequest request, HttpServletResponse response){
+		log.info("支付宝手机订单支付完成后回调 车缴费");
+		wxNotify(request, Constant.PAY_TYPE_CAR);
+	}
+
+	/**
+	 * 支付回调
+	 * @param request
+	 * @param type
+	 */
+	private void wxNotify(HttpServletRequest request, String type) {
+		log.info("支付宝 alipay result  start =======");
+		Map<String,String> params = new HashMap<String,String>();
+		Map requestParams = request.getParameterMap();
+		for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {
+			String name = (String) iter.next();
+			String[] values = (String[]) requestParams.get(name);
+			String valueStr = "";
+			for (int i = 0; i < values.length; i++) {
+				valueStr = (i == values.length - 1) ? valueStr + values[i]
+						: valueStr + values[i] + ",";
+			}
+			//乱码解决，这段代码在出现乱码时使用。
+			//valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
+			params.put(name, valueStr);
+		}
+		//切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
+		try {
+			boolean flag = AlipaySignature.rsaCheckV1(params, ALIPAY_PUBLIC_KEY, CHARSET_UTF8,"RSA2");
+			if (flag){
+				params.put("pay_type","2");
+				if (Constant.PAY_TYPE_BILL.equals(type)) {
+					wxPayService.wxBillNotify(params);
+				} else if (Constant.PAY_TYPE_CAR.equals(type)){
+					wxPayService.wxCarNotify(params);
+				}
+
+			}
+		} catch (AlipayApiException e) {
+			e.printStackTrace();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+}

app-api/src/main/java/com/community/huiju/controller/AssembleController.java

@@ -0,0 +1,96 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.model.ToBanner;
+import com.community.huiju.service.AssembleServiceI;
+import com.community.huiju.service.BannerServiceI;
+import com.community.huiju.service.MenuServiceI;
+import com.community.huiju.service.MessageServiceI;
+import com.community.huiju.service.TpHotelServicel;
+import com.community.huiju.service.TpShopServicel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2018-11-05
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "首页聚合API", description = "首页聚合API")
+public class AssembleController extends BaseController {
+	
+	@Autowired
+	private MenuServiceI menuService;
+	
+	@Autowired
+	private BannerServiceI bannerService;
+	
+	@Autowired
+	private MessageServiceI messageService;
+	
+	@Autowired
+	private TpHotelServicel tpHotelServicel;
+	
+	@Autowired
+	private TpShopServicel tpShopServicel;
+	
+	@Autowired
+	private AssembleServiceI assembleService;
+	
+	@ApiOperation(value = "首页数据获取接口", notes = "首页数据获取接口")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
+	@RequestMapping(value = "/index/{communityId}",method = RequestMethod.GET)
+	public ResponseBean getIndexData(@PathVariable("communityId") Integer communityId, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
+		Map<String,Object> indexMap = new HashMap<>();
+		//获取菜单数据
+		List<TaSysMenu> menuList = menuService.getMenuList(communityId);
+		//获取首页banner数据
+		List<ToBanner> toBannerList = bannerService.viewAllBannerImgAndCommunityId(1,communityId);
+		//获取消息总数接口
+		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userElement.getUserVerifyId());
+		//获取当前小区的酒店信息
+		ResponseBean hotelRes = tpHotelServicel.getHotelCommunity(userElement);
+		//获取当前小区的商铺信息
+		ResponseBean shopRes = tpShopServicel.getShopCommunity(userElement);
+		
+		//组装数据
+		indexMap.put("menuList",menuList);
+		indexMap.put("bannerList",toBannerList);
+		indexMap.put("messageTotal",totalMap.get("messageTotal"));
+		indexMap.put("tpHotel",hotelRes.getData());
+		indexMap.put("tpShopType",((Map<Object, Object>)shopRes.getData()).get("tpShopType"));
+		indexMap.put("tpShopList",((Map<Object, Object>)shopRes.getData()).get("tpShopList"));
+		indexMap.put("toDoTotal",totalMap.get("toDoTotal"));
+		responseBean.addSuccess(indexMap);
+		//获取成功的情况下记录
+		assembleService.saveBriskUser(userElement.getUserVerifyId(),userElement.getCommunityId());
+		return responseBean;
+	}
+}

app-api/src/main/java/com/community/huiju/controller/BannerController.java

@@ -0,0 +1,71 @@
+package com.community.huiju.controller;
+
+import com.aliyun.oss.OSSClient;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.ToBanner;
+import com.community.huiju.service.BannerServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: BannerController
+ * @Description: 首页运营banner入口类
+ * @date 2018/10/22
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "首页运营banner的API", description = "首页运营banner的API")
+public class BannerController {
+
+    @Autowired
+    private BannerServiceI bannerService;
+
+    @ApiOperation(value = "获取首页运营banner接口详情", notes = "获取首页运营banner详情")
+    @RequestMapping(value = "/banner/{bannerId}", method = RequestMethod.GET)
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "bannerId", value = "运营banner图Id") })
+    public ResponseBean selectToBannerImg(@PathVariable("bannerId")Integer bannerId){
+        ResponseBean responseBean = new ResponseBean();
+        ToBanner toBannerList = bannerService.viewBannerImg(bannerId);
+        responseBean.addSuccess(toBannerList);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取首页运营所有banner接口", notes = "获取首页所有运营banner")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "bannerPosition", value = "banner位: 1首页banner 2服务端"),
+    })
+    @RequestMapping(value = "/banners", method = RequestMethod.GET)
+    public ResponseBean selectAllToBannerImg(@RequestParam("bannerPosition") Integer bannerPosition){
+        ResponseBean responseBean = new ResponseBean();
+        List<ToBanner> toBannerList = bannerService.viewAllBannerImg(bannerPosition);
+        responseBean.addSuccess(toBannerList);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取广告banner接口", notes = "获取广告运营banner")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "bannerPosition", value = " 3 广告banner"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区编号")
+    })
+    @RequestMapping(value = "/banners/advertising", method = RequestMethod.GET)
+    public ResponseBean selectAllToBannerImg(@RequestParam("bannerPosition") Integer bannerPosition, @RequestParam(value = "communityId", required = false) Integer communityId){
+        ResponseBean responseBean = new ResponseBean();
+        List<ToBanner> toBannerList = bannerService.viewAllBannerImgAndCommunityId(bannerPosition, communityId);
+        responseBean.addSuccess(toBannerList);
+        return responseBean;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/BaseController.java

@@ -0,0 +1,77 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.session.UserElement;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.model.ToCommunities;
+import com.community.huiju.service.CommunityServiceI;
+import com.community.huiju.vo.TaUserVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * 公共 controller
+ */
+@Slf4j
+public class BaseController {
+
+    @Autowired
+    private CommunityServiceI community;
+
+    /**
+     * 校验小区是否存在
+     * @return
+     */
+    protected boolean check(Integer communityId){
+        ToCommunities toCommunities = community.getByCommunityId(communityId);
+        if (null != toCommunities) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 设置用户 session
+     * @param userVO
+     * @param session
+     */
+    protected void setUserElement(TaUserVO userVO, HttpSession session) {
+        if (null == userVO) {
+            throw new WisdomException("用户信息不能为空!");
+        }
+
+        log.info("用户当前sessionId：{}, 设置的用户信息: {}", session.getId(), userVO);
+        UserElement userElement = new UserElement();
+        BeanUtils.copyProperties(userVO,userElement);
+        userElement.setLoginType(Constant.APP_LOGIN_TYPE);
+        session.setAttribute(Constant.APP_USER_SESSION,userElement);
+        userVO.setToken(session.getId());
+    }
+
+    /**
+     * 获取用户 session
+     * @param session
+     * @return
+     */
+    protected UserElement getUserElement(HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        log.info("用户当前sessionId：{}, 设置的用户信息: {}", session.getId(), userElement);
+        if (null == userElement) {
+            throw new WisdomException("用户 session 不存在！");
+        }
+        return userElement;
+    }
+
+    /**
+     * 删除 用户 session
+     * @param session
+     */
+    protected void removeUserElement(HttpSession session) {
+        log.info("用户当前sessionId：{}", session.getId());
+        session.removeAttribute(Constant.APP_USER_SESSION);
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/BillController.java

@@ -0,0 +1,99 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.BillServiceI;
+import com.sun.org.apache.regexp.internal.RE;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+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.HttpSession;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2018-10-25
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "缴费相关的API", description = "缴费相关的API")
+public class BillController extends BaseController {
+	
+	@Autowired
+	private BillServiceI billServiceI;
+	
+	@ApiOperation(value = "获取本人的收费账单信息(已缴费或未缴费)", notes = "获取本人的收费账单信息(已缴费或未缴费)")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "payType", value = "0是未缴费1是已缴费"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+	})
+	@RequestMapping(value = "/bills/current_user/{payType}",method = RequestMethod.GET)
+	public ResponseBean getBillInvoice(@PathVariable Integer payType,
+									   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									   @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(userElement.getCommunityId())) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
+		Map<String, Object> map = billServiceI.getBillsList(userElement, payType, pageNum, pageSize);
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取账单的详细信息", notes = "获取账单的详细信息")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+						@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单id")})
+	@RequestMapping(value = "/bill/{communityId}/{billInvoiceId}",method = RequestMethod.GET)
+	public ResponseBean getBillInvoiceDetail(@PathVariable Integer communityId,@PathVariable Integer billInvoiceId){
+		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
+		Map<String,Object> billInvoiceMap = billServiceI.getBillInvoiceDetail(communityId,billInvoiceId);
+		responseBean.addSuccess(billInvoiceMap);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "获取历史缴费", notes = "获取历史缴费")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/bill/pay/history", method = RequestMethod.GET)
+	public ResponseBean payHistory(HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = billServiceI.payHistory(userElement);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "获取订单详情", notes = "获取订单详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "orderNumber", value = "订单号")
+	})
+	@RequestMapping(value = "/bill/order/info/{orderNumber}", method = RequestMethod.GET)
+	public ResponseBean getOrderInfo(HttpSession session, @PathVariable("orderNumber") String orderNumber) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = billServiceI.getOrderInfo(orderNumber);
+		return responseBean;
+	}
+}

app-api/src/main/java/com/community/huiju/controller/CodeController.java

@@ -0,0 +1,65 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.code.ICode;
+import com.community.huiju.common.code.cache.AppkeyCache;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+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 sun.rmi.runtime.Log;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author weiximei
+ */
+@RestController
+@RequestMapping("/")
+@RefreshScope
+@Api(value = "获取验证码的API", description = "获取验证码的API")
+@Slf4j
+public class CodeController {
+
+    @Autowired
+    @Qualifier("phoneCodeImpl")
+    private ICode iCode;
+
+    @ApiOperation(value = "获取手机验证码", notes = "根据手机号发送验证码")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "手机号")})
+    @RequestMapping(value = "/code/sendCode",method = {RequestMethod.POST, RequestMethod.GET})
+    public ResponseBean sendCode(@RequestParam String phone, HttpSession session) {
+        ResponseBean response = new ResponseBean();
+
+        log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
+        if (!AccountValidatorUtil.isPhone(phone)){
+            response.addError("请输入正确的手机号!");
+            return response;
+        }
+
+        int code = (int) ((Math.random()*9+1)*1000);
+        boolean result = iCode.sendCode(phone,String.valueOf(code));
+        // boolean result = true;
+        if (result) {
+            log.info("{} 验证码: {}",phone,code);
+            // 设置缓存
+            AppkeyCache.setCache(phone,String.valueOf(code));
+            //session.setAttribute(Constant.SESSION_PHONE_CODE,String.valueOf(code));
+            response.addSuccess("发送成功!"+code);
+        } else {
+            response.addError("发送失败!");
+        }
+        return response;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/CommunityController.java

@@ -0,0 +1,41 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.ToCommunities;
+import com.community.huiju.service.CommunityServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+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 java.util.List;
+
+/**
+ * @author FXF
+ * @date 2018-10-22
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "小区相关的API",description = "小区相关的API")
+public class CommunityController {
+	
+	@Autowired
+	private CommunityServiceI communityService;
+	
+	@ApiOperation(value = "根据小区名获取小区列表", notes = "根据小区名获取小区列表")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "String", name = "communityName", value = "小区名字") })
+	@RequestMapping(value = "/communitys",method = RequestMethod.GET)
+	public ResponseBean getCommunitys(@RequestParam(required = false) String communityName){
+		ResponseBean responseBean = new ResponseBean();
+		List<ToCommunities> communitiesList = communityService.getCommunitys(communityName);
+		responseBean.addSuccess(communitiesList);
+		return responseBean;
+	}
+}

app-api/src/main/java/com/community/huiju/controller/FSController.java

@@ -0,0 +1,117 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.IFuShiService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "车辆操作API", description = "车辆操作API")
+public class FSController extends BaseController {
+
+    @Autowired
+    private IFuShiService iFuShiService;
+
+    @RequestMapping(value = "/car/getParkInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取停车信息（通过车牌号）", notes = "获取停车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.getParkInfoByCarNo(carNo);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/parkGetMonthCardInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取月租车信息（通过车牌号）", notes = "获取月租车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.parkGetMonthCardInfoByCarNo(carNo);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/parkGetTempCarPaymentInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取临时车信息（通过车牌号）", notes = "获取临时车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.parkGetTempCarPaymentInfoByCarNo(carNo);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/apiThirdPartyMonthCardPay", method = RequestMethod.POST)
+    @ApiOperation(value = "月卡续费", notes = "月卡续费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Phone手机号;RenewDayType续费日期类型( 3:年 2:月 1:日, 选入对应的数字);" +
+                    "RenewDay续费日期数目;" +
+                    "PayStyle交易方式(中文描述)，例如：微信、 支付宝、 银联;" +
+                    "CarNo车牌号;" +
+                    "CardNo停车卡号;" +
+                    "RechargeAmt充值续费金额;")
+    })
+    public ResponseBean apiThirdPartyMonthCardPay(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = iFuShiService.apiThirdPartyMonthCardPay(jsonObject.getString("Phone"),
+                jsonObject.getString("RenewDayType"),
+                jsonObject.getString("RenewDay"),
+                jsonObject.getString("PayStyle"),
+                jsonObject.getString("CarNo"),
+                jsonObject.getString("CardNo"),
+                jsonObject.getString("RechargeAmt"));
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/apiThirdPartyTemporaryCardPay", method = RequestMethod.POST)
+    @ApiOperation(value = "第三方临时卡上发缴费", notes = "第三方临时卡上发缴费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Amount应缴金额（单位元）;" +
+                    "ActualAmount实缴金额（单位元）;" +
+                    "DeductionAmount抵扣金额（单位元）;" +
+                    "Reason抵扣原因;" +
+                    "PayStyle交易方式(汉字描述)，例如：微信、支付宝、银联;" +
+                    "CarNo车牌号;" +
+                    "CardNo停车卡号;" +
+                    "CouponList使用的优惠券列表")
+    })
+    public ResponseBean apiThirdPartyTemporaryCardPay(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = iFuShiService.apiThirdPartyTemporaryCardPay(jsonObject.getString("Amount"),
+                jsonObject.getString("ActualAmount"),
+                jsonObject.getString("DeductionAmount"),
+                jsonObject.getString("Reason"),
+                jsonObject.getString("PayStyle"),
+                jsonObject.getString("CarNo"),
+                jsonObject.getString("CardNo"),
+                jsonObject.getString("CouponList"));
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/car/apiGetOfflineFee/{carNoOrCardNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取线下算费结果", notes = "获取线下算费结果")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号")
+    })
+    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.apiGetOfflineFee(carNoOrCardNo);
+        return responseBean;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/FaceController.java

@@ -0,0 +1,83 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.FaceServiceI;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "人脸相关API", description = "人脸相关API")
+public class FaceController extends BaseController {
+    @Autowired
+    private FaceServiceI faceServicel;
+
+    @ApiOperation(value = "添加人脸图片", notes = "添加人脸图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
+    })
+
+    @RequestMapping(value = "/addFace",method = RequestMethod.POST)
+    public Object getTaFace(HttpSession session,
+                            @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
+                            @RequestParam(required = false) Integer otherUserId){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = faceServicel.addFace(userElement ,uploadFile,otherUserId);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改人脸图片", notes = "修改人脸图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人"),
+    })
+    @RequestMapping(value = "/upDateFace",method = RequestMethod.POST)
+    public Object upDateTaFace(HttpSession session,
+                               @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
+                               @RequestParam(required = false) Integer otherUserId
+                               ){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+         responseBean = faceServicel.upDateFace(userElement,uploadFile,otherUserId);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取当前已录入人脸信息", notes = "获取当前已录入人脸信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人"),
+    })
+    @RequestMapping(value = "/getUserIdFace",method = RequestMethod.GET)
+    public Object getTaFaceByUserId(HttpSession session, @RequestParam(required = false) Integer otherUserId){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userElement,otherUserId);
+        return responseBean;
+    }
+    @ApiOperation(value = "删除当前人脸信息", notes = "删除当前人脸信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "verifyId",value = "审核ID"),
+    })
+    @RequestMapping(value = "/deleteFace",method = RequestMethod.GET)
+    public Object deleteFace(HttpSession session, @RequestParam(required = false) Integer otherUserId,
+                            @RequestParam(required = false) Integer verifyId){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = faceServicel.deleteFace(userElement,otherUserId,verifyId);
+        return responseBean;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/HkController.java

@@ -0,0 +1,125 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.HkResponseBean;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.HkVisitorBill;
+import com.community.huiju.service.FaceServiceI;
+import com.community.huiju.service.IEquipmentService;
+import com.community.huiju.service.IHKService;
+import com.community.huiju.service.ISenCartId;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author FXF
+ * @date 2019-01-23
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "海康相关的API",description = "海康相关的API")
+public class HkController extends BaseController {
+
+	@Autowired
+	private IHKService ihkService;
+
+	@Autowired
+	private ISenCartId iSenCartId;
+
+	@Autowired
+	private FaceServiceI faceServiceI;
+
+	@Autowired
+	private IEquipmentService iEquipmentService;
+
+
+
+	@ApiOperation(value = "发送访客账单", notes = "发送访客账单")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "body", name = "hkVisitorBill", dataType = "String",value = "billNum: 账单号,reservationNum:预约单号,plateNum:出场车牌号,leaveTime:出场时间,billFee:账单金额")})
+	@RequestMapping(value = "/sendVisitorBill",method = RequestMethod.POST)
+	public HkResponseBean allMessageRead(@RequestBody HkVisitorBill hkVisitorBill){
+		HkResponseBean hkResponseBean = new HkResponseBean();
+		System.out.println("测试："+hkVisitorBill.getBillFee());
+		System.out.println("测试："+hkVisitorBill.getBillNum());
+		System.out.println("测试："+hkVisitorBill.getPlateNum());
+		System.out.println("测试："+hkVisitorBill.getReservationNum());
+		System.out.println("测试："+hkVisitorBill.getLeaveTime());
+		hkResponseBean.addSuccess("账单发送成功","");
+		return hkResponseBean;
+	}
+
+	@ApiOperation("推送海康人员")
+	@RequestMapping(value = "/pushHKPerson/{appUserId}", method = RequestMethod.POST)
+	public ResponseBean pushHKPerson(@PathVariable("appUserId") String appUserId, @RequestParam("userVerifyId") Integer userVerifyId) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = ihkService.pushPerson(appUserId, userVerifyId);
+		return responseBean;
+	}
+
+	@Deprecated
+	@RequestMapping(value = "/downloadAuthorityByDeviceUuids", method = RequestMethod.POST)
+	public ResponseBean pushHKPerson() {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = ihkService.downloadAuthorityByDeviceUuids();
+		return responseBean;
+	}
+
+	@ApiOperation(value = "门口机(可视对讲)/考勤机 开门", notes = "门口机(可是对讲)/考勤机 开门")
+	@ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "header", name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "id", value = "设备id"),
+	})
+	@RequestMapping(value = "/visual/syncControl/{id}", method = RequestMethod.POST)
+	public ResponseBean syncControl(HttpServletRequest request, HttpSession session, @PathVariable("id") Integer equipmentId){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = ihkService.syncControl(userElement, equipmentId);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "添加人员并卡卡")
+	@RequestMapping(value = "/addUserAndOpenCart", method = RequestMethod.POST)
+	public ResponseBean addUser(@RequestParam("communityId") Integer communityId) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = iSenCartId.addUserAndAddCartId(communityId);
+		return responseBean;
+	}
+
+	@RequestMapping(value = "/addUserOne", method = RequestMethod.POST)
+	@ApiOperation(value = "根据人员为主下发，测试用的")
+	public ResponseBean addUserOne(@ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
+								   @RequestParam(required = false) Integer communityId) {
+
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = iSenCartId.addUserOne(communityId, uploadFile);
+		return responseBean;
+
+	}
+
+	@RequestMapping(value = "/updateFaceInVerify/{userVerifyId}", method = RequestMethod.POST)
+	@ApiOperation(value = "审核用户后, 下发人脸")
+	public ResponseBean addUserOne(@PathVariable("userVerifyId") Integer userVerifyId) {
+
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = faceServiceI.updateFaceInVerify(userVerifyId);
+		return responseBean;
+	}
+
+	@RequestMapping(value = "/deletePerson/{userVerifyId}", method = RequestMethod.POST)
+	@ApiOperation(value = "删除海康人员")
+	public ResponseBean deletePerson(@PathVariable("userVerifyId") Integer userVerifyId) {
+
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = ihkService.deletePerson(userVerifyId);
+		return responseBean;
+	}
+
+}

app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java

@@ -0,0 +1,80 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.IBuildingOwnerInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/3/28
+ **/
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "楼栋资料库API",description = "楼栋资料库API")
+public class IBuildingOwnerInfoController extends BaseController {
+
+    @Autowired
+    private IBuildingOwnerInfo iBuildingOwnerInfo;
+
+    @RequestMapping(value = "/building/select/address", method = RequestMethod.GET)
+    @ApiOperation(value = "根据 小区/期/楼栋/单元/楼层/户号 (申请注册绑定)", notes = "根据 小区/期/楼栋/单元/楼层/户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unitId", value = "单元"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层")
+    })
+    public ResponseBean selectByAddress(@RequestParam("communityId") Integer communityId,
+                                        @RequestParam(value = "phaseId", required = false) Integer phaseId,
+                                        @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                        @RequestParam(value = "unitId", required = false) Integer unitId,
+                                        @RequestParam(value = "levelId", required = false) Integer levelId) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iBuildingOwnerInfo.selectBuildList(communityId, phaseId, buildingId, unitId, levelId);
+        return responseBean;
+
+    }
+
+    @RequestMapping(value = "/building/has", method = RequestMethod.GET)
+    @ApiOperation(value = "根据 小区、期、楼栋、单元、楼层、户号 （并校验这个用户，是否绑定了这个房产）", notes = "根据 小区、期、楼栋、单元、楼层、户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unitId", value = "单元"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNoId", value = "户号"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    public ResponseBean hasBuilding(@RequestParam(value = "communityId", required = false) Integer communityId,
+                                    @RequestParam(value = "phaseId", required = false) Integer phaseId,
+                                   @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                   @RequestParam(value = "unitId", required = false) Integer unitId,
+                                   @RequestParam(value = "levelId", required = false) Integer levelId,
+                                   @RequestParam(value = "roomNoId", required = false) Integer roomNoId,
+                                   HttpSession session){
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfo.hasBuild(userElement, communityId ,phaseId, buildingId, unitId, levelId, roomNoId);
+        return responseBean;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/ImageController.java

@@ -0,0 +1,47 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.ImageServiceI;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author weichaochao
+ * @Title: ImageController
+ * @Description: 图片上传以及获取url
+ * @date 2018/10/31
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "图片操作API", description = "图片操作API")
+public class ImageController {
+
+    @Autowired
+    private ImageServiceI imageService;
+
+    @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
+    @PostMapping(value = "/uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean uploadImgAndGetUrl(@ApiParam(value = "uploadFiles" ,required = true) MultipartFile[] uploadFiles) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        List<String> urls = new ArrayList<String>();
+        for (MultipartFile uploadFile : uploadFiles){
+            String url = imageService.getImageUrl(uploadFile);
+            urls.add(url);
+        }
+        responseBean.addSuccess(urls);
+        return responseBean;
+    }
+}

app-api/src/main/java/com/community/huiju/controller/LoginCodeController.java

@@ -0,0 +1,38 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.perproties.LoginCodePerproties;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+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 java.util.Map;
+
+/**
+ * @author weiximei
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "根据code获取url API", description = "根据code获取url API")
+public class LoginCodeController {
+
+    @Autowired
+    private LoginCodePerproties loginCodePerproties;
+
+    @RequestMapping(value = "/url", method = RequestMethod.GET)
+    public ResponseBean getUrl(@RequestParam String code) {
+        ResponseBean responseBean = new ResponseBean();
+        String url = loginCodePerproties.getLoginCode().get(code);
+        Map<String, String> map = Maps.newHashMap();
+        map.put("url", url);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/MenuController.java

@@ -0,0 +1,51 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.service.MenuServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2018-11-05
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "菜单API", description = "菜单API")
+public class MenuController extends BaseController {
+	
+	@Autowired
+	private MenuServiceI menuService;
+	
+	@ApiOperation(value = "按小区获取菜单列表", notes = "按小区获取菜单列表")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id")})
+	@RequestMapping(value = "/menus/{communityId}",method = RequestMethod.GET)
+	public ResponseBean getMenuList(@PathVariable Integer communityId, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
+		List<TaSysMenu> list = menuService.getMenuList(communityId);
+		responseBean.addSuccess(list);
+		return responseBean;
+	}
+}

app-api/src/main/java/com/community/huiju/controller/MessageController.java

@@ -0,0 +1,142 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.MessageServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2018-10-22
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "消息相关的API",description = "消息相关的API")
+public class MessageController extends BaseController {
+	
+	@Autowired
+	private MessageServiceI messageService;
+	
+	@ApiOperation(value = "按小区获取消息总数", notes = "按小区获取个人消息总数")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
+	@RequestMapping(value = "/message/{communityId}/total",method = RequestMethod.GET)
+	public ResponseBean getMessageTotal(@PathVariable Integer communityId, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
+		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userElement.getUserVerifyId());
+		responseBean.addSuccess(totalMap);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "按小区获取分页消息", notes = "按小区获取分页消息")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+	@RequestMapping(value = "/message/{communityId}/news",method = RequestMethod.GET)
+	public ResponseBean getNews(@PathVariable Integer communityId,
+	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                            @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		ResponseBean responseBean = new ResponseBean();
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+		Map<String,Object> map = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userElement.getUserVerifyId());
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "按小区获取分页待办", notes = "按小区获取分页待办")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+	@RequestMapping(value = "/message/{communityId}/upcoming",method = RequestMethod.GET)
+	public ResponseBean getUpcoming(@PathVariable Integer communityId,
+	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                                @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		Integer userId = userElement.getId();
+		ResponseBean responseBean = new ResponseBean();
+		
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+		Map<String,Object> map = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING, userId);
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "消息已读接口", notes = "消息已读接口")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+	@RequestMapping(value = "/readStatus/{communityId}",method = RequestMethod.POST)
+	public ResponseBean allMessageRead(@PathVariable("communityId") Integer communityId, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		Integer userId = userElement.getUserVerifyId();
+		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
+		messageService.updateMessageReadStatus(communityId, userId);
+		return responseBean;
+	}
+
+
+	@ApiOperation(value = "根据消息id进行已读", notes = "根据消息id进行已读")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "messageId", value = "消息id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+	@RequestMapping(value = "/messageIdreadStatus/{messageId}",method = RequestMethod.PUT)
+	public ResponseBean updateMessageByIdReadStatus(HttpSession session, @PathVariable("messageId") Integer messageId) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		responseBean = messageService.updateMessageByIdReadStatus(userElement, messageId);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "根据消息id获取详细数据", notes = "根据消息id获取详细数据")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "messageId", value = "消息id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+	@RequestMapping(value = "/message/get/{messageId}",method = RequestMethod.GET)
+	public ResponseBean getMessageById(HttpSession session, @PathVariable("messageId") Integer messageId) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		responseBean = messageService.getMessageById(userElement.getCommunityId(), messageId);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "app已读接口", notes = "app已读接口")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "messageId", value = "消息id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+	@RequestMapping(value = "/message/{messageId}",method = RequestMethod.GET)
+	public ResponseBean messageReadStatus(HttpSession session, @PathVariable("messageId") Integer messageId) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		responseBean = messageService.messageReadStatus(userElement,messageId);
+		return responseBean;
+	}
+}

app-api/src/main/java/com/community/huiju/controller/MonitoringController.java

@@ -0,0 +1,105 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.IMonitoringService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * 监控 控制器
+ * @author weiximei
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "监控 控制器", description = "监控相关的数据")
+public class MonitoringController extends BaseController {
+
+    @Autowired
+    private IMonitoringService iMonitoringService;
+
+    @ApiOperation(value = "获取监控列表数据",notes = "根据小区ID获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/monitoring/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getList(@PathVariable("communityId") Integer communityId,
+                                @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                HttpSession session){
+        ResponseBean response = new ResponseBean();
+        if (!check(communityId)) {
+            response.addError("小区不存在");
+            return response;
+        }
+
+        UserElement userElement = getUserElement(session);
+        response = iMonitoringService.getByCommunityId(userElement,communityId,pageNo,pageSize);
+        return response;
+    }
+
+
+    @ApiOperation(value = "获取监控列表token",notes = "根据小区ID获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
+    })
+    @RequestMapping(value = "/monitoring/token/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getMonitoringToken(@PathVariable("communityId") Integer communityId,
+                                @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                @RequestParam(value = "pageSize",defaultValue = "100") Integer pageSize){
+        ResponseBean response = new ResponseBean();
+        if (!check(communityId)) {
+            response.addError("小区不存在");
+            return response;
+        }
+
+        response = iMonitoringService.getMonitoringToken(communityId,pageNo,pageSize);
+        return response;
+    }
+
+    @ApiOperation(value = "获取监控列表数据 HLS",notes = "根据小区ID获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/monitoring/hls/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getListHLS(@PathVariable("communityId") Integer communityId,
+                                   @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                   @RequestParam(value = "pageSize",defaultValue = "100") Integer pageSize,
+                                   HttpSession session) {
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iMonitoringService.getHlsByCommunityId(userElement,communityId, pageNo, 100);
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "获取门口机视频地址",notes = "获取门口机视频地址")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/monitoring/intercom",method = RequestMethod.GET)
+    public ResponseBean getIntercomHLS(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iMonitoringService.getIntercomHLS(userElement);
+        return responseBean;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -0,0 +1,515 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TpActivity;
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpTicket;
+import com.community.huiju.model.TpTransaction;
+import com.community.huiju.service.SocialServiceI;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author weichaochao
+ * @Title: SocialController
+ * @date 2018/10/23
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "app端论坛相关的API", description = "app端论坛相关的API")
+public class SocialController extends BaseController {
+
+    @Autowired
+    private SocialServiceI socialServiceI;
+
+    @RequestMapping(value = "/announcement/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "论坛公告帖子详情", notes = "获取论坛公告帖子详情")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "id", value = "公告帖子id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    public ResponseBean findAnnouncementDetail(@PathVariable(value = "communityId") Integer communityId, @RequestParam("id") Integer id, HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, communityId, userId);
+        responseBean.addSuccess(tpAnnouncement);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.POST)
+    @ApiOperation(value = "活动报名接口", notes = "活动报名接口")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "remark", value = "活动备注"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    public ResponseBean SignActivity(@PathVariable(value = "communityId") Integer communityId,
+                                     @RequestParam(value = "remark", required = false) String remark,
+                                     @RequestParam("activityId") Integer activityId,
+                                     HttpSession session) {
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.findTaUserInfo(userElement, activityId, communityId ,remark);
+        return responseBean;
+    }
+    
+    @RequestMapping(value = "/sign/cancel/{communityId}", method = RequestMethod.POST)
+    @ApiOperation(value = "取消活动报名接口", notes = "取消活动报名接口")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    public ResponseBean cancelSignActivity(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getUserVerifyId();
+        
+        ResponseBean responseBean = new ResponseBean();
+        
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+        //取消报名
+        responseBean = socialServiceI.cancelSignActivity(activityId, communityId, userId);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "修改活动报名接口", notes = "修改活动报名接口")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "remark", value = "活动备注"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    public ResponseBean updateSignActivity(@PathVariable(value = "communityId") Integer communityId,
+                                     @RequestParam(value = "remark", required = false) String remark,
+                                     @RequestParam("activityId") Integer activityId,
+                                     HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getUserVerifyId();
+
+        ResponseBean responseBean = new ResponseBean();
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.updateActivtiySignUp(activityId, communityId, userId,remark);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "查看 活动报名情况", notes = "查看 活动报名情")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    public ResponseBean getSignActivityUp(@PathVariable(value = "communityId") Integer communityId,
+                                           @RequestParam("activityId") Integer activityId,
+                                           HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getUserVerifyId();
+
+        ResponseBean responseBean = new ResponseBean();
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.getActivtiySignUp(activityId, communityId, userId);
+        return responseBean;
+    }
+
+
+
+
+
+    @ApiOperation(value = "按小区获取分页公告列表", notes = "按小区获取分页公告列表,公告标题模糊查询")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "公告标题"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+    @RequestMapping(value = "/announcements/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getAnnouncements(@PathVariable Integer communityId,
+                                         @RequestParam(required = false) String title,
+                                         @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        ResponseBean announcementList = socialServiceI.getAnnouncements(communityId, title, pageNum, pageSize);
+        return announcementList;
+    }
+
+    @ApiOperation(value = "获取公告轮播图", notes = "获取公告轮播图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区id")
+    })
+    @RequestMapping(value = "/announcement/Img/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getAnnouncement(@PathVariable(value = "communityId") Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        List<TpAnnouncement> agreement = socialServiceI.getAnnouncement(communityId);
+        responseBean.addSuccess(agreement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取活动轮播图", notes = "获取活动轮播图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区id")
+    })
+    @RequestMapping(value = "/activity/Img/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getActivity(@PathVariable(value = "communityId") Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        List<TpActivity> agreement = socialServiceI.getActivity(communityId);
+        responseBean.addSuccess(agreement);
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "按小区获取分页活动列表", notes = "按小区获取分页活动列表,公告标题模糊查询")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "活动标题"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+    @RequestMapping(value = "/activitys/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getActivitys(@PathVariable Integer communityId,
+                                     @RequestParam(required = false) String title,
+                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        ResponseBean activityList = socialServiceI.getActivitys(communityId, title, pageNum, pageSize);
+        return activityList;
+    }
+
+    @ApiOperation(value = "论坛活动帖子详情", notes = "获取论坛活动帖子详情")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    @RequestMapping(value = "/activity/{communityId}", method = RequestMethod.GET)
+    public ResponseBean findActivityDetail(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        TpActivity activity = socialServiceI.findActivityDetail(activityId, communityId, userElement);
+        responseBean.addSuccess(activity);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "二手租赁详情", notes = "二手租赁详情")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "帖子id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    @RequestMapping(value = "/getTransaction/{communityId}", method = RequestMethod.GET)
+    public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getUserVerifyId();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        TpTransaction activity = socialServiceI.findUsedDetails(activityId, communityId, userId);
+        if (null != activity ){
+            responseBean.addSuccess(activity);
+        }else {
+            responseBean.addError("此用户已被删除");
+        }
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "查询二手租赁回复", notes = "查询二手租赁回复")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "transactionId", value = "帖子id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "type", value = "0:和我相关，1:楼主，2:物业"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "一页多少行"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "order", value = "asc 正序(默认), desc倒序")
+    })
+    @RequestMapping(value = "/getTransactionReply", method = RequestMethod.GET)
+    public ResponseBean findUsedDetailsReply(@RequestParam("transactionId") Integer transactionId,
+                                             @RequestParam(value = "order", defaultValue = "asc") String order,
+                                             @RequestParam(value = "type",required = false) Integer type,
+                                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                             HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        if (!check(userElement.getCommunityId())) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.findUsedDetailsReply(transactionId, userElement, order, pageNum, pageSize,type);
+        return responseBean;
+    }
+
+
+
+    @ApiOperation(value = "获取所有的二手租赁帖子", notes = "获取所有的二手租赁帖子")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型0 代表 议事大厅 1 是邻里互助 2 是二手/租赁 3 是其他话题"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "帖子标题"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")}
+    )
+    @RequestMapping(value = "/getTransactions/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getAllPosts(@PathVariable("communityId") Integer communityId,
+                                    @RequestParam(value = "type", required = false) String type,
+                                    @RequestParam(value = "transactionTitle",required = false) String transactionTitle,
+                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        ResponseBean tpTransactions = socialServiceI.findAllTransaction(communityId, transactionTitle,type, pageNum, pageSize);
+        return tpTransactions;
+    }
+
+    @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0议事大厅,1是邻里互助 ,2是二手/租赁,3其它话题"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session)throws IOException{
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.addAllTransaction(userElement, paramets);
+        return response;
+    }
+    
+    @ApiOperation(value = "举报二手交易帖子", notes = "举报二手交易帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="transactionId:二手交易帖子id, reportReasonId:举报原因id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/transaction/report/{communityId}", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBean reportTransaction(@PathVariable("communityId") Integer communityId,@RequestBody String paramets, HttpSession session)throws IOException{
+        
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userVerifyId = userElement.getUserVerifyId();
+        ResponseBean response = socialServiceI.reportTransaction(userVerifyId, communityId,paramets);
+        return response;
+    }
+
+    @ApiOperation(value = "获取我发布所有二手租赁帖子", notes = "获取我发布所有二手租赁帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/selectAllTransaction", method = RequestMethod.GET)
+    public ResponseBean selectAllTransaction(HttpSession session,
+                                             @RequestParam(value = "type",required = false) Integer type,
+                                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.selectAllTransaction(userElement, pageNum, pageSize,type);
+        return response;
+    }
+
+    @ApiOperation(value = "修改二手租赁帖子", notes = "修改二手租赁帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "imageUrl:图片url,transactionTitle:小区标题，transactionContent：小区内容"),
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "id", value = "id:帖子id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/updateTransaction/{id}", method = RequestMethod.PUT)
+    public ResponseBean ubdateTransaction(HttpSession session,@PathVariable("id") String id, @RequestBody String paramets) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.updateTransaction(paramets,userElement,Integer.valueOf(id));
+        return response;
+    }
+
+    @ApiOperation(value = "删除二手租赁帖子", notes = "删除二手租赁帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "id", value = "id:帖子id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/deleteTransaction/{id}", method = RequestMethod.DELETE)
+    public ResponseBean deleteTransaction(HttpSession session, @PathVariable("id") String id) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        ResponseBean response = socialServiceI.deleteransaction(Integer.valueOf(id),userElement);
+        return response;
+    }
+
+
+    @ApiOperation(value = "评价工单内容以及评分", notes = "评价工单内容以及评分")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(name = "parameter", value = "score 评分, comment 评语 ", required = true, dataType = "String"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "工单Id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    @RequestMapping(value = "/accessTicket/{communityId}", method = RequestMethod.POST)
+    public ResponseBean accessTicket(@PathVariable("communityId") Integer communityId, @RequestBody String parameter, @RequestParam("ticketId") String ticketId, HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getUserVerifyId();
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        TpTicket tpTicket = JSONObject.parseObject(parameter,TpTicket.class);
+        socialServiceI.accessTicket(communityId, tpTicket, ticketId, userId);
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "获取举报原因列表", notes = "获取举报原因列表")
+    @RequestMapping(value = "/reports", method = RequestMethod.GET)
+    public ResponseBean getReportReasons() {
+        ResponseBean responseBean = new ResponseBean();
+        List<Map<String,Object>> reportList = socialServiceI.getReportReasons();
+        responseBean.addSuccess(reportList);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "二手帖子对话", notes = "二手帖子对话")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "transactionId:当前帖子ID,replyContent:回复内容，replyId：被回复的评论ID，imgArr:可多张[],state:1,此参数用于判断是否是物业"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/addTransactionReply", method = RequestMethod.POST)
+    public ResponseBean addTransactionReply(HttpSession session, @RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.addTransactionReply(paramets,userElement);
+        return response;
+    }
+
+    @ApiOperation(value = "添加点赞", notes = "添加点赞")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "transactionId:当前帖子ID，likeStatus：1是喜欢 2是不喜欢"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/addTransactionLike", method = RequestMethod.POST)
+    public ResponseBean  addTransactionLike(HttpSession session, @RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.addTransactionLike(paramets,userElement);
+        return response;
+    }
+
+    @ApiOperation(value = "我参加的所有活动", notes = "我参加的所有活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+    })
+    @RequestMapping(value = "/user/activitlist", method = RequestMethod.GET)
+    public ResponseBean  userActivityList(HttpSession session,
+                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.userActivityList(userElement,pageNum,pageSize);
+        return response;
+    }
+
+    @ApiOperation(value = "我参加的话题", notes = "我参加的话题")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+    })
+    @RequestMapping(value = "/user/transactionList", method = RequestMethod.GET)
+    public ResponseBean  userTransactionList(HttpSession session,
+                                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.userTransactionList(userElement,pageNum,pageSize);
+        return response;
+    }
+
+    @ApiOperation(value = "签到扫码", notes = "签到扫码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value = "activityId:活动id"),
+    })
+
+    @RequestMapping(value = "/tpactivitysignin/add", method = RequestMethod.POST)
+    public ResponseBean  tpActivitySignInAdd(HttpSession session,@RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.tpActivitySignInAdd(paramets,userElement);
+        return response;
+    }
+
+    @ApiOperation(value = "回复对话", notes = "回复对话")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "transactionId:帖子ID,replyContent:回复内容，replyUserId：被回复的用户ID，imgArr:可多张[]"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/replyAdd", method = RequestMethod.POST)
+    public ResponseBean replyAdd(HttpSession session, @RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean replyAdd = socialServiceI.replyAdd(paramets,userElement);
+        return replyAdd;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/TaVersionController.java

@@ -0,0 +1,46 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.TaVersionServicel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fuxingfan
+ * creat_time: 2019/5/9
+ **/
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "版本相关的API", description = "版本相关的API")
+public class TaVersionController extends BaseController {
+
+
+    @Autowired
+    private TaVersionServicel taVersionService;
+
+
+    @ApiOperation(value = "获取APP版本号并对比", notes = "获取APP版本号并对比")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "type",value = "ios/android"),
+    })
+    @RequestMapping(value = "/version/{type}",method = RequestMethod.GET)
+    public ResponseBean getVersion(@PathVariable String type, HttpSession session){
+        ResponseBean responseBean = taVersionService.getVersion(type);
+        return responseBean;
+    }
+}

app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -0,0 +1,229 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TpTicket;
+import com.community.huiju.model.TpTransaction;
+import com.community.huiju.model.TpTicketRecordComment;
+import com.community.huiju.service.AgreementServicel;
+import com.community.huiju.service.ITicketService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Example;
+import io.swagger.annotations.ExampleProperty;
+import lombok.val;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "工单相关的API",description = "工单相关的API")
+public class TicketController extends BaseController {
+
+    @Autowired
+    private ITicketService iTicketService;
+
+    @Autowired
+    private AgreementServicel agreementServicel;
+
+    @RequestMapping(value = "/tickets/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据", notes = "根据 小区编号,第几页,一页多少行")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @Deprecated
+    public ResponseBean getService(@PathVariable(value = "communityId") Integer communityId,
+                                   @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize,
+                                   HttpSession session) {
+        ResponseBean response = new ResponseBean();
+
+        if (!check(communityId)) {
+            response.addError("小区不存在");
+            return response;
+        }
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        TpTicket tpTicket = new TpTicket();
+        tpTicket.setCommunityId(Integer.valueOf(communityId));
+        tpTicket.setTaUserId(userElement.getId());
+
+        response = iTicketService.getList(tpTicket, pageNum, pageSize);
+        return response;
+    }
+
+    @ApiOperation(value = "获取报修/投诉/联系单进度详情数据", notes = "获取报修/投诉/联系单进度详情数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "communityId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "ticketId", value = "报修id")
+    })
+    @RequestMapping(value = "/ticket/schedule/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getTicketSchedule(@PathVariable(value = "communityId") Integer communityId, @RequestParam Integer ticketId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        TpTicket ticket = iTicketService.getTicketSchedule(String.valueOf(communityId), ticketId);
+        if (null != ticket) {
+            responseBean.addSuccess(ticket);
+        }else {
+            responseBean.addError("没有该工单!");
+        }
+
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/tickets/list/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 报修/投诉/联系单 数据列表", notes = "根据 小区编号,工单类型,第几页,一页多少行")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "type", value = "工单类型 (1：投诉   2：报修 3：联系物业)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+
+    })
+    public ResponseBean getServiceList(@PathVariable(value = "communityId") Integer communityId,
+                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "type") String type,
+                                       HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        TpTicket tpTicket = new TpTicket();
+        tpTicket.setCommunityId(Integer.valueOf(communityId));
+        tpTicket.setTaUserId(userElement.getUserVerifyId());
+        tpTicket.setType(type);
+
+        responseBean = iTicketService.getByTypeList(tpTicket, pageNum, pageSize);
+
+        return responseBean;
+
+    }
+
+    @ApiOperation(value = "回复 报修/投诉/联系单 追问接口", notes = "回复 报修/投诉/联系单 追问接口")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数(ticketId:工单id,content:回复时间,ticketRecordCommentId:需要回复的id)", paramType = "body"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    @RequestMapping(value = "/ticket/reply/{communityId}", method = RequestMethod.POST)
+    public ResponseBean updateTicketsReply(@PathVariable(value = "communityId") Integer communityId, @RequestBody TpTicketRecordComment tpTicketRecordComment,HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        tpTicketRecordComment.setCommunityId(communityId);
+        Integer size = iTicketService.updateTicketsReply(tpTicketRecordComment, userId);
+        if (size > 0){
+            responseBean.addSuccess(size);
+        } else {
+            responseBean.addError("更新失败");
+        }
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加 报修/投诉/联系单", notes = "添加 报修/投诉/联系单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "ticketTitle:工单标题,ticketContent:工单内容，type: 1：投诉   2：报修 3：联系物业 , repairType：0:公共区域  1: 房屋质量  2:户内设施, imageUrl:图片地址 "),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/addtpTicket", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) throws IOException {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = iTicketService.addAiTicketService(userElement, paramets);
+        return response;
+    }
+
+    @ApiOperation(value = "物业，门卫，领导电话", notes = "物业，门卫，领导电话")
+    @RequestMapping(value = "/allTpAnnouncementTel", method = RequestMethod.GET)
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "communityId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    public ResponseBean getTpAnnouncementTel(HttpSession session,
+                                             @RequestParam(value = "communityId",required = false) Integer communityId) {
+        UserElement userElement = getUserElement(session);
+        userElement.setCommunityId(userElement.getCommunityId() == null?communityId:userElement.getCommunityId());
+        ResponseBean agreement = agreementServicel.getTpAnnouncementTel(userElement);
+        return agreement;
+    }
+
+    @ApiOperation(value = "修改 报修/投诉/联系单", notes = "修改 报修/投诉/联系单")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "工单Id"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value =
+                    "ticketTitle:工单标题,ticketContent:工单内容，type: 1：投诉   2：报修 3：联系物业 , imageUrl:图片地址 "),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/updateTicket/{ticketId}", method = RequestMethod.POST)
+    public ResponseBean updateTicketContent(@PathVariable("ticketId") Integer ticketId,
+                                            @RequestBody String parameter,
+                                            HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        responseBean = iTicketService.updateTicketContent(ticketId, parameter,userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "报修进度终止", notes = "报修进度终止")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "帖子Id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    @RequestMapping(value = "/stopTicket/{communityId}", method = RequestMethod.GET)
+    public ResponseBean stopTicket(@PathVariable("communityId") Integer communityId, @RequestParam("ticketId") Integer ticketId, HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        ResponseBean responseBean = new ResponseBean();
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = iTicketService.stopTpTicketRecord(communityId, ticketId, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加工单对话", notes = "添加工单对话")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:对话内容，imageUrl:[]图片,ticketId:工单id，" )
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/addRecordComment", method = RequestMethod.POST)
+    public ResponseBean addRecordComment(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean  responseBean = iTicketService.addRecordComment(parameter,userElement.getUserVerifyId(),userElement.getCommunityId(),userElement.getUserName());
+        return responseBean;
+    }
+}
+
+

app-api/src/main/java/com/community/huiju/controller/TpHotelController.java

@@ -0,0 +1,61 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.TpHotelServicel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+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.HttpSession;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/5/9
+ **/
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "酒店相关的API", description = "酒店相关的API")
+public class TpHotelController extends BaseController {
+
+
+    @Autowired
+    private TpHotelServicel tpHotelServicel;
+
+
+    @ApiOperation(value = "获取本小区酒店", notes = "获取本小区酒店")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/hotel",method = RequestMethod.GET)
+    public Object getHotel(HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = tpHotelServicel.getHotel(userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "当前小区酒店是否需要展示", notes = "当前小区酒店是否需要展示")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/CommunityHotel",method = RequestMethod.GET)
+    public Object getHotelCommunity(HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = tpHotelServicel.getHotelCommunity(userElement);
+        return responseBean;
+    }
+
+
+}

app-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java

@@ -0,0 +1,79 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.TpRentalHouseServicel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/5/9
+ **/
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "长租公寓相关的API", description = "长租公寓相关的API")
+public class TpRentalHouseController extends BaseController{
+
+    @Autowired
+    private TpRentalHouseServicel tpRentalHouseServicel;
+
+    @ApiOperation(value = "长租公寓接口", notes = "长租公寓接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "houseName",value = "商圈或者小区"),
+            @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "rentalTypeValue",value = "1:是整租 2:是合租 3:不限"),
+            @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "houseTypeValue",value = "1:一室居 2:二室居 3:三室局 4:四室居及以上 5:不限"),
+            @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "rentalPriceValue",value = "1:1000以内 2:1000-1500 3:1500-2000 4:2000-3000 5:3000-4000 6:4000以上 7:不限"),
+            @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "priceFluctuateValue",value = "1:价格由低到高 2:价格由高到低  3:默认排序" ),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "communityId",value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据")
+    })
+    @RequestMapping(value = "/rentalhouse",method = RequestMethod.GET)
+    public Object getRentalHouse(HttpSession session,
+                                    @RequestParam(value = "houseName",required = false ) String houseName,
+                                    @RequestParam(value = "rentalTypeValue",required = false) Integer rentalTypeValue,
+                                    @RequestParam(value = "houseTypeValue",required = false) Integer houseTypeValue,
+                                    @RequestParam(value = "rentalPriceValue",required = false) Integer rentalPriceValue,
+                                    @RequestParam(value = "priceFluctuateValue",required = false) Integer priceFluctuateValue,
+                                 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = tpRentalHouseServicel.getRentalHouse(userElement,houseName,rentalTypeValue,houseTypeValue,rentalPriceValue,priceFluctuateValue,pageNum,pageSize);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "长租公寓详情", notes = "长租公寓详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "path",dataTypeClass = Integer.class,name = "id",value = "出租房ID"),
+    })
+    @RequestMapping(value = "/rentalhouse/details/{id}",method = RequestMethod.GET)
+    public Object getRentalHouseDetails(HttpSession session,
+                                        @PathVariable("id") String id){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = tpRentalHouseServicel.getRentalHouseDetails(userElement,id);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "长租公寓数据字典", notes = "长租公寓数据字典")
+    @RequestMapping(value = "/rentalhouse/dictionaries",method = RequestMethod.GET)
+    public Object getRentalHousedictionaries(){
+        ResponseBean responseBean = tpRentalHouseServicel.getRentalHouseDictionaries();
+        return responseBean;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/TpShopController.java

@@ -0,0 +1,109 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TpShop;
+import com.community.huiju.service.TpShopServicel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/5/10
+ **/
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "线下商铺的API", description = "线下商铺的API")
+public class TpShopController extends BaseController{
+    @Autowired
+    private TpShopServicel tpShopServicel;
+
+    @ApiOperation(value = "获取所有线下商铺", notes = "获取所有线下商铺")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "shopName",value = "搜所名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "tpShopTypeId",value = "商铺类型"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+    })
+    @RequestMapping(value = "/shop",method = RequestMethod.GET)
+    public Object getShop(HttpSession session,
+                          @RequestParam(value = "shopName",required = false ) String houseName,
+                          @RequestParam(value = "tpShopTypeId",required = false ) Integer tpShopTypeId,
+                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = tpShopServicel.getShop(userElement,houseName,tpShopTypeId,pageNum,pageSize);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取线下商铺详情", notes = "获取线下商铺详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "path",dataType = "integer",name = "id",value = "商铺ID"),
+    })
+    @RequestMapping(value = "/shop/details/{id}",method = RequestMethod.GET)
+    public Object getShopDetails(HttpSession session,
+                                 @PathVariable("id") String id){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = tpShopServicel.getShopDetails(userElement,Integer.valueOf(id));
+        return responseBean;
+    }
+
+    @ApiOperation(value = "首页商铺信息", notes = "首页商铺信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/getShopCommunity",method = RequestMethod.GET)
+    public Object getShopCommunity(HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = tpShopServicel.getShopCommunity(userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "线下商铺评论列表", notes = "线下商铺评论列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "shopID", value ="shopID:商铺ID"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+    })
+    @RequestMapping(value = "/shopEvaluate/{shopID}", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseBean shopEvaluate(HttpSession session,
+                                     @PathVariable("shopID") Integer shopID,
+                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "9999") Integer pageSize){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = new ResponseBean();
+        ResponseBean response = tpShopServicel.shopEvaluate(shopID,userElement,pageNum,pageSize);
+        return response;
+    }
+
+    @ApiOperation(value = "线下商铺评论", notes = "线下商铺评论")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="shopID:商铺ID,score:评分0-5,content:评价内容"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/shopEvaluateAdd", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBean shopEvaluateAdd(@RequestBody String paramets,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean response = tpShopServicel.shopEvaluateAdd(paramets,userElement);
+        return response;
+    }
+
+
+}

app-api/src/main/java/com/community/huiju/controller/TpTicketAndTransactionController.java

@@ -0,0 +1,193 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TpTransactionMapper;
+import com.community.huiju.dao.TpUserMapper;
+import com.community.huiju.model.TpTransaction;
+import com.community.huiju.model.TpUser;
+import com.community.huiju.service.SocialServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "物业端的帖子和工单", description = "物业端的帖子和工单")
+public class TpTicketAndTransactionController {
+    @Autowired
+    private SocialServiceI socialServiceI;
+
+    @Autowired
+    private TpUserMapper tpUserMapper;
+
+    @ApiOperation(value = "app端话题管理", notes = "app端话题管理")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "loginName",value = "电话号码"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "status",value = "1:被举报话题,2:未读话题,3:已读话题"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "transactionTitle",value = "话题搜索"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "communityId",value = "小区"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
+    })
+    @RequestMapping(value = "/transactionsManageList/{loginName}",method = RequestMethod.GET)
+    public ResponseBean tpTransactionManageList(@PathVariable(value = "loginName") String loginName,
+                                   @RequestParam(value = "status") Integer status,
+                                   @RequestParam(value = "transactionTitle", required = false) String transactionTitle,
+                                   @RequestParam(value = "communityId", required = false) Integer communityId,
+                                   @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "9999") Integer pageSize) {
+       ResponseBean tpTransactionManageList= socialServiceI.tpTransactionManageList(loginName,status,pageNum,pageSize,transactionTitle,communityId);
+       return tpTransactionManageList;
+    }
+
+    @ApiOperation(value = "app端话题管理批量作废话题",nickname ="app端话题管理批量作废话题")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个),loginName:电话号码,communityId:小区")})
+    @RequestMapping(value="/transactions/delete",method = RequestMethod.POST)
+    public ResponseBean transactionsDelete(@RequestBody String paramets){
+        ResponseBean  transactionsUpdata= socialServiceI.transactionsDelete(paramets);
+        return transactionsUpdata;
+    }
+
+    @ApiOperation(value = "app端话题管理清除不实举报",nickname ="app端话题管理清除不实举报")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个),loginName:电话号码,communityId:小区")})
+    @RequestMapping(value="/tpTransactionReport/delete",method = RequestMethod.POST)
+    public ResponseBean tpTransactionReportDelete(@RequestBody String paramets){
+        ResponseBean  transactionsUpdata= socialServiceI.tpTransactionReportDelete(paramets);
+        return transactionsUpdata;
+    }
+
+    @ApiOperation(value = "app端话题管理添加话题",nickname ="app端话题管理添加话题")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="loginName:电话,communityId:小区ID，transactionTitle:话题标题，" +
+                    "type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})
+    @RequestMapping(value="/transactions/add",method = RequestMethod.POST)
+    public ResponseBean transactionsAdd(@RequestBody String paramets){
+        ResponseBean  addAnnouncement= socialServiceI.transactionsAdd(paramets);
+        return addAnnouncement;
+    }
+
+    @ApiOperation(value = "app端话题管理批量已读话题",nickname ="app端话题管理批量已读话题")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个),loginName:电话号码,communityId:小区")})
+    @RequestMapping(value="/transactions/read",method = RequestMethod.POST)
+    public ResponseBean transactionsRead(@RequestBody String paramets){
+        ResponseBean  transactionsUpdata= socialServiceI.transactionsRead(paramets);
+        return transactionsUpdata;
+    }
+
+    @ApiOperation(value = "app端工单管理列表", notes = "app端工单管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "loginName",value = "电话号码"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "status",value = "0:待分配,3正在处理，9:其他状态"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "communityId",value = "小区"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
+    })
+    @RequestMapping(value = "/tpTicketManageList/{loginName}",method = RequestMethod.GET)
+    public ResponseBean tpTicketManageList(@PathVariable(value = "loginName") String loginName,
+                                                @RequestParam(value = "status") Integer status,
+                                                @RequestParam(value = "communityId") Integer communityId,
+                                                @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "9999") Integer pageSize) {
+        ResponseBean tpTicketManageList= socialServiceI.tpTicketManageList(loginName,status,pageNum,pageSize,communityId);
+        return tpTicketManageList;
+    }
+
+    @ApiOperation(value = "app端工单管理详情", notes = "app端工单管理列表详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "tickedID",value = "工单ID"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginName",value = "电话号码"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "communityId",value = "小区")
+    })
+    @RequestMapping(value = "/tpTicketManage/{tickedID}",method = RequestMethod.GET)
+    public ResponseBean tpTicketManageDetails(@PathVariable(value = "tickedID") Integer tickedID,
+                                              @RequestParam(value = "communityId") Integer communityId,
+                                              @RequestParam(value = "loginName") String loginName) {
+        ResponseBean tpTicketManageDetails= socialServiceI.tpTicketManageDetails(tickedID,communityId,loginName);
+        return tpTicketManageDetails;
+    }
+
+    @ApiOperation(value = "app端工单管理回复业主", notes = "app端工单管理回复业主")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName:手机号,communityId:小区,content:对话内容，imageUrl:[]图片,ticketId:工单id，" +
+                    "status:工单状态（0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止）")
+    })
+    @RequestMapping(value = "/tpTicketManage/reply",method = RequestMethod.POST)
+    public ResponseBean tpTicketManageReply(@RequestBody String parameter) {
+        ResponseBean tpTicketManageReply= socialServiceI.tpTicketManageReply(parameter);
+        return tpTicketManageReply;
+    }
+
+    @ApiOperation(value = "app端工单管理受理分配", notes = "app端工单管理受理分配")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName:手机号,communityId:小区,ticketId:工单id，" +
+                    "id:当前处理人id")
+    })
+    @RequestMapping(value = "/ticketManage/addRecord", method = RequestMethod.POST)
+    public ResponseBean ticketManageRecord(@RequestBody String parameter){
+        ResponseBean  responseBean = socialServiceI.ticketManageRecord(parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "app端工单管理拒绝处理", notes = "app端工单管理拒绝处理")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName:手机号,communityId:小区,ticketId:工单id,textContent:拒绝的内容" )
+    })
+    @RequestMapping(value = "/updateTicketStatus", method = RequestMethod.POST)
+    public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpSession session){
+        ResponseBean  responseBean = socialServiceI.updateTicketStatus(parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "app端工单管理处理完成", notes = "app端工单管理处理完成")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName:手机号,communityId:小区,content:对话内容，imageUrl:[]图片,ticketId:工单id" )
+    })
+    @RequestMapping(value = "/updateTicket", method = RequestMethod.POST)
+    public ResponseBean updateTicket(@RequestBody String parameter){
+        ResponseBean  responseBean = socialServiceI.updateTicket(parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "app端话题管理话题详情", notes = "app端话题管理话题详情")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "帖子id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "loginName", value = "手机号"),
+    })
+    @RequestMapping(value = "/getTransactionManage/{communityId}", method = RequestMethod.GET)
+    public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId,@RequestParam("loginName") String loginName) {
+        ResponseBean responseBean = new ResponseBean();
+        TpUser tpUser= tpUserMapper.selectLoginName(loginName,communityId);
+        TpTransaction activity = socialServiceI.findUsedDetails(activityId, communityId, tpUser.getId());
+        responseBean.addSuccess(activity);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "app端个人中心话题管和工单管理是否展示", notes = "app端个人中心话题管和工单管理是否展示")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "loginName", value = "手机号"),
+    })
+    @RequestMapping(value = "/accessAuthority/{communityId}", method = RequestMethod.GET)
+    public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId,@RequestParam("loginName") String loginName) {
+        ResponseBean responseBean = new ResponseBean();
+        TpUser tpUser= tpUserMapper.selectLoginName(loginName,communityId);
+         if (null == tpUser){
+             responseBean.addError("此号码无权限");
+             return responseBean;
+         }
+             responseBean.addSuccess("成功");
+        return responseBean;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -0,0 +1,417 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.code.cache.AppkeyCache;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TpTicket;
+import com.community.huiju.service.ITaUserService;
+import com.community.huiju.vo.TaUserVO;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.catalina.User;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpSession;
+import javax.xml.crypto.dsig.keyinfo.PGPData;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户控制器
+ * @author weiximei
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "用户相关操作的API",description = "用户相关操作的API")
+public class UserController extends BaseController {
+
+    @Autowired
+    private ITaUserService iTaUserService;
+
+    @ApiOperation(value = "登录", notes = "根据登录名和验证码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName(登陆名(手机号)) code(验证码)")
+    })
+    @RequestMapping(value = "/user/login",method = RequestMethod.POST)
+    public ResponseBean login(@RequestBody String parameter,
+                              HttpSession session){
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),jsonObject.getString("code"), session);
+        TaUserVO userVO = (TaUserVO) responseBean.getData();
+        if (null != userVO) {
+            setUserElement(userVO, session);
+        }
+        return responseBean;
+
+    }
+
+    @ApiOperation(value = "注册", notes = "注册")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户姓名;idCard身份证;gender性别(1：男  2：女);loginName手机号;code验证码")
+    })
+    @RequestMapping(value = "/user/register",method = RequestMethod.POST)
+    public ResponseBean register(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.register(parameter, true);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "登录 绑定 房产", notes = "绑定选中的当前房产，进行登录 (在APP登录后，选择房产的时候)，还可以用于切换房产登录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataTypeClass = String.class, name = "userVerifyId",value = "审核 id"),
+            @ApiImplicitParam(paramType = "header",dataTypeClass = String.class, name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/user/binding/login/{userVerifyId}",method = RequestMethod.POST)
+    public ResponseBean login(@PathVariable("userVerifyId") Integer userVerifyId,
+                              HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iTaUserService.bindingLoginAndHouse(userElement, userVerifyId);
+        TaUserVO userVO = (TaUserVO) responseBean.getData();
+        if (null != userVO) {
+            setUserElement(userVO, session);
+        }
+        return responseBean;
+
+    }
+
+    @ApiOperation(value = "修改手机号", notes = "修改手机号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+            @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)
+    public ResponseBean update(@RequestBody String paramets, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        ResponseBean response=iTaUserService.updateLoginName(userElement, paramets);
+        return response;
+    }
+
+    @ApiOperation(value = "查看房屋成员列表", notes = "查看房屋成员列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/roomUserList", method = RequestMethod.GET)
+    public ResponseBean accessTicket(HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserService.getAllRoomUserList(userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改用户名和性别和身份证", notes = "修改用户名和性别和身份证")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户民和gender性别和idCard身份证"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/user/update/info",method = RequestMethod.PUT)
+    public ResponseBean updateUserNameAndGender(@RequestBody String parameter,
+                                                HttpSession session){
+        ResponseBean response = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("userName", jsonObject.getString("userName"));
+        map.put("gender", jsonObject.getString("gender"));
+        map.put("idCard", jsonObject.getString("idCard"));
+        response = iTaUserService.modifyUser(userElement, JSONObject.toJSONString(map));
+        return response;
+
+    }
+
+    @ApiOperation(value = "租客或家属 启用或者停用", notes = "租客或家属 启用或者停用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userId(租客或者家属) type(1启用 0停用)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/user/dependentsOrTenants",method = RequestMethod.PUT)
+    @Deprecated
+    public ResponseBean updateDependentsOrTenants(@RequestBody String parameter,
+                                                HttpSession session){
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        response = iTaUserService.startOrEndUsingUser(userElement.getId(),jsonObject.getInteger("userId"),jsonObject.getInteger("type"));
+
+        return response;
+
+    }
+
+
+    @ApiOperation(value = "业主添加 租客或家属", notes = "业主添加 租客或家属")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName(租客或者家属 姓名) " +
+                    "loginName(租客或者家属 手机号) " +
+                    "gender(租客或者家属 性别 1男 2女) " +
+                    "roleName(TENANT 租客 RELATION 家属)" +
+                    "idCard(身份证号)" +
+                    "code(验证码)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/addTenantsOrDependents",method = RequestMethod.POST)
+    public ResponseBean addTenantsOrDependents(@RequestBody String parameter,
+                                               HttpSession session){
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = getUserElement(session);
+        response = iTaUserService.addTenantsOrDependents(userElement, parameter);
+        return response;
+
+    }
+
+
+    @ApiOperation(value = "业主修改 租客或家属", notes = "业主修改 租客或家属")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id(租客或者家属 ID) userName(租客或者家属 姓名) " +
+                    "phone(租客或者家属 手机号) " +
+                    "gender(租客或者家属 性别 1男 2女) " +
+                    "type(2租客 3家属)" +
+                    "idCard(身份证号)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/updateTenantsOrDependents",method = RequestMethod.POST)
+    @Deprecated
+    public ResponseBean updateTenantsOrDependents(@RequestBody String parameter,
+                                               HttpSession session){
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        response = iTaUserService.updateTenantsOrDependents(jsonObject.getString("userName"),
+                jsonObject.getString("phone"),jsonObject.getString("gender"),
+                userElement.getId(),
+                jsonObject.getInteger("type"),
+                jsonObject.getInteger("id"),
+                jsonObject.getString("idCard"));
+
+        return response;
+
+    }
+
+
+
+    @ApiOperation(value = "修改用户头像", notes = "修改用户头像")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "headPortrait(用户头像)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/modifyUserHeadPortrait",method = RequestMethod.PUT)
+    public ResponseBean modifyUserHeadPortrait(@RequestBody String parameter,
+                                               HttpSession session){
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        ResponseBean response = iTaUserService.modifyUserHeadPortrait(userElement.getId(),jsonObject.getString("headPortrait"));
+
+        return response;
+
+    }
+
+    @ApiOperation(value = "获取用户信息", notes = "获取用户信息, 携带userId表示查询租客或者家属")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "userId",value = "租客或者家属的ID(可选值)"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "userVerifyId",value = "审核id，只有在 userId 参数生效才有效")
+    })
+    @RequestMapping(value = "/user/info",method = RequestMethod.GET)
+    public ResponseBean getUserInfo(@RequestParam(value = "userId",required = false) Integer userId, @RequestParam(value = "userVerifyId", required = false) Integer userVerifyId,
+                                    HttpSession session){
+        ResponseBean response = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        response = iTaUserService.getUserInfo(userElement,userId, userVerifyId, session);
+        Object data = response.getData();
+        if ("1".equals(response.getCode()) && null == data) {
+            // 清空 session
+            removeUserElement(session);
+            return response;
+        }
+        if (null == userId && null != data && data instanceof TaUserVO) {
+            setUserElement((TaUserVO) data, session);
+        }
+        TaUserVO userVO = (TaUserVO) data;
+        userVO.setToken(session.getId());
+
+        return response;
+
+    }
+
+
+    @ApiOperation(value = "游客登录", notes = "游客登录")
+    @RequestMapping(value = "/user/temporary/{communityId}", method = RequestMethod.POST)
+    public ResponseBean temporaryLogin(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.temporaryLogin(session);
+        TaUserVO userVO = (TaUserVO) responseBean.getData();
+        if (null != userVO) {
+            setUserElement(userVO, session);
+        }
+        return responseBean;
+    }
+
+    @ApiOperation(value = "迎宾系统添加人员", notes = "迎宾系统添加人员")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataTypeClass = String.class, value = "userName人员名称"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/welcome/add", method = RequestMethod.POST)
+    public ResponseBean welcomeAddUser(@RequestParam("userName") String userName, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        TaUser user = new TaUser();
+        user.setUserName(userName);
+        responseBean = iTaUserService.addWelcomeUser(userElement, user);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/has/phone", method = RequestMethod.GET)
+    @ApiOperation(value = "校验 手机号是否注册", notes = "校验 手机号是否注册")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "phone", value = "手机号"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    public ResponseBean hasUserPhone(HttpSession session, @RequestParam("phone") String phone) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserService.hasUserPhoneVerify(phone, userElement);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/tenantAndRelation/delete/{userVerifyId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "业主删除 家属或者租客", notes = "业主删除 家属或者租客")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核 id"),
+            @ApiImplicitParam(paramType = "header",dataTypeClass = String.class,name = "X-Auth-Token",value = "Token")
+    })
+    public ResponseBean deleteTenantAndRelation(HttpSession session, @PathVariable("userVerifyId") Integer userVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserService.deleteTenantAndRelation(userElement, userVerifyId);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取令牌", notes = "获取令牌")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "提供的appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "encrypt加密方式(目前值为md5)"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "phone", value = "手机号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "communityId", value = "提供的小区编号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "生成的签名"),
+    })
+    @RequestMapping(value = "/user/token", method = RequestMethod.GET)
+    public ResponseBean daSuToken(@RequestParam("appid") String appid,
+                                  @RequestParam("datetime") String datetime,
+                                  @RequestParam("encrypt") String encrypt,
+                                  @RequestParam("phone") String phone,
+                                  @RequestParam("communityId") String communityId,
+                                  @RequestParam("sign") String sign,
+                                  HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.daSuToken(appid, datetime, encrypt, communityId, phone, sign, session);
+        Object object = responseBean.getData();
+        if (null != object) {
+            TaUserVO userVO = (TaUserVO) responseBean.getData();
+            if (userVO != null) {
+                setUserElement(userVO, session);
+            }
+        }
+        return responseBean;
+    }
+
+    @ApiOperation(value = "app问题反馈", notes = "app问题反馈")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:问题描述,imageUrl:反馈的图片,taUserTel:反馈人电话"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/addfeedback",method = RequestMethod.POST)
+    public ResponseBean addFeedback(@RequestBody String parameter, HttpSession session){
+        ResponseBean response = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        response = iTaUserService.addFeedback(userElement,parameter);
+        return response;
+
+    }
+
+    @ApiOperation(value = "运营联系电话", notes = "运营联系电话")
+    @RequestMapping(value = "/user/operatetel",method = RequestMethod.GET)
+    public ResponseBean operatetel(){
+        ResponseBean response = new ResponseBean();
+        response = iTaUserService.operatetel();
+        return response;
+
+    }
+
+    @ApiOperation(value = "app问题反馈无关联房产", notes = "app问题反馈无关联房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:问题描述,imageUrl:反馈的图片,taUserTel:反馈人电话"),
+    })
+    @RequestMapping(value = "/user/addfeedback/noproperty",method = RequestMethod.POST)
+    public ResponseBean noProperty(@RequestBody String parameter, HttpSession session){
+        ResponseBean response = new ResponseBean();
+        response = iTaUserService.noProperty(parameter);
+        return response;
+
+    }
+
+    @ApiOperation(value = "app问题反馈历史", notes = "app问题反馈历史")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "taUserTel",value = "taUserTel:反馈人电话"),
+    })
+    @RequestMapping(value = "/user/noPropertyHistory",method = RequestMethod.GET)
+    public ResponseBean propertyHistory(@RequestParam("taUserTel") String taUserTel){
+        ResponseBean response = new ResponseBean();
+        response = iTaUserService.propertyHistory(taUserTel);
+        return response;
+
+    }
+    @ApiOperation(value = "app问题反馈历史详情", notes = "app问题反馈历史详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "id",value = "反馈id"),
+    })
+    @RequestMapping(value = "/user/noPropertyHistory/details/{id}",method = RequestMethod.GET)
+    public ResponseBean propertyHistoryDdetails(@PathVariable("id") Integer id){
+        ResponseBean response = new ResponseBean();
+        response = iTaUserService.propertyHistoryDdetails(id);
+        return response;
+
+    }
+
+    @ApiOperation(value = "获取所有家属", notes = "获取所有家属")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/user/relation/all", method = RequestMethod.GET)
+    public ResponseBean getRelationAll(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserService.getRelationAll(userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "切换户主", notes = "切换户主")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "relationUserVerifyId", value = "被切换的家属房产审核id")
+    })
+    @RequestMapping(value = "/user/switchoverOwner/{relationUserVerifyId}", method = RequestMethod.PUT)
+    public ResponseBean switchoverOwner(HttpSession session, @PathVariable("relationUserVerifyId") Integer relationUserVerifyId) {
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iTaUserService.switchoverOwner(userElement, relationUserVerifyId);
+        return responseBean;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/UserLicenseController.java

@@ -0,0 +1,98 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.ITaUserLicenseOrderService;
+import com.community.huiju.service.ITaUserLicenseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "用户车牌操作的API",description = "用户车牌操作的API")
+public class UserLicenseController extends BaseController {
+
+    @Autowired
+    private ITaUserLicenseService iTaUserLicenseService;
+
+    @Autowired
+    private ITaUserLicenseOrderService iTaUserLicenseOrderService;
+
+    @ApiOperation(value = "关联车牌", notes = "关联车牌")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNo", value = "车牌号"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/license/associated/{carNo}", method = RequestMethod.POST)
+    public ResponseBean associatedLicense(@PathVariable("carNo") String carNo, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserLicenseService.associatedLicense(userElement, carNo);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "用户所有车牌", notes = "用户所有车牌")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/license/user/all", method = RequestMethod.GET)
+    public ResponseBean getAllUserLicense(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserLicenseService.getAllUserLicense(userElement);
+
+        return responseBean;
+    }
+
+    @ApiOperation(value = "用户删除车牌", notes = "用户删除车牌")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "车牌id")
+    })
+    @RequestMapping(value = "/license/user/{id}", method = RequestMethod.DELETE)
+    public ResponseBean deleteUserLicense(@PathVariable("id") Integer id,HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserLicenseService.deleteUserLicense(userElement, id);
+
+        return responseBean;
+    }
+
+    @ApiOperation(value = "用户车辆缴费列表", notes = "用户车辆缴费列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+    })
+    @RequestMapping(value = "/license/user/order", method = RequestMethod.GET)
+    public ResponseBean userLicenseOrder(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserLicenseOrderService.selectRecords(userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取用户车牌信息", notes = "获取用户车牌信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "licenseId", value = "车牌id"),
+    })
+    @RequestMapping(value = "/license/user/{licenseId}", method = RequestMethod.GET)
+    public ResponseBean getUserLicenseAndUserId(HttpSession session, @PathVariable("licenseId") Integer licenseId) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserLicenseService.getUserLicenseAndUserId(userElement, licenseId);
+        return responseBean;
+    }
+
+
+}

app-api/src/main/java/com/community/huiju/controller/UserVerifyController.java

@@ -0,0 +1,119 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.ITaUserService;
+import com.community.huiju.service.TaUserVerifyServicel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * app端用户审核
+ *
+ * @author weiximei
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "app端用户审核表", description = "app端用户审核表")
+public class UserVerifyController extends BaseController {
+
+    @Autowired
+    private TaUserVerifyServicel taUserVerifyServicel;
+
+    @RequestMapping(value = "/user/verify/{userVerifyId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 一个房产信息", notes = "获取 一个房产信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
+    })
+    public ResponseBean getUserVerify(HttpSession session, @PathVariable("userVerifyId") Integer userVerifyId) {
+        ResponseBean responseBean = taUserVerifyServicel.getToAuditNotApproved(userVerifyId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/verify/add", method = RequestMethod.POST)
+    @ApiOperation(value = "添加一个审核的房产", notes = "添加一个审核的房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "communityId小区编号;roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
+    })
+    public ResponseBean addUserVerify(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taUserVerifyServicel.addUserVerify(userElement, parameter);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/verify/delete/{userVerifyId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除一个审核的房产", notes = "删除一个审核的房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id")
+    })
+    public ResponseBean deleteUserVerify(@PathVariable("userVerifyId") Integer userVerifyId, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = taUserVerifyServicel.deleteUserVerify(userVerifyId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/current_user/verify/delete/{userVerifyId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除当前用户 关联的房产", notes = "删除当前用户 关联的房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    public ResponseBean deleteCurrentUserVerify(@PathVariable("userVerifyId") Integer userVerifyId, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taUserVerifyServicel.deleteCurrentUserVerify(userElement, userVerifyId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/verify/list", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 当前用户关联的房产列表", notes = "获取 当前用户关联的房产列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    public ResponseBean getByCurrentUser(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taUserVerifyServicel.getByCurrentUser(userElement);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/user/verify/{userVerifyId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "业主审核用户", notes = "业主审核用户")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "userVerifyStatus审核 1是审核通过   2是审核不通过;remark备注"),
+    })
+    public ResponseBean verifyUser(HttpSession session,
+                                   @PathVariable("userVerifyId") Integer userVerifyId,
+                                   @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = taUserVerifyServicel.verifyUser(userElement, userVerifyId, jsonObject.getString("userVerifyStatus"), jsonObject.getString("remark"));
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/user_verify/add", method = RequestMethod.POST)
+    @ApiOperation(value = "添加一个审核的房产 大苏", notes = "添加一个审核的房产 大苏")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "userId用户编号;communityId小区编号;roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
+    })
+    public ResponseBean addDaSuUserVerify(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = taUserVerifyServicel.addDaSuUserVerify(parameter);
+        return responseBean;
+    }
+
+}

app-api/src/main/java/com/community/huiju/controller/VistorController.java

@@ -0,0 +1,87 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaVisitor;
+import com.community.huiju.service.TaVistorServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: VistorController
+ * @Description: 访客相关API
+ * @date 2018/11/1
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "访客相关的API", description = "访客相关的API")
+public class VistorController extends BaseController {
+
+    @Autowired
+    private TaVistorServiceI vistorServiceI;
+
+    @RequestMapping(value = "/vistorDetail/{communityId}", method = RequestMethod.POST)
+    @ApiOperation(value = "创建访客", notes = "创建访客")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value = "carLicense:车牌(数组),drivingStatus:0 是不开车 1是开车," +
+                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStartTime:访问人开始时间,visitorEndTime:访问人结束时间,payEntity:支付方式(owmer是由我承担  visitor是访客承担)")})
+    public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        UserElement userElement = getUserElement(session);
+        TaVisitor taVisitor = JSONObject.parseObject(parameter,TaVisitor.class);
+        responseBean = vistorServiceI.insertTaVistor(taVisitor, userElement);
+        return  responseBean;
+    }
+
+    @RequestMapping(value = "/invateVistorHis/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "邀请历史", notes = "邀请历史")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id")})
+    public ResponseBean invateHis(@PathVariable("communityId")Integer communityId, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        responseBean = vistorServiceI.invateHis(userElement);
+        return  responseBean;
+    }
+
+    @ApiOperation(value = "查询是否开启了访客邀请的车辆", notes = "查询是否开启了访客邀请的车辆")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/invate_license/bool", method = RequestMethod.GET)
+    public ResponseBean invateBool(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = vistorServiceI.invateBool(userElement);
+        return responseBean;
+    }
+
+
+
+}

app-api/src/main/java/com/community/huiju/controller/WxLoginController.java

@@ -0,0 +1,108 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.WxLoginServiceI;
+import com.community.huiju.vo.TaUserVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author FXF
+ * @date 2019-03-29
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "微信登录 API", description = "微信登录 API")
+public class WxLoginController extends BaseController {
+	
+	@Autowired
+	private WxLoginServiceI wxLoginService;
+	
+	/**
+	 * 微信登录
+	 */
+	@RequestMapping(value = "/wxLogin/{wxcode}", method = RequestMethod.POST)
+	public ResponseBean autoLogin(@PathVariable String wxcode, HttpServletRequest request) {
+		ResponseBean responseBean = new ResponseBean();
+		if (StringUtils.isEmpty(wxcode)){
+			responseBean.addError("fail");
+			return responseBean;
+		}
+		//根据wxcode获取openid
+		responseBean = wxLoginService.getOpenidByWxcode(wxcode, request.getSession());
+		Object data = responseBean.getData();
+		if (null != data && data instanceof TaUserVO) {
+			setUserElement((TaUserVO) data, request.getSession());
+		}
+		return responseBean;
+	}
+
+	/**
+	 * 关联微信账号
+	 * @return
+	 */
+	@RequestMapping(value = "/wx/associated", method = RequestMethod.POST)
+	@ApiOperation(value = "手机号和验证码 关联微信账号", notes = "手机号和验证码 关联微信账号")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "loginName手机号;code验证码;openid微信标识;nickname微信用户名称;headimgurl微信头像")
+	})
+	public ResponseBean associatedWX(@RequestBody String parameter, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = wxLoginService.associatedWX(parameter);
+		TaUserVO userVO = (TaUserVO) responseBean.getData();
+		if (null != userVO) {
+			setUserElement(userVO, session);
+		}
+		return responseBean;
+	}
+
+	@ApiOperation(value = "注册", notes = "注册")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户姓名;idCard身份证;gender性别(1：男  2：女);loginName手机号;code验证码;openid微信标识;nickname微信用户名称;headimgurl微信头像")
+	})
+	@RequestMapping(value = "/wx/register",method = RequestMethod.POST)
+	public ResponseBean register(@RequestBody String parameter, HttpServletRequest request ,HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = wxLoginService.register(parameter, request);
+		TaUserVO userVO = (TaUserVO) responseBean.getData();
+		if (null != userVO) {
+			setUserElement(userVO, session);
+		}
+		return responseBean;
+	}
+
+	@RequestMapping(value = "/unbundlingWX", method = RequestMethod.PUT)
+	@ApiOperation(value = "解绑微信", notes = "解绑微信")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	public ResponseBean unbundlingWX(HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = wxLoginService.unbundlingWX(userElement);
+		return responseBean;
+	}
+
+	@RequestMapping(value = "/bundlingWX/{wxcode}", method = RequestMethod.POST)
+	@ApiOperation(value = "绑定微信", notes = "绑定微信")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	public ResponseBean bundlingWX(HttpSession session, @PathVariable("wxcode") String wxcode) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = wxLoginService.bundlingWX(userElement, wxcode);
+		return responseBean;
+	}
+}

app-api/src/main/java/com/community/huiju/controller/WxMPUserController.java

@@ -0,0 +1,199 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.wxmp.WxMPUtil;
+import com.community.huiju.common.wxpay.WXPayConstants;
+import com.community.huiju.common.wxpay.WXPayUtil;
+import com.community.huiju.feign.IFuShiServer;
+import com.community.huiju.feign.entity.ApiThirdPartyMonthCardPay;
+import com.community.huiju.service.WxMPUserServiceI;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+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 javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2019-07-08
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "微信公众号API", description = "微信公众号API")
+public class WxMPUserController {
+	
+	private Logger log = LoggerFactory.getLogger(WxMPUserController.class);
+	
+	@Value("${wx.mp.configs.appId}")
+	private String appId;
+	
+	@Value("${wx.mp.configs.secret}")
+	private String secret;
+	
+	@Autowired
+	private WxMPUserServiceI wxMPUserService;
+	
+	@Autowired
+	private IFuShiServer fuShiServer;
+
+	@RequestMapping(value = "/wxmp/info", method = RequestMethod.GET)
+	@ApiOperation(value = "获取微信公众号相关信息", notes = "获取微信公众号相关信息")
+	@ApiImplicitParams({})
+	public ResponseBean getWxMPinfo(){
+		ResponseBean responseBean = new ResponseBean();
+		Map<String,Object> map = Maps.newHashMap();
+		map.put("appId",appId);
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+	
+	@RequestMapping(value = "/{communityId}/wxmp", method = RequestMethod.GET)
+	@ApiOperation(value = "根据CODE获取OPENID并判断是否第一次来,并返回数据", notes = "根据CODE获取OPENID并判断是否第一次来,并返回数据")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "微信code")})
+	public ResponseBean getOpenidByCode(@PathVariable Integer communityId, @RequestParam String code){
+		ResponseBean responseBean = wxMPUserService.getTemporaryData(code,appId,secret,communityId);
+		return responseBean;
+	}
+	
+	
+	@RequestMapping(value = "/{communityId}/wxmp/records", method = RequestMethod.GET)
+	@ApiOperation(value = "根据openid获取缴费记录", notes = "根据openid获取缴费记录")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "微信openid")})
+	public ResponseBean getRecordsByOpenid(@PathVariable Integer communityId, @RequestParam String openid){
+		ResponseBean responseBean = wxMPUserService.getRecordsByOpenid(openid,communityId);
+		return responseBean;
+	}
+	
+	@RequestMapping(value = "/{communityId}/wxmp/car", method = RequestMethod.GET)
+	@ApiOperation(value = "根据车牌获取数据", notes = "根据车牌获取数据")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "carNo", value = "车牌号")})
+	public ResponseBean getParkInfoByCarNo(@PathVariable Integer communityId, @RequestParam String carNo){
+		ResponseBean responseBean = new ResponseBean();
+		String parkInfoByCarNo = fuShiServer.getParkInfoByCarNo(carNo);
+		JSONObject carNoJson = JSONObject.parseObject(parkInfoByCarNo);
+		//车辆不在停车场
+		if (carNoJson.getInteger("code") == 1){
+			responseBean.addError(carNoJson.getString("message"));
+			return responseBean;
+		}
+		
+		if (carNoJson.getInteger("code") == 0 ){
+			if (carNoJson.getJSONObject("data").getInteger("DataType") != 3){
+				responseBean.addSuccess("储值车不支持在线缴费，月卡车请使用银城慧家APP延期续费");
+				return responseBean;
+			}
+			//返回查询的金额
+			JSONObject jsonParam = carNoJson.getJSONObject("data").getJSONObject("JsonParam");
+			Map<String,Object> resultMap = Maps.newHashMap();
+			resultMap.put("ActualAmount",jsonParam.get("ActualAmount"));
+			responseBean.addSuccess(resultMap);
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "临时车统一下单", notes = "临时车统一下单")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "carNo", value = "车牌号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "微信openid")
+	})
+	@RequestMapping(value = "/{communityId}/wxmp/order",method = RequestMethod.GET)
+	public ResponseBean wxTmpOrder(@PathVariable Integer communityId,
+	                               @RequestParam("carNo") String carNo,
+	                               @RequestParam("openid") String openid){
+		ResponseBean responseBean = new ResponseBean();
+		Map<String, String> resp = Maps.newHashMap();
+		try {
+			//String parkInfoByCarNo = fuShiServer.getParkInfoByCarNo(carNo);
+			//JSONObject carNoJson = JSONObject.parseObject(parkInfoByCarNo);
+			//String actualAmount = String.valueOf(Double.valueOf(((BigDecimal) carNoJson.getJSONObject("JsonParam").get("ActualAmount")).toString()) * 100);
+			//actualAmount = actualAmount.substring(0, actualAmount.lastIndexOf("."));
+			//resp = wxMPUserService.wxTmpOrder(carNo,actualAmount,communityId,openid,(BigDecimal) carNoJson.getJSONObject("JsonParam").get("ActualAmount"));
+			resp = wxMPUserService.wxTmpOrder(carNo,"1",communityId,openid,new BigDecimal("0.1"));
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		responseBean.addSuccess(resp);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "手机订单支付完成后回调临时车缴费", notes = "手机订单支付完成后回调临时车缴费")
+	@RequestMapping(value = "/wxTmpNotify",method = RequestMethod.POST)
+	public String wxBillNotify(HttpServletRequest request, HttpServletResponse response){
+		String failResult = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>" + "<return_msg><![CDATA[失败]]></return_msg>" + "</xml> ";
+		String successResult = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>" + "<return_msg><![CDATA[OK]]></return_msg>" + "</xml> ";
+		InputStream inStream;
+		try {
+			
+			inStream = request.getInputStream();
+			ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
+			byte[] buffer = new byte[1024];
+			int len = 0;
+			while ((len = inStream.read(buffer)) != -1) {
+				outSteam.write(buffer, 0, len);
+			}
+			
+			// 获取微信调用我们notify_url的返回信息
+			String result = new String(outSteam.toByteArray(), "utf-8");
+			WXPayUtil.getLogger().info("wxnotify:微信支付----result----=" + result);
+			
+			// 关闭流
+			outSteam.close();
+			inStream.close();
+			
+			// xml转换为map
+			Map<String, String> resultMap = WXPayUtil.xmlToMap(result);
+			if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("result_code"))) {
+				//推送富士系统
+				//Map<String,Object> temInfo = wxMPUserService.selectByOrderNumber(resultMap.get("out_trade_no"));
+				//temInfo.put("DeductionAmount","0");
+				//temInfo.put("Reason","");
+				//temInfo.put("PayStyle","微信");
+				//fuShiServer.apiThirdPartyTemporaryCardPay(JSON.toJSONString(temInfo));
+				//处理业务逻辑 修改订单状态等
+				String state = wxMPUserService.updateTmpOrder(resultMap.get("out_trade_no"));
+				if (state.equals("success")){
+					log.info("微信支付成功。。");
+					return successResult;
+				}
+			}else{
+				return failResult;
+			}
+			
+		} catch (Exception e) {
+			log.error("手机支付回调通知失败",e);
+			return failResult;
+			
+		}
+		
+		return failResult;
+	}
+}

app-api/src/main/java/com/community/huiju/controller/WxPayController.java

@@ -0,0 +1,210 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.redis.RedisTemplate;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.wxpay.HfWxConfig;
+import com.community.huiju.common.wxpay.WXPay;
+import com.community.huiju.common.wxpay.WXPayConstants;
+import com.community.huiju.common.wxpay.WXPayUtil;
+import com.community.huiju.service.TaVistorServiceI;
+import com.community.huiju.service.WxPayServiceI;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.lang.reflect.Type;
+import java.util.*;
+
+/**
+ * @author FXF
+ * @date 2019-02-19
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "微信支付 API", description = "微信支付 API")
+public class WxPayController {
+	private Logger log = LoggerFactory.getLogger(WxPayController.class);
+	
+	@Autowired
+	private WxPayServiceI wxPayService;
+	
+	@ApiOperation(value = "统一下单", notes = "统一下单")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "订单类型： bill 表示订单，car 车缴费"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/wxUnifiedOrder/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo,
+									   @RequestParam("type") String type,
+									   HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		
+		Map<String, String> resp = Maps.newHashMap();
+		try {
+			resp = wxPayService.wxUnifiedOrder(outTradeNo, type,userElement);
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		log.info("调用微信支付参数: {}",resp);
+		responseBean.addSuccess(resp);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "手机订单支付完成后回调 物业缴费", notes = "手机订单支付完成后回调 物业缴费")
+	@RequestMapping(value = "/wxBillNotify",method = RequestMethod.POST)
+	public String wxBillNotify(HttpServletRequest request, HttpServletResponse response){
+		return wxNotify(request, Constant.PAY_TYPE_BILL);
+	}
+
+
+	@ApiOperation(value = "手机订单支付完成后回调 车缴费", notes = "手机订单支付完成后回调 车缴费")
+	@RequestMapping(value = "/wxCarNotify",method = RequestMethod.POST)
+	public String wxCarNotify(HttpServletRequest request, HttpServletResponse response){
+
+		return wxNotify(request, Constant.PAY_TYPE_CAR);
+	}
+
+	/**
+	 * 微信支付回调
+	 * @param request
+	 * @param type
+	 * @return
+	 */
+	private String wxNotify(HttpServletRequest request, String type) {
+		String failResult = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>" + "<return_msg><![CDATA[失败]]></return_msg>" + "</xml> ";
+		String successResult = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>" + "<return_msg><![CDATA[OK]]></return_msg>" + "</xml> ";
+		InputStream inStream;
+		try {
+
+			inStream = request.getInputStream();
+			ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
+			byte[] buffer = new byte[1024];
+			int len = 0;
+			while ((len = inStream.read(buffer)) != -1) {
+				outSteam.write(buffer, 0, len);
+			}
+
+			// 获取微信调用我们notify_url的返回信息
+			String result = new String(outSteam.toByteArray(), "utf-8");
+			WXPayUtil.getLogger().info("wxnotify:微信支付----result----=" + result);
+
+			// 关闭流
+			outSteam.close();
+			inStream.close();
+
+			// xml转换为map
+			Map<String, String> resultMap = WXPayUtil.xmlToMap(result);
+			if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("result_code"))) {
+				//处理业务逻辑 修改订单状态等
+				resultMap.put("pay_type","0");
+				String state = "";
+				if (Constant.PAY_TYPE_CAR.equals(type)) {
+					state = wxPayService.wxCarNotify(resultMap);
+				} else if (Constant.PAY_TYPE_BILL.equals(type)) {
+					state = wxPayService.wxBillNotify(resultMap);
+				}
+
+				if (state.equals("success")){
+					log.info("微信支付成功。。");
+					return successResult;
+				}
+			}else{
+				return failResult;
+			}
+
+		} catch (Exception e) {
+			log.error("手机支付回调通知失败",e);
+			return failResult;
+
+		}
+
+		return failResult;
+	}
+
+	
+	@ApiOperation(value = "订单查询", notes = "订单查询")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号")
+	})
+	@RequestMapping(value = "/wxOrderQuery/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxOrderQuery(@PathVariable("outTradeNo") String outTradeNo){
+		ResponseBean responseBean = new ResponseBean();
+		Map<String, String> resp = Maps.newHashMap();
+		try {
+			resp = wxPayService.wxOrderQuery(outTradeNo);
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError("查询失败");
+			return responseBean;
+		}
+		responseBean.addSuccess(resp);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "准备开始支付", notes = "准备开始支付")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value = "idArray:账单Id集合, type: 类型(car 车缴费, bill 物业缴费), extensionMonth: 延期月份，也就是延期几个月！只有在 车缴费的时候才有效"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/wxStartPay",method = RequestMethod.POST)
+	public ResponseBean wxStartPay(@RequestBody String parameter, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		try {
+			UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+			JSONObject jsonObject = JSONObject.parseObject(parameter);
+			Integer[] integers = jsonObject.getJSONArray("idArray").toArray(new Integer[]{});
+			String type = jsonObject.getString("type");
+			Integer extensionMonth = jsonObject.getInteger("extensionMonth");
+
+			String outTradeNo = wxPayService.wxStartPay(Arrays.asList(integers), type, extensionMonth,userElement);
+			Map<String,Object> resultMap = Maps.newHashMap();
+			resultMap.put("outTradeNo", outTradeNo);
+			responseBean.addSuccess(resultMap);
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "取消支付", notes = "取消支付")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "String", name = "outTradeNo", value = "订单号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "type: 类型(car 车缴费, bill 物业缴费)"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/wxCancelPay/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxCancelPay(@PathVariable("outTradeNo") String outTradeNo, @RequestParam("type") String type,HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		try {
+			UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+			wxPayService.wxCancelPay(outTradeNo, type,userElement);
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		return responseBean;
+	}
+}

app-api/src/main/java/com/community/huiju/dao/SysNationMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.SysNation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysNationMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(SysNation record);
+
+    int insertSelective(SysNation record);
+
+    SysNation selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(SysNation record);
+
+    int updateByPrimaryKey(SysNation record);
+}

app-api/src/main/java/com/community/huiju/dao/SysReportReasonMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.SysReportReason;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysReportReasonMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(SysReportReason record);
+
+    int insertSelective(SysReportReason record);
+
+    SysReportReason selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(SysReportReason record);
+
+    int updateByPrimaryKey(SysReportReason record);
+}

app-api/src/main/java/com/community/huiju/dao/TaAgreementMapper.java

@@ -0,0 +1,24 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaAgreement;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface TaAgreementMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaAgreement record);
+
+    int insertSelective(TaAgreement record);
+
+    TaAgreement selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaAgreement record);
+
+    int updateByPrimaryKey(TaAgreement record);
+
+    TaAgreement getAgreement();
+
+}

app-api/src/main/java/com/community/huiju/dao/TaBriskUserMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaBriskUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+@Mapper
+public interface TaBriskUserMapper {
+	
+	List<TaBriskUser> selectByParams(@Param("userVerifyId") Integer userVerifyId, @Param("communityId") Integer communityId,@Param("nowDate") Date nowDate);
+	
+	int saveBriskUser(TaBriskUser taBriskUser);
+}

app-api/src/main/java/com/community/huiju/dao/TaFaceMapper.java

@@ -0,0 +1,39 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaFace;
+import com.community.huiju.model.TpTicket;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TaFaceMapper{
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaFace record);
+
+    int insertSelective(TaFace record);
+
+    int selectByPrimaryKey(Integer id);
+
+    void updateByPrimaryKeySelective(TaFace record);
+
+    /**
+     * 查看当前用户信息
+     * @param userVerifyId
+     * @return
+     */
+    TaFace getByUserVerifyId(@Param("userVerifyId") Integer userVerifyId);
+
+    /**
+     * 查看当前信息
+     * @param id
+     * @return
+     */
+    TaFace getById(@Param("id")Integer id);
+
+    /**
+     * 根据审核ID删除人脸信息
+     * @param verifyId
+     */
+    void deleteFace(@Param("verifyId") Integer verifyId);
+}

app-api/src/main/java/com/community/huiju/dao/TaFeedbackImgMapper.java

@@ -0,0 +1,30 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaFeedbackImg;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TaFeedbackImgMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaFeedbackImg record);
+
+    int insertSelective(TaFeedbackImg record);
+
+    TaFeedbackImg selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaFeedbackImg record);
+
+    int updateByPrimaryKey(TaFeedbackImg record);
+
+    /**
+     * 获取反馈当前图片
+     * @param id
+     * @return
+     */
+    List<String> selectImg(@Param("id") Integer id);
+}

app-api/src/main/java/com/community/huiju/dao/TaFeedbackMapper.java

@@ -0,0 +1,39 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaFeedback;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TaFeedbackMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaFeedback record);
+
+    int insertSelective(TaFeedback record);
+
+    TaFeedback selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaFeedback record);
+
+    int updateByPrimaryKey(TaFeedback record);
+
+    List<TaFeedback> getFeedback(@Param("content") String content, @Param("tel") String tel, @Param("handleStatus") String handleStatus);
+
+    /**
+     * 根据手机号码查询历史反馈
+     * @param loginName
+     * @return
+     */
+    List<TaFeedback> noPropertyHistory(@Param("loginName") String loginName);
+
+    /**
+     * 查询反馈详情
+     * @param id
+     * @return
+     */
+    TaFeedback propertyHistoryDdetails(@Param("id") Integer id);
+}

app-api/src/main/java/com/community/huiju/dao/TaPublicMonitorMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaPublicMonitor;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaPublicMonitorMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaPublicMonitor record);
+
+    int insertSelective(TaPublicMonitor record);
+
+    TaPublicMonitor selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaPublicMonitor record);
+
+    int updateByPrimaryKey(TaPublicMonitor record);
+}

app-api/src/main/java/com/community/huiju/dao/TaRemotelyDoorMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaRemotelyDoor;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaRemotelyDoorMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaRemotelyDoor record);
+
+    int insertSelective(TaRemotelyDoor record);
+
+    TaRemotelyDoor selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaRemotelyDoor record);
+
+    int updateByPrimaryKey(TaRemotelyDoor record);
+}

app-api/src/main/java/com/community/huiju/dao/TaRemotelyMonitorMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaRemotelyMonitor;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaRemotelyMonitorMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaRemotelyMonitor record);
+
+    int insertSelective(TaRemotelyMonitor record);
+
+    TaRemotelyMonitor selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaRemotelyMonitor record);
+
+    int updateByPrimaryKey(TaRemotelyMonitor record);
+}

app-api/src/main/java/com/community/huiju/dao/TaSysMenuImgMapper.java

@@ -0,0 +1,24 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaSysMenuImg;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TaSysMenuImgMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysMenuImg record);
+
+    int insertSelective(TaSysMenuImg record);
+
+    TaSysMenuImg selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysMenuImg record);
+
+    int updateByPrimaryKey(TaSysMenuImg record);
+    
+    List<TaSysMenuImg> selectByMenuId(@Param("id") Integer id);
+}

app-api/src/main/java/com/community/huiju/dao/TaSysMenuMapper.java

@@ -0,0 +1,29 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaSysMenu;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TaSysMenuMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysMenu record);
+
+    int insertSelective(TaSysMenu record);
+
+    TaSysMenu selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysMenu record);
+
+    int updateByPrimaryKey(TaSysMenu record);
+    
+    /**
+     * 获取菜单列表
+     * @param communityId
+     * @return
+     */
+    List<TaSysMenu> selectByCommunity(@Param("communityId") Integer communityId);
+}

app-api/src/main/java/com/community/huiju/dao/TaSysRoleMapper.java

@@ -0,0 +1,36 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaSysRole;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TaSysRoleMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysRole record);
+
+    int insertSelective(TaSysRole record);
+
+    TaSysRole selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysRole record);
+
+    int updateByPrimaryKey(TaSysRole record);
+
+    TaSysRole findRoleByUserId(Integer userId);
+
+    /**
+     * 根据 角色名称 查询
+     * @param roleName
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_sys_role where role_name=#{roleName}")
+    TaSysRole selectByRoleName(String roleName);
+
+}

app-api/src/main/java/com/community/huiju/dao/TaSysUserRoleMapper.java

@@ -0,0 +1,41 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaSysUserRole;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+@Mapper
+public interface TaSysUserRoleMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysUserRole record);
+
+    int insertSelective(TaSysUserRole record);
+
+    TaSysUserRole selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysUserRole record);
+
+    int updateByPrimaryKey(TaSysUserRole record);
+
+    Integer findSysUserRoleByUserIdAndRoleId(Integer userId);
+
+    /**
+     *    communityId 小区ID
+     *    userId 用户ID
+     *
+     * @param map
+     * @return
+     */
+    TaSysUserRole selectByCommunityIdAndUserId(Map<String,Object> map);
+
+    /**
+     *查询角色
+     * @param userId
+     * @return
+     */
+    TaSysUserRole selectRole(@Param("communityId") Integer communityId,@Param("userId") Integer userId);
+}

app-api/src/main/java/com/community/huiju/dao/TaTemporaryLicenseOrderMapper.java

@@ -0,0 +1,22 @@
+package com.community.huiju.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TaTemporaryLicenseOrderMapper {
+	
+	List<Map<String, Object>> getLicensePlateByOpenid(@Param("openid") String openid,@Param("communityId") Integer communityId,@Param("paymentType") String paymentType);
+	
+	List<Map<String, Object>> getLicensePlateRecordsByOpenid(@Param("openid") String openid,@Param("communityId") Integer communityId,@Param("paymentType") String paymentType);
+	
+	int saveTmpOrder(@Param("communityId") Integer communityId, @Param("orderNo") String orderNo, @Param("actualAmount") String actualAmount, @Param("openid") String openid, @Param("carNo") String carNo,@Param("price") BigDecimal price,@Param("paymentType") String paymentType);
+	
+	int updateTmpOrder(@Param("outTradeNo") String outTradeNo, @Param("paymentType") String paymentType);
+	
+	Map<String, Object> selectByOrderNumber(@Param("outTradeNo") String outTradeNo, @Param("paymentType") String paymentType);
+}

app-api/src/main/java/com/community/huiju/dao/TaUserHkMapper.java

@@ -0,0 +1,33 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaUserHk;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TaUserHkMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaUserHk record);
+
+    int insertSelective(TaUserHk record);
+
+    TaUserHk selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUserHk record);
+
+    int updateByPrimaryKey(TaUserHk record);
+
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_hk where ta_user_id = #{userVerifyId} and community_id = #{communityId}")
+    TaUserHk selectByUserVerifyIdAndCommunityId(@Param("userVerifyId") Integer userVerifyId, @Param("communityId") Integer communityId);
+
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_hk where community_id = #{communityId}")
+    List<TaUserHk> selectByCommunityId(@Param("communityId") Integer communityId);
+
+}

app-api/src/main/java/com/community/huiju/dao/TaUserLicenseMapper.java

@@ -0,0 +1,52 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaUserLicense;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TaUserLicenseMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaUserLicense record);
+
+    int insertSelective(TaUserLicense record);
+
+    TaUserLicense selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUserLicense record);
+
+    int updateByPrimaryKey(TaUserLicense record);
+
+    /**
+     * 根据用户id 和 小区id 和 车牌号 进行查询
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_license where community_id=#{communityId} and ta_user_id = #{userId} and license_plate = #{licensePlate}")
+    TaUserLicense selectByUserIdAndCommunityIdAndLicensePlate(@Param("communityId") Integer communityId, @Param("userId") Integer userId, @Param("licensePlate") String licensePlate);
+
+    /**
+     * 根据用户id  和 小区 进行查询
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_license where community_id=#{communityId} and ta_user_id = #{userId}")
+    List<TaUserLicense> selectAllByCommunityIdAndUserId(@Param("communityId") Integer communityId, @Param("userId") Integer userId);
+
+
+    /**
+     * 根据用户id 和 小区id 和 车牌id 进行查询
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_license where community_id=#{communityId} and ta_user_id = #{userId} and id = #{id}")
+    TaUserLicense selectByUserIdAndCommunityIdAndLicenseId(@Param("communityId") Integer communityId, @Param("userId") Integer userId, @Param("id") Integer id);
+
+}

app-api/src/main/java/com/community/huiju/dao/TaUserLicenseOrderMapper.java

@@ -0,0 +1,50 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaUserLicenseOrder;
+import com.community.huiju.model.TpBillOrder;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TaUserLicenseOrderMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaUserLicenseOrder record);
+
+    int insertSelective(TaUserLicenseOrder record);
+
+    TaUserLicenseOrder selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUserLicenseOrder record);
+
+    int updateByPrimaryKey(TaUserLicenseOrder record);
+
+    /**
+     * 缴费记录
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_license_order where community_id = #{communityId} and ta_user_id = #{userId} and order_status = 1 order by update_date DESC")
+    List<TaUserLicenseOrder> selectRecords(@Param("communityId") Integer communityId, @Param("userId") Integer userId);
+
+    /**
+     * 根据订单号查询
+     * @param orderNo
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_license_order where order_number=#{orderNo}")
+    List<TaUserLicenseOrder> selectByOrderNumber(String orderNo);
+
+    /**
+     * 可关闭的订单
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT t.* from ta_user_license_order t where TIMESTAMPDIFF(MINUTE,create_date,now()) >= 10 and t.order_status in (0,2)")
+    List<TaUserLicenseOrder> selectCloseOrder();
+}

app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -0,0 +1,115 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TaUserMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaUser record);
+
+    int insertSelective(TaUser record);
+
+    TaUser selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUser record);
+
+    int updateByPrimaryKey(TaUser record);
+
+    /**
+     * 根据loginName和loginPassword 查询用户
+     * @param map
+     * @return 用户
+     */
+    TaUser selectByLoginNameAndByLoginPassword(Map<String, Object> map);
+
+    /**
+     * 根据loginName 查询用户
+     * @param map
+     * @return 用户
+     */
+    TaUser selectByLoginName(@Param("map") Map<String, Object> map);
+
+    /**
+     * 更新当前用户电话
+     * @param record
+     * @return
+     */
+    TaUser updateLongName(TaUser record);
+
+    /**
+     * 查询房屋成员列表
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    List<TaUser> selectHouseUserList(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("userId") Integer userId);
+
+    /**
+     * 判断当前用户的关联关系
+     * @param userId
+     * @param otherUserId
+     * @return
+     */
+    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserId")Integer otherUserId);
+
+    /**
+     * 查询此电话在小区是否存在
+     * @param communityId
+     * @param phone
+     * @return
+     */
+    TaUser getByLoginName(@Param("communityId")Integer communityId, @Param("phone")String phone);
+
+    /**
+     * 根据手机号码查询多套房产
+     * @param loginName
+     * @return
+     */
+    List<TaUser> getByLoginNameList(@Param("loginName") String loginName);
+	
+	TaUser getByOpenId(@Param("openid") String openid);
+
+    /**
+     * 查询已审核通过的，但是没有 海康id 的用户
+     * @param communityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT " +
+            "tuv.id as userVerifyId, " +
+            "tuv.unit_id as unitId, " +
+            " tau.* " +
+            "FROM " +
+            " ta_user_verify tuv " +
+            " LEFT JOIN ta_user tau ON tuv.user_id = tau.id " +
+            " LEFT JOIN ta_user_hk tuh on tuv.user_id = tuh.ta_user_id " +
+            "WHERE " +
+            " tuv.verify_status = 1 " +
+            " AND tuv.community_id = #{communityId} " +
+            " and tuh.hk_user_id is NULL")
+    List<TaUser> selectNotHKuserId(@Param("communityId") Integer communityId);
+
+    /**
+     * 获取所有家属
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    List<TaUser> selectHouseRelationUserList(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId);
+}