liquanyu / talkonline

Commit 00435dbd0567a9a6a0c46e169fb971bb2c69e957

Authored by changpengfei over 4 years ago

修改日志、端口;依赖单独生成jar

Showing 10 changed files with 244 additions and 647 deletions

talkonlineweb/.mvn/wrapper/MavenWrapperDownloader.java
talkonlineweb/.mvn/wrapper/maven-wrapper.jar
talkonlineweb/.mvn/wrapper/maven-wrapper.properties
talkonlineweb/mvnw
talkonlineweb/mvnw.cmd
talkonlineweb/pom.xml
talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyWebConfig.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
talkonlineweb/src/main/resources/application.yml
talkonlineweb/src/main/resources/logback-spring.xml

1		-/*
2		- * Copyright 2007-present the original author or authors.
3		- *
4		- * Licensed under the Apache License, Version 2.0 (the "License");
5		- * you may not use this file except in compliance with the License.
6		- * You may obtain a copy of the License at
7		- *
8		- * https://www.apache.org/licenses/LICENSE-2.0
9		- *
10		- * Unless required by applicable law or agreed to in writing, software
11		- * distributed under the License is distributed on an "AS IS" BASIS,
12		- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13		- * See the License for the specific language governing permissions and
14		- * limitations under the License.
15		- */
16		-
17		-import java.net.*;
18		-import java.io.*;
19		-import java.nio.channels.*;
20		-import java.util.Properties;
21		-
22		-public class MavenWrapperDownloader {
23		-
24		- private static final String WRAPPER_VERSION = "0.5.6";
25		- /**
26		- * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
27		- */
28		- private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
29		- + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
30		-
31		- /**
32		- * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
33		- * use instead of the default one.
34		- */
35		- private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
36		- ".mvn/wrapper/maven-wrapper.properties";
37		-
38		- /**
39		- * Path where the maven-wrapper.jar will be saved to.
40		- */
41		- private static final String MAVEN_WRAPPER_JAR_PATH =
42		- ".mvn/wrapper/maven-wrapper.jar";
43		-
44		- /**
45		- * Name of the property which should be used to override the default download url for the wrapper.
46		- */
47		- private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
48		-
49		- public static void main(String args[]) {
50		- System.out.println("- Downloader started");
51		- File baseDirectory = new File(args[0]);
52		- System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
53		-
54		- // If the maven-wrapper.properties exists, read it and check if it contains a custom
55		- // wrapperUrl parameter.
56		- File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
57		- String url = DEFAULT_DOWNLOAD_URL;
58		- if (mavenWrapperPropertyFile.exists()) {
59		- FileInputStream mavenWrapperPropertyFileInputStream = null;
60		- try {
61		- mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
62		- Properties mavenWrapperProperties = new Properties();
63		- mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
64		- url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
65		- } catch (IOException e) {
66		- System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
67		- } finally {
68		- try {
69		- if (mavenWrapperPropertyFileInputStream != null) {
70		- mavenWrapperPropertyFileInputStream.close();
71		- }
72		- } catch (IOException e) {
73		- // Ignore ...
74		- }
75		- }
76		- }
77		- System.out.println("- Downloading from: " + url);
78		-
79		- File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
80		- if (!outputFile.getParentFile().exists()) {
81		- if (!outputFile.getParentFile().mkdirs()) {
82		- System.out.println(
83		- "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
84		- }
85		- }
86		- System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
87		- try {
88		- downloadFileFromURL(url, outputFile);
89		- System.out.println("Done");
90		- System.exit(0);
91		- } catch (Throwable e) {
92		- System.out.println("- Error downloading");
93		- e.printStackTrace();
94		- System.exit(1);
95		- }
96		- }
97		-
98		- private static void downloadFileFromURL(String urlString, File destination) throws Exception {
99		- if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
100		- String username = System.getenv("MVNW_USERNAME");
101		- char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
102		- Authenticator.setDefault(new Authenticator() {
103		- @Override
104		- protected PasswordAuthentication getPasswordAuthentication() {
105		- return new PasswordAuthentication(username, password);
106		- }
107		- });
108		- }
109		- URL website = new URL(urlString);
110		- ReadableByteChannel rbc;
111		- rbc = Channels.newChannel(website.openStream());
112		- FileOutputStream fos = new FileOutputStream(destination);
113		- fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
114		- fos.close();
115		- rbc.close();
116		- }
117		-
118		-}

No preview for this file type

1		-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2		-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

1		-#!/bin/sh
2		-# ----------------------------------------------------------------------------
3		-# Licensed to the Apache Software Foundation (ASF) under one
4		-# or more contributor license agreements. See the NOTICE file
5		-# distributed with this work for additional information
6		-# regarding copyright ownership. The ASF licenses this file
7		-# to you under the Apache License, Version 2.0 (the
8		-# "License"); you may not use this file except in compliance
9		-# with the License. You may obtain a copy of the License at
10		-#
11		-# https://www.apache.org/licenses/LICENSE-2.0
12		-#
13		-# Unless required by applicable law or agreed to in writing,
14		-# software distributed under the License is distributed on an
15		-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16		-# KIND, either express or implied. See the License for the
17		-# specific language governing permissions and limitations
18		-# under the License.
19		-# ----------------------------------------------------------------------------
20		-
21		-# ----------------------------------------------------------------------------
22		-# Maven Start Up Batch script
23		-#
24		-# Required ENV vars:
25		-# ------------------
26		-# JAVA_HOME - location of a JDK home dir
27		-#
28		-# Optional ENV vars
29		-# -----------------
30		-# M2_HOME - location of maven2's installed home dir
31		-# MAVEN_OPTS - parameters passed to the Java VM when running Maven
32		-# e.g. to debug Maven itself, use
33		-# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
34		-# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
35		-# ----------------------------------------------------------------------------
36		-
37		-if [ -z "$MAVEN_SKIP_RC" ] ; then
38		-
39		- if [ -f /etc/mavenrc ] ; then
40		- . /etc/mavenrc
41		- fi
42		-
43		- if [ -f "$HOME/.mavenrc" ] ; then
44		- . "$HOME/.mavenrc"
45		- fi
46		-
47		-fi
48		-
49		-# OS specific support. $var _must_ be set to either true or false.
50		-cygwin=false;
51		-darwin=false;
52		-mingw=false
53		-case "`uname`" in
54		- CYGWIN*) cygwin=true ;;
55		- MINGW*) mingw=true;;
56		- Darwin*) darwin=true
57		- # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
58		- # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
59		- if [ -z "$JAVA_HOME" ]; then
60		- if [ -x "/usr/libexec/java_home" ]; then
61		- export JAVA_HOME="`/usr/libexec/java_home`"
62		- else
63		- export JAVA_HOME="/Library/Java/Home"
64		- fi
65		- fi
66		- ;;
67		-esac
68		-
69		-if [ -z "$JAVA_HOME" ] ; then
70		- if [ -r /etc/gentoo-release ] ; then
71		- JAVA_HOME=`java-config --jre-home`
72		- fi
73		-fi
74		-
75		-if [ -z "$M2_HOME" ] ; then
76		- ## resolve links - $0 may be a link to maven's home
77		- PRG="$0"
78		-
79		- # need this for relative symlinks
80		- while [ -h "$PRG" ] ; do
81		- ls=`ls -ld "$PRG"`
82		- link=`expr "$ls" : '.-> $.$$'`
83		- if expr "$link" : '/.*' > /dev/null; then
84		- PRG="$link"
85		- else
86		- PRG="`dirname "$PRG"`/$link"
87		- fi
88		- done
89		-
90		- saveddir=`pwd`
91		-
92		- M2_HOME=`dirname "$PRG"`/..
93		-
94		- # make it fully qualified
95		- M2_HOME=`cd "$M2_HOME" && pwd`
96		-
97		- cd "$saveddir"
98		- # echo Using m2 at $M2_HOME
99		-fi
100		-
101		-# For Cygwin, ensure paths are in UNIX format before anything is touched
102		-if $cygwin ; then
103		- [ -n "$M2_HOME" ] &&
104		- M2_HOME=`cygpath --unix "$M2_HOME"`
105		- [ -n "$JAVA_HOME" ] &&
106		- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
107		- [ -n "$CLASSPATH" ] &&
108		- CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
109		-fi
110		-
111		-# For Mingw, ensure paths are in UNIX format before anything is touched
112		-if $mingw ; then
113		- [ -n "$M2_HOME" ] &&
114		- M2_HOME="`(cd "$M2_HOME"; pwd)`"
115		- [ -n "$JAVA_HOME" ] &&
116		- JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
117		-fi
118		-
119		-if [ -z "$JAVA_HOME" ]; then
120		- javaExecutable="`which javac`"
121		- if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '$[^ ]*$'`" = "no" ]; then
122		- # readlink(1) is not available as standard on Solaris 10.
123		- readLink=`which readlink`
124		- if [ ! `expr "$readLink" : '$[^ ]*$'` = "no" ]; then
125		- if $darwin ; then
126		- javaHome="`dirname \"$javaExecutable\"`"
127		- javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
128		- else
129		- javaExecutable="`readlink -f \"$javaExecutable\"`"
130		- fi
131		- javaHome="`dirname \"$javaExecutable\"`"
132		- javaHome=`expr "$javaHome" : '$.*$/bin'`
133		- JAVA_HOME="$javaHome"
134		- export JAVA_HOME
135		- fi
136		- fi
137		-fi
138		-
139		-if [ -z "$JAVACMD" ] ; then
140		- if [ -n "$JAVA_HOME" ] ; then
141		- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
142		- # IBM's JDK on AIX uses strange locations for the executables
143		- JAVACMD="$JAVA_HOME/jre/sh/java"
144		- else
145		- JAVACMD="$JAVA_HOME/bin/java"
146		- fi
147		- else
148		- JAVACMD="`which java`"
149		- fi
150		-fi
151		-
152		-if [ ! -x "$JAVACMD" ] ; then
153		- echo "Error: JAVA_HOME is not defined correctly." >&2
154		- echo " We cannot execute $JAVACMD" >&2
155		- exit 1
156		-fi
157		-
158		-if [ -z "$JAVA_HOME" ] ; then
159		- echo "Warning: JAVA_HOME environment variable is not set."
160		-fi
161		-
162		-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
163		-
164		-# traverses directory structure from process work directory to filesystem root
165		-# first directory with .mvn subdirectory is considered project base directory
166		-find_maven_basedir() {
167		-
168		- if [ -z "$1" ]
169		- then
170		- echo "Path not specified to find_maven_basedir"
171		- return 1
172		- fi
173		-
174		- basedir="$1"
175		- wdir="$1"
176		- while [ "$wdir" != '/' ] ; do
177		- if [ -d "$wdir"/.mvn ] ; then
178		- basedir=$wdir
179		- break
180		- fi
181		- # workaround for JBEAP-8937 (on Solaris 10/Sparc)
182		- if [ -d "${wdir}" ]; then
183		- wdir=`cd "$wdir/.."; pwd`
184		- fi
185		- # end of workaround
186		- done
187		- echo "${basedir}"
188		-}
189		-
190		-# concatenates all lines of a file
191		-concat_lines() {
192		- if [ -f "$1" ]; then
193		- echo "$(tr -s '\n' ' ' < "$1")"
194		- fi
195		-}
196		-
197		-BASE_DIR=`find_maven_basedir "$(pwd)"`
198		-if [ -z "$BASE_DIR" ]; then
199		- exit 1;
200		-fi
201		-
202		-##########################################################################################
203		-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
204		-# This allows using the maven wrapper in projects that prohibit checking in binary data.
205		-##########################################################################################
206		-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
207		- if [ "$MVNW_VERBOSE" = true ]; then
208		- echo "Found .mvn/wrapper/maven-wrapper.jar"
209		- fi
210		-else
211		- if [ "$MVNW_VERBOSE" = true ]; then
212		- echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
213		- fi
214		- if [ -n "$MVNW_REPOURL" ]; then
215		- jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
216		- else
217		- jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
218		- fi
219		- while IFS="=" read key value; do
220		- case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
221		- esac
222		- done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
223		- if [ "$MVNW_VERBOSE" = true ]; then
224		- echo "Downloading from: $jarUrl"
225		- fi
226		- wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
227		- if $cygwin; then
228		- wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
229		- fi
230		-
231		- if command -v wget > /dev/null; then
232		- if [ "$MVNW_VERBOSE" = true ]; then
233		- echo "Found wget ... using wget"
234		- fi
235		- if [ -z "$MVNW_USERNAME" ] \|\| [ -z "$MVNW_PASSWORD" ]; then
236		- wget "$jarUrl" -O "$wrapperJarPath"
237		- else
238		- wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
239		- fi
240		- elif command -v curl > /dev/null; then
241		- if [ "$MVNW_VERBOSE" = true ]; then
242		- echo "Found curl ... using curl"
243		- fi
244		- if [ -z "$MVNW_USERNAME" ] \|\| [ -z "$MVNW_PASSWORD" ]; then
245		- curl -o "$wrapperJarPath" "$jarUrl" -f
246		- else
247		- curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
248		- fi
249		-
250		- else
251		- if [ "$MVNW_VERBOSE" = true ]; then
252		- echo "Falling back to using Java to download"
253		- fi
254		- javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
255		- # For Cygwin, switch paths to Windows format before running javac
256		- if $cygwin; then
257		- javaClass=`cygpath --path --windows "$javaClass"`
258		- fi
259		- if [ -e "$javaClass" ]; then
260		- if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
261		- if [ "$MVNW_VERBOSE" = true ]; then
262		- echo " - Compiling MavenWrapperDownloader.java ..."
263		- fi
264		- # Compiling the Java class
265		- ("$JAVA_HOME/bin/javac" "$javaClass")
266		- fi
267		- if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
268		- # Running the downloader
269		- if [ "$MVNW_VERBOSE" = true ]; then
270		- echo " - Running MavenWrapperDownloader.java ..."
271		- fi
272		- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
273		- fi
274		- fi
275		- fi
276		-fi
277		-##########################################################################################
278		-# End of extension
279		-##########################################################################################
280		-
281		-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
282		-if [ "$MVNW_VERBOSE" = true ]; then
283		- echo $MAVEN_PROJECTBASEDIR
284		-fi
285		-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
286		-
287		-# For Cygwin, switch paths to Windows format before running java
288		-if $cygwin; then
289		- [ -n "$M2_HOME" ] &&
290		- M2_HOME=`cygpath --path --windows "$M2_HOME"`
291		- [ -n "$JAVA_HOME" ] &&
292		- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
293		- [ -n "$CLASSPATH" ] &&
294		- CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
295		- [ -n "$MAVEN_PROJECTBASEDIR" ] &&
296		- MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
297		-fi
298		-
299		-# Provide a "standardized" way to retrieve the CLI args that will
300		-# work with both Windows and non-Windows executions.
301		-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
302		-export MAVEN_CMD_LINE_ARGS
303		-
304		-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
305		-
306		-exec "$JAVACMD" \
307		- $MAVEN_OPTS \
308		- -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
309		- "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
310		- ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

1		-@REM ----------------------------------------------------------------------------
2		-@REM Licensed to the Apache Software Foundation (ASF) under one
3		-@REM or more contributor license agreements. See the NOTICE file
4		-@REM distributed with this work for additional information
5		-@REM regarding copyright ownership. The ASF licenses this file
6		-@REM to you under the Apache License, Version 2.0 (the
7		-@REM "License"); you may not use this file except in compliance
8		-@REM with the License. You may obtain a copy of the License at
9		-@REM
10		-@REM https://www.apache.org/licenses/LICENSE-2.0
11		-@REM
12		-@REM Unless required by applicable law or agreed to in writing,
13		-@REM software distributed under the License is distributed on an
14		-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15		-@REM KIND, either express or implied. See the License for the
16		-@REM specific language governing permissions and limitations
17		-@REM under the License.
18		-@REM ----------------------------------------------------------------------------
19		-
20		-@REM ----------------------------------------------------------------------------
21		-@REM Maven Start Up Batch script
22		-@REM
23		-@REM Required ENV vars:
24		-@REM JAVA_HOME - location of a JDK home dir
25		-@REM
26		-@REM Optional ENV vars
27		-@REM M2_HOME - location of maven2's installed home dir
28		-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
29		-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
30		-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
31		-@REM e.g. to debug Maven itself, use
32		-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
33		-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
34		-@REM ----------------------------------------------------------------------------
35		-
36		-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
37		-@echo off
38		-@REM set title of command window
39		-title %0
40		-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
41		-@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
42		-
43		-@REM set %HOME% to equivalent of $HOME
44		-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
45		-
46		-@REM Execute a user defined script before this one
47		-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
48		-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
49		-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
50		-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
51		-:skipRcPre
52		-
53		-@setlocal
54		-
55		-set ERROR_CODE=0
56		-
57		-@REM To isolate internal variables from possible post scripts, we use another setlocal
58		-@setlocal
59		-
60		-@REM ==== START VALIDATION ====
61		-if not "%JAVA_HOME%" == "" goto OkJHome
62		-
63		-echo.
64		-echo Error: JAVA_HOME not found in your environment. >&2
65		-echo Please set the JAVA_HOME variable in your environment to match the >&2
66		-echo location of your Java installation. >&2
67		-echo.
68		-goto error
69		-
70		-:OkJHome
71		-if exist "%JAVA_HOME%\bin\java.exe" goto init
72		-
73		-echo.
74		-echo Error: JAVA_HOME is set to an invalid directory. >&2
75		-echo JAVA_HOME = "%JAVA_HOME%" >&2
76		-echo Please set the JAVA_HOME variable in your environment to match the >&2
77		-echo location of your Java installation. >&2
78		-echo.
79		-goto error
80		-
81		-@REM ==== END VALIDATION ====
82		-
83		-:init
84		-
85		-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
86		-@REM Fallback to current working directory if not found.
87		-
88		-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
89		-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
90		-
91		-set EXEC_DIR=%CD%
92		-set WDIR=%EXEC_DIR%
93		-:findBaseDir
94		-IF EXIST "%WDIR%"\.mvn goto baseDirFound
95		-cd ..
96		-IF "%WDIR%"=="%CD%" goto baseDirNotFound
97		-set WDIR=%CD%
98		-goto findBaseDir
99		-
100		-:baseDirFound
101		-set MAVEN_PROJECTBASEDIR=%WDIR%
102		-cd "%EXEC_DIR%"
103		-goto endDetectBaseDir
104		-
105		-:baseDirNotFound
106		-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
107		-cd "%EXEC_DIR%"
108		-
109		-:endDetectBaseDir
110		-
111		-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
112		-
113		-@setlocal EnableExtensions EnableDelayedExpansion
114		-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
115		-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
116		-
117		-:endReadAdditionalConfig
118		-
119		-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
120		-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
121		-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
122		-
123		-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
124		-
125		-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
126		- IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
127		-)
128		-
129		-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
130		-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
131		-if exist %WRAPPER_JAR% (
132		- if "%MVNW_VERBOSE%" == "true" (
133		- echo Found %WRAPPER_JAR%
134		- )
135		-) else (
136		- if not "%MVNW_REPOURL%" == "" (
137		- SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
138		- )
139		- if "%MVNW_VERBOSE%" == "true" (
140		- echo Couldn't find %WRAPPER_JAR%, downloading it ...
141		- echo Downloading from: %DOWNLOAD_URL%
142		- )
143		-
144		- powershell -Command "&{"^
145		- "$webclient = new-object System.Net.WebClient;"^
146		- "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
147		- "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
148		- "}"^
149		- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
150		- "}"
151		- if "%MVNW_VERBOSE%" == "true" (
152		- echo Finished downloading %WRAPPER_JAR%
153		- )
154		-)
155		-@REM End of extension
156		-
157		-@REM Provide a "standardized" way to retrieve the CLI args that will
158		-@REM work with both Windows and non-Windows executions.
159		-set MAVEN_CMD_LINE_ARGS=%*
160		-
161		-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
162		-if ERRORLEVEL 1 goto error
163		-goto end
164		-
165		-:error
166		-set ERROR_CODE=1
167		-
168		-:end
169		-@endlocal & set ERROR_CODE=%ERROR_CODE%
170		-
171		-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
172		-@REM check for post script, once with legacy .bat ending and once with .cmd ending
173		-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
174		-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
175		-:skipRcPost
176		-
177		-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
178		-if "%MAVEN_BATCH_PAUSE%" == "on" pause
179		-
180		-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
181		-
182		-exit /B %ERROR_CODE%

...	...	@@ -19,7 +19,17 @@
19	19	<dependency>
20	20	<groupId>org.springframework.boot</groupId>
21	21	<artifactId>spring-boot-starter-web</artifactId>
	22	+ <exclusions><!-- 去掉springboot默认配置 -->
	23	+ <exclusion>
	24	+ <groupId>org.springframework.boot</groupId>
	25	+ <artifactId>spring-boot-starter-logging</artifactId>
	26	+ </exclusion>
	27	+ </exclusions>
22	28	</dependency>
	29	+ <dependency> <!-- 引入log4j2依赖 -->
	30	+ <groupId>org.springframework.boot</groupId>
	31	+ <artifactId>spring-boot-starter-log4j2</artifactId>
	32	+ </dependency>
23	33	<dependency>
24	34	<groupId>com.alibaba</groupId>
25	35	<artifactId>fastjson</artifactId>
26	36
...	...	@@ -60,31 +70,31 @@
60	70	<artifactId>lombok</artifactId>
61	71	<optional>true</optional>
62	72	</dependency>
63		- <dependency>
64		- <groupId>log4j</groupId>
65		- <artifactId>log4j</artifactId>
66		- <version>1.2.15</version>
67		- <exclusions>
68		- <exclusion>
69		- <groupId>javax.mail</groupId>
70		- <artifactId>mail</artifactId>
71		- </exclusion>
72		- <exclusion>
73		- <groupId>javax.jms</groupId>
74		- <artifactId>jms</artifactId>
75		- </exclusion>
76		- <exclusion>
77		- <groupId>com.sun.jdmk</groupId>
78		- <artifactId>jmxtools</artifactId>
79		- </exclusion>
80		- <exclusion>
81		- <groupId>com.sun.jmx</groupId>
82		- <artifactId>jmxri</artifactId>
83		- </exclusion>
84		- </exclusions>
85		- <scope>compile</scope>
86		- </dependency>
87	73	<!-- <dependency>-->
	74	+<!-- <groupId>log4j</groupId>-->
	75	+<!-- <artifactId>log4j</artifactId>-->
	76	+<!-- <version>1.2.15</version>-->
	77	+<!-- <exclusions>-->
	78	+<!-- <exclusion>-->
	79	+<!-- <groupId>javax.mail</groupId>-->
	80	+<!-- <artifactId>mail</artifactId>-->
	81	+<!-- </exclusion>-->
	82	+<!-- <exclusion>-->
	83	+<!-- <groupId>javax.jms</groupId>-->
	84	+<!-- <artifactId>jms</artifactId>-->
	85	+<!-- </exclusion>-->
	86	+<!-- <exclusion>-->
	87	+<!-- <groupId>com.sun.jdmk</groupId>-->
	88	+<!-- <artifactId>jmxtools</artifactId>-->
	89	+<!-- </exclusion>-->
	90	+<!-- <exclusion>-->
	91	+<!-- <groupId>com.sun.jmx</groupId>-->
	92	+<!-- <artifactId>jmxri</artifactId>-->
	93	+<!-- </exclusion>-->
	94	+<!-- </exclusions>-->
	95	+<!-- <scope>compile</scope>-->
	96	+<!-- </dependency>-->
	97	+<!-- <dependency>-->
88	98	<!-- <groupId>com.auth0</groupId>-->
89	99	<!-- <artifactId>java-jwt</artifactId>-->
90	100	<!-- <version>3.4.0</version>-->
91	101
92	102
93	103
94	104
95	105
96	106
...	...	@@ -141,22 +151,62 @@
141	151	<encoding>UTF-8</encoding>
142	152	</configuration>
143	153	</plugin>
	154	+ <!-- 原springboot包 -->
	155	+<!-- <plugin>-->
	156	+<!-- <groupId>org.springframework.boot</groupId>-->
	157	+<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
	158	+<!-- <version>2.3.12.RELEASE</version>-->
	159	+<!-- <configuration>-->
	160	+<!-- <mainClass>com.lyms.talkonlineweb.TalkonlinewebApplication</mainClass>-->
	161	+<!-- </configuration>-->
	162	+<!-- <executions>-->
	163	+<!-- <execution>-->
	164	+<!-- <id>repackage</id>-->
	165	+<!-- <goals>-->
	166	+<!-- <goal>repackage</goal>-->
	167	+<!-- </goals>-->
	168	+<!-- </execution>-->
	169	+<!-- </executions>-->
	170	+<!-- </plugin>-->
144	171	<plugin>
145		- <groupId>org.springframework.boot</groupId>
146		- <artifactId>spring-boot-maven-plugin</artifactId>
147		- <version>2.3.12.RELEASE</version>
148		- <configuration>
149		- <mainClass>com.lyms.talkonlineweb.TalkonlinewebApplication</mainClass>
150		- </configuration>
	172	+ <groupId>org.apache.maven.plugins</groupId>
	173	+ <artifactId>maven-dependency-plugin</artifactId>
151	174	<executions>
152	175	<execution>
153		- <id>repackage</id>
	176	+ <id>copy-installed</id>
	177	+ <phase>package</phase>
154	178	<goals>
155		- <goal>repackage</goal>
	179	+ <goal>copy</goal>
156	180	</goals>
	181	+ <configuration>
	182	+ <artifactItems>
	183	+ <artifactItem>
	184	+ <groupId>${project.groupId}</groupId>
	185	+ <artifactId>${project.artifactId}</artifactId>
	186	+ <version>${project.version}</version>
	187	+ <type>${project.packaging}</type>
	188	+ </artifactItem>
	189	+ </artifactItems>
	190	+ <outputDirectory>target/lib</outputDirectory>
	191	+ </configuration>
157	192	</execution>
	193	+ <execution>
	194	+ <id>copy-lib</id>
	195	+ <phase>prepare-package</phase>
	196	+ <goals>
	197	+ <goal>copy-dependencies</goal>
	198	+ </goals>
	199	+ <configuration>
	200	+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
	201	+ <overWriteReleases>false</overWriteReleases>
	202	+ <overWriteSnapshots>false</overWriteSnapshots>
	203	+ <overWriteIfNewer>true</overWriteIfNewer>
	204	+ <includeScope>compile</includeScope>
	205	+ </configuration>
	206	+ </execution>
158	207	</executions>
159	208	</plugin>
	209	+
160	210	</plugins>
161	211	</build>
162	212

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import org.springframework.beans.factory.annotation.Value;
4	4	import org.springframework.context.annotation.Configuration;
	5	+import org.springframework.web.servlet.config.annotation.CorsRegistry;
5	6	import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
6	7	import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
7	8
...	...	@@ -15,6 +16,16 @@
15	16	public void addInterceptors(InterceptorRegistry registry) {
16	17	// WebMvcConfigurer.super.addInterceptors(registry);
17	18	registry.addInterceptor(new MyWebInterceptor(excludePath));
	19	+ }
	20	+
	21	+ @Override
	22	+ public void addCorsMappings(CorsRegistry registry) {
	23	+// WebMvcConfigurer.super.addCorsMappings(registry);
	24	+ registry.addMapping("/**")
	25	+ .allowedOrigins("*")
	26	+ .allowCredentials(true)
	27	+ .allowedMethods("GET", "POST", "DELETE", "PUT")
	28	+ .maxAge(3600);
18	29	}
19	30	}

...	...	@@ -8,7 +8,7 @@
8	8	import com.lyms.talkonlineweb.service.LymsUserService;
9	9	import com.lyms.talkonlineweb.util.Constant;
10	10	import com.lyms.talkonlineweb.util.JwtUtils;
11		-import lombok.extern.log4j.Log4j;
	11	+import lombok.extern.log4j.Log4j2;
12	12	import org.springframework.beans.factory.annotation.Autowired;
13	13	import org.springframework.web.bind.annotation.GetMapping;
14	14	import org.springframework.web.bind.annotation.RestController;
...	...	@@ -19,7 +19,7 @@
19	19	import java.util.concurrent.TimeUnit;
20	20
21	21	@RestController
22		-@Log4j
	22	+@Log4j2
23	23	public class UserContoller {
24	24	// public static Cache<String, Object> cache = CacheBuilder.newBuilder()
25	25	// .expireAfterAccess(20, TimeUnit.HOURS)

1	1	debug: false
2	2	server:
3		- port: 8080
	3	+ port: 9090
4	4	spring:
5	5	application:
6	6	name: talkonlineweb
...	...	@@ -12,6 +12,8 @@
12	12	# profiles:
13	13	# active:
14	14
	15	+logging:
	16	+ config: classpath:logback-spring.xml
15	17
16	18	excludePath: login,test1,test2

	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<configuration>
	3	+
	4	+ <!-- 项目名称 -->
	5	+ <property name="PROJECT_NAME" value="talkonlineweb" />
	6	+
	7	+ <!-- 日志保存路径为tomcat下面的logs下面的user_center文件夹，logback会自动创建文件夹，这样设置了就可以输出日志文件了 -->
	8	+ <substitutionProperty name="logbase" value="tlogs"/>
	9	+
	10	+
	11	+ <!-- 日志记录器，日期滚动记录 -->
	12	+ <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
	13	+ <!-- 正在记录的日志文件的路径及文件名 -->
	14	+ <file>${logbase}/log_error.log</file>
	15	+ <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
	16	+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
	17	+ <fileNamePattern>${logbase}/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
	18	+ <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，命名日志文件，例如log-error-2017-09-21.0.log -->
	19	+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
	20	+ <maxFileSize>10MB</maxFileSize>
	21	+ </timeBasedFileNamingAndTriggeringPolicy>
	22	+ </rollingPolicy>
	23	+ <!-- 追加方式记录日志 -->
	24	+ <append>true</append>
	25	+ <!-- 日志文件的格式 -->
	26	+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
	27	+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n</pattern>
	28	+ <charset>utf-8</charset>
	29	+ </encoder>
	30	+ <!-- 此日志文件只记录info级别的 -->
	31	+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
	32	+ <level>error</level>
	33	+ <onMatch>ACCEPT</onMatch>
	34	+ <onMismatch>DENY</onMismatch>
	35	+ </filter>
	36	+ </appender>
	37	+ <!-- 日志记录器，日期滚动记录 -->
	38	+ <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
	39	+ <!-- 正在记录的日志文件的路径及文件名 -->
	40	+ <file>${logbase}/log_debug.log</file>
	41	+ <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
	42	+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
	43	+ <fileNamePattern>${logbase}/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
	44	+ <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，命名日志文件，例如log-error-2018-09-21.0.log -->
	45	+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
	46	+ <maxFileSize>10MB</maxFileSize>
	47	+ </timeBasedFileNamingAndTriggeringPolicy>
	48	+ </rollingPolicy>
	49	+ <!-- 追加方式记录日志 -->
	50	+ <append>true</append>
	51	+ <!-- 日志文件的格式 -->
	52	+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
	53	+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n</pattern>
	54	+ <charset>utf-8</charset>
	55	+ </encoder>
	56	+ <!-- 此日志文件只记录debug级别的 -->
	57	+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
	58	+ <level>debug</level>
	59	+ <onMatch>ACCEPT</onMatch>
	60	+ <onMismatch>DENY</onMismatch>
	61	+ </filter>
	62	+ </appender>
	63	+
	64	+ <!-- 日志记录器，日期滚动记录 -->
	65	+ <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
	66	+ <!-- 正在记录的日志文件的路径及文件名 -->
	67	+ <file>${logbase}/log_info.log</file>
	68	+ <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
	69	+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
	70	+ <fileNamePattern>${logbase}/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
	71	+ <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，命名日志文件，例如log-error-2017-09-21.0.log -->
	72	+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
	73	+ <maxFileSize>10MB</maxFileSize>
	74	+ </timeBasedFileNamingAndTriggeringPolicy>
	75	+ </rollingPolicy>
	76	+ <!-- 追加方式记录日志 -->
	77	+ <append>true</append>
	78	+ <!-- 日志文件的格式 -->
	79	+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
	80	+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n</pattern>
	81	+ <charset>utf-8</charset>
	82	+ </encoder>
	83	+ <!-- 此日志文件只记录info级别的 -->
	84	+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
	85	+ <level>info</level>
	86	+ <onMatch>ACCEPT</onMatch>
	87	+ <onMismatch>DENY</onMismatch>
	88	+ </filter>
	89	+ </appender>
	90	+
	91	+
	92	+ <!-- 日志记录器，日期滚动记录 -->
	93	+ <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
	94	+ <!-- 正在记录的日志文件的路径及文件名 -->
	95	+ <file>${logbase}/log_warn.log</file>
	96	+ <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
	97	+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
	98	+ <fileNamePattern>${logbase}/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
	99	+ <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，命名日志文件，例如log-error-2018-09-21.0.log -->
	100	+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
	101	+ <maxFileSize>10MB</maxFileSize>
	102	+ </timeBasedFileNamingAndTriggeringPolicy>
	103	+ </rollingPolicy>
	104	+ <!-- 追加方式记录日志 -->
	105	+ <append>true</append>
	106	+ <!-- 日志文件的格式 -->
	107	+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
	108	+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n</pattern>
	109	+ <charset>utf-8</charset>
	110	+ </encoder>
	111	+ <!-- 此日志文件只记录warn级别的 -->
	112	+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
	113	+ <level>warn</level>
	114	+ <onMatch>ACCEPT</onMatch>
	115	+ <onMismatch>DENY</onMismatch>
	116	+ </filter>
	117	+ </appender>
	118	+
	119	+
	120	+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
	121	+ <!--encoder 默认配置为PatternLayoutEncoder-->
	122	+ <encoder>
	123	+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n</pattern>
	124	+ <charset>utf-8</charset>
	125	+ </encoder>
	126	+ <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
	127	+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
	128	+ <level>info</level>
	129	+ </filter>
	130	+ </appender>
	131	+
	132	+
	133	+ <!-- 生产环境下，将此级别配置为适合的级别，以免日志文件太多或影响程序性能 -->
	134	+ <logger name="com.lyms" level="info" additivity="false">
	135	+ <appender-ref ref="ERROR" />
	136	+ <appender-ref ref="DEBUG" />
	137	+ <appender-ref ref="INFO" />
	138	+ <appender-ref ref="WARN" />
	139	+ <appender-ref ref="STDOUT" />
	140	+ </logger>
	141	+ <root level="info">
	142	+ <!-- 生产环境将请 stdout 去掉 -->
	143	+ <appender-ref ref="STDOUT" />
	144	+ </root>
	145	+
	146	+</configuration>