From d1d6771a32edca40f88a800459442279c00f6867 Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期一, 07 八月 2023 17:52:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- .idea/jarRepositories.xml | 20 ++++++++++ .idea/vcs.xml | 6 +++ .idea/encodings.xml | 13 ++++++ .idea/aws.xml | 11 +++++ .idea/compiler.xml | 28 ++++++++++++++ .idea/.gitignore | 8 ++++ .idea/misc.xml | 12 ++++++ 7 files changed, 98 insertions(+), 0 deletions(-) diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 榛樿蹇界暐鐨勬枃浠� +/shelf/ +/workspace.xml +# 鍩轰簬缂栬緫鍣ㄧ殑 HTTP 瀹㈡埛绔姹� +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/aws.xml b/.idea/aws.xml new file mode 100644 index 0000000..b63b642 --- /dev/null +++ b/.idea/aws.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="accountSettings"> + <option name="activeRegion" value="us-east-1" /> + <option name="recentlyUsedRegions"> + <list> + <option value="us-east-1" /> + </list> + </option> + </component> +</project> \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..3516d6a --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="CompilerConfiguration"> + <annotationProcessing> + <profile name="Maven default annotation processors profile" enabled="true"> + <sourceOutputDir name="target/generated-sources/annotations" /> + <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> + <outputRelativeToContentRoot value="true" /> + <module name="inspection-server" /> + <module name="framework" /> + <module name="sys" /> + <module name="standard-server" /> + <module name="laboratory-server" /> + <module name="user-server" /> + </profile> + </annotationProcessing> + </component> + <component name="JavacSettings"> + <option name="ADDITIONAL_OPTIONS_OVERRIDE"> + <module name="framework" options="-parameters" /> + <module name="inspection-server" options="-parameters" /> + <module name="laboratory-server" options="-parameters" /> + <module name="standard-server" options="-parameters" /> + <module name="sys" options="-parameters" /> + <module name="user-server" options="-parameters" /> + </option> + </component> +</project> \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..343cd9b --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8"> + <file url="file://$PROJECT_DIR$/framework/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/inspection-server/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/laboratory-server/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/standard-server/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/sys/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/user-server/src/main/java" charset="UTF-8" /> + <file url="PROJECT" charset="UTF-8" /> + </component> +</project> \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..980588c --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="RemoteRepositoriesConfiguration"> + <remote-repository> + <option name="id" value="central" /> + <option name="name" value="Maven Central repository" /> + <option name="url" value="https://repo1.maven.org/maven2" /> + </remote-repository> + <remote-repository> + <option name="id" value="jboss.community" /> + <option name="name" value="JBoss Community repository" /> + <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> + </remote-repository> + <remote-repository> + <option name="id" value="central" /> + <option name="name" value="Central Repository" /> + <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" /> + </remote-repository> + </component> +</project> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..0abcc97 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ExternalStorageConfigurationManager" enabled="true" /> + <component name="MavenProjectsManager"> + <option name="originalFiles"> + <list> + <option value="$PROJECT_DIR$/pom.xml" /> + </list> + </option> + </component> + <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK" /> +</project> \ 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="" vcs="Git" /> + </component> +</project> \ No newline at end of file -- Gitblit v1.9.3