JLBA202505130001_关于吉林银行新建AI智能培训系统的需求_修复安卓app端人数过多时候无法正确显示
This commit is contained in:
+2
-2
@@ -4,11 +4,11 @@ ENV = 'development'
|
||||
|
||||
|
||||
|
||||
# VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
|
||||
VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
|
||||
|
||||
|
||||
|
||||
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
|
||||
# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
|
||||
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -8,8 +8,8 @@ android {
|
||||
applicationId "cn.com.jlbank.ai"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 33
|
||||
versionName System.getenv("versionName") ?: "0.3.1"
|
||||
versionCode System.getenv("versionCode")?.toInteger() ?: 229
|
||||
versionName System.getenv("versionName") ?: "0.0.6"
|
||||
versionCode System.getenv("versionCode")?.toInteger() ?: 230
|
||||
multiDexEnabled true
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
|
||||
File diff suppressed because one or more lines are too long
+2
-2
File diff suppressed because one or more lines are too long
@@ -0,0 +1,88 @@
|
||||
|
||||
pwd
|
||||
ls -a
|
||||
echo "开始"
|
||||
# rm -rf gradle-home
|
||||
rm -rf android-sdk-1.0.1.zip
|
||||
mkdir -p gradle-home
|
||||
|
||||
echo "0------------------------"
|
||||
PACKAGE_NAME="gradle"
|
||||
ZIP_FILE="${PACKAGE_NAME}-1.0.1.tar.gz"
|
||||
DEST_DIR="gradle-home"
|
||||
NEXUS_URL="http://25.12.10.69:8081"
|
||||
ZIP_URL="${NEXUS_URL}/repository/gradle-release/org/df/gradle/1.0.1/${ZIP_FILE}"
|
||||
MD5_URL="${ZIP_URL}.md5" # MD5 文件的直接链接
|
||||
|
||||
# 错误处理函数
|
||||
handle_error() {
|
||||
echo "错误:$1"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# 获取远程MD5值
|
||||
get_remote_md5() {
|
||||
local remote_md5=$(wget -q -O - "$MD5_URL" | awk '{print $1}')
|
||||
if [ -z "$remote_md5" ]; then
|
||||
handle_error "无法获取远程MD5校验值"
|
||||
fi
|
||||
echo "$remote_md5"
|
||||
}
|
||||
|
||||
# 获取本地MD5值
|
||||
get_local_md5() {
|
||||
if [ -f "$ZIP_FILE" ]; then
|
||||
md5sum "$ZIP_FILE" | awk '{print $1}'
|
||||
else
|
||||
echo ""
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
remote_md5=$(get_remote_md5)
|
||||
local_md5=$(get_local_md5)
|
||||
|
||||
# 3. 比较MD5值
|
||||
if [ "$remote_md5" = "$local_md5" ]; then
|
||||
echo "MD5校验值匹配,无需下载更新"
|
||||
|
||||
# 检查是否需要解压(如果目标目录为空)
|
||||
if [ ! -d "$DEST_DIR" ] || [ -z "$(ls -A "$DEST_DIR")" ]; then
|
||||
echo "目标目录为空,开始解压..."
|
||||
mkdir -p "$DEST_DIR"
|
||||
tar -xzvf "$ZIP_FILE" -C "$DEST_DIR" --strip-components=1 || handle_error "解压失败"
|
||||
echo "解压完成"
|
||||
else
|
||||
echo "目标目录非空,跳过解压"
|
||||
fi
|
||||
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "MD5校验值不匹配或文件不存在,开始更新..."
|
||||
|
||||
# 4. 尝试删除已存在的文件和文件夹
|
||||
echo "正在清理旧文件..."
|
||||
rm -rf "$ZIP_FILE" "$DEST_DIR" || handle_error "清理失败"
|
||||
echo "清理完成"
|
||||
|
||||
# 5. 下载ZIP文件
|
||||
echo "开始下载 $ZIP_FILE..."
|
||||
wget -q "$ZIP_URL" -O "$ZIP_FILE" || handle_error "下载失败"
|
||||
echo "下载完成"
|
||||
|
||||
# 6. 验证下载后的MD5(使用已获取的remote_md5,无需重新获取)
|
||||
new_local_md5=$(get_local_md5)
|
||||
if [ "$new_local_md5" != "$remote_md5" ]; then
|
||||
handle_error "下载的文件MD5校验失败: 本地=$new_local_md5, 远程=$remote_md5"
|
||||
fi
|
||||
echo "MD5校验成功"
|
||||
|
||||
# 7. 创建目标目录
|
||||
mkdir -p "$DEST_DIR" || handle_error "创建目录失败"
|
||||
|
||||
# 8. 解压文件
|
||||
echo "正在解压..."
|
||||
tar -xzvf "$ZIP_FILE" -C "$DEST_DIR" --strip-components=1 || handle_error "解压失败"
|
||||
echo "解压完成,文件已提取到 $DEST_DIR"
|
||||
ls -a
|
||||
@@ -0,0 +1,81 @@
|
||||
|
||||
ls -a
|
||||
node -v
|
||||
PACKAGE_NAME="android-sdk"
|
||||
ZIP_FILE="${PACKAGE_NAME}-1.0.1.tar.gz"
|
||||
DEST_DIR="android-sdk"
|
||||
NEXUS_URL="http://25.12.10.69:8081"
|
||||
ZIP_URL="${NEXUS_URL}/repository/gradle-release/org/df/android-sdk/1.0.1/${ZIP_FILE}"
|
||||
MD5_URL="${ZIP_URL}.md5" # MD5 文件的直接链接
|
||||
|
||||
# 错误处理函数
|
||||
handle_error() {
|
||||
echo "错误:$1"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# 获取远程MD5值
|
||||
get_remote_md5() {
|
||||
local remote_md5=$(wget -q -O - "$MD5_URL" | awk '{print $1}')
|
||||
if [ -z "$remote_md5" ]; then
|
||||
handle_error "无法获取远程MD5校验值"
|
||||
fi
|
||||
echo "$remote_md5"
|
||||
}
|
||||
|
||||
# 获取本地MD5值
|
||||
get_local_md5() {
|
||||
if [ -f "$ZIP_FILE" ]; then
|
||||
md5sum "$ZIP_FILE" | awk '{print $1}'
|
||||
else
|
||||
echo ""
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
remote_md5=$(get_remote_md5)
|
||||
local_md5=$(get_local_md5)
|
||||
|
||||
# 3. 比较MD5值
|
||||
if [ "$remote_md5" = "$local_md5" ]; then
|
||||
echo "MD5校验值匹配,无需下载更新"
|
||||
|
||||
# 检查是否需要解压(如果目标目录为空)
|
||||
if [ ! -d "$DEST_DIR" ] || [ -z "$(ls -A "$DEST_DIR")" ]; then
|
||||
echo "目标目录为空,开始解压..."
|
||||
mkdir -p "$DEST_DIR"
|
||||
tar -xzvf "$ZIP_FILE" -C "$DEST_DIR" --strip-components=1 || handle_error "解压失败"
|
||||
echo "解压完成"
|
||||
else
|
||||
echo "目标目录非空,跳过解压"
|
||||
fi
|
||||
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "MD5校验值不匹配或文件不存在,开始更新..."
|
||||
|
||||
# 4. 尝试删除已存在的文件和文件夹
|
||||
echo "正在清理旧文件..."
|
||||
rm -rf "$ZIP_FILE" "$DEST_DIR" || handle_error "清理失败"
|
||||
echo "清理完成"
|
||||
|
||||
# 5. 下载ZIP文件
|
||||
echo "开始下载 $ZIP_FILE..."
|
||||
wget -q "$ZIP_URL" -O "$ZIP_FILE" || handle_error "下载失败"
|
||||
echo "下载完成"
|
||||
|
||||
# 6. 验证下载后的MD5(使用已获取的remote_md5,无需重新获取)
|
||||
new_local_md5=$(get_local_md5)
|
||||
if [ "$new_local_md5" != "$remote_md5" ]; then
|
||||
handle_error "下载的文件MD5校验失败: 本地=$new_local_md5, 远程=$remote_md5"
|
||||
fi
|
||||
echo "MD5校验成功"
|
||||
|
||||
# 7. 创建目标目录
|
||||
mkdir -p "$DEST_DIR" || handle_error "创建目录失败"
|
||||
|
||||
# 8. 解压文件
|
||||
echo "正在解压..."
|
||||
tar -xzvf "$ZIP_FILE" -C "$DEST_DIR" --strip-components=1 || handle_error "解压失败"
|
||||
echo "解压完成,文件已提取到 $DEST_DIR"
|
||||
@@ -0,0 +1,19 @@
|
||||
node -v
|
||||
npm -v
|
||||
|
||||
pwd
|
||||
rm -rf dist
|
||||
rm -rf node_modules
|
||||
echo "-----删除成功-----"
|
||||
ls -a
|
||||
|
||||
#下载依赖
|
||||
npm install --unsafe-perm=true --allow-root --registry=http://25.12.10.69:8081/repository/aliyun-npm/
|
||||
#打包成静态资源
|
||||
npm run build:app-plus:${ENV_NAME}
|
||||
echo "打包成功"
|
||||
|
||||
#压缩静态资源
|
||||
cd dist/build/
|
||||
tar -czvf app.tar.gz app/
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
# 第一步 复制vue打包后的内容到安卓目录
|
||||
|
||||
# 目标目录变量
|
||||
TARGET_DIR="Android/simpleDemo/src/main/assets/apps/__UNI__EDE0E52/www"
|
||||
|
||||
# 压缩包路径变量
|
||||
TAR_FILE="dist/build/app.tar.gz"
|
||||
|
||||
# # 执行删除
|
||||
rm -rf "$TARGET_DIR"
|
||||
mkdir -p "$TARGET_DIR"
|
||||
|
||||
|
||||
tar -xzvf "$TAR_FILE" -C "$TARGET_DIR" --strip-components 1
|
||||
|
||||
#cd Android/HBuilder-Integrate-AS/simpleDemo/src/main/assets/apps/__UNI__EDE0E52/www
|
||||
#pwd
|
||||
#ls -a
|
||||
@@ -0,0 +1,41 @@
|
||||
# 第二步 开始安卓编译
|
||||
|
||||
|
||||
# 删除上次构建的
|
||||
rm -rf Android/simpleDemo/build
|
||||
# 删除gradle缓存
|
||||
rm -rf .gradle
|
||||
# java -version
|
||||
chmod -R +x gradle-home
|
||||
export GRADLE_USER_HOME=gradle-home
|
||||
|
||||
|
||||
#设置版本名称和版本号
|
||||
chmod +x environment/jq/jq
|
||||
environment/jq/jq --version
|
||||
APK_PATH="Android/simpleDemo/build/outputs/apk/release/simpleDemo-release.apk"
|
||||
|
||||
MANIFEST_JSON_PATH="Android/simpleDemo/src/main/assets/apps/__UNI__EDE0E52/www/manifest.json"
|
||||
|
||||
#export versionName=$(environment/jq/jq -r '.version.name' $MANIFEST_JSON_PATH)
|
||||
#export versionCode=$(environment/jq/jq -r '.version.code' $MANIFEST_JSON_PATH)
|
||||
|
||||
export versionName='0.2.1'
|
||||
export versionCode=$BUILD_NUMBER
|
||||
echo $versionName
|
||||
echo $versionCode
|
||||
|
||||
cd Android
|
||||
pwd
|
||||
|
||||
# 覆盖设置安卓sdk路径(因为windows端的Android Studio会自动重设)
|
||||
ANDROID_SDK=${WORKSPACE}"/android-sdk"
|
||||
echo "sdk.dir=$ANDROID_SDK" > local.properties
|
||||
# cat local.properties
|
||||
chmod +x ./gradlew
|
||||
echo "执行编译"
|
||||
#./gradlew assembleRelease
|
||||
./gradlew assembleRelease --offline -g ${WORKSPACE}/gradle-home
|
||||
# ./gradlew assembleRelease -g /data/jenkins/agent/workspace/tra-app-build-test/gradle-cache
|
||||
#./gradlew assembleDebug --no-daemon --refresh-dependencies
|
||||
echo "执行编译2"
|
||||
@@ -0,0 +1,19 @@
|
||||
# 把安卓编译的apk包改名
|
||||
|
||||
# cd environment/jq
|
||||
# 读取json需要jq包
|
||||
# chmod +x environment/jq/jq
|
||||
# environment/jq/jq --version
|
||||
|
||||
APK_PATH="Android/simpleDemo/build/outputs/apk/release/"
|
||||
|
||||
MANIFEST_JSON_PATH="Android/simpleDemo/src/main/assets/apps/__UNI__EDE0E52/www/manifest.json"
|
||||
# version=$(environment/jq/jq -r '.version.name' $MANIFEST_JSON_PATH)
|
||||
|
||||
CURRENT_TIME=$(date +"%Y%m%d%H%M")
|
||||
|
||||
OLD_APK_NAME=$APK_PATH"simpleDemo-release.apk"
|
||||
NEW_APK_NAME=$APK_PATH"jax"-${ENV_NAME}-$BUILD_NUMBER-$CURRENT_TIME.apk
|
||||
|
||||
mv $OLD_APK_NAME $NEW_APK_NAME
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
Android/simpleDemo/build/outputs/apk/release/*.apk
|
||||
@@ -0,0 +1,5 @@
|
||||
制品包路径:
|
||||
Android/simpleDemo/build/outputs/apk/release/*.apk
|
||||
|
||||
下载到服务器路径:
|
||||
/home/nginx/tra/download/apk
|
||||
@@ -0,0 +1,21 @@
|
||||
node -v
|
||||
npm -v
|
||||
|
||||
|
||||
pwd
|
||||
rm -rf dist
|
||||
rm -rf node_modules
|
||||
echo "-----删除成功-----"
|
||||
ls -a
|
||||
|
||||
#下载依赖
|
||||
# npm install --unsafe-perm=true --allow-root --registry=http://25.12.10.69:8081/repository/aliyun-npm/
|
||||
npm install --registry=http://25.12.10.69:8081/repository/aliyun-npm/
|
||||
#打包成静态资源
|
||||
npm run build:app-plus:${ENV_NAME}
|
||||
echo "打包成功"
|
||||
|
||||
#压缩静态资源
|
||||
cd dist/build/
|
||||
tar -czvf app.tar.gz app/
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
~/Desktop/lx_uniapp/auto_build/sync_remote_branch.py ${ENV_NAME}
|
||||
@@ -0,0 +1,7 @@
|
||||
选择部署包
|
||||
制品包路径:
|
||||
dist/build/app.tar.gz
|
||||
服务器地址:
|
||||
25.64.16.149/jlbank
|
||||
下载到服务器路径:
|
||||
Desktop/lx_uniapp/build/uat/Ios/HBuilder-Hello/HBuilder-Hello/Pandora/apps/__UNI__EDE0E52
|
||||
@@ -0,0 +1 @@
|
||||
~/Desktop/lx_uniapp/auto_build/build_ios.py ${ENV_NAME} ${ENV_BUILD_VERSION} ${ENV_BUILD_NUMBER}
|
||||
@@ -0,0 +1,27 @@
|
||||
6-1-1上传到苹果服务器
|
||||
~/Desktop/lx_uniapp/auto_build/upload_to_appstore.py ${ENV_NAME}
|
||||
|
||||
6-1-2上传到本地服务器
|
||||
|
||||
# 强制删除旧目录并重建(确保空目录)
|
||||
rm -rf release_ipa
|
||||
mkdir -p release_ipa
|
||||
# 下载 IPA 到目标目录(直接指定路径,避免文件散落在外层)
|
||||
curl -o "release_ipa/"${ENV_NAME}".ipa" "http://25.64.32.152/lx_uniapp_build_for_share/"${ENV_NAME}".ipa"
|
||||
# 定义旧文件路径(直接拼接,避免变量嵌套错误)
|
||||
CURRENT_TIME=$(date +"%Y%m%d%H%M")
|
||||
OLD_APK_NAME="release_ipa/"${ENV_NAME}.ipa
|
||||
# 定义新文件名(变量引用加引号,避免特殊字符或空格问题)
|
||||
NEW_APK_NAME="release_ipa/jax"-${ENV_NAME}-${ENV_BUILD_NUMBER}-${CURRENT_TIME}.ipa
|
||||
# 移动文件到当前目录(或指定目标路径)
|
||||
mv $OLD_APK_NAME $NEW_APK_NAME
|
||||
|
||||
选择部署包
|
||||
release_ipa/*.ipa
|
||||
服务器地址:
|
||||
25.16.122.66/nginx
|
||||
下载到服务器路径:
|
||||
/home/nginx/tra/download/ipa
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
source ~/.zshrc; conda activate auto_build; python ~/Desktop/lx_uniapp/auto_build/push_version.py ${ENV_NAME} ${ENV_BUILD_NUMBER}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 72 KiB |
Reference in New Issue
Block a user