From 8d79341e2305b61c8277b9b9eda88d0024ef4cbc Mon Sep 17 00:00:00 2001
From: huangsimin <huangsimin@yuandian.com>
Date: Thu, 21 Jul 2022 01:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4springboot=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore   |   4 +-
 assembly.xml |  24 +++++------
 pom.xml      | 120 ++++++++++++++++-----------------------------------
 restart.sh   |   2 +
 start.sh     |   9 ++--
 stop.sh      |   1 +
 6 files changed, 59 insertions(+), 101 deletions(-)
 create mode 100755 restart.sh

diff --git a/.gitignore b/.gitignore
index 674db64..ffc6ed1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,7 +79,7 @@ local.properties
 .classpath
 
 # Annotation Processing
-.apt_generated
+.apt_generated*
 
 .sts4-cache/
 
@@ -202,4 +202,4 @@ README.html
 
 
 raftdata
-screenlog.*
\ No newline at end of file
+screenlog.*
diff --git a/assembly.xml b/assembly.xml
index d0a0aa8..e1c5d6e 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -13,25 +13,25 @@
             <scope>runtime</scope>
         </dependencySet>
     </dependencySets>
+
     <fileSets>
+ 
+ 
+          <!-- 文件 -->
         <fileSet>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0755</fileMode>
-            <includes>
-                <include>bin/**</include>
-                <include>config/**</include>
-            </includes>
-            <excludes>
-                <exclude>**/src/**</exclude>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.*/**</exclude>
-            </excludes>
+            <fileMode>0664</fileMode>
+           <directory>${project.build.directory}</directory>
+              <outputDirectory></outputDirectory>
+             <includes>
+                 <include>*.jar</include>
+              </includes>
         </fileSet>
+
     </fileSets>
     <moduleSets>
         <moduleSet>
             <binaries>
-                <outputDirectory>lib/</outputDirectory>
+                <outputDirectory>${project.directory}</outputDirectory>
                 <unpack>false</unpack>
                 <dependencySets>
                     <dependencySet>
diff --git a/pom.xml b/pom.xml
index b6954ae..c0e9190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <mongo.driver.version>3.12.11</mongo.driver.version>
         <nacos.version>2.1.0</nacos.version>
         <snakeyaml.version>1.30</snakeyaml.version>
-
+        <logback.version>1.2.11</logback.version>
         <yuandian.common.config.version>1.0.4</yuandian.common.config.version>
     </properties>
 
@@ -53,13 +53,13 @@
     <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.2.11</version>
+        <version>${logback.version}</version>
     </dependency>
 
     <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>1.2.11</version>
+        <version>${logback.version}</version>
     </dependency>
 
         <dependency>
@@ -67,27 +67,6 @@
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
-
-  
-
-   
-
-
-        <!-- <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency> -->
-
-       
-        <!-- <dependency>
-            <groupId>ch.qos.reload4j</groupId>
-            <artifactId>reload4j</artifactId>
-            <version>1.2.21</version>
-        </dependency> -->
-
-
-   
  
      
         <dependency>
@@ -227,66 +206,63 @@
                 <version>1.6.2</version>
             </plugin>
             
-            <!-- <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.6.1</version>
-                <configuration>
-                    <pluginId>grpc-java</pluginId>
-                    <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
-                    <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                    <clearOutputDirectory>false</clearOutputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>compile-custom</goal>
-                            <goal>test-compile</goal>
-                            <goal>test-compile-custom</goal>        
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin> -->
-            <!-- <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin> -->
+         
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+
                 <configuration>
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
                              <mainClass>com.yuandian.dataflow.Server</mainClass>
                         </manifest>
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
+            <plugin>  
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                  <execution>
+                  <id>copy-dependencies</id>
+                    <phase>prepare-package</phase>
+                  <goals>
+                    <goal>copy-dependencies</goal>
+                  </goals>
+                  <configuration>
+                    <overWriteReleases>false</overWriteReleases>
+                    <overWriteSnapshots>false</overWriteSnapshots>
+                    <overWriteIfNewer>true</overWriteIfNewer>
+                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                  </configuration>
+                  </execution>
+                </executions>
+               </plugin>  
+
+            
+
+             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
-                        <phase>package</phase>
+                        <phase>assembly</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
                 <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.yuandian.dataflow.Server</mainClass>
+                        </manifest>
+                    </archive>
                     <descriptors>
                         <descriptor>assembly.xml</descriptor>
                     </descriptors>
@@ -294,29 +270,7 @@
             </plugin>
 
      
-
-            <!-- <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                  <archive>
-                    <manifest>
-                      <mainClass>com.yuandian.dataflow.Server</mainClass>
-                    </manifest>
-                  </archive>
-                  <descriptorRefs>
-                    <descriptorRef>jar-with-dependencies</descriptorRef>
-                  </descriptorRefs>
-                </configuration>
-                <executions>  
-                    <execution>  
-                      <id>make-assembly</id>          
-                      <phase>package</phase>  
-                      <goals>  
-                          <goal>single</goal>  
-                      </goals>  
-                    </execution>  
-                  </executions>  
-              </plugin> -->
+ 
 
             
 
diff --git a/restart.sh b/restart.sh
new file mode 100755
index 0000000..3bb4f6e
--- /dev/null
+++ b/restart.sh
@@ -0,0 +1,2 @@
+#! /bin/bash
+sh stop.sh & rm raftdata/ -rf && mvn -T4 package  && truncate -s 0 screenlog.0 && sh start.sh
diff --git a/start.sh b/start.sh
index 366b3f1..2b4c76e 100755
--- a/start.sh
+++ b/start.sh
@@ -1,15 +1,16 @@
+#! /bin/bash
 screen -S raft-0 -X quit
 screen -S raft-1 -X quit
 screen -S raft-2 -X quit 
 
 
-version=1.0.0-SNAPSHOT
+VERSION=1.0.0-SNAPSHOT
 
 sleep 1
 
-screen  -dmS raft-0 -L  java -cp target/dataflow-${version}.jar-bin/lib/*jar -jar target/dataflow-${version}.jar 0  
-screen  -dmS raft-1 -L  java -cp target/dataflow-${version}.jar-bin/lib/*jar -jar target/dataflow-${version}.jar 1  
-screen  -dmS raft-2 -L  java -cp target/dataflow-${version}.jar-bin/lib/*jar -jar target/dataflow-${version}.jar 2  
+screen  -dmS raft-0 -L  java -jar  target/dataflow-${VERSION}.jar 0  
+screen  -dmS raft-1 -L  java -jar  target/dataflow-${VERSION}.jar 1  
+screen  -dmS raft-2 -L  java -jar  target/dataflow-${VERSION}.jar 2  
 
 sleep 1
 
diff --git a/stop.sh b/stop.sh
index e34e95a..12f7ef1 100755
--- a/stop.sh
+++ b/stop.sh
@@ -1,3 +1,4 @@
+#! /bin/bash
 screen -S raft-0 -X quit
 screen -S raft-1 -X quit
 screen -S raft-2 -X quit