Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

YeeAmosFireAutoSysStart/pom.xml

@@ -23,15 +23,15 @@
 
 
     <!-- maven打包时将lib提取到jar同目录，将配置文件提取到jar目录/config/下 -->
-    <build>
+   <!--  <build>
         <resources>
-            <!-- 先指定 src/main/resources下所有文件及文件夹为资源文件 -->
+            先指定 src/main/resources下所有文件及文件夹为资源文件
             <resource>
                 <directory>src/main/resources</directory>
                 <includes>
                     <include>**/*</include>
                 </includes>
-                <!-- 过滤不需要引用的文件 -->
+                过滤不需要引用的文件
                 <excludes>
                     <exclude>package.xml</exclude>
                 </excludes>
@@ -43,22 +43,22 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <!-- 添加index则不从mainfest中读取classpath，而是从Index.list中读取 -->
-                        <!-- <index>true</index> -->
+                        添加index则不从mainfest中读取classpath，而是从Index.list中读取
+                        <index>true</index>
                         <manifest>
                             <mainClass>com.yeejoin.amos.YeeAmosFireAutoSysStart</mainClass>
-                            <!-- to create a class path to your dependecies you have to fill true
-                                in this field -->
+                            to create a class path to your dependecies you have to fill true
+                                in this field
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
-                            <!--<classpathLayoutType>custom</classpathLayoutType> <customClasspathLayout>
-                                lib/ artifact.groupId. {artifact.artifactId}.$${artifact.extension} </customClasspathLayout> -->
+                            <classpathLayoutType>custom</classpathLayoutType> <customClasspathLayout>
+                                lib/ artifact.groupId. {artifact.artifactId}.$${artifact.extension} </customClasspathLayout>
                         </manifest>
                         <manifestEntries>
                             <Class-Path>./</Class-Path>
                         </manifestEntries>
                     </archive>
-                    <!-- <excludes> <exclude>config/**</exclude> </excludes> -->
+                    <excludes> <exclude>config/**</exclude> </excludes>
                     <includes>
                         <include>**/**.class</include>
                     </includes>
@@ -67,7 +67,7 @@
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <!-- not append assembly id in release file name -->
+                    not append assembly id in release file name
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
                         <descriptor>src/main/resources/package.xml</descriptor>
@@ -103,5 +103,41 @@
             </plugin>
         </plugins>
     </build>
-
+ -->
+ <build>
+		<resources>
+	        <!-- 先指定 src/main/resources下所有文件及文件夹为资源文件 -->
+		    <resource>
+			    <directory>src/main/resources</directory>
+			    <includes>
+			    	<include>**/*</include>
+			    </includes>
+			    <!-- 过滤不需要引用的文件 -->
+			    <excludes>
+			   		<exclude>config/*</exclude>
+				</excludes>
+		    </resource>
+	    </resources>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/application-docker.properties

@@ -12,7 +12,7 @@ eureka.client.healthcheck.enabled = true
 eureka.client.fetchRegistry = true
 
 #DB properties:
-spring.datasource.url=jdbc:mysql://amos-mysql:3306/91-safety-business?serverTimezone=UTC&&useSSL=false&&allowMultiQueries=true&serverTimezone=GMT&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://amos-mysql:3306/yeejoin_safety_business?serverTimezone=UTC&&useSSL=false&&allowMultiQueries=true&serverTimezone=GMT&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=yeejoin_1234
 spring.datasource.driver-class-name = com.mysql.jdbc.Driver

YeeAmosFireAutoSysStart/src/main/resources/application.properties

-spring.application.name = Amos-autosys-xkq
+spring.application.name = AMOS-FIREAUTOSYS
  
 server.port = 8083