Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/.gitignore

@@ -4,6 +4,7 @@ build/
 target/
 .gradle/
 .settings/
+.idea/
 .project
 .classpath
 *.bak
@@ -11,4 +12,4 @@ target/
 .idea/
 *.iml
 *.ipr
-*.iws
+*.iws
\ No newline at end of file

backend/build.war/build.gradle

@@ -121,7 +121,7 @@ dependencies {
 	compile lib.bap2_sysconfig
 	compile lib.bap2_system
 	compile lib.hibernate_common_annotations
-	
+	compile lib.net_byte_buddy
 	compile lib.bcp_authc
 	compile lib.bcp_import
 	compile lib.json

backend/build.war/gradle/wrapper/gradle-wrapper.properties

+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

backend/build.war/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" "$@"

backend/build.war/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 execute
+
+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 execute
+
+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
+
+: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 %*
+
+: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

backend/build.war/settings.gradle

-rootProject.name = "inz.plateform.war"
+rootProject.name = "inz.platform.war"
 
 includeBuild("../") {
 	dependencySubstitution {

backend/common.gradle

@@ -247,7 +247,9 @@ ext {
         
         javax_persistence_api:        "javax.persistence:javax.persistence-api:2.2",
         jboss_javax_transaction_api:  "org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final",
-        hibernate_common_annotations: "org.hibernate.common:hibernate-commons-annotations:5.0.4.Final"
+        hibernate_common_annotations: "org.hibernate.common:hibernate-commons-annotations:5.0.4.Final",
+		net_byte_buddy:               "net.bytebuddy:byte-buddy:1.8.15"
+
 
 	]
 }
@@ -401,7 +403,13 @@ configurations.all {
 		force lib.poi
 		force lib.poi_ooxml
 		force lib.poi_ooxml_schemas
-		
+
+
+		force lib.javax_persistence_api
+		force lib.hibernate_common_annotations
+		force lib.jboss_javax_transaction_api
+		force lib.net_byte_buddy
+
 		exclude group: "c3p0", module: "c3p0"
 		exclude group: "dom4j", module: "dom4j"
 		exclude group: "com.vaadin.external.google", module: "android-json"

backend/inz.common/src/main/java/com/beecode/inz/common/util/ApiSecurityHandle.java

@@ -24,15 +24,15 @@ public class ApiSecurityHandle {
 	private final Logger log = LoggerFactory.getLogger(ApiSecurityHandle.class);
 	
 	//签名
-	@Value("${rongtong.api.apiSecret:null}")
+//	@Value("${rongtong.api.apiSecret:null}")
 	private String API_SECRET;
 	
 	//请求超时时间，单位：分钟
-	@Value("${rongtong.api.timestampExpire:0}")
+//	@Value("${rongtong.api.timestampExpire:0}")
 	private Integer TIMESTAMP_TIME_OUT_MINUTE;
 
 	//开启签名验证
-	@Value("${rongtong.api.signVerify:false}")
+//	@Value("${rongtong.api.signVerify:false}")
 	private boolean SIGN_VERIFY;
 	
 	//请求头签名

backend/inz.message/src/main/java/com/beecode/inz/message/web/MessageInfoController.java

@@ -32,32 +32,32 @@ import com.google.gson.JsonSyntaxException;
 @RestController
 @RequestMapping(value ="/common/",consumes="application/json")
 public class MessageInfoController {
-	
+
 	@Autowired
 	private MessageInfoService messageInfoService;
-	
+
 	@Autowired
 	private HttpServletRequest request;
-	
-	@Value("${rongtong.customer}")
+
+//	@Value("${rongtong.customer}")
     private boolean isCustomer;
-	
+
 	private Logger logger=LoggerFactory.getLogger(MessageInfoController.class);
-	
+
 	private final static String READ = "read";
-	
+
 	private final static String TYPE = "type";
-	
+
 	private final static String READ_COUNT = "readCount";
-	
+
 	private final static String NO_READ_COUNT = "noreadCount";
-	
+
 	private final static String IS_QUERY = "isQuery";
 	/**
 	 * 根据用户的id和消息类型来获取提醒消息
 	 * @param partId
 	 * @return
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 //	@RequestMapping(value ="message/query/{type}",method = RequestMethod.GET)
 //	public Object ListRemindMessageInfoByUserId(@PathVariable("type") String type) throws Exception {
@@ -69,10 +69,10 @@ public class MessageInfoController {
 //		List<KObject> list = messageInfoService.ListMessagesByUserIdAndType(userId, type);
 //		return list.stream().map(KObject::toValueMap).collect(Collectors.toList());
 //	}
-	
+
 	/**
 	 * 获取所有消息类型及对应未读消息数量(当前用户)
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 	@RequestMapping(value = "message/types",method = RequestMethod.GET)
 	public Object getTypesAndNoreadCount() throws Exception{
@@ -94,7 +94,7 @@ public class MessageInfoController {
 		 };
 		 return new JSONArray(types).toString();
 	}
-	
+
 	private void add(List<Map<String,Object>> list,Map<String,Object> e){
 		if(!(boolean)e.get(IS_QUERY)){
 			e.remove(IS_QUERY);
@@ -110,13 +110,13 @@ public class MessageInfoController {
 		e.remove(IS_QUERY);
 		list.add(e);
 	}
-	
-	
+
+
 	/**
 	 * 根据当前用户的id和消息类型获取未读消息数量
 	 * @param partId
 	 * @return
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 	@RequestMapping(value ="message/noread/count",method = RequestMethod.GET)
 	public Object countNoReadByUserIdAndType(@RequestParam String type) throws Exception {
@@ -124,7 +124,7 @@ public class MessageInfoController {
 		String count = messageInfoService.countNoReadByUserIdAndType(userId, type);
 		return count;
 	}
-	
+
 	/**
 	 * 一键已读
 	 */
@@ -133,8 +133,8 @@ public class MessageInfoController {
 		String userId = MessageUtils.gerCurrentUserId(isCustomer);
 		messageInfoService.readAll(userId, type);
 	}
-	
-	
+
+
 	/**
 	 * 根据消息的id更改消息的状态为已读
 	 * @param partId
@@ -150,12 +150,12 @@ public class MessageInfoController {
 		default:
 			throw new UnsupportedOperationException("operation: " + operation);
 		}
-		
+
 	}
 
 	/**
 	 * 获取指定消息类型指定页的消息-已读未读都包含，未读在前面
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 	@RequestMapping(value ="messages/query",method = RequestMethod.POST)
 	public Object queryByPaging(@RequestBody String body) throws Exception{
@@ -179,7 +179,7 @@ public class MessageInfoController {
 		}
 		return messageInfos;
 	}
-	
+
 	/**
 	 * 通过角色，消息要素，发送消息
 	 */