From f207d4a341a55a3c1d7ccd5e15f1f86233b1a7f2 Mon Sep 17 00:00:00 2001
From: mxd <838425805@qq.com>
Date: Tue, 1 Mar 2022 21:22:05 +0800
Subject: [PATCH] =?UTF-8?q?`git`=E6=8F=92=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pom.xml                                               | 8 ++++----
 .../src/main/java/org/ssssssss/magicapi/git/GitRepo.java  | 0
 .../main/java/org/ssssssss/magicapi/git/GitResource.java  | 0
 .../org/ssssssss/magicapi/git/GitStoreProperties.java     | 0
 .../org/ssssssss/magicapi/git/MagicGitConfiguration.java} | 4 ++--
 .../src/main/resources/META-INF/spring.factories          | 2 +-
 magic-api-plugins/pom.xml                                 | 2 +-
 .../org/ssssssss/magicapi/core/resource/FileResource.java | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename magic-api-plugins/{magic-api-plugin-git-store => magic-api-plugin-git}/pom.xml (83%)
 rename magic-api-plugins/{magic-api-plugin-git-store => magic-api-plugin-git}/src/main/java/org/ssssssss/magicapi/git/GitRepo.java (100%)
 rename magic-api-plugins/{magic-api-plugin-git-store => magic-api-plugin-git}/src/main/java/org/ssssssss/magicapi/git/GitResource.java (100%)
 rename magic-api-plugins/{magic-api-plugin-git-store => magic-api-plugin-git}/src/main/java/org/ssssssss/magicapi/git/GitStoreProperties.java (100%)
 rename magic-api-plugins/{magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/MagicGitStoreConfiguration.java => magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/MagicGitConfiguration.java} (89%)
 rename magic-api-plugins/{magic-api-plugin-git-store => magic-api-plugin-git}/src/main/resources/META-INF/spring.factories (54%)

diff --git a/magic-api-plugins/magic-api-plugin-git-store/pom.xml b/magic-api-plugins/magic-api-plugin-git/pom.xml
similarity index 83%
rename from magic-api-plugins/magic-api-plugin-git-store/pom.xml
rename to magic-api-plugins/magic-api-plugin-git/pom.xml
index 6579153c..888bd4b3 100644
--- a/magic-api-plugins/magic-api-plugin-git-store/pom.xml
+++ b/magic-api-plugins/magic-api-plugin-git/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-plugins</artifactId>
-        <version>2.0.0-alpha.4</version>
+        <version>2.0.0-beta.1</version>
     </parent>
-    <artifactId>magic-api-plugin-git-store</artifactId>
+    <artifactId>magic-api-plugin-git</artifactId>
     <packaging>jar</packaging>
-    <name>magic-api-plugin-git-store</name>
-    <description>magic-api-plugin-git-store</description>
+    <name>magic-api-plugin-git</name>
+    <description>magic-api-plugin-git</description>
     <properties>
         <jgit.version>5.13.0.202109080827-r</jgit.version>
     </properties>
diff --git a/magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitRepo.java b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitRepo.java
similarity index 100%
rename from magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitRepo.java
rename to magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitRepo.java
diff --git a/magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitResource.java b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitResource.java
similarity index 100%
rename from magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitResource.java
rename to magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitResource.java
diff --git a/magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitStoreProperties.java b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitStoreProperties.java
similarity index 100%
rename from magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitStoreProperties.java
rename to magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitStoreProperties.java
diff --git a/magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/MagicGitStoreConfiguration.java b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/MagicGitConfiguration.java
similarity index 89%
rename from magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/MagicGitStoreConfiguration.java
rename to magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/MagicGitConfiguration.java
index d8aab900..fe6c09c9 100644
--- a/magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/MagicGitStoreConfiguration.java
+++ b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/MagicGitConfiguration.java
@@ -16,12 +16,12 @@ import java.io.IOException;
 
 @Configuration
 @EnableConfigurationProperties(GitStoreProperties.class)
-public class MagicGitStoreConfiguration implements MagicPluginConfiguration {
+public class MagicGitConfiguration implements MagicPluginConfiguration {
 
 	private final MagicAPIProperties properties;
 	private final GitStoreProperties gitStoreProperties;
 
-	public MagicGitStoreConfiguration(MagicAPIProperties properties, GitStoreProperties gitStoreProperties) {
+	public MagicGitConfiguration(MagicAPIProperties properties, GitStoreProperties gitStoreProperties) {
 		this.properties = properties;
 		this.gitStoreProperties = gitStoreProperties;
 	}
diff --git a/magic-api-plugins/magic-api-plugin-git-store/src/main/resources/META-INF/spring.factories b/magic-api-plugins/magic-api-plugin-git/src/main/resources/META-INF/spring.factories
similarity index 54%
rename from magic-api-plugins/magic-api-plugin-git-store/src/main/resources/META-INF/spring.factories
rename to magic-api-plugins/magic-api-plugin-git/src/main/resources/META-INF/spring.factories
index 83c6a893..faf9674c 100644
--- a/magic-api-plugins/magic-api-plugin-git-store/src/main/resources/META-INF/spring.factories
+++ b/magic-api-plugins/magic-api-plugin-git/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  org.ssssssss.magicapi.git.MagicGitStoreConfiguration
+  org.ssssssss.magicapi.git.MagicGitConfiguration
diff --git a/magic-api-plugins/pom.xml b/magic-api-plugins/pom.xml
index 11ee112b..ad3d1d33 100644
--- a/magic-api-plugins/pom.xml
+++ b/magic-api-plugins/pom.xml
@@ -20,7 +20,7 @@
         <module>magic-api-plugin-mongo</module>
         <module>magic-api-plugin-elasticsearch</module>
         <module>magic-api-plugin-cluster</module>
-        <module>magic-api-plugin-git-store</module>
+        <module>magic-api-plugin-git</module>
     </modules>
     <dependencies>
         <dependency>
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/resource/FileResource.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/resource/FileResource.java
index f88a19dd..bf743ed2 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/core/resource/FileResource.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/core/resource/FileResource.java
@@ -19,8 +19,8 @@ import java.util.zip.ZipOutputStream;
 public class FileResource implements Resource {
 
 	private final boolean readonly;
-	private File file;
-	private String rootPath;
+	protected File file;
+	protected String rootPath;
 
 	public FileResource(File file, boolean readonly, String rootPath) {
 		this.file = file;