In this article the general theory of Commutative BCK-algebras and BCI-algebras and several classes of BCK-algebras are given according to [2].