11

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

@@ -0,0 +1,23 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import com.ekexiu.portal.po.ArtKeyWord;
@DAO
public interface ArtKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,ArtKeyWord[] okws)throws SQLException;
	
	@DeleteWith
	@From(ArtKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
}

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

@@ -0,0 +1,26 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import com.ekexiu.portal.po.ArticleOrg;
@DAO
public interface ArticleOrgDao {
	
	@Insert
	int insert(Connection con,ArticleOrg org) throws SQLException;
	@SelectList
	public abstract List<ArticleOrg> query(Connection con, String articleId) throws SQLException;
	@DeleteWith
	@From(ArticleOrg.class)
	public abstract int delete(Connection con, String articleId) throws SQLException;
	
}

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

@@ -4,15 +4,11 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import com.ekexiu.portal.po.ArticlePro;
@@ -21,11 +17,11 @@ public abstract class ArticleProDao {
	@Insert
	public abstract int insert(Connection con, ArticlePro articlePro) throws SQLException;
	@QueryVal
	@From(ArticlePro.class)
	@Column(handlerClass = IntHandler.class, value = "COUNT(1)")
	@DefaultValue("0")
	public abstract int queryByArticleId(Connection con, String articleId) throws SQLException;
//	@QueryVal
//	@From(ArticlePro.class)
//	@Column(handlerClass = IntHandler.class, value = "COUNT(1)")
//	@DefaultValue("0")
//	public abstract int queryByArticleId(Connection con, String articleId) throws SQLException;
	@SelectList
	public abstract List<ArticlePro> query(Connection con, String articleId) throws SQLException;

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

@@ -7,16 +7,11 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import com.ekexiu.portal.po.ArticlePro;
import com.ekexiu.portal.po.ArticleRes;
@DAO
@@ -24,11 +19,11 @@ public abstract class ArticleResDao {
	@Insert
	public abstract int insert(Connection con, ArticleRes articleRes) throws SQLException;
	@QueryVal
	@From(ArticlePro.class)
	@Column(handlerClass = IntHandler.class, value = "COUNT(1)")
	@DefaultValue("0")
	public abstract int queryByArticleId(Connection con, String articleId) throws SQLException;
//	@QueryVal
//	@From(ArticlePro.class)
//	@Column(handlerClass = IntHandler.class, value = "COUNT(1)")
//	@DefaultValue("0")
//	public abstract int queryByArticleId(Connection con, String articleId) throws SQLException;
	public List<ArticleRes> query(Connection con, String articleId) throws SQLException{
        int index = 1;

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

@@ -226,5 +226,12 @@ public abstract class OrgDao {
	@From(Organization.class)
	@Select(Organization.class)
	public abstract List<EditOrganization> query(Connection con,@In String[] id) throws SQLException;
	
	@LimitQuery
	@Select(Organization.class)
	@From(Organization.class)
	@OrderBy(" ORDER BY SORT_NUM DESC,PAGE_VIEWS DESC,SHARE_ID ASC")
	@Or
	public abstract List<EditOrganization> relateQuery(Connection con,@Nullable @SqlColumn(value={"(IS_JOIN='1' AND NAME LIKE ?)","(IS_JOIN='1' AND FOR_SHORT LIKE ?)"},handlerClass=StringHandler.class) String kw,int rows)throws SQLException;
}

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

@@ -0,0 +1,23 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import com.ekexiu.portal.po.OrgKeyWord;
@DAO
public interface OrgKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,OrgKeyWord[] okws)throws SQLException;
	
	@DeleteWith
	@From(OrgKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
}

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

@@ -0,0 +1,23 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import com.ekexiu.portal.po.PapKeyWord;
@DAO
public interface PapKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,PapKeyWord[] okws)throws SQLException;
	
	@DeleteWith
	@From(PapKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
}

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

@@ -0,0 +1,23 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import com.ekexiu.portal.po.PatKeyWord;
@DAO
public interface PatKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,PatKeyWord[] okws)throws SQLException;
	
	@DeleteWith
	@From(PatKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
}

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

@@ -0,0 +1,25 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import com.ekexiu.portal.po.ProKeyWord;
@DAO
public interface ProKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,ProKeyWord[] pkw)throws SQLException;
	
	@DeleteWith
	@From(ProKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
	
}

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

@@ -17,6 +17,7 @@ import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.Or;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Select;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
@@ -45,6 +46,11 @@ import com.ekexiu.portal.pojo.UserInfo;
public abstract class ProfessorDao {
	@Insert
	public abstract int insert(Connection con, Professor professor) throws SQLException;
	
	@UpdateWith
	@From(Professor.class)
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
	public abstract int incPageViews(Connection con,String id)throws SQLException;
	@Update
	public abstract int update(Connection con, Professor professor) throws SQLException;

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

@@ -0,0 +1,23 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import com.ekexiu.portal.po.ResKeyWord;
@DAO
public interface ResKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,ResKeyWord[] okws)throws SQLException;
	
	@DeleteWith
	@From(ResKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
}

src/main/java/com/ekexiu/portal/job/ArticleTaskJobEntry.java

@@ -13,6 +13,7 @@ import org.jfw.apt.annotation.Bean;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.service.ArticleService;
@Bean
public class ArticleTaskJobEntry implements Runnable {
@@ -23,6 +24,16 @@ public class ArticleTaskJobEntry implements Runnable {
	private DataSource dataSource;
	@Autowrie
	private ArticleDao articleDao;
	@Autowrie
	private ArticleService articleService;
	
	
	public ArticleService getArticleService() {
		return articleService;
	}
	public void setArticleService(ArticleService articleService) {
		this.articleService = articleService;
	}
	public long getDelayTime() {
		return delayTime;
	}
@@ -50,7 +61,7 @@ public class ArticleTaskJobEntry implements Runnable {
				SimpleDateFormat df = new SimpleDateFormat(this.dateFormat);
				List<Article> articles = this.articleDao.queryTiming(con, df.format(new Date()));
				for (Article article : articles) {
					this.articleDao.updateStatus(con, article.getArticleId(), "1");
					this.articleService.publish(con,article.getArticleId());
					logger.info("定时发布文章："+article.getArticleId()+"--"+df.format(new Date()));
				}
                con.commit();

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

@@ -0,0 +1,26 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class ArtKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
}

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

@@ -0,0 +1,45 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.annotation.entry.Unique;
import org.jfw.apt.orm.annotation.entry.Uniques;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
@Table
@Uniques(@Unique(clolumns = { "articleId", "orgId" }, name = "ARTICLE_ORG_UQ"))
public class ArticleOrg implements CreateTimeSupported {
	private String articleId;
	private String orgId;
	private String createTime;
	private Article article;
	@Override
	public String getCreateTime() {
		return this.createTime;
	}
	@Override
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	@Column(DE.id_32)
	public String getArticleId() {
		return articleId;
	}
	public void setArticleId(String articleId) {
		this.articleId = articleId;
	}
	@Column(DE.id_32)
	public String getOrgId() {
		return orgId;
	}
	public void setOrgId(String orgId) {
		this.orgId = orgId;
	}
	public Article getArticle() {
		return article;
	}
	public void setArticle(Article article) {
		this.article = article;
	}
}

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

@@ -0,0 +1,26 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class OrgKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
}

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

@@ -0,0 +1,26 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class PapKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
}

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

@@ -0,0 +1,26 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class PatKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
}

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

@@ -0,0 +1,28 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class ProKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
	
}

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

@@ -55,6 +55,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
	private Integer growthValue;
	private String scorePercent;
	private long shareId;
	private long pageViews;
	
	private Organization organization;
	private List<Resource> resources;
@@ -342,5 +343,12 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
		this.shareId = shareId;
	}
	
	@Column(DE.bigSerial)
	public long getPageViews() {
		return pageViews;
	}
	public void setPageViews(long pageViews) {
		this.pageViews = pageViews;
	}
}

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

@@ -0,0 +1,26 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class ResKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
}

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

@@ -29,6 +29,7 @@ import org.jfw.util.io.IoUtil;
import com.ekexiu.portal.dao.ArticleAgreeDao;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.ArticleOrgDao;
import com.ekexiu.portal.dao.ArticleProDao;
import com.ekexiu.portal.dao.ArticleResDao;
import com.ekexiu.portal.dao.LeaveWordDao;
@@ -39,6 +40,7 @@ import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.dao.WatchDao;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.po.ArticleAgree;
import com.ekexiu.portal.po.ArticleOrg;
import com.ekexiu.portal.po.ArticlePro;
import com.ekexiu.portal.po.ArticleRes;
import com.ekexiu.portal.po.Image;
@@ -79,6 +81,30 @@ public class ArticleService {
	private ArticleProDao articleProDao;
	@Autowrie
	private ArticleResDao articleResDao;
	
	@Autowrie
	private ArticleOrgDao articleOrgDao;
	
	@Autowrie
	private KeyWordService keyWordService;
	
	
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	public ArticleOrgDao getArticleOrgDao() {
		return articleOrgDao;
	}
	public void setArticleOrgDao(ArticleOrgDao articleOrgDao) {
		this.articleOrgDao = articleOrgDao;
	}
	public String getDateFormat() {
		return dateFormat;
@@ -292,7 +318,7 @@ public class ArticleService {
	@Post
	@Path("/save")
	public String saveArticle(@JdbcConn(true) Connection con,Article article,@Nullable String[] professors,
			@Nullable String[] resources) throws SQLException, IOException, JfwBaseException{
			@Nullable String[] resources,@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException{
		if(article.getArticleId() == null){
			String articleId = StringUtil.buildUUID();
			if(article.getArticleImg() != null){
@@ -312,6 +338,7 @@ public class ArticleService {
				throw new JfwBaseException(-1, "错误参数：文章发布者ID");
			}
			this.articleDao.insert(con, article);
			this.keyWordService.refreshArticle(con,articleId, KeyWordService.splitKeyWord(article.getSubject()));
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
@@ -328,6 +355,14 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(articleId);
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			return articleId;
		}else if(article.getArticleId().trim().length() == 32){
			if(article.getArticleImg() != null){
@@ -336,8 +371,10 @@ public class ArticleService {
			}
			this.articleDao.update(con, article);
			this.articleDao.updatePublishTime(con, article.getArticleId(), "1", this.publishTime());
			this.keyWordService.refreshArticle(con,article.getArticleId(), KeyWordService.splitKeyWord(article.getSubject()));
			this.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			this.articleOrgDao.delete(con, article.getArticleId());
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
@@ -354,6 +391,14 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(article.getArticleId());
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			return article.getArticleId();
		}else{
			throw new JfwBaseException(-2, "bad parameter:articleId");
@@ -363,7 +408,7 @@ public class ArticleService {
	@Post
	@Path("/draft")
	public String draft(@JdbcConn(true) Connection con,Article article,@Nullable String[] professors,
			@Nullable String[] resources) throws SQLException, IOException, JfwBaseException{
			@Nullable String[] resources,@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException{
		if(article.getArticleId() == null){
			String articleId = StringUtil.buildUUID();
			if(article.getArticleImg() != null){
@@ -382,6 +427,7 @@ public class ArticleService {
				throw new JfwBaseException(-1, "错误参数：文章发布者ID");
			}
			this.articleDao.insert(con, article);
			this.keyWordService.refreshArticle(con,articleId, null);
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
@@ -398,6 +444,14 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(articleId);
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			return articleId;
		}else if(article.getArticleId().trim().length() == 32){
			if(article.getArticleImg() != null){
@@ -406,8 +460,10 @@ public class ArticleService {
			}
			this.articleDao.update(con, article);
			this.articleDao.updateStatus(con, article.getArticleId(), "0");
			this.keyWordService.refreshArticle(con, article.getArticleId(), null);
			this.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			this.articleOrgDao.delete(con, article.getArticleId());
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
@@ -424,6 +480,14 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(article.getArticleId());
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			return article.getArticleId();
		}else{
			throw new JfwBaseException(-2, "bad parameter:articleId");
@@ -433,7 +497,7 @@ public class ArticleService {
	@Post
	@Path("/timing")
	public String timingPublish(@JdbcConn(true) Connection con,Article article,@Nullable String[] professors,
			@Nullable String[] resources) throws SQLException, IOException, JfwBaseException{
			@Nullable String[] resources,@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException{
		if(article.getPublishTime() == null){
			throw new JfwBaseException(-3, "no parameter found:publishTime");
		}
@@ -471,6 +535,14 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(articleId);
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			return articleId;
		}else if(article.getArticleId().trim().length() == 32){
			if(article.getArticleImg() != null){
@@ -479,9 +551,11 @@ public class ArticleService {
			}
			this.articleDao.update(con, article);
			this.articleDao.updatePublishTime(con, article.getArticleId(), "2", article.getPublishTime());
			this.keyWordService.refreshArticle(con,article.getArticleId(), null);
			this.articleResDao.delete(con, article.getArticleId());
			this.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			this.articleOrgDao.delete(con, article.getArticleId());
			
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
@@ -498,6 +572,14 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(article.getArticleId());
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			return article.getArticleId();
		}else{
			throw new JfwBaseException(-2, "bad parameter:articleId");
@@ -526,6 +608,7 @@ public class ArticleService {
	public void updateDraft(@JdbcConn(true) Connection con, String articleId) throws SQLException{
		//修改文章状态为草稿
		this.articleDao.updateStatus(con, articleId, "0");
		this.keyWordService.refreshArticle(con,articleId,null);
	}
	
	@Post
@@ -533,6 +616,10 @@ public class ArticleService {
	public void publish(@JdbcConn(true) Connection con,String articleId) throws SQLException{
		//修改文章状态为发布
		this.articleDao.updateStatus(con, articleId, "1");
		Article a = this.articleDao.queryOne(con, articleId);
		if(a!=null){
			this.keyWordService.refreshArticle(con,articleId,KeyWordService.splitKeyWord(a.getSubject()));
		}
	}
	
	@Post
@@ -540,6 +627,7 @@ public class ArticleService {
	public void deleteArticle(@JdbcConn(true) Connection con,String articleId) throws SQLException{
		//修改文章状态为删除
		this.articleDao.updateStatus(con, articleId, "3");
		this.keyWordService.refreshArticle(con, articleId,null);
	}
	
	@Post
@@ -730,6 +818,12 @@ public class ArticleService {
	public List<ArticleRes> ralateRes(@JdbcConn Connection con,String articleId) throws SQLException{
		return this.articleResDao.query(con, articleId);
	}
	@Get
	@Path("/ralateOrg")
	public List<ArticleOrg> ralateOrg(@JdbcConn Connection con,String articleId) throws SQLException{
		return this.articleOrgDao.query(con, articleId);
	}	
	
	
	@Get
	@Path("/ralateArticles")
@@ -755,6 +849,9 @@ public class ArticleService {
		this.leaveWordDao.deleteArticle(con, articleId);
		this.articleAgreeDao.delete(con, articleId);
		this.watchDao.deleteWatch(con, articleId);
		this.articleOrgDao.delete(con, articleId);
		this.articleProDao.delete(con, articleId);
		this.articleProDao.delete(con, articleId);
	}
	
	@Path("/byShareId")

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

@@ -0,0 +1,192 @@
package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Bean;
import com.ekexiu.portal.dao.ArtKeyWordDao;
import com.ekexiu.portal.dao.OrgKeyWordDao;
import com.ekexiu.portal.dao.PapKeyWordDao;
import com.ekexiu.portal.dao.PatKeyWordDao;
import com.ekexiu.portal.dao.ProKeyWordDao;
import com.ekexiu.portal.dao.ResKeyWordDao;
import com.ekexiu.portal.po.ArtKeyWord;
import com.ekexiu.portal.po.OrgKeyWord;
import com.ekexiu.portal.po.PapKeyWord;
import com.ekexiu.portal.po.PatKeyWord;
import com.ekexiu.portal.po.ProKeyWord;
import com.ekexiu.portal.po.ResKeyWord;
@Bean
public class KeyWordService {
	@Autowrie
	private ProKeyWordDao proKeyWordDao;
	@Autowrie
	private OrgKeyWordDao orgKeyWordDao;
	@Autowrie
	private ResKeyWordDao resKeyWordDao;
	@Autowrie
	private ArtKeyWordDao artKeyWordDao;
	@Autowrie
	private PatKeyWordDao patKeyWordDao;
	@Autowrie
	private PapKeyWordDao papKeyWordDao;
	
	
	public ProKeyWordDao getProKeyWordDao() {
		return proKeyWordDao;
	}
	public void setProKeyWordDao(ProKeyWordDao proKeyWordDao) {
		this.proKeyWordDao = proKeyWordDao;
	}
	public OrgKeyWordDao getOrgKeyWordDao() {
		return orgKeyWordDao;
	}
	public void setOrgKeyWordDao(OrgKeyWordDao orgKeyWordDao) {
		this.orgKeyWordDao = orgKeyWordDao;
	}
	public ResKeyWordDao getResKeyWordDao() {
		return resKeyWordDao;
	}
	public void setResKeyWordDao(ResKeyWordDao resKeyWordDao) {
		this.resKeyWordDao = resKeyWordDao;
	}
	public ArtKeyWordDao getArtKeyWordDao() {
		return artKeyWordDao;
	}
	public void setArtKeyWordDao(ArtKeyWordDao artKeyWordDao) {
		this.artKeyWordDao = artKeyWordDao;
	}
	public PatKeyWordDao getPatKeyWordDao() {
		return patKeyWordDao;
	}
	public void setPatKeyWordDao(PatKeyWordDao patKeyWordDao) {
		this.patKeyWordDao = patKeyWordDao;
	}
	public PapKeyWordDao getPapKeyWordDao() {
		return papKeyWordDao;
	}
	public void setPapKeyWordDao(PapKeyWordDao papKeyWordDao) {
		this.papKeyWordDao = papKeyWordDao;
	}
	public void refreshProfessor(Connection con,String id,String[] kws)throws SQLException{
		proKeyWordDao.delete(con, id);
		if(kws!=null && kws.length>0){
			ProKeyWord[] okws = new ProKeyWord[kws.length];
			for(int i = 0 ;i < kws.length ; ++i){
				ProKeyWord okw = new ProKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i]= okw;
			}
			proKeyWordDao.insert(con, okws);
		}
	}
	
	public void refreshOrg(Connection con,String id,String[] kws)throws SQLException{
		orgKeyWordDao.delete(con, id);
		if(kws!=null && kws.length>0){
			OrgKeyWord[] okws = new OrgKeyWord[kws.length];
			for(int i = 0 ;i < kws.length ; ++i){
				OrgKeyWord okw = new OrgKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i]= okw;
			}
			orgKeyWordDao.insert(con, okws);
		}
	}
	
	public void refreshArticle(Connection con,String id,String[] kws)throws SQLException{
		artKeyWordDao.delete(con, id);
		if(kws!=null && kws.length>0){
			ArtKeyWord[] okws = new ArtKeyWord[kws.length];
			for(int i = 0 ;i < kws.length ; ++i){
				ArtKeyWord okw = new ArtKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i]= okw;
			}
			artKeyWordDao.insert(con, okws);
		}
	}
	
	public void refreshResource(Connection con,String id,String[] kws)throws SQLException{
		resKeyWordDao.delete(con, id);
		if(kws!=null && kws.length>0){
			ResKeyWord[] okws = new ResKeyWord[kws.length];
			for(int i = 0 ;i < kws.length ; ++i){
				ResKeyWord okw = new ResKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i]= okw;
			}
			resKeyWordDao.insert(con, okws);
		}
	}
	
	public void refreshPaper(Connection con,String id,String[] kws)throws SQLException{
		papKeyWordDao.delete(con, id);
		if(kws!=null && kws.length>0){
			PapKeyWord[] okws = new PapKeyWord[kws.length];
			for(int i = 0 ;i < kws.length ; ++i){
				PapKeyWord okw = new PapKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i]= okw;
			}
			papKeyWordDao.insert(con, okws);
		}
	}
	
	
	public void refreshPatent(Connection con,String id,String[] kws)throws SQLException{
		patKeyWordDao.delete(con, id);
		if(kws!=null && kws.length>0){
			PatKeyWord[] okws = new PatKeyWord[kws.length];
			for(int i = 0 ;i < kws.length ; ++i){
				PatKeyWord okw = new PatKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i]= okw;
			}
			patKeyWordDao.insert(con, okws);
		}
	}
	public static String[] splitKeyWord(String kws){
		if(kws == null || kws.trim().length()== 0) return null;
		kws = kws.trim();		
		ArrayList<String> result = new ArrayList<String>();
		char[] cs = kws.toCharArray();
		int mi = cs.length;
		if (mi > 0) {
			int begin = 0;
			for (int i = 0; i < mi; ++i) {
				char c = cs[i];
				if (c == ',') {
					if (i != begin) result.add(new String(cs, begin, i - begin));
					begin = i + 1;
				}
			}
			if (begin!= mi) result.add(new String(cs, begin, mi - begin));
		} 
		return result.isEmpty()?null :result.toArray(new String[result.size()]);
	}
	
}

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

@@ -39,8 +39,18 @@ public class OrgService {
	@Autowrie
	private OrgRegInfoDao orgRegInfoDao;
	
	@Autowrie
	private KeyWordService keyWordService;
	
	
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	public OrgRegInfoDao getOrgRegInfoDao() {
		return orgRegInfoDao;
	}
@@ -88,6 +98,18 @@ public class OrgService {
		organization.setId(StringUtil.buildUUID());
		if(organization.getOrgType()== null) organization.setOrgType(this.defaultOrgType);
		this.orgDao.insert(con, organization);
		Organization no = this.orgDao.query(con, organization.getId());
		if(no!=null && no.getIsJoin().equals("1")){
			String s = no.getSubject();
			String in = no.getIndustry();
			String kw = s==null?"":s.trim();
			kw = kw + (in==null?"":(","+in.trim()));
			
			this.keyWordService.refreshOrg(con,organization.getId(),KeyWordService.splitKeyWord(kw));
		}else{
			this.keyWordService.refreshOrg(con,organization.getId(),null);
		}
		
	}
	
	
@@ -98,6 +120,17 @@ public class OrgService {
			this.imageService.saveOrgLogo(organization.getId(), fn);
		}
		this.orgDao.update(con, organization);
		Organization no = this.orgDao.query(con, organization.getId());
		if(no!=null && no.getIsJoin().equals("1")){
			String s = no.getSubject();
			String in = no.getIndustry();
			String kw = s==null?"":s.trim();
			kw = kw + (in==null?"":(","+in.trim()));
			
			this.keyWordService.refreshOrg(con,organization.getId(),KeyWordService.splitKeyWord(kw));
		}else{
			this.keyWordService.refreshOrg(con,organization.getId(),null);
		}
	}
	
	@Get
@@ -203,4 +236,15 @@ public class OrgService {
		}
		return ret;
	}
	
	@Get
	@Path("/qr")
	public List<EditOrganization> relateQuery(@JdbcConn Connection con,@Nullable String kw,@DefaultValue("3") int limit) throws SQLException{
		List<EditOrganization> ret = this.orgDao.relateQuery(con, kw, limit);
		for (EditOrganization organization :ret) {
			organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
		}
		return ret;
		
	}
}

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

@@ -26,6 +26,19 @@ public class PpaperService {
	private PpaperDao ppaperDao;
	@Autowrie
	private PaperAuthorDao paperAuthorDao;
	
	@Autowrie
	private KeyWordService keyWordService;
	
	
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	public PpaperDao getPpaperDao() {
		return ppaperDao;
@@ -136,6 +149,7 @@ public class PpaperService {
	@Path("/kw")
	public void update(@JdbcConn(true) Connection con, String id, @Nullable String keywords) throws SQLException {
		this.ppaperDao.update(con, id, keywords);
		this.keyWordService.refreshPaper(con, id, KeyWordService.splitKeyWord(keywords));		
	}
	@Get

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

@@ -27,7 +27,18 @@ public class PpatentServcie {
	@Autowrie
	private PatentAuthorDao patentAuthorDao;
	
	@Autowrie
	private KeyWordService keyWordService;
	
	
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	
	public PpatentDao getPpatentDao() {
		return ppatentDao;
@@ -134,6 +145,7 @@ public class PpatentServcie {
	@Path("/kw")
	public void update(@JdbcConn(true) Connection con,String id,@Nullable String keywords)throws SQLException{
		this.ppatentDao.update(con, id, keywords);
		this.keyWordService.refreshPatent(con, id, KeyWordService.splitKeyWord(keywords));		
	}
	@Get
	@Path("/byShareId")

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

@@ -92,6 +92,17 @@ public class ProfessorService {
	@Autowrie
	private OrgResStaffDao orgResStaffDao;
	@Autowrie
	private KeyWordService keyWordService;
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	public GrowthLogService getGrowthLogService() {
		return growthLogService;
	}
@@ -243,7 +254,6 @@ public class ProfessorService {
	public void setOrgDao(OrgDao orgDao) {
		this.orgDao = orgDao;
	}
	
	public ImageDao getImageDao() {
		return imageDao;
@@ -263,37 +273,36 @@ public class ProfessorService {
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, Professor professor, @Nullable String orgName)
			throws SQLException, IOException {
		if(professor.getId() == null ) {
	public String insert(@JdbcConn(true) Connection con, Professor professor, @Nullable String orgName) throws SQLException, IOException {
		if (professor.getId() == null) {
			professor.setId(StringUtil.buildUUID());
		}
		if (professor.getOrgId() == null && orgName != null) {
			if(null != this.orgDao.queryByName(con, orgName)){
			if (null != this.orgDao.queryByName(con, orgName)) {
				professor.setOrgId(this.orgDao.queryByName(con, orgName));
			} else {
				professor.setOrgId(this.orgService.createOrganization(con, orgName));
			}
		}
		if(professor.getOrgAuth() == null){
		if (professor.getOrgAuth() == null) {
			professor.setOrgAuth("0");
		}
		User user = this.userDao.query(con, professor.getId());
		if(user != null){
		if (user != null) {
			int value = 0;
			if(user.getMobilePhone() != null && user.getMobilePhone().trim().length() == 11){
			if (user.getMobilePhone() != null && user.getMobilePhone().trim().length() == 11) {
				professor.setPhone(user.getMobilePhone());
				value = value + this.rule.getBindMobile();
				this.growthLogService.firstBindMobile(con, professor.getId());
			}
			if(user.getEmail() != null && !"".equals(user.getEmail())){
			if (user.getEmail() != null && !"".equals(user.getEmail())) {
				professor.setEmail(user.getEmail());
				value = value + this.rule.getBindEmail();
				this.growthLogService.firstBindEmail(con, professor.getId());
			}
			professor.setScoreValue(value);
			professor.setGrowthValue(value);
		}else{
		} else {
			professor.setScoreValue(0);
			professor.setGrowthValue(0);
		}
@@ -304,30 +313,30 @@ public class ProfessorService {
	@Put
	@Path
	public void update(@JdbcConn(true) Connection con, @RequestBody EditProfessor professor) throws SQLException, IOException {
		if(professor.getOrgName()!=null)
			if(null != this.orgDao.queryByName(con, professor.getOrgName())){
		if (professor.getOrgName() != null)
			if (null != this.orgDao.queryByName(con, professor.getOrgName())) {
				professor.setOrgId(this.orgDao.queryByName(con, professor.getOrgName()));
			} else {
				professor.setOrgId(this.orgService.createOrganization(con, professor.getOrgName()));
			}
		this.professorDao.update(con, professor);
	}
	
	@Post
	@Path("/updatePro")
	public void updatePro(@JdbcConn(true) Connection con,EditProfessor professor)throws SQLException, IOException{
		if(professor.getOrgName()!=null)
			if(null != this.orgDao.queryByName(con, professor.getOrgName())){
	public void updatePro(@JdbcConn(true) Connection con, EditProfessor professor) throws SQLException, IOException {
		if (professor.getOrgName() != null)
			if (null != this.orgDao.queryByName(con, professor.getOrgName())) {
				professor.setOrgId(this.orgDao.queryByName(con, professor.getOrgName()));
			} else {
				professor.setOrgId(this.orgService.createOrganization(con, professor.getOrgName()));
			}
		this.professorDao.update(con, professor);
	}
	
	@Get
	@Path("/queryInvite")
	public List<EditProfessor> queryInvite(@JdbcConn Connection con, String id) throws SQLException{
	public List<EditProfessor> queryInvite(@JdbcConn Connection con, String id) throws SQLException {
		List<EditProfessor> professors = this.professorDao.queryInvite(con, id);
		for (EditProfessor professor : professors) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
@@ -336,27 +345,27 @@ public class ProfessorService {
		}
		return professors;
	}
	
	@Get
	@Path("/auth")
	public Professor queryAuth(@JdbcConn Connection con, String id) throws SQLException{
	public Professor queryAuth(@JdbcConn Connection con, String id) throws SQLException {
		return this.professorDao.queryAuth(con, id);
	}
	
	@Get
	@Path("/baseInfo/{id}")
	public EditProfessor queryBaseInfo(@JdbcConn Connection con, @PathVar String id) throws SQLException {
		EditProfessor professor = this.professorDao.queryBaseInfo(con, id);
		if(null != professor){
		if (null != professor) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(id));
		}
		return professor;
	}
	
	@Get
	@Path("/qaByName")
	public List<EditProfessor> queryByName(@JdbcConn Connection con,@Nullable String name,@DefaultValue("3") int total)throws SQLException {
		if(name != null){
	public List<EditProfessor> queryByName(@JdbcConn Connection con, @Nullable String name, @DefaultValue("3") int total) throws SQLException {
		if (name != null) {
			name = "%" + name + "%";
		}
		List<EditProfessor> professors = this.professorDao.queryByName(con, name, total);
@@ -365,35 +374,36 @@ public class ProfessorService {
		}
		return professors;
	}
	
	@Get
	@Path("/editBaseInfo/{id}")
	public EditProfessor queryEditBaseInfo(@JdbcConn Connection con, @PathVar String id) throws SQLException {
		EditProfessor professor = this.professorDao.queryEditBaseInfo(con, id);
		if(null != professor){
		if (null != professor) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(id));
		}
		return professor;
	}
	
	@Get
	@Path("/{id}")
	public Professor query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
		return this.professorDao.query(con, id);
	}
	@Get
	@Path("/qa")
	public List<Professor> queryAll(@JdbcConn Connection con) throws SQLException {
		return this.professorDao.query(con);
	}
	
	@Get
	@Path("/pqOrgAuth")
	public PageQueryResult<EditProfessor> queryPageOrgAuth(@JdbcConn Connection con,String orgId,@Nullable String orgAuth,
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
	public PageQueryResult<EditProfessor> queryPageOrgAuth(@JdbcConn Connection con, String orgId, @Nullable String orgAuth, @DefaultValue("10") int pageSize,
			@DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryPage(con, orgId, orgAuth, pageSize, pageNo);
		List<EditProfessor> professors = queryResult.getData();
		if(!professors.isEmpty()){
		if (!professors.isEmpty()) {
			for (EditProfessor professor : professors) {
				professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
				professor.setResearchAreas(this.researchAreaDao.query(con, professor.getId()));
@@ -402,10 +412,10 @@ public class ProfessorService {
		}
		return queryResult;
	}
	
	@Get
	@Path("/qaOrgAuth")
	public List<EditProfessor> queryOrgAuth(@JdbcConn Connection con,String orgId,@Nullable String orgAuth)throws SQLException{
	public List<EditProfessor> queryOrgAuth(@JdbcConn Connection con, String orgId, @Nullable String orgAuth) throws SQLException {
		List<EditProfessor> professors = this.professorDao.queryByOrg(con, orgId, orgAuth);
		for (EditProfessor professor : professors) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
@@ -413,7 +423,7 @@ public class ProfessorService {
		}
		return professors;
	}
	
	public void updateStarAvg(Connection con) throws SQLException {
		try {
			List<Professor> professors = this.professorDao.queryStar(con);
@@ -432,7 +442,7 @@ public class ProfessorService {
			e.printStackTrace();
		}
	}
	
	public void updateScorePercent(Connection con) throws SQLException {
		List<Professor> professors = this.professorDao.queryList(con);
		int count = this.professorDao.queryCount(con);
@@ -440,8 +450,8 @@ public class ProfessorService {
			for (Professor professor : professors) {
				int lessThan = this.professorDao.queryCountLessThan(con, professor.getScoreValue());
				double value = 0;
				if(count != 0){
					value = (double)lessThan/(double)count;
				if (count != 0) {
					value = (double) lessThan / (double) count;
				}
				DecimalFormat df = new DecimalFormat("#%");
				this.professorDao.updateScorePercent(con, professor.getId(), df.format(value));
@@ -451,13 +461,14 @@ public class ProfessorService {
			e.printStackTrace();
		}
	}
	
	@Get
	@Path("/pqHot")
	public PageQueryResult<EditProfessor> queryHot(@JdbcConn Connection con,@DefaultValue("8") int pageSize,@DefaultValue("1") int pageNo) throws SQLException {
	public PageQueryResult<EditProfessor> queryHot(@JdbcConn Connection con, @DefaultValue("8") int pageSize, @DefaultValue("1") int pageNo)
			throws SQLException {
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryHot(con, pageSize, pageNo);
		List<EditProfessor> professors = queryResult.getData();
		if(!professors.isEmpty()){
		if (!professors.isEmpty()) {
			for (EditProfessor editProfessor : professors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
@@ -466,21 +477,30 @@ public class ProfessorService {
		}
		return queryResult;
	}
	
	@Get
	@Path("/pqAPP")
	public PageQueryResult<EditProfessor> queryAPP(@JdbcConn Connection con, @Nullable String key,
			@Nullable String subject,@Nullable String industry,@Nullable String province,
			@Nullable String address, @DefaultValue("1") Integer authType, 
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo) throws SQLException{
		if(key!=null) {key="%"+key+"%";}
		if(subject!=null) {subject ="%"+subject+"%";}
		if(null!=industry) {industry="%"+industry+"%";}
		if(null!=province) {province="%"+province+"%";}
		if(null!=address) {address="%"+address+"%";}
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryAPP(con,key,subject,industry,province,address,authType,pageSize,pageNo);
	public PageQueryResult<EditProfessor> queryAPP(@JdbcConn Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry,
			@Nullable String province, @Nullable String address, @DefaultValue("1") Integer authType, @DefaultValue("10") int pageSize,
			@DefaultValue("1") int pageNo) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		if (subject != null) {
			subject = "%" + subject + "%";
		}
		if (null != industry) {
			industry = "%" + industry + "%";
		}
		if (null != province) {
			province = "%" + province + "%";
		}
		if (null != address) {
			address = "%" + address + "%";
		}
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryAPP(con, key, subject, industry, province, address, authType, pageSize, pageNo);
		List<EditProfessor> editProfessors = queryResult.getData();
		if(!editProfessors.isEmpty()) {
		if (!editProfessors.isEmpty()) {
			for (EditProfessor editProfessor : editProfessors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
@@ -490,82 +510,97 @@ public class ProfessorService {
		}
		return queryResult;
	}
	
	@Post
	@Path("/sortFirst")
	public void updateSortFirst(@JdbcConn(true) Connection con, String id, Integer sortFirst) throws SQLException{
	public void updateSortFirst(@JdbcConn(true) Connection con, String id, Integer sortFirst) throws SQLException {
		this.professorDao.updateSortFirst(con, id, sortFirst);
	}
	
	@Post
	@Path("/authentication")
	public void updateAuthentication(@JdbcConn(true) Connection con, String id, Integer authentication, 
			Integer authType, Integer authStatus) throws SQLException{
	public void updateAuthentication(@JdbcConn(true) Connection con, String id, Integer authentication, Integer authType, Integer authStatus)
			throws SQLException {
		this.professorDao.updateAuthentication(con, id, authentication, authType, authStatus);
	}
	
	@Post
	@Path("/authType")
	public void updateAuthType(@JdbcConn(true) Connection con,String id,Integer authType)throws SQLException{
	public void updateAuthType(@JdbcConn(true) Connection con, String id, Integer authType) throws SQLException {
		this.professorDao.updateAuthType(con, id, authType);
	}
	
	@Post
	@Path("/authen")
	public void updateAuthen(@JdbcConn(true) Connection con,String id,Integer authentication)throws SQLException{
	public void updateAuthen(@JdbcConn(true) Connection con, String id, Integer authentication) throws SQLException {
		this.professorDao.updateAuthentication(con, id, authentication);
	}
	
	@Post
	@Path("/authStatus")
	public void updateAuthStatus(@JdbcConn(true) Connection con, String id, Integer authStatus) throws SQLException{
	public void updateAuthStatus(@JdbcConn(true) Connection con, String id, Integer authStatus) throws SQLException {
		this.professorDao.updateAuthStatus(con, id, authStatus);
	}
	
	@Post
	@Path("/passOrgAuth")
	public void passOrgAuth(@JdbcConn(true) Connection con,String id)throws SQLException{
	public void passOrgAuth(@JdbcConn(true) Connection con, String id) throws SQLException {
		this.professorDao.updateOrgAuth(con, id, "1");
		//通过企业认证给用户增加积分
		// 通过企业认证给用户增加积分
		this.growthLogService.authOrg(con, id);
	}
	
	@Post
	@Path("/removeOrgAuth")
	public void removeOrgAuth(@JdbcConn(true) Connection con,String id)throws SQLException{
	public void removeOrgAuth(@JdbcConn(true) Connection con, String id) throws SQLException {
		this.professorDao.updateOrgAuth(con, id, "0");
	}
	
	@Post
	@Path("/starLevel")
	public void updateStarLevel(@JdbcConn(true) Connection con, String id, BigDecimal starLevel) throws SQLException{
	public void updateStarLevel(@JdbcConn(true) Connection con, String id, BigDecimal starLevel) throws SQLException {
		this.professorDao.updateStarLevel(con, id, starLevel);
	}
	
	@Post
	@Path("/subject")
	public void updateSubject(@JdbcConn(true) Connection con,String id,@Nullable String subject) throws SQLException{
	public void updateSubject(@JdbcConn(true) Connection con, String id, @Nullable String subject) throws SQLException {
		this.professorDao.updateSubject(con, id, subject);
		Professor p = this.professorDao.query(con, id);
		// String subject = p.getSubject();
		if (subject == null)
			subject = "";
		String industry = p.getIndustry();
		if (industry == null)
			industry = "";
		this.keyWordService.refreshProfessor(con, id, KeyWordService.splitKeyWord(subject + "," + industry));
	}
	
	@Post
	@Path("/industry")
	public void updateIndustry(@JdbcConn(true) Connection con,String id,@Nullable String industry) throws SQLException{
	public void updateIndustry(@JdbcConn(true) Connection con, String id, @Nullable String industry) throws SQLException {
		this.professorDao.updateIndustry(con, id, industry);
		Professor p = this.professorDao.query(con, id);
		String subject = p.getSubject();
		if (subject == null)
			subject = "";
		if (industry == null)
			industry = "";
		this.keyWordService.refreshProfessor(con, id, KeyWordService.splitKeyWord(subject + "," + industry));
	}
	@Post
	@Path("/address")
	public void updateAddress(@JdbcConn(true) Connection con, String id,
			@Nullable String province,@Nullable String address) throws SQLException{
	public void updateAddress(@JdbcConn(true) Connection con, String id, @Nullable String province, @Nullable String address) throws SQLException {
		this.professorDao.updateProvince(con, id, province);
		this.professorDao.updateAddress(con, id, address);
	}
	@Post
	@Path("/descp")
	public void updateDescp(@JdbcConn(true) Connection con,String id,@Nullable String descp) throws SQLException{
	public void updateDescp(@JdbcConn(true) Connection con, String id, @Nullable String descp) throws SQLException {
		this.professorDao.updateDescp(con, id, descp);
	}
	
	@Delete
	@Path("/{id}")
@@ -583,20 +618,29 @@ public class ProfessorService {
		this.watchDao.deleteWatch(con, id);
		this.resourceDao.deletePro(con, id);
		this.articleDao.deletePro(con, id);
		this.keyWordService.refreshProfessor(con, id, null);
	}
	
	@Get
	@Path("/pqBaseInfo")
	PageQueryResult<EditProfessor> queryEditBaseInfo(@JdbcConn(false) Connection con,@Nullable String key,
			@Nullable String subject,@Nullable String industry,@Nullable String address,@DefaultValue("1") Integer authType, 
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(key!=null) {key="%"+key+"%";}
		if(subject!=null) {subject ="%"+subject+"%";}
		if(null!=industry) {industry="%"+industry+"%";}
		if(null!=address) {address="%"+address+"%";}
	PageQueryResult<EditProfessor> queryEditBaseInfo(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry,
			@Nullable String address, @DefaultValue("1") Integer authType, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo)
			throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		if (subject != null) {
			subject = "%" + subject + "%";
		}
		if (null != industry) {
			industry = "%" + industry + "%";
		}
		if (null != address) {
			address = "%" + address + "%";
		}
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryEditBaseInfo(con, key, subject, industry, address, authType, pageSize, pageNo);
		List<EditProfessor> editProfessors = queryResult.getData();
		if(!editProfessors.isEmpty()){
		if (!editProfessors.isEmpty()) {
			for (EditProfessor editProfessor : editProfessors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
@@ -605,39 +649,47 @@ public class ProfessorService {
		}
		return queryResult;
	}
	
	@Get
	@Path("/pqUserInfo")
	PageQueryResult<UserInfo> queryUserInfo(@JdbcConn(false) Connection con,@Nullable String key,
			@Nullable String address,@Nullable String orgName,@Nullable Integer activeState,@Nullable Integer authType, 
			@DefaultValue("20") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(key!=null) {key="%"+key+"%";}
		if(null!=address) {address="%"+address+"%";}
		if(orgName!=null) {orgName ="%"+orgName+"%";}
	PageQueryResult<UserInfo> queryUserInfo(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String address, @Nullable String orgName,
			@Nullable Integer activeState, @Nullable Integer authType, @DefaultValue("20") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		if (null != address) {
			address = "%" + address + "%";
		}
		if (orgName != null) {
			orgName = "%" + orgName + "%";
		}
		return this.professorDao.queryUserInfo(con, key, address, authType, orgName, activeState, pageSize, pageNo);
	}
	
	@Get
	@Path("/pq")
	PageQueryResult<Professor> query(@JdbcConn(false) Connection con,@Nullable String key,
			@Nullable String subject,@Nullable String industry,@Nullable String address, 
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
	//	System.out.println("key==["+(key==null?"":key)+"]");
	//	System.out.println("subject==["+(subject==null?"":subject)+"]");
	//	System.out.println("industry==["+(industry==null?"":industry)+"]");
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";
		if(null!=industry) industry="%"+industry+"%";
		if(null!=address) address="%"+address+"%";
	PageQueryResult<Professor> query(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry,
			@Nullable String address, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		// System.out.println("key==["+(key==null?"":key)+"]");
		// System.out.println("subject==["+(subject==null?"":subject)+"]");
		// System.out.println("industry==["+(industry==null?"":industry)+"]");
		if (key != null)
			key = "%" + key + "%";
		if (subject != null)
			subject = "%" + subject + "%";
		if (null != industry)
			industry = "%" + industry + "%";
		if (null != address)
			address = "%" + address + "%";
		return this.professorDao.query(con, key, subject, industry, address, pageSize, pageNo);
	}
	
	@Get
	@Path("/info/{id}")
	public ProfessorInfo qinfo(@JdbcConn(false) Connection con,@PathVar String id) throws SQLException{
	public ProfessorInfo qinfo(@JdbcConn(false) Connection con, @PathVar String id) throws SQLException {
		ProfessorInfo info = this.professorDao.queryInfo(con, id);
		if(info!=null){
			if(info.getOrgId() != null){
		if (info != null) {
			if (info.getOrgId() != null) {
				info.setOrgName(this.orgDao.query(con, info.getOrgId()).getName());
			}
			info.setHasHeadImage(this.imageService.hasProfessorImage(id));
@@ -648,7 +700,7 @@ public class ProfessorService {
			info.setPatents(this.patentDao.query(con, id));
			info.setProjects(this.projectDao.query(con, id));
			List<EditResearchAreaLog> logs = this.researchAreaLogDao.query(con, id);
			if(!logs.isEmpty()){
			if (!logs.isEmpty()) {
				for (EditResearchAreaLog log : logs) {
					log.setHasHeadImage(this.imageService.hasProfessorImage(log.getOpreteProfessorId()));
				}
@@ -656,7 +708,7 @@ public class ProfessorService {
			info.setEditResearchAreaLogs(logs);
			info.setResearchAreas(this.researchAreaDao.query(con, id));
			List<Resource> resources = this.resourceDao.queryPro(con, id);
			if(!resources.isEmpty()){
			if (!resources.isEmpty()) {
				for (Resource resource : resources) {
					resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
				}
@@ -664,29 +716,45 @@ public class ProfessorService {
			info.setResources(resources);
		}
		return info;
		
	}
	@Get
	@Path("/byShareId")
	public Professor query(@JdbcConn Connection con,long id)throws SQLException{
		return this.professorDao.query(con,id);
	}
	
	public static void main(String[] args)throws Exception{
//		Connection con = DriverManager.getConnection("jdbc:postgresql://121.42.53.174:5432/ekexiu", "postgres",  "postgres");
//		try{
//		ProfessorService service = new ProfessorService();
//		ProfessorDao dao = new ProfessorDaoExtend();
//		service.setProfessorDao(dao);
//		PageQueryResult<Professor> result =service.query(con,"鏉?, "鏉愭枡", "閲戝睘", 10, 2);
//		System.out.println(result.getTotal());
//		for(Professor p:result.getData()){
//			System.out.println("======");
//			JsonService.toJson(p,System.out);
//		}
//		}finally{
//			con.close();
//		}
	public Professor query(@JdbcConn Connection con, long id) throws SQLException {
		return this.professorDao.query(con, id);
	}
	/**
	 * 增加用户浏览量
	 * @param con
	 * @param id
	 * @throws SQLException
	 */
	@Post
	@Path("/incPageViews")
	public void incPageViews(@JdbcConn(true) Connection con, String id) throws SQLException {
		this.professorDao.incPageViews(con, id);
	}
	public static void main(String[] args) throws Exception {
		// Connection con =
		// DriverManager.getConnection("jdbc:postgresql://121.42.53.174:5432/ekexiu",
		// "postgres", "postgres");
		// try{
		// ProfessorService service = new ProfessorService();
		// ProfessorDao dao = new ProfessorDaoExtend();
		// service.setProfessorDao(dao);
		// PageQueryResult<Professor> result =service.query(con,"鏉?, "鏉愭枡",
		// "閲戝睘", 10, 2);
		// System.out.println(result.getTotal());
		// for(Professor p:result.getData()){
		// System.out.println("======");
		// JsonService.toJson(p,System.out);
		// }
		// }finally{
		// con.close();
		// }
		System.out.println(URLEncoder.encode("输出中文", "UTF-8"));
	}
}

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

@@ -69,6 +69,20 @@ public class ResourceService {
	private OrgDao orgDao;
	@Autowrie
	private ResourceTmpLogDao resourceTmpLogDao;
	
	
	@Autowrie
	private KeyWordService keyWordService;
	
	
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	public String getTimeFormat() {
		return timeFormat;
@@ -199,6 +213,7 @@ public class ResourceService {
		resource.setResourceId(resourceId);
		this.resourceDao.insert(con, resource);
		//this.growthLogService.addResource(con, resource.getProfessorId());
		this.keyWordService.refreshResource(con,resourceId, KeyWordService.splitKeyWord(resource.getSubject()));
		return resourceId;
	}
	
@@ -223,6 +238,7 @@ public class ResourceService {
			throw new JfwBaseException(-1, "bad parameter:ownerId");
		}
		this.resourceDao.insert(con, resource);
		this.keyWordService.refreshResource(con,resourceId,KeyWordService.splitKeyWord(resource.getSubject()));
		this.resourceTmpLogDao.insert(con, log);
		if(imgSrc != null){
			Image image = new Image();
@@ -260,6 +276,7 @@ public class ResourceService {
			resource.setPublishTime(this.publishTime());
			resource.setResourceType("1");
			this.resourceDao.insert(con, resource);
			this.keyWordService.refreshResource(con,resourceId,KeyWordService.splitKeyWord(resource.getSubject()));
			//this.growthLogService.addResource(con, resource.getProfessorId());
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
@@ -285,12 +302,23 @@ public class ResourceService {
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updatePublishTime(con, resource.getResourceId(), "1", this.publishTime());
			this.keyWordService.refreshResource(con,resource.getResourceId(),KeyWordService.splitKeyWord(resource.getSubject()));
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
		}
	}
	
	/**
	 * 保存划稿
	 * @param con
	 * @param resource
	 * @param fns
	 * @param imageIds
	 * @return
	 * @throws SQLException
	 * @throws IOException
	 * @throws JfwBaseException
	 */
	@Post
	@Path("/draft")
	public String draft(@JdbcConn(true) Connection con, Resource resource, @Nullable String[] fns, @Nullable String[] imageIds) 
@@ -305,6 +333,7 @@ public class ResourceService {
			resource.setPageViews(0);
			resource.setResourceType("1");
			this.resourceDao.insert(con, resource);
			this.keyWordService.refreshResource(con,resourceId,null);
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
			int imageLength = 0;
@@ -329,6 +358,7 @@ public class ResourceService {
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updateStatus(con, resource.getResourceId(), "0");
			this.keyWordService.refreshResource(con,resource.getResourceId(),null);
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
@@ -349,6 +379,7 @@ public class ResourceService {
			resource.setPageViews(0);
			resource.setResourceType("1");
			this.resourceDao.insert(con, resource);
			this.keyWordService.refreshResource(con,resourceId,null);
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
			int imageLength = 0;
@@ -373,6 +404,7 @@ public class ResourceService {
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updatePublishTime(con, resource.getResourceId(), "2", resource.getPublishTime());
			this.keyWordService.refreshResource(con,resource.getResourceId(),null);
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
@@ -394,6 +426,7 @@ public class ResourceService {
			resource.setPublishTime(this.publishTime());
			resource.setResourceType("2");
			this.resourceDao.insert(con, resource);
			this.keyWordService.refreshResource(con,resourceId,KeyWordService.splitKeyWord(resource.getSubject()));
			if(professorIds != null){
				for (String professorId : professorIds) {
					OrgResStaff orgResStaff = new OrgResStaff();
@@ -426,6 +459,7 @@ public class ResourceService {
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updatePublishTime(con, resource.getResourceId(), "1", this.publishTime());
			this.keyWordService.refreshResource(con,resource.getResourceId(),null);
			this.orgResStaffDao.delete(con, resource.getResourceId());
			if(professorIds != null){
				for (String professorId : professorIds) {
@@ -455,6 +489,7 @@ public class ResourceService {
			resource.setPageViews(0);
			resource.setResourceType("2");
			this.resourceDao.insert(con, resource);
			this.keyWordService.refreshResource(con,resourceId,null);
			if(professorIds != null){
				for (String professorId : professorIds) {
					OrgResStaff orgResStaff = new OrgResStaff();
@@ -487,6 +522,7 @@ public class ResourceService {
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updateStatus(con, resource.getResourceId(), "0");
			this.keyWordService.refreshResource(con,resource.getResourceId(),null);
			this.orgResStaffDao.delete(con, resource.getResourceId());
			if(professorIds != null){
				for (String professorId : professorIds) {
@@ -507,6 +543,7 @@ public class ResourceService {
	public void deleteRes(@JdbcConn(true) Connection con, String resourceId) throws SQLException{
		//修改资源状态为删除
		this.resourceDao.updateStatus(con, resourceId, "3");
		this.keyWordService.refreshResource(con,resourceId,null);
	}
	
	@Post
@@ -519,6 +556,7 @@ public class ResourceService {
		}
		resource.setResourceId(resourceId);
		this.resourceDao.insert(con, resource);
		this.keyWordService.refreshResource(con,resourceId,KeyWordService.splitKeyWord(resource.getSubject()));
		//this.growthLogService.addResource(con, resource.getProfessorId());
		return resourceId;
	}
@@ -531,6 +569,7 @@ public class ResourceService {
			this.imagesService.insert(con, resource.getResourceId(), fn);
		}
		this.resourceDao.update(con, resource);
		this.keyWordService.refreshResource(con,resource.getResourceId(),KeyWordService.splitKeyWord(resource.getSubject()));
	}
	
	@Post

src/main/resources/database.sql

@@ -1518,6 +1518,34 @@ ALTER TABLE  organization ADD COLUMN linkman text;
COMMENT ON COLUMN  organization.linkman IS '联系人';
--begin v1.9.1
ALTER TABLE professor ADD COLUMN page_views  int8 default 0 not null;
COMMENT ON COLUMN professor.page_views IS '浏览量';
CREATE TABLE art_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE art_key_word IS '文章关键字';
COMMENT ON COLUMN art_key_word.id IS '文章ID';
COMMENT ON COLUMN art_key_word.kw IS '关键字';
CREATE TABLE res_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE res_key_word IS '资源关键字';
COMMENT ON COLUMN res_key_word.id IS '资源ID';
COMMENT ON COLUMN res_key_word.kw IS '关键字';
CREATE TABLE pro_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE pro_key_word IS '用户关键字';
COMMENT ON COLUMN pro_key_word.id IS '用户ID';
COMMENT ON COLUMN pro_key_word.kw IS '关键字';
CREATE TABLE org_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE org_key_word IS '企业关键字';
COMMENT ON COLUMN org_key_word.id IS '企业ID';
COMMENT ON COLUMN org_key_word.kw IS '关键字';
CREATE TABLE pap_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE pap_key_word IS '论文关键字';
COMMENT ON COLUMN pap_key_word.id IS '论文ID';
COMMENT ON COLUMN pap_key_word.kw IS '关键字';
CREATE TABLE pat_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE pat_key_word IS '专利关键字';
COMMENT ON COLUMN pat_key_word.id IS '专利ID';
COMMENT ON COLUMN pat_key_word.kw IS '关键字';

src/main/resources/project-test-dev.properties

@@ -149,7 +149,7 @@ com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html1/
com_ekexiu_portal_service_ArticleService.articlePath::java.io.File=/kexiu/webdata1/data/article
com_ekexiu_portal_service_ArticleService.dateFormat::java.lang.String=yyyyMMdd
#科研文章图片尺寸
com_ekexiu_portal_service_ArticleService.artMaxLen::int=640
com_ekexiu_portal_service_ArticleService.artMaxLen::int=70
#资源分享图片尺寸
com_ekexiu_portal_service_ImagesService.resImageMaxLen::int=240
#认证图片保存目录

src/main/resources/project-test.properties

@@ -149,7 +149,7 @@ com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html/i
com_ekexiu_portal_service_ArticleService.articlePath::java.io.File=/kexiu/webdata/data/article
com_ekexiu_portal_service_ArticleService.dateFormat::java.lang.String=yyyyMMdd
#科研文章图片尺寸
com_ekexiu_portal_service_ArticleService.artMaxLen::int=640
com_ekexiu_portal_service_ArticleService.artMaxLen::int=70
#资源分享图片尺寸
com_ekexiu_portal_service_ImagesService.resImageMaxLen::int=240
#认证图片保存目录

src/main/resources/project.properties

@@ -149,7 +149,7 @@ com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html/i
com_ekexiu_portal_service_ArticleService.articlePath::java.io.File=/kexiu/webdata/data/article
com_ekexiu_portal_service_ArticleService.dateFormat::java.lang.String=yyyyMMdd
#科研文章图片尺寸
com_ekexiu_portal_service_ArticleService.artMaxLen::int=640
com_ekexiu_portal_service_ArticleService.artMaxLen::int=70
#资源分享图片尺寸
com_ekexiu_portal_service_ImagesService.resImageMaxLen::int=240
#认证图片保存目录