Merge remote-tracking branch 'origin/master' into code_bank

# Conflicts:
#	.idea/workspace.xml
This commit is contained in:
YuCheng Hu 2021-04-23 16:06:21 -04:00
commit 75dad45f99
No known key found for this signature in database
GPG Key ID: C395DC68EF030B59
4 changed files with 14 additions and 13 deletions

1
.idea/compiler.xml generated
View File

@ -15,6 +15,7 @@
<module name="cwiki-us-demo-tutorials.spring-batch.main" target="11" /> <module name="cwiki-us-demo-tutorials.spring-batch.main" target="11" />
<module name="cwiki-us-demo-tutorials.spring-batch.test" target="11" /> <module name="cwiki-us-demo-tutorials.spring-batch.test" target="11" />
<module name="lang-tutorial" target="1.5" /> <module name="lang-tutorial" target="1.5" />
<module name="parent-modules" target="11" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>
</project> </project>

1
.idea/modules.xml generated
View File

@ -8,6 +8,7 @@
<module fileurl="file://$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.main.iml" filepath="$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.main.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.main.iml" filepath="$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.test.iml" filepath="$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.test.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.test.iml" filepath="$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.test.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/cwiki-us-demo-tutorials.test.iml" filepath="$PROJECT_DIR$/.idea/modules/cwiki-us-demo-tutorials.test.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/cwiki-us-demo-tutorials.test.iml" filepath="$PROJECT_DIR$/.idea/modules/cwiki-us-demo-tutorials.test.iml" />
<module fileurl="file://$PROJECT_DIR$/parent-modules.iml" filepath="$PROJECT_DIR$/parent-modules.iml" />
</modules> </modules>
</component> </component>
</project> </project>

View File

@ -1,12 +1,12 @@
<p align="center"> <p align="center">
<a href="https://www.hackerrank.com/huyuchengus"> <a href="https://www.hackerrank.com/huyuchengus">
<img height=85 src="https://avatars1.githubusercontent.com/u/45009982?s=200&v=4"> <img height=85 src="https://avatars1.githubusercontent.com/u/45009982?s=200&v=4">
</a> </a>
<br>提供 CWIKI.US 项目中使用的代码 <br>提供 CWIKI.US 项目中使用的代码
</p> </p>
所有的 Java 代码使用的是 JDK 8 所有的 Java 代码使用的是 JDK 11
你可以通过单击下面连接后访问我们网站,并且访问我们提供的最新有关 Java 的开发资料。 你可以通过单击下面连接后访问我们网站,并且访问我们提供的最新有关 Java 的开发资料。
* [概述](https://www.cwiki.us/pages/viewpage.action?pageId=37492282) * [概述](https://www.cwiki.us/pages/viewpage.action?pageId=37492282)

View File

@ -239,8 +239,7 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>3.8.1</version>
<configuration> <configuration>
<source>${java.version}</source> <release>${java.version}</release>
<target>${java.version}</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>