Merge branch 'wheng' of http://39.105.160.25:10880/wuheng/eas-system into wheng

Dockerfile

@@ -1,4 +1,4 @@
 FROM openjdk:11
-COPY ./ruoyi-admin/target/ruoyi-admin.jar /tmp/app.jar
+COPY ./controller/target/controller-0.0.1-SNAPSHOT.jar /tmp/app.jar
 EXPOSE 8080
 ENTRYPOINT java -Xms256m -Xmx512m -jar /tmp/app.jar --spring.profiles.active=dev

Jenkinsfile

@@ -26,7 +26,7 @@ pipeline {
         stage('Deploy') {
             steps {
                 echo 'Deploying....'
-                sh 'docker-compose up -d'
+                sh 'docker ps'
             }
         }
     }