From e6376b991eedfbd758a63fedc75b1eaee995347f Mon Sep 17 00:00:00 2001
From: shilei <798989044@qq.com>
Date: Mon, 18 Sep 2023 11:32:34 +0800
Subject: [PATCH] =?UTF-8?q?#E10-decondev-1#=20=E5=88=9D=E5=A7=8B=E5=8C=96E?=
=?UTF-8?q?10=E4=BA=8C=E5=BC=80=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/.gitignore | 8 +
.idea/E10-secondev.iml | 11 +
.idea/inspectionProfiles/Project_Default.xml | 36 +++
.idea/misc.xml | 9 +
.idea/modules.xml | 8 +
.idea/vcs.xml | 6 +
build.gradle | 163 ++++++++++++
gradle/wrapper/gradle-wrapper.properties | 5 +
gradlew | 234 ++++++++++++++++++
gradlew.bat | 89 +++++++
settings.gradle | 2 +
src/main/resources/application.properties | 24 ++
.../applicationContext-secondev-dubbo.xml | 7 +
src/main/webapp/remote/health.jsp | 93 +++++++
weapp-ecology-dev.iml | 7 +
15 files changed, 702 insertions(+)
create mode 100644 .idea/.gitignore
create mode 100644 .idea/E10-secondev.iml
create mode 100644 .idea/inspectionProfiles/Project_Default.xml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/vcs.xml
create mode 100644 build.gradle
create mode 100644 gradle/wrapper/gradle-wrapper.properties
create mode 100644 gradlew
create mode 100644 gradlew.bat
create mode 100644 settings.gradle
create mode 100644 src/main/resources/application.properties
create mode 100644 src/main/resources/applicationContext-secondev-dubbo.xml
create mode 100644 src/main/webapp/remote/health.jsp
create mode 100644 weapp-ecology-dev.iml
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..73f69e0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/E10-secondev.iml b/.idea/E10-secondev.iml
new file mode 100644
index 0000000..c90834f
--- /dev/null
+++ b/.idea/E10-secondev.iml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..6560a98
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..d4b854b
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..63a9d48
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..a0fcac3
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,163 @@
+import java.nio.file.StandardCopyOption
+import java.util.zip.ZipEntry
+
+plugins {
+ id 'java'
+
+}
+
+
+group 'com.weaver.seconddev'
+version '1.0.2'
+description 'asd'
+
+java.targetCompatibility = JavaVersion.VERSION_1_8
+
+compileJava {
+ options.encoding = 'UTF-8'
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+}
+jar {
+ manifest {
+ attributes 'weaver-ecode-seconddev-id': rootProject.group + '-' + rootProject.name,
+ 'Implementation-Version': version,
+ 'Implementation-Vendor-Id': rootProject.group,
+ 'Implementation-Title': rootProject.name
+ }
+}
+repositories {
+ maven { url 'https://maven.aliyun.com/repository/public/' }
+ mavenLocal()
+ mavenCentral()
+}
+
+
+// task
+// 三方包处理
+def createJarFlagId(File jarFile) {
+ return "${rootProject.group}-${rootProject.name}-lib^${jarFile.getName()}";
+}
+
+def appendFlagIdToMF(File jarFile) {
+ println("====> 处理jar包: ${jarFile.getName()}");
+ // 重新写入 jar包内
+ def zipIn = new java.util.zip.ZipInputStream(new FileInputStream(jarFile));
+ def tmpFile = new java.io.File(System.getProperty("java.io.tmpdir") + File.separator + jarFile.getName());
+ def zipOut = new java.util.zip.ZipOutputStream(new FileOutputStream(tmpFile));
+ def entry = null;
+ while ((entry = zipIn.getNextEntry()) != null) {
+ if (!entry.isDirectory() && entry.getName().equalsIgnoreCase("META-INF/MANIFEST.MF")) {
+
+ // 如果是要修改的文件，将修改后的内容写入内存
+ def reader = new BufferedReader(new InputStreamReader(zipIn))
+ StringBuffer sb = new StringBuffer();
+ String line = "";
+ while ((line = reader.readLine()) != null ) {
+ if (line.length() > 0) {
+ if (sb.length() == 0) {
+ sb.append(line);
+ } else {
+ sb.append("\n").append(line);
+ }
+ }
+ }
+
+ // 修改内容
+ def content = sb.toString();
+
+ if (!content.contains('weaver-ecode-seconddev-id')) {
+ // 去除为首空格
+ content = content.trim();
+ // 添加id
+ def createId = createJarFlagId(jarFile);
+ println("添加flagId => ${createId}");
+ content += "\nweaver-ecode-seconddev-id: " + createId + "\n";
+ }
+
+
+ byte[] modifiedBytes = content.getBytes();
+ def byteArrayOutputStream = new ByteArrayOutputStream();
+ byteArrayOutputStream.write(modifiedBytes);
+
+ // 将修改后的内容写回 ZIP 文件
+ def modifiedEntry = new java.util.zip.ZipEntry(entry.getName());
+ zipOut.putNextEntry(modifiedEntry);
+ zipOut.write(byteArrayOutputStream.toByteArray());
+ zipOut.closeEntry();
+
+ } else {
+ zipOut.putNextEntry(new java.util.zip.ZipEntry(entry.getName()));
+ byte[] buffer = new byte[1024];
+ int bytesRead;
+ while ((bytesRead = zipIn.read(buffer)) != -1) {
+ zipOut.write(buffer, 0, bytesRead);
+ }
+ zipOut.closeEntry();
+ }
+ }
+ zipIn.close();
+ zipOut.close();
+ // 调整jar包的原有名称_开头
+ def filename = jarFile.getName();
+ if (!filename.startsWith("_")) {
+ filename = '_' + filename;
+ }
+ java.nio.file.Files.move(tmpFile.toPath(), new File(jarFile.getParentFile(), filename).toPath(),
+ java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+}
+
+task processDevLib() {
+ doFirst {
+ println("====> 处理第三方包manifest文件");
+ // 扫描第三方包目录
+ File devDir = new File("${project.rootDir}/devLib");
+ if (Objects.nonNull(devDir) && devDir.isDirectory()) {
+ for (File file : devDir.listFiles()) {
+ if (file.getName().endsWith(".jar") && !file.getName().startsWith("_")) {
+ try {
+ appendFlagIdToMF(file)
+ } catch (Exception e) {
+ println("自动处理失败：${file.getName()}")
+ e.printStackTrace()
+ }
+ };
+ }
+ }
+ }
+}
+
+task fixSoftLink() {
+ doLast {
+ println("====> 替换secDevLib中的软连接为目标文件")
+ println("====> secDevLib path: ${project.rootDir}/secDevLib")
+ File secDir = new File("${project.rootDir}/secDevLib");
+ if (!secDir.exists() || !secDir.isDirectory()) {
+ return;
+ }
+ File[] jars = secDir.listFiles();
+ for (File jarFile : jars) {
+ if (jarFile.getAbsolutePath().equals(jarFile.getCanonicalPath())) continue;
+ // 判断如果是目标链接则拷贝替换为实际文件
+ java.nio.file.Path symbolicLink = java.nio.file.Paths.get(jarFile.toURI());
+ java.nio.file.Path realPath = symbolicLink.toRealPath();
+ println("jar file => ${jarFile.getName()}, realPath => ${realPath.toFile().getPath()}")
+ java.nio.file.Files.copy(realPath, jarFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+ }
+ }
+}
+
+
+
+dependencies {
+// implementation ('org.springframework.boot:spring-boot-starter-tomcat') {
+// exclude group: 'ch.qos.logback', module: 'logback-classic'
+// } // java.lang.NoClassDefFoundError: org/apache/neethi/AssertionBuilderFactory
+ // 添加二开服务拉取的清单依赖
+ def includeType = ['**/*.jar', '**/*.class']
+ implementation fileTree(dir: project.projectDir.getPath() + '/secDevLib', includes: includeType)
+ // 项目二开自定义依赖
+ implementation fileTree(dir: project.projectDir.getPath() + "/devLib", includes: includeType)
+
+}
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..ec991f9
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..1b6c787
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original 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 POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${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 "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# 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 ;; #(
+ MSYS* | 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" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@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
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..beb97dd
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,2 @@
+
+rootProject.name = 'ecology-dev'
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
new file mode 100644
index 0000000..b5a1cd3
--- /dev/null
+++ b/src/main/resources/application.properties
@@ -0,0 +1,24 @@
+server.port=9896
+spring.application.name=weaver-secondev-service
+#dubbo.mvc.static-path-pattern=/**
+#dubbo.resources.static-locations=classpath:/ecode/,classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/
+http.filter.exclusions=/health/*
+weaver.permission.module-type=SECONDEV
+weaver.secondev.localFile.enabled=n
+weaver.secondev.release.dir=
+weaver.secondev.component.scan.packages=com.weaver,cn.eteams.wechat
+#weaver.ecode.resource.ext=png,js,css,jpg,jpeg,gif
+weaver.secondev.cas.path=/api/**
+weaver.secondev.cas.whiteList=/papi/**,/sapi/**,/api/**
+weaver.secondev.token.timeout=1800
+weaver.secondev.token.refresh.timeout=7200
+weaver.swagger.basePackage=com.weaver.ecode
+#logging.level.com.weaver=debug
+#weaver.mybatis-plus.monitor-sql.info=true
+
+spring.jackson.serialization.write-dates-as-timestamps=true
+spring.jackson.default-property-inclusion=NON_NULL
+spring.jackson.deserialization.READ_UNKNOWN_ENUM_VALUES_AS_NULL=true
+
+# dubbo.protocol.port= 6677
+
diff --git a/src/main/resources/applicationContext-secondev-dubbo.xml b/src/main/resources/applicationContext-secondev-dubbo.xml
new file mode 100644
index 0000000..9076e8f
--- /dev/null
+++ b/src/main/resources/applicationContext-secondev-dubbo.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/src/main/webapp/remote/health.jsp b/src/main/webapp/remote/health.jsp
new file mode 100644
index 0000000..0a080cd
--- /dev/null
+++ b/src/main/webapp/remote/health.jsp
@@ -0,0 +1,93 @@
+<%@ page trimDirectiveWhitespaces="true" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@page import="java.util.*" %>
+<%@page import="org.springframework.web.context.support.*" %>
+<%@page import="org.springframework.context.*" %>
+<%@ page import="com.alibaba.druid.pool.DruidDataSource" %>
+<%@ page import="org.springframework.beans.BeansException" %>
+<%@ page import="java.lang.management.ManagementFactory" %>
+<%@ page import="java.lang.management.ThreadMXBean" %>
+<%@ page import="java.sql.*" %>
+<%@ page import="org.slf4j.Logger" %>
+<%@ page import="org.slf4j.LoggerFactory" %>
+<%@ page import="javax.management.MBeanServer" %>
+<%@ page import="javax.management.ObjectName" %>
+<%@ page import="javax.management.Query" %>
+
+<%
+ Map result = new HashMap();//返回结果
+ Logger logger = LoggerFactory.getLogger("health.jsp");
+ try {
+ ApplicationContext applicationContext = WebApplicationContextUtils.getWebApplicationContext(request.getServletContext());
+
+ /*内存状态 begin*/
+ Runtime runtime = Runtime.getRuntime();
+ long maxMemory = runtime.maxMemory()/(1024 * 1024);
+ long totalMemory = runtime.totalMemory() / (1024 * 1024);
+ long freeMemory = runtime.freeMemory() / (1024 * 1024);
+ long memoryFreeRate = 100 * (maxMemory - totalMemory + freeMemory) / maxMemory;
+ result.put("maxMemory", maxMemory + "M");
+ result.put("totalMemory", totalMemory + "M");
+ result.put("freeMemory", freeMemory + "M");
+ result.put("memoryFreeRate", memoryFreeRate + "");
+ /*内存状态 end*/
+
+ /*数据库连接测试 begin*/
+ try {
+ DruidDataSource druidDataSource = (DruidDataSource) applicationContext.getBean("dataSource");
+ int activeConnectCount = druidDataSource.getActiveCount();
+ int maxActive = druidDataSource.getMaxActive();
+ int poolConnectCountIdleRate = 100 * (maxActive-activeConnectCount) / maxActive;
+ result.put("activeConnectCount", activeConnectCount + "");
+ result.put("maxActive", maxActive + "");
+ result.put("poolConnectCountIdleRate", poolConnectCountIdleRate + "");
+ //获得连接是否成功信息
+ Connection connection = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ boolean databaseConnectStatus = true;
+ try {
+ connection = druidDataSource.getConnection();
+ String sql = "select 1";
+ ps = connection.prepareStatement(sql);
+ rs = ps.executeQuery();
+ } catch (Exception e) {
+ databaseConnectStatus = false;
+ } finally {
+ if(rs!=null && !rs.isClosed()){
+ rs.close();
+ }
+ if(ps!=null && !ps.isClosed()){
+ ps.close();
+ }
+ if(connection!=null && !connection.isClosed()){
+ connection.close();
+ }
+ }
+ result.put("databaseConnectStatus", databaseConnectStatus + "");
+ } catch (BeansException e) {
+ result.put("databaseMap", "NONE");
+ }
+ /*数据库连接测试 end*/
+
+ /*应用的主线程活跃数监控 begin*/
+ ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
+ int threadCount = threadBean.getThreadCount();
+ result.put("threadCount",threadCount + "");
+ /*应用的主线程活跃数监控 end*/
+ } catch (Exception e) {
+ result.put("error", e.getMessage());
+ }
+
+ result.put("abc", "abc");
+ MBeanServer beanServer = ManagementFactory.getPlatformMBeanServer();
+ Set objectNames = beanServer.queryNames(new ObjectName("*:type=Connector,*"), Query.match(Query.attr("protocol"), Query.value("HTTP/1.1")));
+ String port = ((ObjectName) objectNames.iterator().next()).getKeyProperty("port");
+ try {
+ result.put("tomcat_port",port);
+ } catch (Exception e) {
+ logger.error(e+":"+ Arrays.toString(e.getStackTrace()));
+ }
+
+ String resultStr = com.alibaba.druid.support.json.JSONUtils.toJSONString(result);
+ response.getWriter().write(resultStr);
+%>
diff --git a/weapp-ecology-dev.iml b/weapp-ecology-dev.iml
new file mode 100644
index 0000000..e7a0b7d
--- /dev/null
+++ b/weapp-ecology-dev.iml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file