ly 2 mesiacov pred
rodič
commit
6be3cfc571
2 zmenil súbory, kde vykonal 37 pridanie a 25 odobranie
  1. 30 18
      pom.xml
  2. 7 7
      src/main/resources/application-dev.yml

+ 30 - 18
pom.xml

@@ -344,9 +344,21 @@
 
     </dependencies>
 
-
-
     <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置,devtools不会生效 -->
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!--<build>
         <finalName>${project.artifactId}</finalName>
         <extensions>
             <extension>
@@ -363,7 +375,7 @@
                     <fork>true</fork>
                 </configuration>
             </plugin>
-            <!-- resource插件 -->
+            &lt;!&ndash; resource插件 &ndash;&gt;
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -372,7 +384,7 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
-            <!-- 跳过单元测试 -->
+            &lt;!&ndash; 跳过单元测试 &ndash;&gt;
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -388,16 +400,16 @@
                     <fromFile>target/${pack-name}</fromFile>
                     <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
                     <commands>
-                        <!-- Kill Old Process -->
+                        &lt;!&ndash; Kill Old Process &ndash;&gt;
                         <command>kill -9 `ps -ef |grep ${project.artifactId}.jar|grep -v "grep" |awk '{print $2}'`
                         </command>
-                        <!-- Restart jar package,write result into renren.log -->
+                        &lt;!&ndash; Restart jar package,write result into renren.log &ndash;&gt;
                         <command>
-                            <![CDATA[nohup java -jar ${service-path}/${pack-name} --spring.profiles.active=test > ${service-path}/renren.log 2>&1 & ]]></command>
+                            <![CDATA[nohup java -jar ${service-path}/${pack-name} &#45;&#45;spring.profiles.active=test > ${service-path}/renren.log 2>&1 & ]]></command>
                         <command><![CDATA[netstat -nptl]]></command>
                         <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>
                     </commands>
-                    <!-- 运行命令 mvn clean package wagon:upload-single wagon:sshexec-->
+                    &lt;!&ndash; 运行命令 mvn clean package wagon:upload-single wagon:sshexec&ndash;&gt;
                     <displayCommandOutputs>true</displayCommandOutputs>
                 </configuration>
             </plugin>
@@ -406,14 +418,14 @@
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <version>0.4.14</version>
-                <!--<executions>-->
-                <!--<execution>-->
-                <!--<phase>package</phase>-->
-                <!--<goals>-->
-                <!--<goal>build</goal>-->
-                <!--</goals>-->
-                <!--</execution>-->
-                <!--</executions>-->
+                &lt;!&ndash;<executions>&ndash;&gt;
+                &lt;!&ndash;<execution>&ndash;&gt;
+                &lt;!&ndash;<phase>package</phase>&ndash;&gt;
+                &lt;!&ndash;<goals>&ndash;&gt;
+                &lt;!&ndash;<goal>build</goal>&ndash;&gt;
+                &lt;!&ndash;</goals>&ndash;&gt;
+                &lt;!&ndash;</execution>&ndash;&gt;
+                &lt;!&ndash;</executions>&ndash;&gt;
                 <configuration>
                     <imageName>renren/fast</imageName>
                     <dockerDirectory>${project.basedir}</dockerDirectory>
@@ -425,10 +437,10 @@
                         </resource>
                     </resources>
                 </configuration>
-                <!-- 运行命令 mvn clean package docker:build 打包并生成docker镜像 -->
+                &lt;!&ndash; 运行命令 mvn clean package docker:build 打包并生成docker镜像 &ndash;&gt;
             </plugin>
         </plugins>
-    </build>
+    </build>-->
 
     <repositories>
         <repository>

+ 7 - 7
src/main/resources/application-dev.yml

@@ -6,13 +6,13 @@ spring:
       #            url: jdbc:mysql://106.12.179.155:3306/ssy_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
       #            username: ENC(Jnap8dU25YV9cE1pJKpISg==)
       #            password: ENC(tjXpQ4vKnTCS/zeRsZdx6oTxW36qkJt9)
-#      driver-class-name: oracle.jdbc.OracleDriver
-#      url: jdbc:oracle:thin:@47.114.101.16:1521:XE
-#      username: newcpms
-#      password: ssy666666
-      url: jdbc:oracle:thin:@10.138.6.6:1521:moct
-      username: NEWCPMS
-      password: pw4Test!
+      driver-class-name: oracle.jdbc.OracleDriver
+      url: jdbc:oracle:thin:@47.114.101.16:1521:XE
+      username: newcpms
+      password: ssy666666
+#      url: jdbc:oracle:thin:@10.138.6.6:1521:moct
+#      username: NEWCPMS
+#      password: pw4Test!
       initial-size: 10
       max-active: 100
       min-idle: 10