From a609529f9fc705e27f34ecfe990a5285fbaecb22 Mon Sep 17 00:00:00 2001
From: fangshunjian <fangshunjian@geedgenetworks.com>
Date: Fri, 1 Apr 2022 11:27:19 +0800
Subject: build: 修改xjar 密码
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml   | 4 +---
 tools/package.sh | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cba265..0f6e101 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,10 +55,8 @@ dev_build:
   script:
     - env | sort
     - pwd
-    - mvn clean install -Dxjar.password=111111 -Dxjar.excludes=/db/*,/static/**/*
+    - mvn clean install -Dxjar.password=2q667Gykpr36Thcjf4JK -Dxjar.excludes=/db/*,/static/**/*
     - cd ./target && go build xjar.go && cd ..
-    - chmod +x ./tools/package.sh
-    - ./tools/package.sh
   artifacts:
     name: "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
     when: on_success
diff --git a/tools/package.sh b/tools/package.sh
index 23acad2..1e2799e 100644
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -36,7 +36,7 @@ mkdir -p $RPM_AGENT_PATH/config
 
 echo 'packaging  begin ...'
 # mvn 编译 
-mvn clean install -Dxjar.password=111111 -Dxjar.excludes=/db/*,/static/**/*
+mvn clean install -Dxjar.password=2q667Gykpr36Thcjf4JK -Dxjar.excludes=/db/*,/static/**/*
 cd ./target && go build xjar.go 
 cd $CUR_PWD 
 # 设置可执行权限
@@ -77,6 +77,7 @@ fpm -s dir -t rpm -n ${PACKAGE_NAME} -v ${PACKAGE_VERSION} --iteration ${ITERATI
 	--post-uninstall ./tools/afterremove.sh  \
 	-C $BUILD_PATH -f  \
 	-p $BUILD_PATH 
+	
 # 计算md5值
 cd $BUILD_PATH && md5sum $RPM_FULL_NAME > $RPM_FULL_NAME.md5sum.txt
 cd $CUR_PWD 
-- 
cgit v1.2.3