Merge remote-tracking branch 'origin/master'

# Conflicts:
#	user_auth/user_auth.iml

user_center/src/main/java/com/huaxu/common/ResourceUtil.java

@@ -31,7 +31,7 @@ public class ResourceUtil extends ResourceUtils {
     /**
      * 获取资源加载器（可读取jar内的文件）
      *
-     * @author ThinkGem
+     * @author WYY
      */
     public static ResourceLoader getResourceLoader() {
         return resourceLoader;
@@ -56,7 +56,7 @@ public class ResourceUtil extends ResourceUtils {
      *
      * @param location
      * @throws IOException
-     * @author ThinkGem
+     * @author WYY
      */
     public static InputStream getResourceFileStream(String location) throws IOException {
         Resource resource = resourceLoader.getResource(location);
@@ -67,7 +67,7 @@ public class ResourceUtil extends ResourceUtils {
      * 获取资源文件内容
      *
      * @param location
-     * @author ThinkGem
+     * @author WYY
      */
     public static String getResourceFileContent(String location) {
         try (InputStream is = getResourceFileStream(location)) {
@@ -81,7 +81,7 @@ public class ResourceUtil extends ResourceUtils {
      * Spring 搜索资源文件
      *
      * @param locationPattern
-     * @author ThinkGem
+     * @author WYY
      */
     public static Resource[] getResources(String locationPattern) {
         try {