From 4e5ccb872fb420d385882e5a4a044cb20f9c75aa Mon Sep 17 00:00:00 2001
From: mindol1004 <mindolangel@gmail.com>
Date: Tue, 26 Dec 2023 16:15:25 +0900
Subject: [PATCH] pipeline commit

---
 Dockerfile           |  2 +-
 Jenkinsfile          | 38 ++++++++++++++++++++++++++++----------
 nexacro-security.txt | 20 ++++++++++++++++++++
 3 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 nexacro-security.txt

diff --git a/Dockerfile b/Dockerfile
index 8264025..a00ca67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,5 +10,5 @@ RUN ./gradlew bootJar
 FROM openjdk:17-alpine
 COPY --from=builder build/libs/*.jar app.jar
 
-EXPOSE 8080
+EXPOSE 8090
 ENTRYPOINT ["java", "-jar", "/app.jar"]
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index d471ad0..2ac902a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,7 +34,6 @@ pipeline {
 
         // gradle build
 		stage('Bulid Gradle') {
-			agent any
 			steps {
 				echo 'Bulid Gradle'
 				dir ('/var/jenkins_home/workspace/kiz-shop'){
@@ -53,7 +52,6 @@ pipeline {
         
         // docker build
         stage('Bulid Docker') {
-			agent any
 			steps {
 				echo 'Bulid Docker'
 				script {
@@ -74,22 +72,42 @@ pipeline {
         
         // docker push
         stage('Push Docker') {
-			agent any
 			steps { 
 			    echo 'Push Docker'
                 script {
                     docker.withRegistry('', registryCredential){
-                        dockerImage.push("1.0")
+                        dockerImage.push("${env.BUILD_NUMBER}")
+                        dockerImage.push("latest")
                     }
                 }
             }
 			post {
-			    success { 
-					echo 'Successfully Push Docker'
-				}
-				failure {
-					error 'This pipeline stops here...'
-				}
+			    success {
+                    sh 'sudo docker rmi -f ' + imagename + ' || true'
+                }
+                failure {
+                    error 'Docker Image Push Fail'
+                }
+			}
+        }
+
+        // docker run
+        stage('Run Docker') {
+			steps { 
+			    echo 'Run Docker'
+                script {
+                    sh 'sudo docker stop kiz-shop || true'
+                    sh 'sudo docker rm -f kiz-shop || true'
+                    sh 'sudo docker run -d -p 8090:8090 --name kiz-shop ' + imagename
+                }
+            }
+			post {
+			    success {
+                    echo 'Successfully Run Docker'
+                }
+                failure {
+                    error 'Docker Run Fail'
+                }
 			}
         }
     }
diff --git a/nexacro-security.txt b/nexacro-security.txt
new file mode 100644
index 0000000..781b684
--- /dev/null
+++ b/nexacro-security.txt
@@ -0,0 +1,20 @@
+public static Map<String, Object> nexacroDatasetToMap(NexacroContext nexacroCachedData) {
+    Map<String, Object> result = null;
+    try {
+        DataSetToObjectConverter converter = new DataSetToObjectConverter();
+        ConvertDefinition definition = new ConvertDefinition();
+        String dsName = nexacroCachedData.getPlatformRequest().getData().getDataSetList().get(0).getName();
+        definition.setName(dsName);
+        definition.setGenericType(Map.class);
+
+        DataSet dataSet = nexacroCachedData.getPlatformData().getDataSet(dsName);
+        result = (Map<String, Object>) converter.convert(dataSet, definition);
+    } catch (Exception e) {
+        throw new BizException();
+    }
+    return result;
+}
+
+
+NexacroContext nexacroCachedData = NexacroContextHolder.getNexacroContext(request, response);
+Map<String, Object> user = Utils.nexacroDatasetToMap(nexacroCachedData);
\ No newline at end of file