Merge branch 'dev' into test

.gitignore

+# ignore file
+.gradle
+.idea
+*.iml
+/c:/
+/out/
+/logs/
+**/contiperf-report/
+**/build/

gradle/wrapper/gradle-wrapper.properties

+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://downloads.gradle-dn.com/distributions/gradle-6.7.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed 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.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+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
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+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
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
\ No newline at end of file

gradlew.bat

+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem 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, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
\ No newline at end of file

src/main/java/com/patzn/cloud/service/lims/SoilServiceApplication.java

@@ -2,14 +2,9 @@ package com.patzn.cloud.service.lims;
 
 import com.patzn.cloud.commons.lock.EnableRedisDistributedLock;
 import com.patzn.cloud.commons.spring.SpringHelper;
-import com.patzn.cloud.commons.starter.EnablePatzn;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -18,14 +13,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
- * <p>
  * LimsService 实验室管理服务
- * </p>
  *
  * @author hubin
  * @since 2017-08-28
  */
-@EnablePatzn
 @EnableAsync
 @EnableCaching
 @EnableSwagger2
@@ -34,20 +26,16 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication
 @EnableTransactionManagement
 @EnableFeignClients(basePackages = {"com.patzn.cloud.feign"})
-public class SoilServiceApplication extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(SoilServiceApplication.class);
-    }
-
-    private static final Logger logger = LoggerFactory.getLogger(SoilServiceApplication.class);
+public class SoilServiceApplication {
 
     public static void main(String[] args) {
-        SpringApplication application = new SpringApplication(SoilServiceApplication.class);
-        application.setBannerMode(Banner.Mode.CONSOLE);
-        SpringHelper.setApplicationContext(application.run(args));
-        SoilServiceApplication.logger.info("SoilService start!\thttp://api.dev.patzn.com:7000/soil/swagger-ui.html");
+        try {
+            SpringApplication application = new SpringApplication(SoilServiceApplication.class);
+            application.setBannerMode(Banner.Mode.CONSOLE);
+            SpringHelper.setApplicationContext(application.run(args));
+            System.out.println("SoilService start!\thttp://api.dev.patzn.com:7000/soil/swagger-ui.html");
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
     }
-
 }

src/main/java/com/patzn/cloud/service/lims/config/AspectConfig.java

-package com.patzn.cloud.service.lims.config;
-
-import com.patzn.cloud.commons.exception.ExceptionAspect;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class AspectConfig {
-
-    @Bean
-    public ExceptionAspect exceptionAspect() {
-        return new ExceptionAspect();
-    }
-}

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilExperimentService.java

 package com.patzn.cloud.service.lims.soil.service;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
@@ -14,9 +12,10 @@ import com.patzn.cloud.service.soil.entity.SoilExperiment;
 import com.patzn.cloud.service.soil.entity.SoilOriginalRecord;
 import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
-import com.patzn.cloud.service.soil.vo.SoilUserVO;
 import jcifs.smb.SmbFile;
 
+import java.util.List;
+
 /**
  * <p>
  * 土工-样品试验表 服务类

src/main/resources/application-devout.yml

@@ -29,7 +29,6 @@ spring:
     port: 5672
     username: mqbase
     password: mqb123#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: dev.topic.push.msg

src/main/resources/application-devtest.yml

@@ -25,7 +25,6 @@ spring:
     port: 5672
     username: mqbase
     password: mqb123#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: devtest.topic.push.msg

src/main/resources/application-devtmp.yml

@@ -29,7 +29,6 @@ spring:
     port: 5672
     username: mqbase
     password: mqb123#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: dev.topic.push.msg

src/main/resources/application-hnnn.yml

@@ -24,7 +24,6 @@ spring:
     port: 5672
     username: patznrmq
     password: mqnn456#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: pro.topic.push.msg

src/main/resources/application-icas.yml

@@ -24,7 +24,6 @@ spring:
     port: 5672
     username: patznrmq
     password: mqcus123#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: pro.topic.push.msg

src/main/resources/application-jlsc.yml

@@ -25,7 +25,6 @@ spring:
     port: 5672
     username: mq_jlsc
     password: rmq_jlsc&568!
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: pro.topic.push.msg

src/main/resources/application-out.yml

@@ -29,7 +29,6 @@ spring:
     port: 5672
     username: mqbase
     password: mqb123#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: dev.topic.push.msg

src/main/resources/application-pertest.yml

@@ -39,7 +39,6 @@ spring:
     port: 5672
     username: mqbase
     password: mqb123#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: test.topic.push.msg

src/main/resources/application-pro.yml

@@ -22,7 +22,6 @@ spring:
     port: 5672
     username: mqbase
     password: mqb123#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: pro.topic.push.msg

src/main/resources/application-sjjc.yml

@@ -26,7 +26,6 @@ spring:
     port: 5672
     username: patznrmq
     password: mqsjjc476#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: pro.topic.push.msg

src/main/resources/application-test.yml

@@ -29,7 +29,6 @@ spring:
     port: 5672
     username: mqbase
     password: mqb123#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: test.topic.push.msg

src/main/resources/application-testexe.yml

@@ -29,7 +29,6 @@ spring:
     port: 5672
     username: mquser
     password: 1qazqwer
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: test.topic.push.msg

src/main/resources/application-whjc.yml

@@ -27,7 +27,6 @@ spring:
     port: 5672
     username: ptmqwh
     password: mq_weihai#125
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: pro.topic.push.msg

src/main/resources/application-zhyf.yml

@@ -25,7 +25,6 @@ spring:
     port: 5672
     username: patznsomq
     password: mqsoil456#@$5
-    publisher-confirms: true
     virtual-host: /
     topic:
       push-msg: pro.topic.push.msg

src/main/resources/application.yml

@@ -127,9 +127,6 @@ logging:
   config: classpath:log4j2.xml
   pattern:
     console: "%-5level - %msg%n"
-  level:
-  - error
-  - com.memorynotfound=trace
 
 management:
   health: