add pic upload port
login bug fixed
conflict fixed