Kevin , 144 hrs free transit

Hi!
Im a french national I will be having a cruise depart from shanghai seaport and 8 days in japan then back to shanghai again then Philippines. Am i eligible to 144hr free visa in shanghai? I will arrive in shanghai from philippines on August 20 and leave for cruise going to japan on august 21. and back again in shanghai on August 29 and fly to philippines on the same day.