final

martinjingyu · May 27, 2024 · 7fa3143 · 7fa3143
1 parent 031da93
commit 7fa3143
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 6 deletions.
diff --git a/data/Kids/222/TransactionHistory.txt b/data/Kids/222/TransactionHistory.txt
@@ -1 +1 @@
-xpF1bfT1/2h9c3+2XFFLBKjhvvLAe4AhLqtvezTJqBZMfvywi2D6jU9i+csB+bcohbCoDoVJjCS+EGMgOKRrqD6i/S2Q8wBhl6+LRVGvhZM=
+xpF1bfT1/2h9c3+2XFFLBKjhvvLAe4AhLqtvezTJqBZMfvywi2D6jU9i+csB+bcohbCoDoVJjCS+EGMgOKRrqPYO93tWVTQuAlADipoX4MU979Ed11wMrHJz4KZRAcDfJPCi4eWGSdEZ/HO/rrS69Hfj2yeNzxRmy3T5FjpFUJbUFVXIbjtFphU1JuqETIPtPkSiB7Tnw6t4ZN3Y7K2KFqgzLeRUFx0vv8jORfyJAXO/1kSfzInEXdEEeAbGhrIRb+S4DDC67siqi13xBlzjwl0oQLbFkmy/94GA8KTHrFCuwflIS+r1bR4HMZiLHv2bdsuVn0kLZj+655oQkvQF6gp/D4EKBxMvMF+M1vtId38VqzVqwnuOjczjoeuhjEK1IQmOM3cPXpv//K8HUJVnfSXQhF8WtM6LJjeFvMg7xF54mu9xLRnrON1UYPT/VfSxhF6lLrg+KwLq6bmOCoo6bw==
diff --git a/data/Kids/22222/Account.txt b/data/Kids/22222/Account.txt
diff --git a/data/Kids/22222/CurrentAccount.txt b/data/Kids/22222/CurrentAccount.txt
diff --git a/data/Kids/22222/Message.txt b/data/Kids/22222/Message.txt
diff --git a/data/Kids/22222/Product.txt b/data/Kids/22222/Product.txt
diff --git a/data/Kids/22222/SavingAccount.txt b/data/Kids/22222/SavingAccount.txt
diff --git a/data/Kids/22222/SelectedProduct.txt b/data/Kids/22222/SelectedProduct.txt
diff --git a/data/Kids/22222/Task.txt b/data/Kids/22222/Task.txt
diff --git a/data/Kids/22222/TransactionHistory.txt b/data/Kids/22222/TransactionHistory.txt
diff --git a/data/Kids/22222/User.txt b/data/Kids/22222/User.txt
diff --git a/src/GUI/task_page/Task_parent.java b/src/GUI/task_page/Task_parent.java
@@ -129,7 +129,7 @@ public void showDialog1(int index){
                         System.out.println("salary： ");
                         System.out.println(salary);
                         task_parent_control.getKid().getAccountManager().getCurrentAccountByName(destination).deposit(salary);
-                        HistoryTransaction historyTransaction = new HistoryTransaction("parent",task_parent_control.getKid().getAccountManager().getCurrentAccountByName(destination).getName(),salary);
+                        HistoryTransaction historyTransaction = new HistoryTransaction("Task",task_parent_control.getKid().getAccountManager().getCurrentAccountByName(destination).getName(),salary);
                         task_parent_control.getKid().getTransactionList().addTransaction(historyTransaction);
 
                         // 删除任务

diff --git a/src/utill/read/EncryptionUtilTest.java b/src/utill/read/EncryptionUtilTest.java
@@ -12,15 +12,24 @@ public static void main(String[] args) {
             System.setProperty("ENCRYPTION_KEY", ENCRYPTION_KEY);
 
             // 原始数据
-            String data = "CA1, shop, -20, 2024:3:10 12:12:11\nTask, CA2, 5, 2024:3:11 12:12:11";
+            String data = "CA1,shop,-20.0,2024/3/10 12:12:11\n" +
+                    "Task,CA2,5.0,2024/3/11 12:12:11\n" +
+                    "CA2,CA1,3.0,2024/5/28 03:04:33\n" +
+                    "SA1,CA1,10.0,2024/5/28 03:04:39\n" +
+                    "SA4,CA2,10.08,2024/5/28 03:04:45\n" +
+                    "CA1,Sa44,-12.0,2024/5/28 03:04:55\n" +
+                    "CA2,shop,-4.0,2024/5/28 03:05:18\n" +
+                    "CA2,shop,-3.0,2024/5/28 03:05:24\n" +
+                    "CA2,shop,-4.0,2024/5/28 03:05:27\n" +
+                    "parent,CA2,11.0,2024/5/28 03:08:09\n";
             String data1 ="Martin,200.0,1.5,3.0,4.25";
             String data2 ="SA1,10.0,10.0,2024-01-10T12:12:40,2024-10-10T12:12:40,15 days\n" +
                     "SA2,10.0,10.0,2024-01-10T12:12:40,2024-10-10T12:12:40, 1 month\n" +
                     "SA3,10.0,10.0,2024-01-10T12:12:40,2024-10-10T12:12:40,3 months\n" +
                     "SA4,10.0,10.0,2024-01-10T12:12:40,2024-02-10T12:14:40,15 days";
 
             // 加密数据
-            String encryptedData = EncryptionUtil.encrypt(data1);
+            String encryptedData = EncryptionUtil.encrypt(data);
             System.out.println("Encrypted data: " + encryptedData);
 
             // 解密数据
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		xpF1bfT1/2h9c3+2XFFLBKjhvvLAe4AhLqtvezTJqBZMfvywi2D6jU9i+csB+bcohbCoDoVJjCS+EGMgOKRrqD6i/S2Q8wBhl6+LRVGvhZM=
		xpF1bfT1/2h9c3+2XFFLBKjhvvLAe4AhLqtvezTJqBZMfvywi2D6jU9i+csB+bcohbCoDoVJjCS+EGMgOKRrqPYO93tWVTQuAlADipoX4MU979Ed11wMrHJz4KZRAcDfJPCi4eWGSdEZ/HO/rrS69Hfj2yeNzxRmy3T5FjpFUJbUFVXIbjtFphU1JuqETIPtPkSiB7Tnw6t4ZN3Y7K2KFqgzLeRUFx0vv8jORfyJAXO/1kSfzInEXdEEeAbGhrIRb+S4DDC67siqi13xBlzjwl0oQLbFkmy/94GA8KTHrFCuwflIS+r1bR4HMZiLHv2bdsuVn0kLZj+655oQkvQF6gp/D4EKBxMvMF+M1vtId38VqzVqwnuOjczjoeuhjEK1IQmOM3cPXpv//K8HUJVnfSXQhF8WtM6LJjeFvMg7xF54mu9xLRnrON1UYPT/VfSxhF6lLrg+KwLq6bmOCoo6bw==