TungNT (Blue)

tungnt.blue@gmail.com

User Tools

Site Tools

Trace:
development:system:git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
development:system:git [2024/08/12 14:27] – [Git Rebase & Git Merge] tungntdevelopment:system:git [2024/08/15 09:03] (current) – tungnt
Line 51: Line 51:
 Identity added: /var/root/.ssh/id_rsa_nguyentung (/var/root/.ssh/id_rsa_nguyentung) Identity added: /var/root/.ssh/id_rsa_nguyentung (/var/root/.ssh/id_rsa_nguyentung)
 $ ssh-add -l $ ssh-add -l
-4096 SHA256:HntA0FUgaD0ELTaHSU/h0SfTAKVPkJ9xEjnP6aXyCvM /var/root/.ssh/id_rsa_tungntblue (RSA) +4096 SHA256:HntA0FUgaD0***EjnP6aXyCvM /var/root/.ssh/id_rsa_tungntblue (RSA) 
-4096 SHA256:2cJDMSnLCJPnd6K4cIdjmI58FwJ/X7u4Wrml4S8ulHw /var/root/.ssh/id_rsa_nguyentung (RSA)+4096 SHA256:2cJDMSnLCJP***Wrml4S8ulHw /var/root/.ssh/id_rsa_nguyentung (RSA)
 </code> </code>
  
Line 62: Line 62:
      
 ssh-add /var/root/.ssh/id_rsa_tungntblue ssh-add /var/root/.ssh/id_rsa_tungntblue
-ssh-add /var/root/.ssh/id_rsa_tungnt9pay 
 ssh-add /var/root/.ssh/id_rsa_nguyentung ssh-add /var/root/.ssh/id_rsa_nguyentung
  
Line 351: Line 350:
 {{ :development:system:git-merge-vs-rebase.png |}} {{ :development:system:git-merge-vs-rebase.png |}}
  
-<code base>+<code bash>
 tungnt@MacBook-Pro-cua-Nguyen-2 gitflow % git branch tungnt@MacBook-Pro-cua-Nguyen-2 gitflow % git branch
   develop   develop
Line 560: Line 559:
   * git merge: khi xem log các commit sẽ được sắp xếp theo thời gian commit, dùng khi dự án ít người cùng làm.   * git merge: khi xem log các commit sẽ được sắp xếp theo thời gian commit, dùng khi dự án ít người cùng làm.
   * git rebase: khi xem log các commit sẽ không sắp xếp theo thời gian commit như git merge, mà sẽ ưu tiên commit của cá nhân lên đầu. Nên sử dụng khi dự án có nhiều người cùng làm.   * git rebase: khi xem log các commit sẽ không sắp xếp theo thời gian commit như git merge, mà sẽ ưu tiên commit của cá nhân lên đầu. Nên sử dụng khi dự án có nhiều người cùng làm.
 +
 +====== Git Log ======
 +
 +https://git-scm.com/book/id/v2/Git-Basics-Viewing-the-Commit-History
 +
 +<code bash>
 +% git log --oneline 
 +
 +% git log -- filename modules/core/app/Http/Controllers/ExampleController.php
 +% git log -p -- filename modules/core/app/Http/Controllers/ExampleController.php
 +
 +tungnt@MacBook-Pro-cua-Nguyen-2 api.9s.vn % git log --pretty=format:"%h - %ae, %ar : %s : %cn" --since="2024-01-01"  --no-merges --author=tungnt -- filename modules/core/app/Http/Controllers/ExampleController.php
 +56e4d7fe03 - tungnt.blue@gmail.com, 3 months ago : Payout hold with MC : tungnt
 +b668bd133d - tungnt.blue@gmail.com, 5 months ago : Test TCB VA Key : tungnt
 +54327213ec - tungnt.blue@gmail.com, 5 months ago : Test TCB : tungnt
 +50db75fa85 - tungnt.blue@gmail.com, 5 months ago : Test TCB : tungnt
 +ae02e78fb4 - tungnt.blue@gmail.com, 5 months ago : Test TCB : tungnt
 +eaae3faa6f - tungnt.blue@gmail.com, 5 months ago : Test TCB : tungnt
 +7656495fc8 - tungnt.blue@gmail.com, 5 months ago : Update Payout config : tungnt
 +b0ffc56c41 - tungnt.blue@gmail.com, 6 months ago : Test key : tungnt
 +1958516401 - tungnt.blue@gmail.com, 6 months ago : Update SMS BIDV 8600664888 : tungnt
 +6ecef6fb81 - tungnt.blue@gmail.com, 6 months ago : D : tungnt
 +cd02aafff4 - tungnt.blue@gmail.com, 7 months ago : Debug : tungnt
 +2dcbc9cdb7 - tungnt.blue@gmail.com, 7 months ago : Golive jira_5001 : tungnt
 +7dae86672a - tungnt.blue@gmail.com, 7 months ago : MSB VA : tungnt
 +7974263273 - tungnt.blue@gmail.com, 7 months ago : Update name TiktokLive to Tiktok : tungnt
 +
 +tungnt@MacBook-Pro-cua-Nguyen-2 api.9s.vn % git show 54327213ec
 +commit 54327213ec68b3e8e75194653a60bb95f9f09e5a
 +Author: tungnt <tungnt.blue@gmail.com>
 +Date:   Tue Mar 12 16:44:03 2024 +0700
 +
 +    Test TCB
 +
 +diff --git a/modules/core/app/Http/Controllers/ExampleController.php b/modules/core/app/Http/Controllers/ExampleController.php
 +index 9b98620801..1bbac43c4c 100644
 +--- a/modules/core/app/Http/Controllers/ExampleController.php
 ++++ b/modules/core/app/Http/Controllers/ExampleController.php
 +@@ -47,11 +47,11 @@ class ExampleController extends BaseController
 + 
 +             $aesPlaintTextHash = hash('sha256', $aesPlaintText, true);
 +     
 +-            $sign1 = $this->sign($aesPlaintTextHash, storage_path('credentials/rsa/transfer/techcombank/2024/tcb2024/1pay_cks_1.jks'), '***');
 +-            $sign2 = $this->sign($aesPlaintTextHash, storage_path('credentials/rsa/transfer/techcombank/2024/tcb2024/1pay_cks_2.jks'), '***');
 ++            $sign1 = $this->sign($aesPlaintTextHash, storage_path('credentials/rsa/transfer/techcombank/2024/1pay_cks_1.jks'), '***');
 ++            $sign2 = $this->sign($aesPlaintTextHash, storage_path('credentials/rsa/transfer/techcombank/2024/1pay_cks_2.jks'), '***');
 +     
 +-            $verify1 = $this->verify($aesPlaintTextHash, $sign1, storage_path('credentials/rsa/transfer/techcombank/2024/tcb2024/1pay_tcb_verify_sign_1.cer'));
 +-            $verify2 = $this->verify($aesPlaintTextHash, $sign2, storage_path('credentials/rsa/transfer/techcombank/2024/tcb2024/1pay_tcb_verify_sign_2.cer'));
 ++            $verify1 = $this->verify($aesPlaintTextHash, $sign1, storage_path('credentials/rsa/transfer/techcombank/2024/1pay_tcb_verify_sign_1.cer'));
 ++            $verify2 = $this->verify($aesPlaintTextHash, $sign2, storage_path('credentials/rsa/transfer/techcombank/2024/1pay_tcb_verify_sign_2.cer'));
 +     
 +             dd($aesPlaintText, $sign1, $sign2, $verify1, $verify2);
 +         }
 +</code>
  
 ====== Một số lỗi có thể gặp ====== ====== Một số lỗi có thể gặp ======
development/system/git.1723472835.txt.gz · Last modified: 2024/08/12 14:27 by tungnt
Donate Powered by PHP Valid HTML5 Valid CSS Driven by DokuWiki