Merge remote-tracking branch 'origin/aes' into appbase

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "libjc/jcc/libs"]
 	path = libjc/jcc/libs
 	url = https://gitea.winboll.cc/Studio/APP_libjc_jcc_libs.git
+[submodule "keystore"]
+	path = keystore
+	url = https://gitea.winboll.cc/Studio/keystore.git

.winboll/bashChangeToBetaKeyStore.sh

@@ -1,3 +0,0 @@
-#!/bin/usr/bash
-## Change Back To Beta KeyStore in keystore module.
-cd keystore;git reset --hard f5bc75ff45fcb8894b5bd3f49b91bdd8fe3c317e;cd ..

.winboll/bashChangeToStageMGKeyStore.sh

@@ -1,3 +0,0 @@
-#!/bin/usr/bash
-## Change Back To StageMG KeyStore in keystore module.
-cd keystore;git reset --hard d22519b11253f85f495400b01b6373e9657defb4;cd ..

GenKeyStore/gen_debug_keystore.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+# 应用秘钥创建脚本
+# Linux 命令行创建JKS秘钥，alias和keyAlias可配置，文件名含时间戳
+
+# 可配置参数（按需修改）
+ALIAS="WinBoLL.CC_Debug"  # 别名（与keyAlias一致）
+STORE_PASS="androiddebugkey"
+KEY_PASS="androiddebugkey"
+COUNTRY="CN"        # 国家代码
+
+# 获取当前时间戳
+TIMESTAMP=$(date +%Y%m%d%H%M%S)
+FILENAME="${ALIAS}_${TIMESTAMP}.jks"
+STORENAME="${ALIAS}_${TIMESTAMP}.keystore"
+
+# 生成JKS文件（alias与keyAlias同步）
+keytool -genkeypair \
+  -alias "${ALIAS}" \
+  -keyalg RSA \
+  -keysize 2048 \
+  -validity 1 \
+  -keystore "${FILENAME}" \
+  -dname "CN=WBFans, OU=Studio, O=WinBoLL, L=Shanwei, ST=Guangdong, C=${COUNTRY}" \
+  -storepass "${STORE_PASS}" \
+  -keypass "${KEY_PASS}"
+
+# 写入配置文件
+cat <<EOF > ${STORENAME}
+keyAlias=${ALIAS}
+keyPassword=${KEY_PASS}
+storeFile=../appkey.jks
+storePassword=${STORE_PASS}
+EOF
+
+echo "已生成秘钥：${FILENAME}"
+echo "配置已写入 ${STORENAME}（keyAlias=${ALIAS}）"
+
+# 询问是否复制文件
+read -p "是否需要将文件复制为 appkey.jks 和 appkey.keystore？(y/n): " CONFIRM
+
+if [[ $CONFIRM =~ ^[Yy]$ ]]; then
+  # 复制 jks 文件为 appkey.jks
+  cp -v ${FILENAME} ../appkey.jks
+  # 复制 keystore 文件为 appkey.keystore
+  cp -v ${STORENAME} ../appkey.keystore
+  echo "文件复制完成"
+else
+  echo "已取消文件复制"
+fi

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jun 01 15:41:55 HKT 2025
+#Tue Jun 03 13:40:08 HKT 2025
-stageCount=3
+stageCount=5
 libraryProject=libappbase
 baseVersion=15.8
-publishVersion=15.8.2
+publishVersion=15.8.4
 buildCount=0
-baseBetaVersion=15.8.3
+baseBetaVersion=15.8.5

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 13 11:18:09 HKT 2025
+#Sun Jun 01 16:01:35 HKT 2025
-stageCount=2
+stageCount=3
 libraryProject=libapputils
 baseVersion=15.8
-publishVersion=15.8.1
+publishVersion=15.8.2
 buildCount=0
-baseBetaVersion=15.8.2
+baseBetaVersion=15.8.3

build.gradle

@@ -72,7 +72,7 @@ allprojects {
         bashCommitAppPublishBuildFlagInfoFilePath = ".winboll/bashCommitAppPublishBuildFlagInfo.sh"
         
         winbollFilePath = "winboll.properties"
-        keyPropsFilePath = "current.keystore"
+        keyPropsFilePath = "appkey.keystore"
         // 定义 lint 输出文件
         lintXmlReportFilePath = "build/reports/lint-results.xml"
         lintHTMLReportFilePath = "build/reports/lint-results.html"

current.keystore-demo

@@ -1,4 +0,0 @@
-keyAlias=WinBoLL.CC
-keyPassword=androiddebugkey
-storeFile=../WinBoLL.CC.jks
-storePassword=androiddebugkey

keystore

@@ -0,0 +1 @@
+Subproject commit e7f70226c1471f77e89079b308bf3bf431587996

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jun 01 15:41:38 HKT 2025
+#Tue Jun 03 13:40:01 HKT 2025
-stageCount=3
+stageCount=5
 libraryProject=libappbase
 baseVersion=15.8
-publishVersion=15.8.2
+publishVersion=15.8.4
 buildCount=0
-baseBetaVersion=15.8.3
+baseBetaVersion=15.8.5

libapputils/build.gradle

@@ -21,7 +21,7 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libappbase:15.8.0'
+    api 'cc.winboll.studio:libappbase:15.8.2'
     
     // 二维码类库
     api 'com.google.zxing:core:3.4.1'

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 13 11:17:53 HKT 2025
+#Sun Jun 01 16:01:19 HKT 2025
-stageCount=2
+stageCount=3
 libraryProject=libapputils
 baseVersion=15.8
-publishVersion=15.8.1
+publishVersion=15.8.2
 buildCount=0
-baseBetaVersion=15.8.2
+baseBetaVersion=15.8.3