appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jun 05 04:02:31 GMT 2025
+#Wed Jun 04 15:04:39 HKT 2025
 stageCount=8
 libraryProject=libappbase
 baseVersion=15.8
 publishVersion=15.8.7
-buildCount=1
+buildCount=0
 baseBetaVersion=15.8.8

libappbase/build.gradle

@@ -24,8 +24,5 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     // 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
-    api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
+    
-    // 添加Gson依赖
-    api 'com.google.code.gson:gson:2.10.1'
-
 }

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jun 05 04:02:31 GMT 2025
+#Wed Jun 04 15:04:39 HKT 2025
 stageCount=8
 libraryProject=libappbase
 baseVersion=15.8
 publishVersion=15.8.7
-buildCount=1
+buildCount=0
 baseBetaVersion=15.8.8

libappbase/src/main/java/cc/winboll/studio/libappbase/activities/LogonActivity.java

@@ -3,14 +3,10 @@ package cc.winboll.studio.libappbase.activities;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.RadioButton;
-import cc.winboll.studio.libappbase.BuildConfig;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.R;
-import cc.winboll.studio.libappbase.models.UserInfoModel;
 import cc.winboll.studio.libappbase.utils.RSAUtils;
-import cc.winboll.studio.libappbase.utils.YunUtils;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import java.security.KeyPair;
 import java.security.PrivateKey;
@@ -25,14 +21,8 @@ public class LogonActivity extends Activity implements IWinBoLLActivity {
 
     public static final String TAG = "LogonActivity";
 
-    public static final String DEBUG_HOST = "http://10.8.0.250:456";
-    public static final String YUN_HOST = "https://yun.winboll.cc";
-    
-    String mHost = "";
-    RadioButton mrbYunHost;
-    RadioButton mrbDebugHost;
     LogView mLogView;
-    
+
     @Override
     public Activity getActivity() {
         return this;
@@ -50,25 +40,6 @@ public class LogonActivity extends Activity implements IWinBoLLActivity {
         mLogView = findViewById(R.id.logview);
         mLogView.start();
 
-        mHost = BuildConfig.DEBUG ? DEBUG_HOST: YUN_HOST;
-        if (BuildConfig.DEBUG) {
-            mrbYunHost = findViewById(R.id.rb_yunhost);
-            mrbDebugHost = findViewById(R.id.rb_debughost);
-            mrbYunHost.setChecked(!BuildConfig.DEBUG);
-            mrbDebugHost.setChecked(BuildConfig.DEBUG);
-        } else {
-            findViewById(R.id.ll_hostbar).setVisibility(View.GONE);
-        }
-    }
-    
-    public void onSwitchHost(View view) {
-        if (view.getId() == R.id.rb_yunhost) {
-            mrbDebugHost.setChecked(false);
-            mHost = YUN_HOST;
-        } else if (view.getId() == R.id.rb_debughost) {
-            mrbYunHost.setChecked(false);
-            mHost = DEBUG_HOST;
-        }
     }
 
     @Override
@@ -77,33 +48,24 @@ public class LogonActivity extends Activity implements IWinBoLLActivity {
         mLogView.start();
     }
 
-    public void onTestLogin(View view) {
-        LogUtils.d(TAG, "onTestLogin");
-        final YunUtils yunUtils = YunUtils.getInstance(this);
-        
-        UserInfoModel userInfoModel = new UserInfoModel();
-        userInfoModel.setUsername("jian");
-        userInfoModel.setPassword("kkiio");
-        userInfoModel.setToken("aaa111");
-        yunUtils.login(mHost, userInfoModel);
-    }
-
     public void onTestRSA(View view) {
         LogUtils.d(TAG, "onTestRSA");
-        RSAUtils utils = RSAUtils.getInstance(this);
+        String keyPath = getFilesDir() + "/home/keys/"; // 密钥保存路径
-        
+        LogUtils.d(TAG, String.format("keyPath %s", keyPath));
+        RSAUtils utils = RSAUtils.getInstance();
+
         try {
             // 测试 1：首次生成密钥对
             LogUtils.d(TAG, "==== 首次生成密钥对 ====");
-            if (utils.keysExist()) {
+            if (utils.keysExist(keyPath)) {
                 LogUtils.d(TAG, "密钥对已生成");
             } else {
-                utils.generateAndSaveKeys();
+                utils.generateAndSaveKeys(keyPath);
-                LogUtils.d(TAG, "密钥对生成成功。");
+                LogUtils.d(TAG, "密钥对生成成功，保存至：" + keyPath);
             }
 
             // 测试 2：获取密钥对（自动读取已生成的文件）
-            KeyPair keyPair = utils.getOrGenerateKeys();
+            KeyPair keyPair = utils.getOrGenerateKeys(keyPath);
             PublicKey publicKey = keyPair.getPublic();
             PrivateKey privateKey = keyPair.getPrivate();
 
@@ -116,7 +78,7 @@ public class LogonActivity extends Activity implements IWinBoLLActivity {
 
             // 测试 3：重复调用时检查是否复用文件
             LogUtils.d(TAG, "\n==== 二次调用 ====");
-            KeyPair reusedPair = utils.getOrGenerateKeys();
+            KeyPair reusedPair = utils.getOrGenerateKeys(keyPath);
             LogUtils.d(TAG, "是否为同一公钥：" + (publicKey.equals(reusedPair.getPublic()))); // true（单例引用）
             LogUtils.d(TAG, "操作完成");
 
@@ -132,8 +94,8 @@ public class LogonActivity extends Activity implements IWinBoLLActivity {
 
             // 3. 私钥解密
             String decryptedMessage = utils.decryptWithPrivateKey(encryptedData, privateKeyReused);
-            LogUtils.d(TAG, "解密结果: " + decryptedMessage);
+            LogUtils.d(TAG, "解密结果：" + decryptedMessage);
-            
+
             // 4. 验证解密是否成功
             if (testMessage.equals(decryptedMessage)) {
                 LogUtils.d(TAG, "加密解密测试通过！");
@@ -144,6 +106,4 @@ public class LogonActivity extends Activity implements IWinBoLLActivity {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
     }
-    
-
 }

libappbase/src/main/java/cc/winboll/studio/libappbase/models/APPModel.java

@@ -17,6 +17,8 @@ public class APPModel extends BaseBean {
     // 应用是否处于正在调试状态
     //
     boolean isDebuging = false;
+    // 用本机 RSA 加密后保存的令牌
+    String rsaToken = "";
 
     public APPModel() {
         this.isDebuging = false;
@@ -26,6 +28,14 @@ public class APPModel extends BaseBean {
         this.isDebuging = isDebuging;
     }
 
+    public void setRsaToken(String rsaToken) {
+        this.rsaToken = rsaToken;
+    }
+
+    public String getRsaToken() {
+        return rsaToken;
+    }
+
     public void setIsDebuging(boolean isDebuging) {
         this.isDebuging = isDebuging;
     }
@@ -43,6 +53,7 @@ public class APPModel extends BaseBean {
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
         jsonWriter.name("isDebuging").value(isDebuging());
+        jsonWriter.name("rsaToken").value(getRsaToken());
     }
 
     @Override
@@ -50,6 +61,8 @@ public class APPModel extends BaseBean {
         if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
             if (name.equals("isDebuging")) {
                 setIsDebuging(jsonReader.nextBoolean());
+            } else if (name.equals("rsaToken")) {
+                setRsaToken(jsonReader.nextString());
             } else {
                 return false;
             }

libappbase/src/main/java/cc/winboll/studio/libappbase/models/ResponseData.java

@@ -1,38 +0,0 @@
-package cc.winboll.studio.libappbase.models;
-
-/**
- * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/06/05 11:26
- */
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class ResponseData {
-    @JsonProperty("status")
-    private String status;
-    @JsonProperty("message")
-    private String message;
-
-    // ❌ 原代码只有带参构造函数，缺少无参构造函数
-    // public ResponseData(String status, String message) {
-    //     this.status = status;
-    //     this.message = message;
-    // }
-
-    // ✅ 添加无参构造函数（Jackson 反序列化必需）
-    public ResponseData() {
-        // 空实现
-    }
-
-    // 保留带参构造函数（可选，用于手动创建实例）
-    public ResponseData(String status, String message) {
-        this.status = status;
-        this.message = message;
-    }
-
-    // Getter 和 Setter
-    public String getStatus() { return status; }
-    public void setStatus(String status) { this.status = status; }
-    public String getMessage() { return message; }
-    public void setMessage(String message) { this.message = message; }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/models/UserInfoModel.java

@@ -1,96 +0,0 @@
-package cc.winboll.studio.libappbase.models;
-
-/**
- * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/06/04 19:14
- */
-import android.util.JsonReader;
-import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.IOException;
-
-public class UserInfoModel extends BaseBean {
-
-    public static final String TAG = "UserInfoModel";
-
-    @JsonProperty("username")
-    String username;
-    @JsonProperty("password")
-    String password;
-    @JsonProperty("token")
-    String token;
-
-    public UserInfoModel() {
-        this.username = "";
-        this.password = "";
-        this.token = "";
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    @Override
-    public String getName() {
-        return UserInfoModel.class.getName();
-    }
-
-    @Override
-    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
-        super.writeThisToJsonWriter(jsonWriter);
-        jsonWriter.name("username").value(getUsername());
-        jsonWriter.name("password").value(getPassword());
-        jsonWriter.name("token").value(getToken());
-    }
-
-    @Override
-    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
-        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("username")) {
-                setUsername(jsonReader.nextString());
-            } else if (name.equals("password")) {
-                setPassword(jsonReader.nextString());
-            } else if (name.equals("token")) {
-                setToken(jsonReader.nextString());
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
-        jsonReader.beginObject();
-        while (jsonReader.hasNext()) {
-            String name = jsonReader.nextName();
-            if (!initObjectsFromJsonReader(jsonReader, name)) {
-                jsonReader.skipValue();
-            }
-        }
-        // 结束 JSON 对象
-        jsonReader.endObject();
-        return this;
-    }
-}

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/FileUtils.java

@@ -1,128 +0,0 @@
-package cc.winboll.studio.libappbase.utils;
-
-/**
- * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/06/04 20:15
- * @Describe 文件操作类
- */
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class FileUtils {
-    public static final String TAG = "FileUtils";
-
-    /**
-     * 读取文件为字节数组（Java 7 语法）
-     */
-    public static byte[] readFileToByteArray(String filePath) {
-        FileInputStream fis = null;
-        ByteArrayOutputStream bos = null;
-        try {
-            fis = new FileInputStream(filePath);
-            bos = new ByteArrayOutputStream();
-            byte[] buffer = new byte[4096];
-            int bytesRead;
-            while ((bytesRead = fis.read(buffer)) != -1) {
-                bos.write(buffer, 0, bytesRead);
-            }
-            return bos.toByteArray();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        } finally {
-            // 手动关闭流（Java 7 不支持 try-with-resources）
-            if (fis != null) {
-                try {
-                    fis.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (bos != null) {
-                try {
-                    bos.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    /**
-     * 写入字节数组到文件（Java 7 语法）
-     */
-    public static boolean writeByteArrayToFile(byte[] data, String filePath) {
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(filePath);
-            fos.write(data);
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        } finally {
-            if (fos != null) {
-                try {
-                    fos.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    // 原字符串读写方法（适配 Java 7）
-    public static String readFileToString(String filePath) {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new FileReader(filePath));
-            StringBuilder content = new StringBuilder();
-            String line;
-            while ((line = reader.readLine()) != null) {
-                content.append(line).append(System.getProperty("line.separator"));
-            }
-            // 去除最后一个换行符（可选）
-            if (content.length() > 0) {
-                content.deleteCharAt(content.length() - 1);
-            }
-            return content.toString();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static boolean writeStringToFile(String content, String filePath, boolean append) {
-        BufferedWriter writer = null;
-        try {
-            writer = new BufferedWriter(new FileWriter(filePath, append));
-            writer.write(content);
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-}

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/JsonFormatter.java

@@ -1,46 +0,0 @@
-package cc.winboll.studio.libappbase.utils;
-
-/**
- * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/06/05 11:09
- */
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.models.ResponseData;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.net.URLDecoder;
-
-public class JsonFormatter {
-    public static final String TAG = "JsonFormatter";
-    
-    /**
-     * 将包含 Unicode 转义的 JSON 字符串转为可读中文
-     * @param jsonStr 原始 JSON 字符串（如：{"status":"error","message":"\u672a\u63a5\u6536\u5230 JSON \u6570\u636e"}）
-     * @return 格式化后的中文消息字符串
-     */
-    public static String formatUnicodeToChinese(String jsonStr) {
-        try {
-            // 1. 使用 Jackson 解析 JSON 到对象
-            ObjectMapper mapper = new ObjectMapper();
-            ResponseData data = mapper.readValue(jsonStr, ResponseData.class);
-
-            // 2. 解码 Unicode 转义字符（如 \u672a 转为中文）
-            String decodedMessage = URLDecoder.decode(data.getMessage(), "UTF-8");
-
-            // 3. 重新构建 JSON（可选：如需保留 JSON 格式）
-            return "{\"status\":\"" + data.getStatus() + "\",\"message\":\"" + decodedMessage + "\"}";
-
-        } catch (Exception e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            return jsonStr; // 解析失败时返回原始字符串
-        }
-    }
-
-    // 示例用法
-    /*public static void main(String[] args) {
-        String rawJson = "{\"status\":\"error\",\"message\":\"\\u672a\\u63a5\\u6536\\u5230 JSON \\u6570\\u636e\"}";
-        String formattedJson = formatUnicodeToChinese(rawJson);
-        System.out.println("格式化前：" + rawJson);
-        System.out.println("格式化后：" + formattedJson);
-    }*/
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/RSAUtils.java

@@ -5,218 +5,120 @@ package cc.winboll.studio.libappbase.utils;
  * @Date 2025/06/04 13:36
  * @Describe RSA加密工具
  */
-import android.content.Context;
-import android.util.Base64;
 import cc.winboll.studio.libappbase.LogUtils;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.security.KeyFactory;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
-import java.util.Objects;
 import javax.crypto.Cipher;
 
 public class RSAUtils {
-    private static final String TAG = "RSAUtils";
+    public static final String TAG = "RSAUtils";
+    private static final RSAUtils INSTANCE = new RSAUtils();
     private static final int KEY_SIZE = 2048;
     private static final String KEY_ALGORITHM = "RSA";
     private static final String PUBLIC_KEY_FILE = "public.key";
     private static final String PRIVATE_KEY_FILE = "private.key";
-    private static final String CIPHER_ALGORITHM = KEY_ALGORITHM + "/ECB/PKCS1Padding"; // 保留原加密方式
 
-    private final String keyPath;
+    private RSAUtils() {}
-    private static volatile RSAUtils INSTANCE;
 
-    /**
+    public static RSAUtils getInstance() {
-     * 构造方法：初始化密钥存储路径（内部存储）
-     */
-    private RSAUtils(Context context) {
-        keyPath = context.getFilesDir() + File.separator + "keys" + File.separator; // 修正路径格式
-    }
-
-    /**
-     * 获取单例实例
-     */
-    public static synchronized RSAUtils getInstance(Context context) {
-        if (INSTANCE == null) {
-            INSTANCE = new RSAUtils(context);
-        }
         return INSTANCE;
     }
 
     /**
      * 检查密钥文件是否存在
      */
-    public boolean keysExist() {
+    public boolean keysExist(String path) {
-        File publicKeyFile = new File(keyPath + PUBLIC_KEY_FILE);
+        File publicKeyFile = new File(path + PUBLIC_KEY_FILE);
-        File privateKeyFile = new File(keyPath + PRIVATE_KEY_FILE);
+        File privateKeyFile = new File(path + PRIVATE_KEY_FILE);
         return publicKeyFile.exists() && privateKeyFile.exists();
     }
 
     /**
-     * 生成密钥对并保存到文件
+     * 生成密钥对并保存为字节文件
      */
-    public void generateAndSaveKeys() throws Exception {
+    public void generateAndSaveKeys(String path) throws Exception {
-        LogUtils.d(TAG, "开始生成 RSA 密钥对（2048位）");
+        LogUtils.d(TAG, "正在生成密钥对");
+        // 生成密钥对
         KeyPairGenerator generator = KeyPairGenerator.getInstance(KEY_ALGORITHM);
         generator.initialize(KEY_SIZE);
         KeyPair keyPair = generator.generateKeyPair();
 
-        saveKey(PUBLIC_KEY_FILE, keyPair.getPublic().getEncoded());
+        // 保存公钥（X.509字节）
-        saveKey(PRIVATE_KEY_FILE, keyPair.getPrivate().getEncoded());
+        saveKey(path, PUBLIC_KEY_FILE, keyPair.getPublic().getEncoded());
-        LogUtils.d(TAG, "密钥对生成并保存成功");
+        // 保存私钥（PKCS#8字节）
+        saveKey(path, PRIVATE_KEY_FILE, keyPair.getPrivate().getEncoded());
     }
 
     /**
-     * 获取或生成密钥对（线程安全）
+     * 读取密钥对（存在则读取，不存在则生成）
      */
-    public KeyPair getOrGenerateKeys() throws Exception {
+    public KeyPair getOrGenerateKeys(String path) throws Exception {
-        if (!keysExist()) {
+        if (keysExist(path)) {
-            synchronized (RSAUtils.class) { // 双重检查锁，避免多线程重复生成
+            LogUtils.d(TAG, "密钥对已存在");
-                if (!keysExist()) {
+            return readKeysFromFile(path);
-                    generateAndSaveKeys();
+        } else {
-                }
+            LogUtils.d(TAG, "未生成密钥对");
-            }
+            generateAndSaveKeys(path);
+            return readKeysFromFile(path);
         }
-        return readKeysFromFile();
     }
 
     /**
      * 从文件读取密钥对
      */
-    private KeyPair readKeysFromFile() throws Exception {
+    private KeyPair readKeysFromFile(String path) throws Exception {
-        LogUtils.d(TAG, "读取密钥对文件");
+        LogUtils.d(TAG, "正在读取密钥对");
-        try {
+        byte[] publicKeyBytes = Files.readAllBytes(Paths.get(path + PUBLIC_KEY_FILE));
-            byte[] publicKeyBytes = readFileToBytes(keyPath + PUBLIC_KEY_FILE);
+        byte[] privateKeyBytes = Files.readAllBytes(Paths.get(path + PRIVATE_KEY_FILE));
-            byte[] privateKeyBytes = readFileToBytes(keyPath + PRIVATE_KEY_FILE);
 
-            X509EncodedKeySpec publicSpec = new X509EncodedKeySpec(publicKeyBytes);
+        X509EncodedKeySpec publicSpec = new X509EncodedKeySpec(publicKeyBytes);
-            PKCS8EncodedKeySpec privateSpec = new PKCS8EncodedKeySpec(privateKeyBytes);
+        PKCS8EncodedKeySpec privateSpec = new PKCS8EncodedKeySpec(privateKeyBytes);
 
-            KeyFactory factory = KeyFactory.getInstance(KEY_ALGORITHM);
+        KeyFactory factory = KeyFactory.getInstance(KEY_ALGORITHM);
-            PublicKey publicKey = factory.generatePublic(publicSpec);
+        PublicKey publicKey = factory.generatePublic(publicSpec);
-            PrivateKey privateKey = factory.generatePrivate(privateSpec);
+        PrivateKey privateKey = factory.generatePrivate(privateSpec);
 
-            return new KeyPair(publicKey, privateKey);
+        return new KeyPair(publicKey, privateKey);
-        } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException e) {
-            LogUtils.e(TAG, "密钥文件读取失败：" + e.getMessage());
-            throw new Exception("密钥文件损坏或格式错误", e);
-        }
     }
 
     /**
-     * 保存密钥到文件（通用方法）
+     * 通用保存密钥字节方法
      */
-    private void saveKey(String fileName, byte[] keyBytes) throws IOException {
+    private void saveKey(String path, String fileName, byte[] keyBytes) throws IOException {
-        Objects.requireNonNull(keyBytes, "密钥字节数据不可为空");
+        File dir = new File(path);
-        File dir = new File(keyPath);
+        if (!dir.exists()) dir.mkdirs(); // 自动创建目录
-        if (!dir.exists() && !dir.mkdirs()) {
+        try (FileOutputStream fos = new FileOutputStream(path + fileName)) {
-            throw new IOException("创建密钥目录失败：" + keyPath);
-        }
-
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(keyPath + fileName);
             fos.write(keyBytes);
-        } finally {
-            if (fos != null) {
-                try {
-                    fos.close();
-                } catch (IOException e) {
-                    LogUtils.e(TAG, "关闭文件流失败：" + e.getMessage());
-                }
-            }
         }
     }
-
+    
     /**
-     * 读取文件为字节数组（Java 7 兼容）
+     * 公钥加密
-     */
-    private byte[] readFileToBytes(String filePath) throws IOException {
-        File file = new File(filePath);
-        if (!file.exists() || file.isDirectory()) {
-            throw new IOException("文件不存在或为目录：" + filePath);
-        }
-
-        FileInputStream fis = null;
-        try {
-            fis = new FileInputStream(file);
-            byte[] data = new byte[(int) file.length()];
-            int bytesRead = fis.read(data);
-            if (bytesRead != data.length) {
-                throw new IOException("文件读取不完整");
-            }
-            return data;
-        } finally {
-            if (fis != null) {
-                try {
-                    fis.close();
-                } catch (IOException e) {
-                    LogUtils.e(TAG, "关闭文件流失败：" + e.getMessage());
-                }
-            }
-        }
-    }
-
-    /**
-     * 公钥加密（带参数校验）
      */
     public byte[] encryptWithPublicKey(String plainText, PublicKey publicKey) throws Exception {
-        Objects.requireNonNull(plainText, "明文不可为空");
+        Cipher cipher = Cipher.getInstance(KEY_ALGORITHM + "/ECB/PKCS1Padding");
-        Objects.requireNonNull(publicKey, "公钥不可为空");
-
-        Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
         cipher.init(Cipher.ENCRYPT_MODE, publicKey);
-
-        // 检查数据长度是否超过 RSA 限制（2048位密钥最大明文为 214字节，PKCS1Padding）
-        int maxPlainTextSize = cipher.getBlockSize() - 11; // PKCS1Padding 固定填充长度
-        if (plainText.getBytes("UTF-8").length > maxPlainTextSize) {
-            throw new IllegalArgumentException("明文过长，最大支持 " + maxPlainTextSize + " 字节");
-        }
-
         return cipher.doFinal(plainText.getBytes("UTF-8"));
     }
 
     /**
-     * 私钥解密（带参数校验）
+     * 私钥解密
      */
     public String decryptWithPrivateKey(byte[] encryptedData, PrivateKey privateKey) throws Exception {
-        Objects.requireNonNull(encryptedData, "密文不可为空");
+        Cipher cipher = Cipher.getInstance(KEY_ALGORITHM + "/ECB/PKCS1Padding");
-        Objects.requireNonNull(privateKey, "私钥不可为空");
-
-        Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
         cipher.init(Cipher.DECRYPT_MODE, privateKey);
         byte[] decryptedBytes = cipher.doFinal(encryptedData);
         return new String(decryptedBytes, "UTF-8");
     }
-    /**
-     * 将 HTTP 传输的 Base64 字符串还原为加密字节数组（Java 7 兼容）
-     * @param httpString Base64 字符串（非 null）
-     * @return 加密字节数组
-     * @throws IllegalArgumentException 解码失败时抛出
-     */
-    public byte[] httpStringToEncryptBytes(String httpString) {
-        Objects.requireNonNull(httpString, "HTTP 字符串不可为空");
-
-        // 计算缺失的填充符数量（Java 7 不支持 repeat()，手动拼接）
-        int pad = httpString.length() % 4;
-        StringBuilder paddedString = new StringBuilder(httpString);
-        if (pad != 0) {
-            for (int i = 0; i < pad; i++) {
-                paddedString.append('='); // 补全 '='
-            }
-        }
-
-        // 使用 Base64 解码（Android 原生 Base64 类兼容 Java 7）
-        return Base64.decode(paddedString.toString(), Base64.URL_SAFE);
-    }
 }
 

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/YunUtils.java

@@ -1,276 +0,0 @@
-package cc.winboll.studio.libappbase.utils;
-
-/**
- * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/06/04 17:21
- * @Describe 应用登录与接口工具
- */
-import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.models.UserInfoModel;
-import com.google.gson.Gson;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyPair;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.util.concurrent.TimeUnit;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-public class YunUtils {
-    public static final String TAG = "YunUtils";
-    // 私有静态实例，类加载时创建
-    private static volatile YunUtils INSTANCE;
-    Context mContext;
-    UserInfoModel mUserInfoModel;
-    String token = "";
-    String mDataFolderPath = "";
-    String mUserInfoModelPath = "";
-
-    private static final int CONNECT_TIMEOUT = 15; // 连接超时时间（秒）
-    private static final int READ_TIMEOUT = 20;    // 读取超时时间（秒）
-    private static volatile YunUtils instance;
-    private OkHttpClient okHttpClient;
-    private Handler mainHandler; // 主线程 Handler
-
-    // 私有构造方法，防止外部实例化
-    private YunUtils(Context context) {
-        LogUtils.d(TAG, "YunUtils");
-        mContext = context;
-        mDataFolderPath = mContext.getExternalFilesDir(TAG).toString();
-        File fTest = new File(mDataFolderPath);
-        if (!fTest.exists()) {
-            fTest.mkdirs();
-        }
-        mUserInfoModelPath = mDataFolderPath + File.separator + "UserInfoModel.rsajson";
-
-        okHttpClient = new OkHttpClient.Builder()
-            .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
-            .readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
-            .build();
-        mainHandler = new Handler(Looper.getMainLooper()); // 获取主线程 Looper
-    }
-
-    // 公共静态方法，返回唯一实例
-    public static synchronized YunUtils getInstance(Context context) {
-        LogUtils.d(TAG, "getInstance");
-        if (INSTANCE == null) {
-            INSTANCE = new YunUtils(context);
-        }
-        return INSTANCE;
-    }
-
-    public void checkLoginStatus() {
-        String token = getLocalToken();
-        LogUtils.d(TAG, String.format("checkLoginStatus token is %s", token));
-    }
-
-    String getLocalToken() {
-        UserInfoModel userInfoModel = loadUserInfoModel();
-        return (userInfoModel == null) ?"": userInfoModel.getToken();
-    }
-
-    public void login(String host, UserInfoModel userInfoModel) {
-        LogUtils.d(TAG, "login");
-
-        // 发送 POST 请求
-        String apiUrl = host + "/login/index.php";
-        // 序列化对象为JSON
-        Gson gson = new Gson();
-        String jsonData = gson.toJson(userInfoModel); // 自动生成标准JSON
-        //String jsonData = userInfoModel.toString();
-        LogUtils.d(TAG, "要发送的数据 : " + jsonData);
-
-        sendPostRequest(apiUrl, jsonData, new OnResponseListener() {
-                // 成功回调（主线程）
-                @Override
-                public void onSuccess(String responseBody) {
-                    LogUtils.d(TAG, "onSuccess");
-                    try {
-                        String formattedJson = JsonFormatter.formatUnicodeToChinese(responseBody);
-                        LogUtils.d(TAG, formattedJson);
-                        return;
-                    } catch (Exception e) {
-                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                    }
-                    
-                    try {
-                        UserInfoModel userInfoModel = UserInfoModel.parseStringToBean(responseBody, UserInfoModel.class);
-                        if (userInfoModel != null) {
-                            LogUtils.d(TAG, "收到网站 UserInfoModel");
-                            String token = userInfoModel.getToken();
-                            saveLocalToken(token);
-                            checkLoginStatus();
-                        }
-                    } catch (IOException e) {
-                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                    }
-                }
-
-                // 失败回调（主线程）
-                @Override
-                public void onFailure(String errorMsg) {
-                    LogUtils.d(TAG, errorMsg);
-                    // 处理错误
-                }
-            });
-    }
-
-    public void saveLocalToken(String token) {
-        UserInfoModel userInfoModel = new UserInfoModel();
-        userInfoModel.setToken(token);
-        saveUserInfoModel(userInfoModel);
-    }
-
-    UserInfoModel loadUserInfoModel() {
-        LogUtils.d(TAG, "loadUserInfoModel");
-        if (new File(mUserInfoModelPath).exists()) {
-            try {
-                // 加载加密后的模型数据
-                byte[] encryptedData = FileUtils.readFileToByteArray(mUserInfoModelPath);
-                // 加载 RSA 工具
-                RSAUtils utils = RSAUtils.getInstance(mContext);
-                KeyPair keyPair = utils.getOrGenerateKeys();
-                //PublicKey publicKey = keyPair.getPublic();
-                PrivateKey privateKey = keyPair.getPrivate();
-                // 私钥解密模型数据
-                String szInfo = utils.decryptWithPrivateKey(encryptedData, keyPair.getPrivate());
-                LogUtils.d(TAG, String.format("szInfo %s", szInfo));
-                mUserInfoModel = UserInfoModel.parseStringToBean(szInfo, UserInfoModel.class);
-                if (mUserInfoModel == null) {
-                    LogUtils.d(TAG, "模型数据解析为空数据。");
-                }
-                LogUtils.d(TAG, "UserInfoModel 解密加载结束。");
-            } catch (Exception e) {
-                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            }
-        } else {
-            LogUtils.d(TAG, "云服务登录信息不存在。");
-            mUserInfoModel = null;
-        }
-        return mUserInfoModel;
-    }
-
-    void saveUserInfoModel(UserInfoModel userInfoModel) {
-        LogUtils.d(TAG, "saveUserInfoModel");
-        try {
-            String szInfo = userInfoModel.toString();
-            LogUtils.d(TAG, "原始数据: " + szInfo);
-
-            RSAUtils utils = RSAUtils.getInstance(mContext);
-            KeyPair keyPair = utils.getOrGenerateKeys();
-            PublicKey publicKey = keyPair.getPublic();
-
-            // 公钥加密（传入字节数组，避免中间字符串转换）
-            byte[] encryptedData = utils.encryptWithPublicKey(szInfo, publicKey);
-
-            // 保存加密字节数组到文件（直接操作字节，无需转字符串）
-            FileUtils.writeByteArrayToFile(encryptedData, mUserInfoModelPath);
-            LogUtils.d(TAG, "加密数据已保存");
-
-            // 测试解密（仅调试用）
-            String szInfo2 = utils.decryptWithPrivateKey(encryptedData, keyPair.getPrivate());
-            LogUtils.d(TAG, "解密结果: " + szInfo2);
-
-            mUserInfoModel = UserInfoModel.parseStringToBean(szInfo2, UserInfoModel.class);
-            if (mUserInfoModel == null) {
-                LogUtils.d(TAG, "模型解析失败");
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, "加密/解密失败: " + e.getMessage());
-        }
-    }
-
-    // 发送 POST 请求（JSON 数据）
-    public void sendPostRequest(String url, String data, OnResponseListener listener) {
-        RequestBody requestBody = RequestBody.create(
-            MediaType.parse("application/json; charset=utf-8"), // 关键头信息
-            data.getBytes(StandardCharsets.UTF_8)
-        );
-
-        Request request = new Request.Builder()
-            .url(url)
-            .post(requestBody)
-            .addHeader("Content-Type", "application/json") // 显式添加头
-            .build();
-
-        executeRequest(request, listener);
-    }
-
-    // 发送 GET 请求
-    public void sendGetRequest(String url, OnResponseListener listener) {
-        Request request = new Request.Builder()
-            .url(url)
-            .get()
-            .build();
-        executeRequest(request, listener);
-    }
-
-    // 执行请求（子线程处理）
-    private void executeRequest(final Request request, final OnResponseListener listener) {
-        okHttpClient.newCall(request).enqueue(new Callback() {
-                // 响应成功（子线程）
-                @Override
-                public void onResponse(Call call, Response response) throws IOException {
-                    try {
-                        if (!response.isSuccessful()) {
-                            postFailure(listener, "响应码错误：" + response.code());
-                            return;
-                        }
-                        String responseBody = response.body().string();
-                        postSuccess(listener, responseBody);
-                    } catch (Exception e) {
-                        postFailure(listener, "解析失败：" + e.getMessage());
-                    }
-                }
-
-                // 响应失败（子线程）
-                @Override
-                public void onFailure(Call call, IOException e) {
-                    postFailure(listener, "网络失败：" + e.getMessage());
-                }
-
-                // 主线程回调（使用 Handler）
-                private void postSuccess(final OnResponseListener listener, final String msg) {
-                    mainHandler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                listener.onSuccess(msg);
-                            }
-                        });
-                }
-
-                private void postFailure(final OnResponseListener listener, final String msg) {
-                    mainHandler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                listener.onFailure(msg);
-                            }
-                        });
-                }
-            });
-    }
-
-    public interface OnResponseListener {
-        /**
-         * 成功响应（主线程回调）
-         * @param responseBody 响应体字符串
-         */
-        void onSuccess(String responseBody);
-
-        /**
-         * 失败回调（包含错误信息）
-         * @param errorMsg 错误描述
-         */
-        void onFailure(String errorMsg);
-    }
-}

libappbase/src/main/res/layout/activity_logon.xml

@@ -6,31 +6,6 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:gravity="right"
-        android:padding="10dp"
-        android:id="@+id/ll_hostbar">
-
-        <RadioButton
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="10.8.0.250:456"
-            android:id="@+id/rb_debughost"
-            android:onClick="onSwitchHost"/>
-
-        <RadioButton
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="yun.winboll.cc"
-            android:id="@+id/rb_yunhost"
-            android:onClick="onSwitchHost"/>
-
-	</LinearLayout>
-    
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
@@ -43,12 +18,6 @@
 			android:text="Test RSA"
             android:onClick="onTestRSA"/>
 
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Test Login"
-            android:onClick="onTestLogin"/>
-        
 	</LinearLayout>
 
 	<LinearLayout