msg

.idea/compiler.xml

@@ -12,6 +12,7 @@
     <bytecodeTargetLevel>
       <module name="cloud-model" target="1.8" />
       <module name="model" target="1.8" />
+      <module name="yunsu" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>

.idea/encodings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/model" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/model/cloud-model" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/cloud-model" charset="UTF-8" />
   </component>
 </project>

.idea/misc.xml

@@ -7,6 +7,7 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/model/pom.xml" />
+        <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
   </component>

.idea/modules.xml

@@ -2,9 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/cloud-model/cloud-model.iml" />
       <module fileurl="file://$PROJECT_DIR$/model/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/model/cloud-model/cloud-model.iml" />
-      <module fileurl="file://$PROJECT_DIR$/model/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/model/cloud-model/cloud-model.iml" />
-      <module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
       <module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/yunsu.iml" filepath="$PROJECT_DIR$/.idea/yunsu.iml" />
     </modules>

.idea/yunsu.iml

@@ -1,11 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/model/cloud-model" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/cloud-model/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.21" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.21" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.21" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.17.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.13" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.13" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.15" level="project" />
   </component>
 </module>

model/.gitignore

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

model/cloud-model/.gitignore

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

model/cloud-model/mvnw

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

model/cloud-model/mvnw.cmd

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

model/cloud-model/pom.xml

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.hssx</groupId>
-        <artifactId>model</artifactId>
-        <version>0.0.1-SNAPSHOT</version> <!-- lookup parent from repository -->
-    </parent>
-    <groupId>com.hssx</groupId>
-    <artifactId>cloud-model</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>cloud-model</name>
-    <description>Demo project for Spring Boot</description>
-
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- mybatis-plus依赖 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.1.2</version>
-        </dependency>
-        <!-- mybatis-plus代码生成器依赖 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.1.2</version>
-        </dependency>
-
-        <!-- velocity模板引擎 -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>2.0</version>
-        </dependency>
-
-        <!-- freemarker 模板引擎-->
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.23</version>
-        </dependency>
-
-        <!-- 文件上传 -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.3.3</version>
-        </dependency>
-
-        <!-- fastjson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.7</version>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/commons-net/commons-net -->
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-            <version>3.6</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>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

model/cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java

@@ -1,16 +0,0 @@
-package com.hssx.cloudmodel;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-
-@SpringBootApplication
-@MapperScan("com.hssx.cloudmodel.mapper")
-public class CloudModelApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(CloudModelApplication.class, args);
-    }
-
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java

@@ -1,16 +0,0 @@
-package com.hssx.cloudmodel.constant;
-
-/**
- * Author: 吴涛涛
- * Date : 2019 - 07 - 24 16:00
- * Description:<描述>常量配置类
- * Version: 1.0
- */
-public class Constant {
-    public static final String SYS_USER = "sysUserInfo";
-    public static final String COMMON_USER = "UserInfo";
-    public static final Integer SYSTEM_ID = 1;
-    public static final String DEFAULT_PWD = "000000";
-    public static final Integer PAGE_NUM = 1;
-    public static final Integer PAGE_SIZE = 10;
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java

@@ -1,84 +0,0 @@
-package com.hssx.cloudmodel.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.entity.Company;
-import com.hssx.cloudmodel.entity.Role;
-import com.hssx.cloudmodel.service.CompanyService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-
-/**
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@Controller
-@RequestMapping("/company")
-@Slf4j
-public class CompanyController {
-
-    @Autowired
-    private CompanyService companyService;
-
-    /**
-     * 添加/修改公司
-     * @param company
-     * 参数：companyName 公司名 companyAddress 公司地址
-     * @param flag 0-添加，1-修改
-     * @return
-     */
-    @ApiOperation("添加/修改公司")
-    @RequestMapping("/add")
-    @ResponseBody
-    public HttpRespMsg addAndUpdateRole(Company company, HttpServletRequest request, Integer flag,
-                                        HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = companyService.addAndUpdateRole(company,flag);
-        return msg;
-    }
-
-    /**
-     * 删除公司
-     * @param company
-     * 参数 id 公司id
-     * @return
-     */
-    @ApiOperation("删除公司")
-    @RequestMapping("/delete")
-    @ResponseBody
-    public HttpRespMsg delete(Company company, HttpServletRequest request,
-                                        HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = companyService.removeById(company.getId());
-        return msg;
-    }
-
-    /**
-     * 公司列表
-     * @param keyName 关键字查询 根据公司名称检索
-     * @return
-     */
-    @ApiOperation("公司列表")
-    @RequestMapping("/list")
-    @ResponseBody
-    public HttpRespMsg deleteRole(String keyName, HttpServletRequest request,
-                                  HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<Company> qw = new QueryWrapper<>();
-        qw.like("company_name",keyName);
-        msg.data = companyService.list(qw);
-        return msg;
-    }
-
-}
-

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/DictionaryDataController.java

@@ -1,21 +0,0 @@
-package com.hssx.cloudmodel.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-@RestController
-@RequestMapping("/dictionary-data")
-public class DictionaryDataController {
-
-}
-

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/FactoryController.java

@@ -1,89 +0,0 @@
-package com.hssx.cloudmodel.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.entity.Company;
-import com.hssx.cloudmodel.entity.Factory;
-import com.hssx.cloudmodel.service.CompanyService;
-import com.hssx.cloudmodel.service.FactoryService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-
-/**
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@Controller
-@RequestMapping("/factory")
-@Slf4j
-public class FactoryController {
-
-
-    @Autowired
-    private FactoryService factoryService;
-
-    /**
-     * 添加/修改工厂
-     * @param factory
-     * 参数：factoryName 工厂名 factoryArea 公司地址
-     * yLng 经度  xLat 纬度
-     * @param flag 0-添加，1-修改
-     * @return
-     */
-    @ApiOperation("添加/修改工厂")
-    @RequestMapping("/add")
-    @ResponseBody
-    public HttpRespMsg addAndUpdateRole(Factory factory, HttpServletRequest request, Integer flag,
-                                        HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = factoryService.addAndUpdateRole(factory,flag);
-        return msg;
-    }
-
-    /**
-     *
-     * @param factory
-     * 参数：id 工厂id
-     * @return
-     */
-    @ApiOperation("删除公司")
-    @RequestMapping("/delete")
-    @ResponseBody
-    public HttpRespMsg delete(Factory factory, HttpServletRequest request,
-                              HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = factoryService.removeById(factory.getId());
-        return msg;
-    }
-
-    /**
-     * 工厂列表
-     * @param keyName
-     * 参数: 关键字
-     * @return
-     */
-    @ApiOperation("工厂列表")
-    @RequestMapping("/list")
-    @ResponseBody
-    public HttpRespMsg deleteRole(String keyName, HttpServletRequest request,
-                                  HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<Factory> qw = new QueryWrapper<>();
-        qw.like("factory_name",keyName);
-        msg.data = factoryService.list(qw);
-        return msg;
-    }
-
-
-}
-

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java

@@ -1,87 +0,0 @@
-package com.hssx.cloudmodel.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.entity.Role;
-import com.hssx.cloudmodel.entity.SysUser;
-import com.hssx.cloudmodel.service.RoleService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@Controller
-@RequestMapping("/role")
-public class RoleController {
-
-    @Autowired
-    private RoleService roleService;
-
-    /**
-     * 添加/修改角色
-     * @param role
-     * 参数：roleName 角色名 dowloadPower 下载权限 0-无，1-有
-     * uploadPower 上传权限 0-无，1-有 viewPower 浏览权限 0-无，1-有
-     * approvalPower 审批权限 0-无，1-有
-     * @param flag 0-添加，1-修改
-     * @return
-     */
-    @ApiOperation("添加/修改角色")
-    @RequestMapping("/add")
-    @ResponseBody
-    public HttpRespMsg addAndUpdateRole(Role role, HttpServletRequest request,Integer flag,
-                               HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = roleService.addAndUpdateRole(role,flag);
-        return msg;
-    }
-
-    /**
-     * 删除角色
-     * @param role
-     * 参数 id 角色id
-     * @return
-     */
-    @ApiOperation("删除角色")
-    @RequestMapping("/delete")
-    @ResponseBody
-    public HttpRespMsg deleteRole(Role role, HttpServletRequest request,
-                               HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = roleService.removeById(role.getId());
-        return msg;
-    }
-
-    /**
-     * 角色列表
-     * @param keyName 关键字查询
-     * @return
-     */
-    @ApiOperation("角色列表")
-    @RequestMapping("/list")
-    @ResponseBody
-    public HttpRespMsg deleteRole(String keyName, HttpServletRequest request,
-                                  HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<Role> qw = new QueryWrapper<>();
-        qw.like("role_name",keyName);
-        msg.data = roleService.list(qw);
-        return msg;
-    }
-}
-

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java

@@ -1,40 +0,0 @@
-package com.hssx.cloudmodel.controller;
-
-
-import com.hssx.cloudmodel.entity.SysUser;
-import com.hssx.cloudmodel.service.SysUserService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-@Controller
-@RequestMapping("/system")
-@Slf4j
-public class SysUserController {
-    @Autowired
-    SysUserService sysUserService;
-
-    @ApiOperation(value = "系统管理员登录", notes = "登录方法")
-    @RequestMapping("login")
-    @ResponseBody
-    public HttpRespMsg sysLogin(SysUser sysUser, HttpServletRequest request,
-                                HttpServletResponse response) {
-        log.info("user"+sysUser);
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = sysUserService.login(sysUser,request);
-        return msg;
-    }
-
-}
-

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/UserController.java

@@ -1,103 +0,0 @@
-package com.hssx.cloudmodel.controller;
-
-import com.hssx.cloudmodel.entity.User;
-import com.hssx.cloudmodel.service.UserService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import com.hssx.cloudmodel.util.MD5Util;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@RestController
-@RequestMapping("/user")
-@Slf4j
-public class UserController {
-    @Autowired
-    private UserService userService;
-
-    /**
-     *
-     * @param user
-     * 参数：account 账号 password 密码
-     * @return
-     */
-    @ApiOperation(value = "普通用户登录", notes = "登录方法")
-    @RequestMapping("login")
-    @ResponseBody
-    public HttpRespMsg sysLogin(User user, HttpServletRequest request,
-                                HttpServletResponse response) {
-        log.info("user"+user);
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = userService.login(user,request);
-        return msg;
-    }
-
-    /**
-     * 添加/修改用户
-     *
-     * @param user
-     * 参数：account 账号 username 用户名（账号使用者的名字）
-     * password 密码 ,mobile 手机号 ,roleType 角色类型, companyId 所属公司id
-     * @param flag 0-添加，1-修改
-     * @return
-     */
-    @ApiOperation("添加/修改用户")
-    @RequestMapping("/add")
-    @ResponseBody
-    public HttpRespMsg addAndUpdateRole(User user, HttpServletRequest request, Integer flag,
-                                        HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = userService.addAndUpdateRole(user, flag);
-        return msg;
-    }
-
-    /**
-     * 添加/修改用户
-     * @param user
-     * 参数：id 用户id  account 账号  password 密码
-     * @return
-     */
-    @ApiOperation("修改用户密码")
-    @RequestMapping("/updatePassword")
-    @ResponseBody
-    public HttpRespMsg updatePassword(User user, HttpServletRequest request,
-                                        HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        user.setPassword(MD5Util.getPassword(user.getPassword()));
-        msg.data = userService.updateById(user);
-        return msg;
-    }
-
-    /**
-     * 删除角色
-     * @param user
-     * 参数 id 角色id
-     * @return
-     */
-    @ApiOperation("删除角色")
-    @RequestMapping("/delete")
-    @ResponseBody
-    public HttpRespMsg deleteRole(User user, HttpServletRequest request,
-                                  HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = userService.removeById(user.getId());
-        return msg;
-    }
-
-}
-

model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/Company.java

@@ -1,79 +0,0 @@
-package com.hssx.cloudmodel.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@TableName("tb_company")
-public class Company extends Model<Company> {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 公司id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 公司名称
-     */
-    @TableField("company_name")
-    private String companyName;
-
-    /**
-     * 公司地址
-     */
-    @TableField("company_address")
-    private String companyAddress;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getCompanyAddress() {
-        return companyAddress;
-    }
-
-    public void setCompanyAddress(String companyAddress) {
-        this.companyAddress = companyAddress;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "Company{" +
-        "id=" + id +
-        ", companyName=" + companyName +
-        ", companyAddress=" + companyAddress +
-        "}";
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/DictionaryData.java

@@ -1,124 +0,0 @@
-package com.hssx.cloudmodel.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-@TableName("tb_dictionary_data")
-public class DictionaryData extends Model<DictionaryData> {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 字典主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 字典编码
-     */
-    @TableField("dict_code")
-    private String dictCode;
-
-    /**
-     * 字典名称
-     */
-    @TableField("data_name")
-    private String dataName;
-
-    /**
-     * 字典值
-     */
-    @TableField("dict_value")
-    private Integer dictValue;
-
-    /**
-     * 字典排序
-     */
-    @TableField("dict_order")
-    private Integer dictOrder;
-
-    /**
-     * 是否禁用 0-否 1-是
-     */
-    @TableField("disabled")
-    private Integer disabled;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getDictCode() {
-        return dictCode;
-    }
-
-    public void setDictCode(String dictCode) {
-        this.dictCode = dictCode;
-    }
-
-    public String getDataName() {
-        return dataName;
-    }
-
-    public void setDataName(String dataName) {
-        this.dataName = dataName;
-    }
-
-    public Integer getDictValue() {
-        return dictValue;
-    }
-
-    public void setDictValue(Integer dictValue) {
-        this.dictValue = dictValue;
-    }
-
-    public Integer getDictOrder() {
-        return dictOrder;
-    }
-
-    public void setDictOrder(Integer dictOrder) {
-        this.dictOrder = dictOrder;
-    }
-
-    public Integer getDisabled() {
-        return disabled;
-    }
-
-    public void setDisabled(Integer disabled) {
-        this.disabled = disabled;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "DictionaryData{" +
-        "id=" + id +
-        ", dictCode=" + dictCode +
-        ", dataName=" + dataName +
-        ", dictValue=" + dictValue +
-        ", dictOrder=" + dictOrder +
-        ", disabled=" + disabled +
-        "}";
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/Factory.java

@@ -1,122 +0,0 @@
-package com.hssx.cloudmodel.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@TableName("tb_factory")
-public class Factory extends Model<Factory> {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 工厂名称
-     */
-    @TableField("factory_name")
-    private String factoryName;
-
-    /**
-     * 工厂地址
-     */
-    @TableField("factory_area")
-    private String factoryArea;
-
-    /**
-     * 经度
-     */
-    @TableField("y_lng")
-    private String yLng;
-
-    /**
-     * 纬度
-     */
-    @TableField("x_lat")
-    private String xLat;
-
-    /**
-     * 创建时间
-     */
-    @TableField("indate")
-    private LocalDateTime indate;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getFactoryName() {
-        return factoryName;
-    }
-
-    public void setFactoryName(String factoryName) {
-        this.factoryName = factoryName;
-    }
-
-    public String getFactoryArea() {
-        return factoryArea;
-    }
-
-    public void setFactoryArea(String factoryArea) {
-        this.factoryArea = factoryArea;
-    }
-
-    public String getyLng() {
-        return yLng;
-    }
-
-    public void setyLng(String yLng) {
-        this.yLng = yLng;
-    }
-
-    public String getxLat() {
-        return xLat;
-    }
-
-    public void setxLat(String xLat) {
-        this.xLat = xLat;
-    }
-
-    public LocalDateTime getIndate() {
-        return indate;
-    }
-
-    public void setIndate(LocalDateTime indate) {
-        this.indate = indate;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "Factory{" +
-        "id=" + id +
-        ", factoryName=" + factoryName +
-        ", factoryArea=" + factoryArea +
-        ", yLng=" + yLng +
-        ", xLat=" + xLat +
-        ", indate=" + indate +
-        "}";
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/Role.java

@@ -1,140 +0,0 @@
-package com.hssx.cloudmodel.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@TableName("tb_role")
-public class Role extends Model<Role> {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 角色表主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 角色名称
-     */
-    @TableField("role_name")
-    private String roleName;
-
-    /**
-     * 下载权限
-     */
-    @TableField("dowload_power")
-    private Integer dowloadPower;
-
-    /**
-     * 上传权限
-     */
-    @TableField("upload_power")
-    private Integer uploadPower;
-
-    /**
-     * 浏览权限
-     */
-    @TableField("view_power")
-    private Integer viewPower;
-
-    /**
-     * 审批权限
-     */
-    @TableField("approval_power")
-    private Integer approvalPower;
-
-    /**
-     * 创建时间
-     */
-    @TableField("indate")
-    private LocalDateTime indate;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getRoleName() {
-        return roleName;
-    }
-
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
-    }
-
-    public Integer getDowloadPower() {
-        return dowloadPower;
-    }
-
-    public void setDowloadPower(Integer dowloadPower) {
-        this.dowloadPower = dowloadPower;
-    }
-
-    public Integer getUploadPower() {
-        return uploadPower;
-    }
-
-    public void setUploadPower(Integer uploadPower) {
-        this.uploadPower = uploadPower;
-    }
-
-    public Integer getViewPower() {
-        return viewPower;
-    }
-
-    public void setViewPower(Integer viewPower) {
-        this.viewPower = viewPower;
-    }
-
-    public Integer getApprovalPower() {
-        return approvalPower;
-    }
-
-    public void setApprovalPower(Integer approvalPower) {
-        this.approvalPower = approvalPower;
-    }
-
-    public LocalDateTime getIndate() {
-        return indate;
-    }
-
-    public void setIndate(LocalDateTime indate) {
-        this.indate = indate;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "Role{" +
-        "id=" + id +
-        ", roleName=" + roleName +
-        ", dowloadPower=" + dowloadPower +
-        ", uploadPower=" + uploadPower +
-        ", viewPower=" + viewPower +
-        ", approvalPower=" + approvalPower +
-        ", indate=" + indate +
-        "}";
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/SysUser.java

@@ -1,91 +0,0 @@
-package com.hssx.cloudmodel.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-@TableName("tb_sys_user")
-public class SysUser extends Model<SysUser> {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 用户名
-     */
-    @TableField("username")
-    private String username;
-
-    /**
-     * 密码
-     */
-    @TableField("password")
-    private String password;
-
-    /**
-     * 名称
-     */
-    @TableField("name")
-    private String name;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "SysUser{" +
-        "id=" + id +
-        ", username=" + username +
-        ", password=" + password +
-        ", name=" + name +
-        "}";
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/User.java

@@ -1,275 +0,0 @@
-package com.hssx.cloudmodel.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@TableName("tb_user")
-public class User extends Model<User> {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 账号
-     */
-    @TableField("account")
-    private String account;
-
-    /**
-     * 名字
-     */
-    @TableField("username")
-    private String username;
-
-    /**
-     * 密码
-     */
-    @TableField("password")
-    private String password;
-
-    /**
-     * 联系电话
-     */
-    @TableField("mobile")
-    private String mobile;
-
-    /**
-     * (供应商)角色类型，0-项目经理 1-普通用户。(客户方)5-客服方领导，6-客户方普通人员
-     */
-    @TableField("role_type")
-    private Integer roleType;
-
-    /**
-     * 公司id
-     */
-    @TableField("company_id")
-    private Integer companyId;
-
-    /**
-     * 上级id,0-无上级
-     */
-    @TableField("parent_id")
-    private Integer parentId;
-
-    /**
-     * 性别，0-男 1-女
-     */
-    @TableField("sex")
-    private Integer sex;
-
-    /**
-     * 部门编号
-     */
-    @TableField("dep_no")
-    private String depNo;
-
-    /**
-     * 工作状态
-     */
-    @TableField("work_state")
-    private Integer workState;
-
-    /**
-     * 是否禁用，0-非禁用 1-禁用
-     */
-    @TableField("is_disable")
-    private Integer isDisable;
-
-    /**
-     * 创建时间
-     */
-    @TableField("indate")
-    private LocalDateTime indate;
-
-    /**
-     * 用户头像
-     */
-    @TableField("head_imgurl")
-    private String headImgurl;
-
-    /**
-     * 团体名称
-     */
-    @TableField("team_name")
-    private String teamName;
-
-    /**
-     * 所属方，0-供应商 1-客户方
-     */
-    @TableField("subordinate_type")
-    private Integer subordinateType;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public Integer getRoleType() {
-        return roleType;
-    }
-
-    public void setRoleType(Integer roleType) {
-        this.roleType = roleType;
-    }
-
-    public Integer getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Integer companyId) {
-        this.companyId = companyId;
-    }
-
-    public Integer getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Integer parentId) {
-        this.parentId = parentId;
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public String getDepNo() {
-        return depNo;
-    }
-
-    public void setDepNo(String depNo) {
-        this.depNo = depNo;
-    }
-
-    public Integer getWorkState() {
-        return workState;
-    }
-
-    public void setWorkState(Integer workState) {
-        this.workState = workState;
-    }
-
-    public Integer getIsDisable() {
-        return isDisable;
-    }
-
-    public void setIsDisable(Integer isDisable) {
-        this.isDisable = isDisable;
-    }
-
-    public LocalDateTime getIndate() {
-        return indate;
-    }
-
-    public void setIndate(LocalDateTime indate) {
-        this.indate = indate;
-    }
-
-    public String getHeadImgurl() {
-        return headImgurl;
-    }
-
-    public void setHeadImgurl(String headImgurl) {
-        this.headImgurl = headImgurl;
-    }
-
-    public String getTeamName() {
-        return teamName;
-    }
-
-    public void setTeamName(String teamName) {
-        this.teamName = teamName;
-    }
-
-    public Integer getSubordinateType() {
-        return subordinateType;
-    }
-
-    public void setSubordinateType(Integer subordinateType) {
-        this.subordinateType = subordinateType;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-        "id=" + id +
-        ", account=" + account +
-        ", username=" + username +
-        ", password=" + password +
-        ", mobile=" + mobile +
-        ", roleType=" + roleType +
-        ", companyId=" + companyId +
-        ", parentId=" + parentId +
-        ", sex=" + sex +
-        ", depNo=" + depNo +
-        ", workState=" + workState +
-        ", isDisable=" + isDisable +
-        ", indate=" + indate +
-        ", headImgurl=" + headImgurl +
-        ", teamName=" + teamName +
-        ", subordinateType=" + subordinateType +
-        "}";
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/mapper/CompanyMapper.java

@@ -1,16 +0,0 @@
-package com.hssx.cloudmodel.mapper;
-
-import com.hssx.cloudmodel.entity.Company;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-public interface CompanyMapper extends BaseMapper<Company> {
-
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/mapper/DictionaryDataMapper.java

@@ -1,16 +0,0 @@
-package com.hssx.cloudmodel.mapper;
-
-import com.hssx.cloudmodel.entity.DictionaryData;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-public interface DictionaryDataMapper extends BaseMapper<DictionaryData> {
-
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/mapper/FactoryMapper.java

@@ -1,16 +0,0 @@
-package com.hssx.cloudmodel.mapper;
-
-import com.hssx.cloudmodel.entity.Factory;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-public interface FactoryMapper extends BaseMapper<Factory> {
-
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/mapper/RoleMapper.java

@@ -1,16 +0,0 @@
-package com.hssx.cloudmodel.mapper;
-
-import com.hssx.cloudmodel.entity.Role;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-public interface RoleMapper extends BaseMapper<Role> {
-
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/mapper/SysUserMapper.java

@@ -1,16 +0,0 @@
-package com.hssx.cloudmodel.mapper;
-
-import com.hssx.cloudmodel.entity.SysUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-public interface SysUserMapper extends BaseMapper<SysUser> {
-
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/mapper/UserMapper.java

@@ -1,16 +0,0 @@
-package com.hssx.cloudmodel.mapper;
-
-import com.hssx.cloudmodel.entity.User;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-public interface UserMapper extends BaseMapper<User> {
-
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/CompanyService.java

@@ -1,18 +0,0 @@
-package com.hssx.cloudmodel.service;
-
-import com.hssx.cloudmodel.entity.Company;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-public interface CompanyService extends IService<Company> {
-
-    HttpRespMsg addAndUpdateRole(Company company, Integer flag);
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/DictionaryDataService.java

@@ -1,16 +0,0 @@
-package com.hssx.cloudmodel.service;
-
-import com.hssx.cloudmodel.entity.DictionaryData;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-public interface DictionaryDataService extends IService<DictionaryData> {
-
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/FactoryService.java

@@ -1,18 +0,0 @@
-package com.hssx.cloudmodel.service;
-
-import com.hssx.cloudmodel.entity.Factory;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-public interface FactoryService extends IService<Factory> {
-
-    HttpRespMsg addAndUpdateRole(Factory factory, Integer flag);
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/RoleService.java

@@ -1,18 +0,0 @@
-package com.hssx.cloudmodel.service;
-
-import com.hssx.cloudmodel.entity.Role;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-public interface RoleService extends IService<Role> {
-
-    HttpRespMsg addAndUpdateRole(Role role, Integer flag);
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java

@@ -1,21 +0,0 @@
-package com.hssx.cloudmodel.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.entity.SysUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-public interface SysUserService extends IService<SysUser> {
-
-    HttpRespMsg login(SysUser sysUser, HttpServletRequest request);
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/UserService.java

@@ -1,22 +0,0 @@
-package com.hssx.cloudmodel.service;
-
-import com.hssx.cloudmodel.entity.User;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-public interface UserService extends IService<User> {
-
-    HttpRespMsg addAndUpdateRole(User user, Integer flag);
-
-    HttpRespMsg login(User user, HttpServletRequest request);
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -1,45 +0,0 @@
-package com.hssx.cloudmodel.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.entity.Company;
-import com.hssx.cloudmodel.entity.Role;
-import com.hssx.cloudmodel.mapper.CompanyMapper;
-import com.hssx.cloudmodel.service.CompanyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@Service
-public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
-    @Autowired
-    CompanyMapper companyMapper;
-
-    @Override
-    public HttpRespMsg addAndUpdateRole(Company company, Integer flag) {
-        HttpRespMsg msg = new HttpRespMsg();
-        if (flag == 0) {
-            //添加公司
-            QueryWrapper<Company> qw = new QueryWrapper<>();
-            qw.eq("company_name", company.getCompanyName());
-            int count = companyMapper.selectCount(qw);
-            if (count > 0) {
-                msg.setError("公司已存在，请勿重复添加");
-            } else {
-                companyMapper.insert(company);
-            }
-        } else if (flag == 1) {
-            //更新公司信息
-            companyMapper.updateById(company);
-        }
-        return msg;
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/DictionaryDataServiceImpl.java

@@ -1,20 +0,0 @@
-package com.hssx.cloudmodel.service.impl;
-
-import com.hssx.cloudmodel.entity.DictionaryData;
-import com.hssx.cloudmodel.mapper.DictionaryDataMapper;
-import com.hssx.cloudmodel.service.DictionaryDataService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-@Service
-public class DictionaryDataServiceImpl extends ServiceImpl<DictionaryDataMapper, DictionaryData> implements DictionaryDataService {
-
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/FactoryServiceImpl.java

@@ -1,45 +0,0 @@
-package com.hssx.cloudmodel.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.entity.Company;
-import com.hssx.cloudmodel.entity.Factory;
-import com.hssx.cloudmodel.mapper.FactoryMapper;
-import com.hssx.cloudmodel.service.FactoryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@Service
-public class FactoryServiceImpl extends ServiceImpl<FactoryMapper, Factory> implements FactoryService {
-
-    @Autowired
-    FactoryMapper factoryMapper;
-    @Override
-    public HttpRespMsg addAndUpdateRole(Factory factory, Integer flag) {
-        HttpRespMsg msg = new HttpRespMsg();
-        if (flag == 0) {
-            //添加公司
-            QueryWrapper<Factory> qw = new QueryWrapper<>();
-            qw.eq("factory_name", factory.getFactoryName());
-            int count = factoryMapper.selectCount(qw);
-            if (count > 0) {
-                msg.setError("工厂已存在，请勿重复添加");
-            } else {
-                factoryMapper.insert(factory);
-            }
-        } else if (flag == 1) {
-            //更新公司信息
-            factoryMapper.updateById(factory);
-        }
-        return msg;
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/RoleServiceImpl.java

@@ -1,45 +0,0 @@
-package com.hssx.cloudmodel.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.entity.Role;
-import com.hssx.cloudmodel.mapper.RoleMapper;
-import com.hssx.cloudmodel.service.RoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@Service
-public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
-    @Autowired
-    RoleMapper roleMapper;
-
-    @Override
-    public HttpRespMsg addAndUpdateRole(Role role, Integer flag) {
-        HttpRespMsg msg = new HttpRespMsg();
-        if (flag == 0) {
-            //添加角色
-            QueryWrapper<Role> qw = new QueryWrapper<>();
-            qw.eq("role_name", role.getRoleName());
-            int count = roleMapper.selectCount(qw);
-            if (count > 0) {
-                msg.setError("角色已存在，请勿重复添加");
-            } else {
-                roleMapper.insert(role);
-            }
-        } else if (flag == 1) {
-            //更新角色信息
-            roleMapper.updateById(role);
-        }
-        return msg;
-
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java

@@ -1,54 +0,0 @@
-package com.hssx.cloudmodel.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.constant.Constant;
-import com.hssx.cloudmodel.entity.SysUser;
-import com.hssx.cloudmodel.mapper.SysUserMapper;
-import com.hssx.cloudmodel.service.SysUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import com.hssx.cloudmodel.util.MD5Util;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-@Service
-public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
-
-    @Autowired
-    SysUserMapper sysUserMapper;
-
-    @Override
-    public HttpRespMsg login(SysUser sysUser, HttpServletRequest request) {
-        System.out.println("sysUser" + sysUser);
-        HttpRespMsg msg = new HttpRespMsg();
-        //验证用户名是否存在
-        QueryWrapper<SysUser> qw = new QueryWrapper<>();
-        qw.eq("username", sysUser.getUsername());
-        Integer count = sysUserMapper.selectCount(qw);
-        //验证用户名是否正确
-        if (count > 0) {
-            SysUser user = sysUserMapper.selectOne(qw);
-            //验证密码是否正确
-            if (user.getPassword().equals(MD5Util.getPassword(sysUser.getPassword()))) {
-                user.setPassword("");
-                request.getSession().setAttribute(Constant.SYS_USER, user);
-                msg.data = user;
-            } else {
-                msg.setError("密码错误");
-            }
-        } else {
-            msg.setError("用户不存在");
-        }
-        return msg;
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -1,78 +0,0 @@
-package com.hssx.cloudmodel.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.constant.Constant;
-import com.hssx.cloudmodel.entity.Role;
-import com.hssx.cloudmodel.entity.SysUser;
-import com.hssx.cloudmodel.entity.User;
-import com.hssx.cloudmodel.mapper.UserMapper;
-import com.hssx.cloudmodel.service.UserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import com.hssx.cloudmodel.util.MD5Util;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-26
- */
-@Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
-    @Autowired
-    UserMapper userMapper;
-
-    @Override
-    public HttpRespMsg login(User user, HttpServletRequest request) {
-        System.out.println("user" + user);
-        HttpRespMsg msg = new HttpRespMsg();
-        //验证用户名是否存在
-        QueryWrapper<User> qw = new QueryWrapper<>();
-        qw.eq("account", user.getAccount());
-        Integer count = userMapper.selectCount(qw);
-        //验证用户名是否正确
-        if (count > 0) {
-            User newUser = userMapper.selectOne(qw);
-            //验证密码是否正确
-            if (user.getPassword().equals(MD5Util.getPassword(user.getPassword()))) {
-                user.setPassword("");
-                request.getSession().setAttribute(Constant.COMMON_USER, user);
-                msg.data = user;
-            } else {
-                msg.setError("密码错误");
-            }
-        } else {
-            msg.setError("账号不存在");
-        }
-        return msg;
-    }
-
-    @Override
-    public HttpRespMsg addAndUpdateRole(User user, Integer flag) {
-        HttpRespMsg msg = new HttpRespMsg();
-        if (flag == 0) {
-            //添加角色
-            QueryWrapper<User> qw = new QueryWrapper<>();
-            qw.eq("account", user.getAccount());
-            int count = userMapper.selectCount(qw);
-            if (count > 0) {
-                msg.setError("账号已存在，请输入其他账号");
-            } else {
-                //创建账号默认密码"000000"
-                user.setPassword(MD5Util.getPassword("000000"));
-                userMapper.insert(user);
-            }
-        } else if (flag == 1) {
-            //更新角色信息
-            userMapper.updateById(user);
-        }
-        return msg;
-    }
-
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -1,217 +0,0 @@
-package com.hssx.cloudmodel.util;
-
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.FileType;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-/**
- * mybatis-plus代码生成器
- *  使用该类需要添加以下依赖，在此之前请移除所有与mybatis有关的其他依赖，防止冲突
- *   <dependency>
- *      <groupId>com.baomidou</groupId>
- *       <artifactId>mybatis-plus-generator</artifactId>
- *       <version>3.1.2</version>
- *  </dependency>
- *
- *  <dependency>
- *        <groupId>com.baomidou</groupId>
- *        <artifactId>mybatis-plus-boot-starter</artifactId>
- *        <version>3.1.2</version>
- *   </dependency>
- *
- */
-// 演示例子，执行 main 方法控制台输入模块表名回车自动生成对应项目目录中
-public class CodeGenerator {
-
-    /**
-     * <p>
-     * 读取控制台内容
-     * </p>
-     */
-    public static String scanner(String tip) {
-        Scanner scanner = new Scanner(System.in);
-        StringBuilder help = new StringBuilder();
-        help.append("请输入" + tip + "：");
-        System.out.println(help.toString());
-        if (scanner.hasNext()) {
-            String ipt = scanner.next();
-            if (StringUtils.isNotEmpty(ipt)) {
-                return ipt;
-            }
-        }
-        throw new MybatisPlusException("请输入正确的" + tip + "！");
-    }
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        // 全局配置
-
-
-        // 自定义文件命名，注意 %s 会自动填充表实体属性！
-//        gc.setMapperName("%sDao");
-//        gc.setXmlName("%sMapper");
-//        gc.setServiceName("%sService");
-//        gc.setServiceImplName("%sServiceImap");
-//        gc.setControllerName("%sController");
-        //生成的代码存放到某个路径下，这里是E盘，
-//        gc.setOutputDir("E://");
-        //生成的代码位置为当前项目
-        String projectPath = System.getProperty("user.dir");
-        gc.setOutputDir(projectPath + "/src/main/java");
-        gc.setAuthor("吴涛涛");
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setActiveRecord(true);
-        //%s是实体类类名占位符，不配置这行的话，对于User会生成IUserService,配置后即可生成UserService;
-        gc.setServiceName("%sService");
-        // XML 二级缓存
-//      gc.setEnableCache(true);
-        // XML ResultMap
-        gc.setBaseResultMap(true);
-        // XML columList
-        gc.setBaseColumnList(true);
-        //
-        // gc.setSwagger2(true); 实体属性 Swagger2 注解
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
-//        dsc.setSchemaName("public");
-        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("p011430seya10");
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        //若果需要在Parent（此处即com.example.plus）下新建模块时打开下面注释，后续在控制台提示输入模块时，输入想要新建的模块名就可以
-//        pc.setModuleName(scanner("模块名"));
-        pc.setParent("com.hssx.cloudmodel");
-        mpg.setPackageInfo(pc);
-
-        // 自定义配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                // to do nothing
-            }
-        };
-        //以下为两种模板来生成*mapper.xml文件,任选一种即可，不同的模板对应不同的依赖
-        // 如果模板引擎是 freemarker，请添加以下依赖。
-        /**
-         *         <dependency>
-         *             <groupId>org.freemarker</groupId>
-         *             <artifactId>freemarker</artifactId>
-         *             <version>2.3.23</version>
-         *         </dependency>
-         */
-//        String templatePath = "/templates/mapper.xml.ftl";
-        // 如果模板引擎是 velocity 请添加以下依赖。
-        /**
-         *         <dependency>
-         *             <groupId>org.apache.velocity</groupId>
-         *             <artifactId>velocity-engine-core</artifactId>
-         *             <version>2.0</version>
-         *         </dependency>
-         */
-         String templatePath = "/templates/mapper.xml.vm";
-
-        // 自定义输出配置
-        List<FileOutConfig> focList = new ArrayList<>();
-        // 自定义配置会被优先输出
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                if(pc.getModuleName() == null){
-                    return projectPath + "/src/main/resources/mapper/"
-                            + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
-                }else{
-                    // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
-                    return projectPath + "/src/main/resources/mapper/" + pc.getModuleName()
-                            + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
-                }
-
-            }
-
-        });
-
-        cfg.setFileCreate(new IFileCreate() {
-            @Override
-            public boolean isCreate(ConfigBuilder configBuilder, FileType fileType, String filePath) {
-                // 判断自定义文件夹是否需要创建,这里调用默认的方法
-                checkDir(filePath);
-                //对于已存在的文件，只需重复生成 entity 和 mapper.xml
-                File file = new File(filePath);
-                boolean exist = file.exists();
-                if(exist){
-                    if (filePath.endsWith("Mapper.xml")||FileType.ENTITY==fileType){
-                        return true;
-                    }else {
-                        return false;
-                    }
-                }
-                //不存在的文件都需要创建
-                return  true;
-            }
-        });
-
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-        mpg.setTemplate(new TemplateConfig().setXml(null));
-
-        // 配置模板
-//        TemplateConfig templateConfig = new TemplateConfig();
-//
-//        // 配置自定义输出模板
-//        //指定自定义模板路径，注意不要带上.ftl/.vm, 会根据使用的模板引擎自动识别
-//        // templateConfig.setEntity("templates/entity2.java");
-//        // templateConfig.setService();
-//        // templateConfig.setController();
-//
-//        templateConfig.setXml(null);
-//        mpg.setTemplate(templateConfig);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        //若想要生成的实体类继承某个类，则可打开下面注释。写上需要继承的类的位置即可
-//        strategy.setSuperEntityClass("com.baomidou.ant.common.BaseEntity");
-        //【实体】是否为lombok模型（默认 false）
-//        strategy.setEntityLombokModel(true);
-        //对控制器生成 @RestController 注解
-        strategy.setRestControllerStyle(true);
-        //是否生成实体时，生成字段注解
-        strategy.setEntityTableFieldAnnotationEnable(true);
-//        strategy.setEntitySerialVersionUID(false)//加此行不生成生成实体类序列化编号，不加默认生成
-        //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
-//        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
-        //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_factory");
-//        strategy.setExclude();//数据库表全生成
-//        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
-        strategy.setControllerMappingHyphenStyle(true);
-        //数据库表前缀，不配置这行的话，生成的类会带有T如:TUser,配置后即可将前缀去掉
-        strategy.setTablePrefix("tb_");
-        mpg.setStrategy(strategy);
-//        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
-        mpg.execute();
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/util/HttpRespMsg.java

@@ -1,39 +0,0 @@
-package com.hssx.cloudmodel.util;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import java.io.Serializable;
-
-public class HttpRespMsg implements Serializable {
-
-    //status code, ok or error.
-    public String code;
-
-
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    public String msg;
-
-    //data content, in jsonformat, or zipped string when format is gzip
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    public Object data;
-
-    public HttpRespMsg() {
-        code = "ok";
-    }
-
-    public void setError(String errorMsg) {
-        code = "error";
-        msg = errorMsg;
-    }
-
-
-    public String toJSONStr() {
-        JSONObject json = new JSONObject();
-        json.put("code", code);
-        json.put("data", data);
-        json.put("msg", msg);
-
-        return json.toJSONString();
-    }
-}

model/cloud-model/src/main/java/com/hssx/cloudmodel/util/MD5Util.java

@@ -1,21 +0,0 @@
-package com.hssx.cloudmodel.util;
-
-import org.springframework.util.DigestUtils;
-
-/**
- * Author: 吴涛涛 cuiyi@itany.com
- * Date : 2019 - 07 - 25 16:56
- * Description:<描述>MD5加密工具
- * Version: 1.0
- */
-public class MD5Util {
-
-    public static String getPassword(String password){
-        return DigestUtils.md5DigestAsHex(password.getBytes());
-    }
-
-    public static void main(String[] args) {
-        String password = "000000";
-        System.out.println(MD5Util.getPassword(password));
-    }
-}

model/cloud-model/src/main/resources/application.properties

@@ -1,43 +0,0 @@
-# ####################################################################################################
-# 服务端配置
-server.port=8098
-server.servlet.context-path=/
-server.tomcat.uri-encoding=UTF-8
-# ####################################################################################################
-# thymeleaf 配置
-spring.thymeleaf.cache=false
-spring.thymeleaf.jackson.time-zone=GMT+8
-spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
-# ####################################################################################################
-# 数据源配置
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-spring.datasource.username=root
-spring.datasource.password=p011430seya10
-#spring.datasource.druid.test-on-borrow=true
-#spring.datasource.druid.test-while-idle=true
-# ####################################################################################################
-# MyBatis 配置
-mybatis.mapper-locations=mappers/*Mapper.xml
-mybatis.type-aliases-package=com.hssx.cloudmodel.entity/*
-# 控制台输出SQL语句
-logging.level.com.hssx.cloud.dao.*=debug
-# ####################################################################################################
-#配置Session
-spring.session.store-type=none
-# ####################################################################################################
-#成功页面跳转
-spring.thymeleaf.prefix=classpath:/static/
-######################################################################################################
-## redis 配置
-#spring.redis.host=localhost
-#spring.redis.port=6379
-######################################################################################################
-# 文件上传路径
-upload.path=D:/cloud/upload/
-#######################################################################################################
-# 配置上传文件的大小设置
-# Single file max size  即单个文件大小
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=100MB
-

model/cloud-model/src/main/resources/application.yml

@@ -1,30 +0,0 @@
-
-##########
-logging:
-  level:
-    root: info
-    org.mybatis: debug
-    java.sql: debug
-    org.springframework.web: trace
-    #打印sql语句
-    com.example.plus.mapper: debug
-##########
-mybatis-plus:
-#  mapper-locations: classpath:mapper/*/*.xml
-#  #实体扫描，多个package用逗号或者分号分隔
-#  typeAliasesPackage: com.hssx.cloudmodel
-  global-config:
-    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-    id-type: 0
-    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-    field-strategy: 2
-    db-column-underline: true
-    refresh-mapper:
-#################插入和更新非null判断
-    db-config:
-      insert-strategy: not_null
-      update-strategy: not_null
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-

model/cloud-model/src/main/resources/mapper/CompanyMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.CompanyMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Company">
-        <id column="id" property="id" />
-        <result column="company_name" property="companyName" />
-        <result column="company_address" property="companyAddress" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_name, company_address
-    </sql>
-
-</mapper>

model/cloud-model/src/main/resources/mapper/DictionaryDataMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.DictionaryDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.DictionaryData">
-        <id column="id" property="id" />
-        <result column="dict_code" property="dictCode" />
-        <result column="data_name" property="dataName" />
-        <result column="dict_value" property="dictValue" />
-        <result column="dict_order" property="dictOrder" />
-        <result column="disabled" property="disabled" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, dict_code, data_name, dict_value, dict_order, disabled
-    </sql>
-
-</mapper>

model/cloud-model/src/main/resources/mapper/FactoryMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.FactoryMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Factory">
-        <id column="id" property="id" />
-        <result column="factory_name" property="factoryName" />
-        <result column="factory_area" property="factoryArea" />
-        <result column="y_lng" property="yLng" />
-        <result column="x_lat" property="xLat" />
-        <result column="indate" property="indate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, factory_name, factory_area, y_lng, x_lat, indate
-    </sql>
-
-</mapper>

model/cloud-model/src/main/resources/mapper/RoleMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.RoleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Role">
-        <id column="id" property="id" />
-        <result column="role_name" property="roleName" />
-        <result column="dowload_power" property="dowloadPower" />
-        <result column="upload_power" property="uploadPower" />
-        <result column="view_power" property="viewPower" />
-        <result column="approval_power" property="approvalPower" />
-        <result column="indate" property="indate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, role_name, dowload_power, upload_power, view_power, approval_power, indate
-    </sql>
-
-</mapper>

model/cloud-model/src/main/resources/mapper/SysUserMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.SysUserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.SysUser">
-        <id column="id" property="id" />
-        <result column="username" property="username" />
-        <result column="password" property="password" />
-        <result column="name" property="name" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, username, password, name
-    </sql>
-
-</mapper>

model/cloud-model/src/test/java/com/hssx/cloudmodel/CloudModelApplicationTests.java

@@ -1,16 +0,0 @@
-package com.hssx.cloudmodel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class CloudModelApplicationTests {
-
-    @Test
-    public void contextLoads() {
-    }
-
-}

model/pom.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.6.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-    <groupId>com.hssx</groupId>
-    <artifactId>model</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>model</name>
-    <modules>
-        <module>cloud-model</module>
-    </modules>
-    <packaging>pom</packaging>
-    <description>Demo project for Spring Boot</description>
-
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/io.swagger/swagger-annotations -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.15</version>
-        </dependency>
-
-        <!--&lt;!&ndash; https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper-spring-boot-starter &ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>com.github.pagehelper</groupId>-->
-            <!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
-            <!--<version>1.2.10</version>-->
-        <!--</dependency>-->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>