Merge branch 'dev' of http://www.ekexiu.com:3000/jiapeng/portal-web.git

into dev

Conflicts:
	src/main/java/com/ekexiu/portal/service/AuthImageService.java

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

import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import com.ekexiu.portal.po.AuthApply;
import com.ekexiu.portal.pojo.AuthApplyInfo;
                    AuthApply _result = new AuthApply();
                    _result.setAuthApplyId(rs.getString(1));
                    _result.setProfessorId(rs.getString(2));
                    _result.setApplyType(rs.getString(3));
                    _result.setApplyType(rs.getInt(3));
                    _result.setSolveStatus(rs.getInt(4));
                    return _result;
                }else{

src/main/java/com/ekexiu/portal/po/AuthApply.java

public class AuthApply implements CreateTimeSupported {
	private String authApplyId;
	private String professorId;
	private String applyType;
	private Integer applyType;
	private Integer solveStatus;
	private String createTime;
	
		this.professorId = professorId;
	}
	
	@Column(DE.string_de)
	public String getApplyType() {
	@Column(handlerClass=WIntHandler.class,dbType="INT",insertable=true,nullable=false,renewable=false,queryable=true)
	public Integer getApplyType() {
		return applyType;
	}
	public void setApplyType(String applyType) {
	public void setApplyType(Integer applyType) {
		this.applyType = applyType;
	}
	

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

import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.ResearchAreaDao;
import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.pojo.EditProfessor;
	private ProfessorDao professorDao;
	@Autowrie
	private ResourceDao resourceDao;
	@Autowrie
	private ImageService imageService;
	@Autowrie
	private ResearchAreaDao researchAreaDao;
	public String getDateFormat() {
		return dateFormat;
		this.resourceDao = resourceDao;
	}
	public ImageService getImageService() {
		return imageService;
	}
	public void setImageService(ImageService imageService) {
		this.imageService = imageService;
	}
	public ResearchAreaDao getResearchAreaDao() {
		return researchAreaDao;
	}
	public void setResearchAreaDao(ResearchAreaDao researchAreaDao) {
		this.researchAreaDao = researchAreaDao;
	}
	private byte[] resImage(byte[] src, int maxLen) throws IOException {
		ByteArrayInputStream in = new ByteArrayInputStream(src);
		ByteArrayOutputStream out = new ByteArrayOutputStream();
		if(article != null){
			EditProfessor professor = this.professorDao.queryBaseInfo(con, article.getProfessorId());
			if(professor != null){
				professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
				professor.setResearchAreas(this.researchAreaDao.query(con, professor.getId()));
				professor.setResources(this.resourceDao.queryPro(con, professor.getId()));
			}
			article.setProfessor(professor);

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

import java.io.IOException;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import java.sql.SQLException;
import java.util.List;
import java.text.SimpleDateFormat;
import java.util.Date;
	public void setAuthApplyDao(AuthApplyDao authApplyDao) {
		this.authApplyDao = authApplyDao;
	}
	
	public String insertImg(@JdbcConn(true) Connection con, String authApplyId, String fn) throws SQLException, IOException{
		String authImageId = StringUtil.buildUUID();
		SimpleDateFormat df = new SimpleDateFormat(this.dateFormat);
		String date = df.format(new Date());
		File dateFile = new File(this.authImgPath + "/" + date);
		if (!dateFile.exists()) {
			dateFile.mkdir();
		}
		InputStream in = new FileInputStream(new File(this.tmpPath, fn));
		try {
			IoUtil.copy(in, new FileOutputStream(new File(dateFile, authImageId + ".jpg")), false, true);
		} finally {
			in.close();
		}
		AuthImage authImage = new AuthImage();
		authImage.setAuthImageId(authImageId);
		authImage.setAuthApplyId(authApplyId);
		authImage.setAuthSrc(date + "/" + authImageId + ".jpg");
		this.authImageDao.insert(con, authImage);
		return authImageId;
	}
	@Post
	@Path