blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
admin
2021-02-01 c6c5a8ce0f42d46ea2fe0312c9eda67a49fd3917 
 src/main/java/com/yeshi/buwan/service/imp/UserService.java


@@ -12,9 +12,9 @@


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import com.yeshi.buwan.dao.LoginUserDao;


import com.yeshi.buwan.dao.user.LoginUserDao;


import com.yeshi.buwan.dao.UserDao;


import com.yeshi.buwan.domain.LoginUser;


import com.yeshi.buwan.domain.user.LoginUser;


import com.yeshi.buwan.domain.SystemInfo;


import com.yeshi.buwan.domain.UserData;


import com.yeshi.buwan.domain.UserInfo;


@@ -186,6 +186,7 @@


                        lu.setOpenid(openid);


                        lu.setPortrait(portrait);


                        lu.setIpinfo(ipInfo);


                        lu.setState(LoginUser.STATE_NORMAL);


                        session.save(lu);


                        session.flush();


                        session.getTransaction().commit();


@@ -241,6 +242,7 @@


                if (list != null && list.size() > 0)


                    return "该邮箱已注册";


                try {


                    user.setState(LoginUser.STATE_NORMAL);


                    session.getTransaction().begin();


                    session.save(user);


                    session.flush();