--优化代码；

src/main/java/com/ekexiu/portal/dao/ProfessorDao.java

@@ -206,7 +206,11 @@ public abstract class ProfessorDao {
                    organization.setName(orgName);
                    professor.setOrganization(organization);
                    professor.setTitle(rs.getString(5));
                    professor.setAuthentication(rs.getInt(6));
                    Integer auth = rs.getInt(6);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(7));
                    professor.setAuthStatus(rs.getInt(8));
                    professor.setId(rs.getString(9));
@@ -240,7 +244,11 @@ public abstract class ProfessorDao {
            try{
                if(rs.next()){
                	Professor professor = new Professor();
                    professor.setAuthentication(rs.getInt(1));
                	Integer auth = rs.getInt(1);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(2));
                    professor.setAuthStatus(rs.getInt(3));
                    professor.setAuthStatusExpert(rs.getInt(4));
@@ -291,7 +299,11 @@ public abstract class ProfessorDao {
                    	title = null;
                	}
                    professor.setTitle(title);
                    professor.setAuthentication(rs.getInt(4));
                    Integer auth = rs.getInt(4);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(5));
                    professor.setAuthStatus(rs.getInt(6));
                    professor.setId(rs.getString(7));
@@ -363,7 +375,11 @@ public abstract class ProfessorDao {
                		title = null;
                	}
                    professor.setTitle(title);
                    professor.setAuthentication(rs.getInt(4));
                    Integer auth = rs.getInt(4);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(5));
                    professor.setAuthStatus(rs.getInt(6));
                    professor.setId(rs.getString(7));
@@ -445,7 +461,11 @@ public abstract class ProfessorDao {
                    	title = null;
                    }
                    professor.setTitle(title);
                    professor.setAuthentication(rs.getInt(8));
                    Integer auth = rs.getInt(8);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(9));
                    professor.setAuthStatus(rs.getInt(10));
                    professor.setId(rs.getString(11));
@@ -536,7 +556,11 @@ public abstract class ProfessorDao {
                    organization.setName(orgName);
                    professor.setOrganization(organization);
                    professor.setTitle(rs.getString(9));
                    professor.setAuthentication(rs.getInt(10));
                    Integer auth = rs.getInt(10);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(11));
                    professor.setAuthStatus(rs.getInt(12));
                    professor.setId(rs.getString(13));
@@ -649,7 +673,11 @@ public abstract class ProfessorDao {
                    	title = null;
                	}
                    professor.setTitle(title);
                    professor.setAuthentication(rs.getInt(4));
                    Integer auth = rs.getInt(4);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(5));
                    professor.setAuthStatus(rs.getInt(6));
                    professor.setId(rs.getString(7));
@@ -707,7 +735,11 @@ public abstract class ProfessorDao {
                    	title = null;
                	}
                    professor.setTitle(title);
                    professor.setAuthentication(rs.getInt(4));
                    Integer auth = rs.getInt(4);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(5));
                    professor.setAuthStatus(rs.getInt(6));
                    professor.setId(rs.getString(7));
@@ -915,7 +947,11 @@ public abstract class ProfessorDao {
                    	title = null;
                    }
                    professor.setTitle(title);
                    professor.setAuthentication(rs.getInt(4));
                    Integer auth = rs.getInt(4);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(5));
                    professor.setAuthStatus(rs.getInt(6));
                    professor.setId(rs.getString(7));
@@ -1126,7 +1162,11 @@ public abstract class ProfessorDao {
                    	title = null;
                    }
                    professor.setTitle(title);
                    professor.setAuthentication(rs.getInt(4));
                    Integer auth = rs.getInt(4);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(5));
                    professor.setAuthStatus(rs.getInt(6));
                    professor.setId(rs.getString(7));
@@ -1346,7 +1386,11 @@ public abstract class ProfessorDao {
						title = null;
					}
					professor.setTitle(title);
					professor.setAuthentication(rs.getInt(8));
					Integer auth = rs.getInt(8);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
					professor.setAuthType(rs.getInt(9));
					professor.setAuthStatus(rs.getInt(10));
					professor.setId(rs.getString(11));
@@ -1546,7 +1590,11 @@ public abstract class ProfessorDao {
						title = null;
					}
					professor.setTitle(title);
					professor.setAuthentication(rs.getInt(9));
					Integer auth = rs.getInt(9);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
					professor.setId(rs.getString(10));
					professor.setName(rs.getString(11));
					String descp = rs.getString(12);
@@ -1751,7 +1799,11 @@ public abstract class ProfessorDao {
						title = null;
					}
					userInfo.setTitle(title);
					userInfo.setAuthentication(rs.getInt(8));
					Integer auth = rs.getInt(8);
					if(rs.wasNull()){
						auth = null;
					}
					userInfo.setAuthentication(auth);
					userInfo.setAuthType(rs.getInt(9));
					userInfo.setAuthStatus(rs.getInt(10));
					userInfo.setId(rs.getString(11));

src/main/java/com/ekexiu/portal/oauth/OAuthService.java

@@ -19,6 +19,7 @@ import org.jfw.util.state.StateCode;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.dao.UserOpenIdDao;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.User;
import com.ekexiu.portal.po.UserOpenId;
import com.ekexiu.portal.pojo.SessionUser;
@@ -125,8 +126,9 @@ public class OAuthService {
		JfwAppContext.removeCachedObject(authCode);
		SessionUser ret = new SessionUser();
		ret.setId(user.getId());
		if (null != this.professorDao.query(con, user.getId())) {
			ret.setName(this.professorDao.query(con, user.getId()).getName());
		Professor professor = this.professorDao.queryOne(con, user.getId());
		if (null != professor) {
			ret.setName(professor.getName());
		}
		ret.setMobilePhone(user.getMobilePhone());
		ret.setType(user.getUserType());
@@ -150,8 +152,9 @@ public class OAuthService {
			if (user != null) {
				SessionUser ret = new SessionUser();
				ret.setId(user.getId());
				if (null != this.professorDao.query(con, user.getId())) {
					ret.setName(this.professorDao.query(con, user.getId()).getName());
				Professor professor = this.professorDao.queryOne(con, user.getId());
				if (null != professor) {
					ret.setName(professor.getName());
				}
				ret.setMobilePhone(user.getMobilePhone());
				ret.setType(user.getUserType());

src/main/java/com/ekexiu/portal/service/SysService.java

@@ -861,7 +861,6 @@ public class SysService {
			Professor professor = new Professor();
			professor.setId(user.getId());
			professor.setName(name);
			professor.setAuthentication(-1);
			this.professorService.insert(con, professor, null);
			return user.getId();
		} finally {
@@ -940,7 +939,6 @@ public class SysService {
			Professor professor = new Professor();
			professor.setId(user.getId());
			professor.setName(sc.getDescp());
			professor.setAuthentication(-1);
			this.professorService.insert(con, professor, null);
			con.commit();
		} catch (SQLException e) {
@@ -1290,8 +1288,8 @@ public class SysService {
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())", "userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
			"userEmail=result.getEmail()==null?\"\":result.getEmail()","authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userAuth=String.valueOf(result.isAuth())", "userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/invitelogin")
	public SessionUser inviteLogin(@JdbcConn Connection con, String key, String code) throws SQLException {
@@ -1302,20 +1300,23 @@ public class SysService {
		if (!user.getInviteCode().equals(code)) {
			return null;
		}
		Professor professor = this.professorDao.query(con, user.getId());
		Professor professor = this.professorDao.queryOne(con, user.getId());
		SessionUser ret = new SessionUser();
		ret.setId(user.getId());
		ret.setMobilePhone(user.getMobilePhone());
		ret.setType(user.getUserType());
		ret.setEmail(user.getEmail());
		ret.setName(professor.getName());
		if (professor != null) {
			ret.setName(professor.getName());
			ret.setAuthentication(professor.getAuthentication()+"");
		}
		ret.setAuth(!DEFAULT_PASS_WORD.equals(user.getPasswd()));
		return ret;
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())", "userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
			"userEmail=result.getEmail()==null?\"\":result.getEmail()","authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userAuth=String.valueOf(result.isAuth())", "userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/slogin")
	public SessionUser sLogin(@JdbcConn Connection con, String code, String mobile) throws SQLException {
@@ -1324,20 +1325,23 @@ public class SysService {
			return null;
		if (!mobile.equals(user.getMobilePhone()))
			return null;
		Professor professor = this.professorDao.query(con, code);
		Professor professor = this.professorDao.queryOne(con, code);
		SessionUser ret = new SessionUser();
		ret.setId(code);
		ret.setMobilePhone(mobile);
		ret.setType(user.getUserType());
		ret.setEmail(user.getEmail());
		ret.setName(professor.getName());
		if(professor != null){
			ret.setName(professor.getName());
			ret.setAuthentication(professor.getAuthentication()+"");
		}
		ret.setAuth(!DEFAULT_PASS_WORD.equals(user.getPasswd()));
		return ret;
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())", "userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
			"userEmail=result.getEmail()==null?\"\":result.getEmail()","authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userAuth=String.valueOf(result.isAuth())", "userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/login")
	public SessionUser login(@JdbcConn Connection con, String lk, String pw) throws SQLException, JfwBaseException {
@@ -1354,6 +1358,7 @@ public class SysService {
		Professor pf = this.professorDao.query(con, user.getId());
		if (null != pf) {
			ret.setName(pf.getName());
			ret.setAuthentication(pf.getAuthentication()+"");
		}
		ret.setMobilePhone(user.getMobilePhone());
		ret.setType(user.getUserType());
@@ -1363,8 +1368,8 @@ public class SysService {
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())", "userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
			"userEmail=result.getEmail()==null?\"\":result.getEmail()","authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userAuth=String.valueOf(result.isAuth())", "userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/mobileLogin")
	public SessionUser mobileLogin(@JdbcConn Connection con, String state, String mobilePhone, String validateCode) throws SQLException, JfwBaseException {
@@ -1389,6 +1394,7 @@ public class SysService {
			Professor professor = this.professorDao.query(con, user.getId());
			if (null != professor) {
				ret.setName(professor.getName());
				ret.setAuthentication(professor.getAuthentication()+"");
			}
			ret.setMobilePhone(user.getMobilePhone());
			ret.setType(user.getUserType());
@@ -1400,8 +1406,8 @@ public class SysService {
		}
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "orgId=result.getId()", "orgType=result.getType()", "orgAuth=String.valueOf(result.isAuth())",
			"orgEmail=result.getEmail()==null?\"\":result.getEmail()",
	@SetCookie(checkResultNull = true, path = "/", value = { "orgId=result.getId()", "orgType=result.getType()",
			"orgAuth=String.valueOf(result.isAuth())","orgEmail=result.getEmail()==null?\"\":result.getEmail()",
			"orgName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/orgLogin")