Merge remote-tracking branch 'origin/develop' into develop

.gitlab-ci.yml

@@ -25,10 +25,10 @@ build:
           </settings>' > $HOME/.m2/settings.xml
 
   artifacts:
-    name: stock-market.war
+    name: india_market_java.jar
     expire_in: 1 day
     paths:
-      - ./target/stock-market.war
+      - ./target/india_market_java.jar
   script:
     - echo ">>>>>>Start Building<<<<<<"
     - pwd
@@ -36,22 +36,17 @@ build:
     - mvn -v
     - mvn clean install -Dmaven.test.skip=true
     - ls
-    #- apt-get install -y curl
-    #- curl --max-time 20 http://43.128.20.12:11113/api/webhook/justpull?project=api\&setenv_file=alpha.sh\&publish_env=alpha
     - echo ">>>>>>Finish Building<<<<<<"
 webhook:
   stage: webhook
-  #tags:
-  #  - gz
   only:
-    - main
     - develop
   script:
     - echo ">>>>>>Start Deploy<<<<<<"
     - ls
     - apt-get update
     - apt-get install -y curl
-    - curl --max-time 30 http://43.139.146.165:11113/api/webhook/justpull?project=market\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-alpha.sh
+    - curl --max-time 30 http://43.132.212.180:11113/api/webhook/justpull?project=india_market_java\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-test.sh
     - echo ">>>>>>Start Deploy Finish<<<<<<"
 
 

pom.xml

@@ -176,7 +176,7 @@
 	</dependencies>
 	
 	<build>
-		<finalName>india_stock_market</finalName>
+		<finalName>india_market_java</finalName>
 		<plugins>
 			<!--<plugin>
 				<groupId>org.apache.maven.plugins</groupId>