Merge remote-tracking branch 'origin/test'

src/main/java/com/ekexiu/portal/cms/ContentType.java

@@ -0,0 +1,5 @@
package com.ekexiu.portal.cms;
public enum ContentType {
	Article,Paper,Patent
}

src/main/java/com/ekexiu/portal/cms/Node.java

@@ -0,0 +1,18 @@
package com.ekexiu.portal.cms;
public class Node {
	private ContentType type;
	private Object key;
	public ContentType getType() {
		return type;
	}
	public void setType(ContentType type) {
		this.type = type;
	}
	public Object getKey() {
		return key;
	}
	public void setKey(Object key) {
		this.key = key;
	}
}

src/main/java/com/ekexiu/portal/cms/TemplateService.java

@@ -7,10 +7,32 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.StringReader;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import javax.sql.DataSource;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.util.ConstData;
import org.jfw.util.json.JsonService;
import org.jfw.util.log.LogFactory;
import org.jfw.util.log.Logger;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.PpaperDao;
import com.ekexiu.portal.dao.PpatentDao;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.po.Ppatent;
import freemarker.cache.TemplateLoader;
import freemarker.template.Configuration;
@@ -20,9 +42,70 @@ import freemarker.template.TemplateExceptionHandler;
@Path("/cms")
public class TemplateService {
	
	private static final Logger log = LogFactory.getLog(TemplateService.class);
	private final Queue<Node> queue = new ConcurrentLinkedQueue<Node>();
	@SuppressWarnings("unused")
	private File source;
	private Configuration cfg =  new Configuration(Configuration.VERSION_2_3_26);
	private Configuration cfg = new Configuration(Configuration.VERSION_2_3_26);
	private long rate = 10000;
	
	private long lastIndexStatic = 0;
	
	private long indexRate = 24*60*60*1000;
	@Autowrie
	private ArticleDao articleDao;
	@Autowrie
	private PpaperDao ppaperDao;
	@Autowrie
	private PpatentDao ppatentDao;
	private File dir;
	public File getDir() {
		return dir;
	}
	public void setDir(File dir) {
		this.dir = dir;
	}
	public ArticleDao getArticleDao() {
		return articleDao;
	}
	public void setArticleDao(ArticleDao articleDao) {
		this.articleDao = articleDao;
	}
	public PpaperDao getPpaperDao() {
		return ppaperDao;
	}
	public void setPpaperDao(PpaperDao ppaperDao) {
		this.ppaperDao = ppaperDao;
	}
	public PpatentDao getPpatentDao() {
		return ppatentDao;
	}
	public void setPpatentDao(PpatentDao ppatentDao) {
		this.ppatentDao = ppatentDao;
	}
	public long getRate() {
		return rate;
	}
	public void setRate(long rate) {
		this.rate = rate;
	}
	public void setSource(File source) {
		this.source = source;
		try {
@@ -32,20 +115,20 @@ public class TemplateService {
			this.cfg.setTemplateLoader(new TemplateLoader() {
				@Override
				public Reader getReader(Object templateSource, String encoding) throws IOException {
					StringReader reader = new StringReader("TemplateService'source is invalid dir,so "+templateSource.toString()+" can't read");
					StringReader reader = new StringReader("TemplateService'source is invalid dir,so " + templateSource.toString() + " can't read");
					return reader;
				}
				
				@Override
				public long getLastModified(Object templateSource) {
					return 0;
				}
				
				@Override
				public Object findTemplateSource(String name) throws IOException {
					return name;
				}
				
				@Override
				public void closeTemplateSource(Object templateSource) throws IOException {
				}
@@ -53,15 +136,18 @@ public class TemplateService {
		}
		cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
	}
	
	
	public void genCnt(String templateName,File dest,Map<String,Object> root) throws IOException, TemplateException{
		if(dest.exists()){
			if(!dest.delete()){
				throw new IOException("delete file["+dest.getAbsolutePath()+"] error");
	public void genCnt(String templateName, File dest, Map<String, Object> root) throws IOException, TemplateException {
		if (dest.exists()) {
			if (!dest.delete()) {
				throw new IOException("delete file[" + dest.getAbsolutePath() + "] error");
			}
		}
		Template template = this.cfg.getTemplate(templateName,"UTF-8");
		File parent = dest.getParentFile();
		if (!parent.exists()) {
			parent.mkdirs();
		}
		Template template = this.cfg.getTemplate(templateName, "UTF-8");
		OutputStream out = new FileOutputStream(dest);
		try {
			template.process(root, new OutputStreamWriter(out, ConstData.UTF8));
@@ -70,15 +156,317 @@ public class TemplateService {
			out.close();
		}
	}
	
	
	
	public void push(ContentType type, Object key) {
		Node node = new Node();
		node.setType(type);
		node.setKey(key);
		this.queue.add(node);
	}
	@Get
	@Post
	@Path()
	public void push(String t, String k) {
		ContentType type = null;
		try {
			type = ContentType.valueOf(t);
		} catch (Throwable thr) {
		}
		if (type != null) {
			this.push(type, k);
		}
	}
	public synchronized void handle(DataSource ds) {
		Connection con;
		try {
			con = ds.getConnection();
		} catch (SQLException e1) {
			return;
		}
		try {
			for (;;) {
				if (!this.handle(con))
					break;
			}
			long ct = System.currentTimeMillis();
			if((ct - this.lastIndexStatic)> this.indexRate){
				this.handleIndex(con);
				this.lastIndexStatic = ct;
			}
		} finally {
			if (con != null) {
				try {
					con.close();
				} catch (Exception e) {
				}
			}
		}
	}
	public void handleIndex(Connection con){
		this.staticArticleIndex(con);
		this.staticPaperIndex(con);
		this.staticPatentIndex(con);
		try {
			this.saveFile(new File(dir,"index.html"), "<!DOCTYPE html><html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'></head><body>"
					+ "<a href='a/index.html'>article</a><br><a href='pp/index.html'>paper</a><br><a href='pt/index.html'>patent</a></body></html>");
		} catch (IOException e) {
		}
	}
	
	public boolean handle(Connection con) {
		Node node = this.queue.peek();
		if (node == null)
			return false;
		try {
			ContentType type = node.getType();
			Object key = node.getKey();
			if (type != null) {
				switch (type) {
				case Article:
					this.staticArticle(con, key);
					break;
				case Paper:
					this.staticPaper(con, key);
					break;
				case Patent:
					this.staticPatent(con, key);
					break;
				default:
					break;
				}
			}
		} finally {
			if (node != null) {
				this.queue.poll();
			}
		}
		return true;
	}
	private void staticArticle(Connection con, Object key) {
		try {
			Article article = articleDao.queryOne(con, (String) key);
			if (article == null)
				return;
			String path = article.getCreateTime().substring(0, 8) + "/";
			File file = new File(this.dir, "a/" + path + article.getShareId() + ".html");
			if (file.exists()) {
				file.delete();
			}
			Map<String, Object> data = new HashMap<String, Object>();
			data.put("data", article);
			data.put("jsonData", JsonService.toJson(article));
			if (article.getStatus().equals("1")) {
				this.genCnt("article.html", file, data);
			}
		} catch (Exception e) {
			log.error("static article[" + key + "]error", e);
		}
	}
	private void saveFile(File dest,String cnt) throws IOException{
		if(dest.exists()){
			dest.delete();
		}
		byte[] fc =cnt.getBytes(ConstData.UTF8);
		FileOutputStream fos = new FileOutputStream(dest);
		try{
			fos.write(fc);
			fos.flush();
		}finally{
			try{fos.close();}catch(IOException e){}
		}
	}
	
	
	private void flushIndex(StringBuilder cnt,String path,int pageno) throws IOException {
		StringBuilder sb = new StringBuilder();
		sb.append("<!DOCTYPE html><html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'></head><body>");		
		sb.append(cnt);
		if(pageno>1){
			sb.append("<a href='index_"+(pageno-1)+".html'>上一页</a>");
		}else if(pageno==1){
			sb.append("<a href='index.html'>上一页</a>");
		}
		sb.append("<a href='index_"+(pageno+1)+".html'>下一页</a></body></html>");
		File dest = new File(dir,path+"/index"+(pageno==0?"":("_"+pageno))+".html");
		this.saveFile(dest, sb.toString());
	}
	
	
	
	private void staticArticleIndex(Connection con) {
		int pageno = 0;
		int rn = 0;
		StringBuilder sb = new StringBuilder();
		try {
			PreparedStatement ps = con.prepareStatement("SELECT ARTICLE_ID,CREATE_TIME,SHARE_ID FROM ARTICLE WHERE STATUS ='1'");
			try {
				ResultSet rs = ps.executeQuery();
				try {
					while (rs.next()) {
						String id = rs.getString(1);
						String ct = rs.getString(2);
						long si = rs.getLong(3);
						sb.append("<a href='").append(ct.substring(0,8)).append("/").append(si).append(".html'>").append(rn).append("  :  ").append(id).append("</a><br>");
						++rn;
						if(rn == 200){
							flushIndex(sb, "a", pageno);
							++pageno;
							rn=0;
							sb.delete(0,sb.length());
						}
					}
					flushIndex(sb, "a", pageno);
					sb.delete(0,sb.length());
				} finally {
					try {
						rs.close();
					} catch (SQLException e) {
					}
				}
			} finally {
				try {
					ps.close();
				} catch (SQLException e) {
				}
			}
			
			
		} catch (Exception e) {
			log.error("static article index error", e);
		}
		
	}
	private void staticPaperIndex(Connection con) {
		int pageno = 0;
		int rn = 0;
		StringBuilder sb = new StringBuilder();
		try {
			PreparedStatement ps = con.prepareStatement("SELECT ID,CREATE_TIME,SHARE_ID FROM PPAPER");
			try {
				ResultSet rs = ps.executeQuery();
				try {
					while (rs.next()) {
						String id = rs.getString(1);
						String ct = rs.getString(2);
						long si = rs.getLong(3);
						sb.append("<a href='").append(ct.substring(0,8)).append("/").append(si).append(".html'>").append(rn).append(" : ").append(id).append("</a><br>");
						++rn;
						if(rn  ==200){
							flushIndex(sb, "pp", pageno);
							++pageno;
							rn=0;
							sb.delete(0,sb.length());
						}
					}
				} finally {
					try {
						rs.close();
					} catch (SQLException e) {
					}
				}
				flushIndex(sb, "pp", pageno);
				sb.delete(0,sb.length());
			} finally {
				try {
					ps.close();
				} catch (SQLException e) {
				}
			}
		} catch (Exception e) {
			log.error("static paper index error", e);
		}
	}
	private void staticPatentIndex(Connection con) {
		int pageno = 0;
		int rn = 0;
		StringBuilder sb = new StringBuilder();
		try {
			PreparedStatement ps = con.prepareStatement("SELECT ID,CREATE_TIME,SHARE_ID FROM PPATENT");
			try {
				ResultSet rs = ps.executeQuery();
				try {
					while (rs.next()) {
						String id = rs.getString(1);
						String ct = rs.getString(2);
						long si = rs.getLong(3);
						sb.append("<a href='").append(ct.substring(0,8)).append("/").append(si).append(".html'>").append(rn).append(" : ").append(id).append("</a>");
						++rn;
						if(rn ==200){
							flushIndex(sb, "pt", pageno);
							++pageno;
							rn=0;
							sb.delete(0,sb.length());
						}
					}
				} finally {
					try {
						rs.close();
					} catch (SQLException e) {
					}
				}
				flushIndex(sb, "pt", pageno);
				sb.delete(0,sb.length());
			} finally {
				try {
					ps.close();
				} catch (SQLException e) {
				}
			}
		} catch (Exception e) {
			log.error("static article index error", e);
		}
	}
	private void staticPaper(Connection con, Object key) {
		try {
			Ppaper page = this.ppaperDao.query(con, (String) key);
			if (page == null)
				return;
			String path = page.getCreateTime().substring(0, 8) + "/";
			File file = new File(this.dir, "pp/" + path + page.getShareId() + ".html");
			if (file.exists()) {
				file.delete();
			}
			Map<String, Object> data = new HashMap<String, Object>();
			data.put("data", page);
			data.put("jsonData", JsonService.toJson(page));
			this.genCnt("paper.html", file, data);
		} catch (Exception e) {
			log.error("static paper[" + key + "]error", e);
		}
	}
	private void staticPatent(Connection con, Object key) {
		try {
			Ppatent page = this.ppatentDao.query(con, (String) key);
			if (page == null)
				return;
			String path = page.getCreateTime().substring(0, 8) + "/";
			File file = new File(this.dir, "pt/" + path + page.getShareId() + ".html");
			if (file.exists()) {
				file.delete();
			}
			Map<String, Object> data = new HashMap<String, Object>();
			data.put("data", page);
			data.put("jsonData", JsonService.toJson(page));
			this.genCnt("patent.html", file, data);
		} catch (Exception e) {
			log.error("static patent[" + key + "]error", e);
		}
	}
	public static void main(String[] args) throws Exception {
		System.out.println(ContentType.valueOf("Article"));
	}
}

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

@@ -7,57 +7,65 @@ import java.util.Date;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.sql.DataSource;
import org.jfw.apt.annotation.Bean;
import org.jfw.util.bean.AfterBeanFactory;
import org.jfw.util.bean.BeanFactory;
import org.jfw.util.context.JfwAppContext;
import com.ekexiu.portal.cms.TemplateService;
import com.ekexiu.portal.service.WeixinService;
import com.ekexiu.push.service.PushService;
@Bean
public class TaskJob implements AfterBeanFactory {
	private ScheduledExecutorService service;
	
	private DataSource dataSource;
	@Override
	public void handle(BeanFactory bf) throws Throwable {
	
		this.dataSource =(DataSource) bf.getBean("dataSource");
		ArticleTaskJobEntry atje = (ArticleTaskJobEntry) bf.getBean("com_ekexiu_portal_job_ArticleTaskJobEntry");
		TaskJobEntry tje = (TaskJobEntry) bf.getBean("com_ekexiu_portal_job_TaskJobEntry");
		ProScoreTaskJobEntry pstje = (ProScoreTaskJobEntry) bf.getBean("com_ekexiu_portal_job_ProScoreTaskJobEntry");
//		UserLogTaskJobEntry ultje = (UserLogTaskJobEntry) bf.getBean("com_ekexiu_portal_job_UserLogTaskJobEntry");
		// UserLogTaskJobEntry ultje = (UserLogTaskJobEntry)
		// bf.getBean("com_ekexiu_portal_job_UserLogTaskJobEntry");
		DictTaskJobEntry dtje = (DictTaskJobEntry) bf.getBean("com_ekexiu_portal_job_DictTaskJobEntry");
		HotKeyJobEntry hkje = (HotKeyJobEntry) bf.getBean("com_ekexiu_portal_job_HotKeyJobEntry");
		final WeixinService weixin =(WeixinService)bf.getBean("com_ekexiu_portal_service_WeixinService");
		final PushService pushService =(PushService)bf.getBean("com_ekexiu_push_service_PushService");
		
		DemandInvalidJob dij = (DemandInvalidJob)bf.getBean("com_ekexiu_portal_job_DemandInvalidJob");
		
		final WeixinService weixin = (WeixinService) bf.getBean("com_ekexiu_portal_service_WeixinService");
		final PushService pushService = (PushService) bf.getBean("com_ekexiu_push_service_PushService");
		final TemplateService templateService = (TemplateService) bf.getBean("com_ekexiu_portal_cms_TemplateService");
		DemandInvalidJob dij = (DemandInvalidJob) bf.getBean("com_ekexiu_portal_job_DemandInvalidJob");
		long delayTime = tje.getDelayTime();
		long task = getTimeMillis(tje.getTaskTime());
		long taskTime = task - System.currentTimeMillis();
		taskTime = taskTime > 0 ? taskTime : delayTime + taskTime;
		
        this.service = JfwAppContext.getScheduledExecutorService();
        // 第二个参数为首次执行的延时时间，第三个参数为定时执行的间隔时间  
        service.scheduleAtFixedRate(atje, 1, atje.getDelayTime(), TimeUnit.SECONDS);
		this.service = JfwAppContext.getScheduledExecutorService();
		// 第二个参数为首次执行的延时时间，第三个参数为定时执行的间隔时间
		service.scheduleAtFixedRate(atje, 1, atje.getDelayTime(), TimeUnit.SECONDS);
		service.scheduleAtFixedRate(tje, taskTime, delayTime, TimeUnit.MILLISECONDS);
		
		long pstjeTask = getTimeMillis(pstje.getTaskTime());
		long pstjeTaskTime = pstjeTask - System.currentTimeMillis();
		pstjeTaskTime = pstjeTaskTime > 0 ? pstjeTaskTime : pstjeTaskTime + pstje.getDelayTime();
		service.scheduleAtFixedRate(pstje, pstjeTaskTime, pstje.getDelayTime(), TimeUnit.MILLISECONDS);
//		service.scheduleAtFixedRate(ultje, taskTime, delayTime, TimeUnit.MILLISECONDS);
		// service.scheduleAtFixedRate(ultje, taskTime, delayTime,
		// TimeUnit.MILLISECONDS);
		service.scheduleAtFixedRate(dtje, 1, dtje.getDelayTime(), TimeUnit.SECONDS);
		
		long hkjeTask = getTimeMillis(hkje.getTaskTime());
		long hkjeTaskTime = hkjeTask - System.currentTimeMillis();
		hkjeTaskTime = hkjeTaskTime > 0 ? hkjeTaskTime : hkjeTaskTime + hkje.getDelayTime();
		service.scheduleAtFixedRate(hkje, hkjeTaskTime, hkje.getDelayTime(), TimeUnit.MILLISECONDS);
		if(hkjeTaskTime>300*1000){
		if (hkjeTaskTime > 300 * 1000) {
			service.submit(hkje);
		}
		
		service.scheduleAtFixedRate(new Runnable() {
			@Override
			public void run() {
@@ -67,21 +75,29 @@ public class TaskJob implements AfterBeanFactory {
		service.scheduleAtFixedRate(new Runnable() {
			@Override
			public void run() {
				pushService.refresh();				
				pushService.refresh();
			}
		}, 0, 2, TimeUnit.SECONDS);
		service.scheduleAtFixedRate(dij, 0, 5, TimeUnit.MINUTES);
		service.scheduleWithFixedDelay(new Runnable() {
			@Override
			public void run() {
				templateService.handle(dataSource);
			}
		}, 0, 2,TimeUnit.SECONDS);		
		service.scheduleAtFixedRate(dij, 0, 5,TimeUnit.MINUTES);
		}, 0, templateService.getRate(), TimeUnit.MILLISECONDS);
	}
	private static long getTimeMillis(String time) {  
	    try {  
	        DateFormat dateFormat = new SimpleDateFormat("yy-MM-dd HH:mm:ss");  
	        DateFormat dayFormat = new SimpleDateFormat("yy-MM-dd");  
	        Date curDate = dateFormat.parse(dayFormat.format(new Date()) + " " + time);  
	        return curDate.getTime();  
	    } catch (ParseException e) {  
	        e.printStackTrace();  
	    }  
	    return 0;  
	private static long getTimeMillis(String time) {
		try {
			DateFormat dateFormat = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
			DateFormat dayFormat = new SimpleDateFormat("yy-MM-dd");
			Date curDate = dateFormat.parse(dayFormat.format(new Date()) + " " + time);
			return curDate.getTime();
		} catch (ParseException e) {
			e.printStackTrace();
		}
		return 0;
	}
	
}

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

@@ -28,6 +28,8 @@ import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.io.IoUtil;
import com.ekexiu.portal.cms.ContentType;
import com.ekexiu.portal.cms.TemplateService;
import com.ekexiu.portal.dao.ArticleAgreeDao;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.ArticleOrgDao;
@@ -59,6 +61,7 @@ public class ArticleService {
	private int artMaxLen = 70;
	private static final String JPG = "jpg";
	public static final String MAX_MODIFYTIME = "9";
	@Autowrie
	private ArticleDao articleDao;
	@Autowrie
@@ -90,6 +93,17 @@ public class ArticleService {
	@Autowrie
	private KeyWordService keyWordService;
	@Autowrie
	private TemplateService templateService;
	public TemplateService getTemplateService() {
		return templateService;
	}
	public void setTemplateService(TemplateService templateService) {
		this.templateService = templateService;
	}
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
@@ -292,34 +306,9 @@ public class ArticleService {
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, Article article) throws SQLException, IOException, JfwBaseException {
	public String insert(@JdbcConn(false) Connection con, Article article) throws SQLException, IOException, JfwBaseException {
		String articleId = StringUtil.buildUUID();
		if (article.getArticleImg() != null) {
			this.saveArtImg(article.getArticleImg(), articleId);
			article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
		}
		article.setArticleId(articleId);
		article.setArticleAgree(0);
		article.setPageViews(0);
		article.setStatus("1");
		article.setPublishTime(this.publishTime());
		if (article.getProfessorId() != null && article.getOrgId() == null) {
			article.setArticleType("1");
		} else if (article.getProfessorId() == null && article.getOrgId() != null) {
			article.setArticleType("2");
		} else {
			throw new JfwBaseException(-1, "错误参数：文章发布者ID");
		}
		this.articleDao.insert(con, article);
		return articleId;
	}
	@Post
	@Path("/save")
	public String saveArticle(@JdbcConn(true) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources,
			@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException {
		if (article.getArticleId() == null) {
			String articleId = StringUtil.buildUUID();
		try {
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), articleId);
				article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
@@ -337,262 +326,344 @@ 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();
					articlePro.setArticleId(articleId);
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
				}
			con.commit();
			this.templateService.push(ContentType.Article, article.getArticleId());
		} catch (SQLException e) {
			try {
				con.rollback();
			} catch (SQLException ee) {
			}
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(articleId);
					articleRes.setResourceId(resource);
					this.articleResDao.insert(con, articleRes);
			throw e;
		}
		return articleId;
	}
	@Post
	@Path("/save")
	public String saveArticle(@JdbcConn(false) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources,
			@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException {
		String articleId = null;
		try {
			if (article.getArticleId() == null) {
				articleId = StringUtil.buildUUID();
				if (article.getArticleImg() != null) {
					this.saveArtImg(article.getArticleImg(), articleId);
					article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
				}
			}
			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);
				article.setArticleId(articleId);
				article.setArticleAgree(0);
				article.setPageViews(0);
				article.setStatus("1");
				article.setPublishTime(this.publishTime());
				if (article.getProfessorId() != null && article.getOrgId() == null) {
					article.setArticleType("1");
				} else if (article.getProfessorId() == null && article.getOrgId() != null) {
					article.setArticleType("2");
				} else {
					throw new JfwBaseException(-1, "错误参数：文章发布者ID");
				}
			}
			return articleId;
		} else if (article.getArticleId().trim().length() == 32) {
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), article.getArticleId());
				article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
			}
			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();
					articlePro.setArticleId(article.getArticleId());
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
				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();
						articlePro.setArticleId(articleId);
						articlePro.setProfessorId(professor);
						this.articleProDao.insert(con, articlePro);
					}
				}
			}
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(article.getArticleId());
					articleRes.setResourceId(resource);
					this.articleResDao.insert(con, articleRes);
				if (resources != null) {
					for (String resource : resources) {
						ArticleRes articleRes = new ArticleRes();
						articleRes.setArticleId(articleId);
						articleRes.setResourceId(resource);
						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);
				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);
					}
				}
			} else if (article.getArticleId().trim().length() == 32) {
				articleId = article.getArticleId();
				if (article.getArticleImg() != null) {
					this.saveArtImg(article.getArticleImg(), article.getArticleId());
					article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
				}
				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();
						articlePro.setArticleId(article.getArticleId());
						articlePro.setProfessorId(professor);
						this.articleProDao.insert(con, articlePro);
					}
				}
				if (resources != null) {
					for (String resource : resources) {
						ArticleRes articleRes = new ArticleRes();
						articleRes.setArticleId(article.getArticleId());
						articleRes.setResourceId(resource);
						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);
					}
				}
			} else {
				throw new JfwBaseException(-2, "bad parameter:articleId");
			}
			return article.getArticleId();
		} else {
			throw new JfwBaseException(-2, "bad parameter:articleId");
			con.commit();
			this.templateService.push(ContentType.Article, article.getArticleId());
		} catch (SQLException | IOException | JfwBaseException e) {
			try {
				con.rollback();
			} catch (SQLException ee) {
			}
			throw e;
		}
		return articleId;
	}
	@Post
	@Path("/draft")
	public String draft(@JdbcConn(true) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources, @Nullable String[] orgs)
	public String draft(@JdbcConn(false) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources, @Nullable String[] orgs)
			throws SQLException, IOException, JfwBaseException {
		if (article.getArticleId() == null) {
			String articleId = StringUtil.buildUUID();
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), articleId);
				article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
			}
			article.setArticleId(articleId);
			article.setArticleAgree(0);
			article.setPageViews(0);
			article.setStatus("0");
			if (article.getProfessorId() != null && article.getOrgId() == null) {
				article.setArticleType("1");
			} else if (article.getProfessorId() == null && article.getOrgId() != null) {
				article.setArticleType("2");
			} else {
				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();
					articlePro.setArticleId(articleId);
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
		String articleId = null;
		try {
			if (article.getArticleId() == null) {
				articleId = StringUtil.buildUUID();
				if (article.getArticleImg() != null) {
					this.saveArtImg(article.getArticleImg(), articleId);
					article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
				}
			}
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(articleId);
					articleRes.setResourceId(resource);
					this.articleResDao.insert(con, articleRes);
				article.setArticleId(articleId);
				article.setArticleAgree(0);
				article.setPageViews(0);
				article.setStatus("0");
				if (article.getProfessorId() != null && article.getOrgId() == null) {
					article.setArticleType("1");
				} else if (article.getProfessorId() == null && article.getOrgId() != null) {
					article.setArticleType("2");
				} else {
					throw new JfwBaseException(-1, "错误参数：文章发布者ID");
				}
			}
			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);
				this.articleDao.insert(con, article);
				this.keyWordService.refreshArticle(con, articleId, null);
				if (professors != null) {
					for (String professor : professors) {
						ArticlePro articlePro = new ArticlePro();
						articlePro.setArticleId(articleId);
						articlePro.setProfessorId(professor);
						this.articleProDao.insert(con, articlePro);
					}
				}
			}
			return articleId;
		} else if (article.getArticleId().trim().length() == 32) {
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), article.getArticleId());
				article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
			}
			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();
					articlePro.setArticleId(article.getArticleId());
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
				if (resources != null) {
					for (String resource : resources) {
						ArticleRes articleRes = new ArticleRes();
						articleRes.setArticleId(articleId);
						articleRes.setResourceId(resource);
						this.articleResDao.insert(con, articleRes);
					}
				}
			}
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(article.getArticleId());
					articleRes.setResourceId(resource);
					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);
					}
				}
			}
			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);
			} else if (article.getArticleId().trim().length() == 32) {
				articleId = article.getArticleId();
				if (article.getArticleImg() != null) {
					this.saveArtImg(article.getArticleImg(), article.getArticleId());
					article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
				}
				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();
						articlePro.setArticleId(article.getArticleId());
						articlePro.setProfessorId(professor);
						this.articleProDao.insert(con, articlePro);
					}
				}
				if (resources != null) {
					for (String resource : resources) {
						ArticleRes articleRes = new ArticleRes();
						articleRes.setArticleId(article.getArticleId());
						articleRes.setResourceId(resource);
						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);
					}
				}
			} else {
				throw new JfwBaseException(-2, "bad parameter:articleId");
			}
			return article.getArticleId();
		} else {
			throw new JfwBaseException(-2, "bad parameter:articleId");
			con.commit();
			this.templateService.push(ContentType.Article, articleId);
		} catch (SQLException | IOException | JfwBaseException e) {
			try {
				con.rollback();
			} catch (SQLException ee) {
			}
			throw e;
		}
		return articleId;
	}
	@Post
	@Path("/timing")
	public String timingPublish(@JdbcConn(true) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources,
	public String timingPublish(@JdbcConn(false) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources,
			@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException {
		if (article.getPublishTime() == null) {
			throw new JfwBaseException(-3, "no parameter found:publishTime");
		}
		if (article.getArticleId() == null) {
			String articleId = StringUtil.buildUUID();
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), articleId);
				article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
			}
			article.setArticleId(articleId);
			article.setArticleAgree(0);
			article.setPageViews(0);
			article.setStatus("2");
			if (article.getProfessorId() != null && article.getOrgId() == null) {
				article.setArticleType("1");
			} else if (article.getProfessorId() == null && article.getOrgId() != null) {
				article.setArticleType("2");
			} else {
				throw new JfwBaseException(-1, "错误参数：文章发布者ID");
		String articleId = null;
		try {
			if (article.getPublishTime() == null) {
				throw new JfwBaseException(-3, "no parameter found:publishTime");
			}
			this.articleDao.insert(con, article);
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(articleId);
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
			if (article.getArticleId() == null) {
				articleId = StringUtil.buildUUID();
				if (article.getArticleImg() != null) {
					this.saveArtImg(article.getArticleImg(), articleId);
					article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
				}
			}
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(articleId);
					articleRes.setResourceId(resource);
					this.articleResDao.insert(con, articleRes);
				article.setArticleId(articleId);
				article.setArticleAgree(0);
				article.setPageViews(0);
				article.setStatus("2");
				if (article.getProfessorId() != null && article.getOrgId() == null) {
					article.setArticleType("1");
				} else if (article.getProfessorId() == null && article.getOrgId() != null) {
					article.setArticleType("2");
				} else {
					throw new JfwBaseException(-1, "错误参数：文章发布者ID");
				}
			}
			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);
				this.articleDao.insert(con, article);
				if (professors != null) {
					for (String professor : professors) {
						ArticlePro articlePro = new ArticlePro();
						articlePro.setArticleId(articleId);
						articlePro.setProfessorId(professor);
						this.articleProDao.insert(con, articlePro);
					}
				}
			}
			return articleId;
		} else if (article.getArticleId().trim().length() == 32) {
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), article.getArticleId());
				article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
			}
			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.articleOrgDao.delete(con, article.getArticleId());
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(article.getArticleId());
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
				if (resources != null) {
					for (String resource : resources) {
						ArticleRes articleRes = new ArticleRes();
						articleRes.setArticleId(articleId);
						articleRes.setResourceId(resource);
						this.articleResDao.insert(con, articleRes);
					}
				}
			}
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(article.getArticleId());
					articleRes.setResourceId(resource);
					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);
					}
				}
			}
			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);
			} else if (article.getArticleId().trim().length() == 32) {
				articleId = article.getArticleId();
				if (article.getArticleImg() != null) {
					this.saveArtImg(article.getArticleImg(), article.getArticleId());
					article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
				}
				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.articleOrgDao.delete(con, article.getArticleId());
				if (professors != null) {
					for (String professor : professors) {
						ArticlePro articlePro = new ArticlePro();
						articlePro.setArticleId(article.getArticleId());
						articlePro.setProfessorId(professor);
						this.articleProDao.insert(con, articlePro);
					}
				}
				if (resources != null) {
					for (String resource : resources) {
						ArticleRes articleRes = new ArticleRes();
						articleRes.setArticleId(article.getArticleId());
						articleRes.setResourceId(resource);
						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");
			}
			return article.getArticleId();
		} else {
			throw new JfwBaseException(-2, "bad parameter:articleId");
			con.commit();
			this.templateService.push(ContentType.Article, articleId);
		} catch (SQLException | IOException | JfwBaseException e) {
			try {
				con.rollback();
			} catch (SQLException ee) {
			}
			throw e;
		}
		return articleId;
	}
	@Post
	@Path("/updateArt")
	public void update(@JdbcConn(true) Connection con, Article article) throws SQLException, JfwBaseException, IOException {
		if (article.getArticleImg() != null) {
			this.saveArtImg(article.getArticleImg(), article.getArticleId());
			article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
	public void update(@JdbcConn(false) Connection con, Article article) throws SQLException, JfwBaseException, IOException {
		try {
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), article.getArticleId());
				article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
			}
			this.articleDao.update(con, article);
			con.commit();
			this.templateService.push(ContentType.Article, article.getArticleId());
		} catch (SQLException | IOException | JfwBaseException e) {
			try {
				con.rollback();
			} catch (SQLException ee) {
			}
			throw e;
		}
		this.articleDao.update(con, article);
	}
	@Post
@@ -603,36 +674,76 @@ public class ArticleService {
	@Post
	@Path("/updateDraft")
	public void updateDraft(@JdbcConn(true) Connection con, String articleId) throws SQLException {
	public void updateDraft(@JdbcConn(false) Connection con, String articleId) throws SQLException {
		// 修改文章状态为草稿
		this.articleDao.updateStatus(con, articleId, "0");
		this.keyWordService.refreshArticle(con, articleId, null);
		try {
			this.articleDao.updateStatus(con, articleId, "0");
			this.keyWordService.refreshArticle(con, articleId, null);
			con.commit();
			this.templateService.push(ContentType.Article, articleId);
		} catch (SQLException e) {
			try {
				con.rollback();
			} catch (SQLException ee) {
			}
			throw e;
		}
	}
	@Post
	@Path("/publish")
	public void publish(@JdbcConn(true) Connection con, String articleId) throws SQLException {
	public void publish(@JdbcConn(false) 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()));
		try {
			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()));
			}
			con.commit();
			this.templateService.push(ContentType.Article, articleId);
		} catch (SQLException e) {
			try {
				con.rollback();
			} catch (SQLException ee) {
			}
			throw e;
		}
	}
	@Post
	@Path("/deleteArticle")
	public void deleteArticle(@JdbcConn(true) Connection con, String articleId) throws SQLException {
	public void deleteArticle(@JdbcConn(false) Connection con, String articleId) throws SQLException {
		// 修改文章状态为删除
		this.articleDao.updateStatus(con, articleId, "3");
		this.keyWordService.refreshArticle(con, articleId, null);
		try {
			this.articleDao.updateStatus(con, articleId, "3");
			this.keyWordService.refreshArticle(con, articleId, null);
			con.commit();
			this.templateService.push(ContentType.Article, articleId);
		} catch (SQLException e) {
			try {
				con.rollback();
			} catch (SQLException ee) {
			}
			throw e;
		}
	}
	@Post
	@Path("/close")
	public void closeArticle(@JdbcConn(true) Connection con, String articleId) throws SQLException {
		// 修改文章状态为关闭
		try{
		this.articleDao.updateStatus(con, articleId, "4");
		con.commit();
		this.templateService.push(ContentType.Article,articleId);
		} catch (SQLException  e) {
			try {
				con.rollback();
			} catch (SQLException ee) {
			}
			throw e;
		}
	}
	@Post
@@ -764,8 +875,8 @@ public class ArticleService {
	@Get
	@Path("/pqself")
	public PageQueryResult<SelfArticle> queryPageSelf(@JdbcConn Connection con, @Nullable String professorId, @Nullable String orgId, @Nullable String articleTitle,
			@DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
	public PageQueryResult<SelfArticle> queryPageSelf(@JdbcConn Connection con, @Nullable String professorId, @Nullable String orgId,
			@Nullable String articleTitle, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if (articleTitle != null) {
			articleTitle = "%" + articleTitle + "%";
		}
@@ -855,7 +966,7 @@ public class ArticleService {
		return this.articleDao.limitQueryPublish(con, ids, rows);
	}
	
	@Get
	@Path("/byAssOrg")
	public List<Article> byAssOrg(@JdbcConn Connection con, String id, @DefaultValue("5") int rows) throws SQLException {
@@ -873,6 +984,7 @@ public class ArticleService {
		return this.articleDao.limitQueryPublish(con, ids, rows);
	}
	@Get
	@Path("/byAssResource")
	public List<Article> byAssResource(@JdbcConn Connection con, String id, @DefaultValue("5") int rows) throws SQLException {
@@ -896,23 +1008,25 @@ public class ArticleService {
	public Article query(@JdbcConn Connection con, long id) throws SQLException {
		return this.articleDao.query(con, id);
	}
	
	
	@Path("/find")
	@Get
	public PageQueryResult<Article> find(@JdbcConn Connection con,@DefaultValue("0") int col,@Nullable String[] exclude,@DefaultValue("20") int pageSize,@DefaultValue("1") int pageNo) throws SQLException{
			return this.articleDao.queryFind(con,col>0?col:null,exclude, pageSize, pageNo);
	public PageQueryResult<Article> find(@JdbcConn Connection con, @DefaultValue("0") int col, @Nullable String[] exclude, @DefaultValue("20") int pageSize,
			@DefaultValue("1") int pageNo) throws SQLException {
		return this.articleDao.queryFind(con, col > 0 ? col : null, exclude, pageSize, pageNo);
	}
	@Path("/lastestPublished")
	@Get
	public List<Article> lastet(@JdbcConn Connection con,@Nullable String time,@DefaultValue("10") int rows) throws SQLException{
		if(time==null){
			time = DateUtil.formatDate(System.currentTimeMillis() - 7*24*60*60*1000)+"000000";
	public List<Article> lastet(@JdbcConn Connection con, @Nullable String time, @DefaultValue("10") int rows) throws SQLException {
		if (time == null) {
			time = DateUtil.formatDate(System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000) + "000000";
		}
		return this.articleDao.lasterByPublishTime(con,time,rows);		
		return this.articleDao.lasterByPublishTime(con, time, rows);
	}
	public static void main(String[] args){
		System.out.println( DateUtil.formatDate(System.currentTimeMillis() - 7*24*60*60*1000));
	public static void main(String[] args) {
		System.out.println(DateUtil.formatDate(System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000));
	}
}

src/main/java/com/ekexiu/push/service/PushService.java

@@ -61,7 +61,7 @@ public class PushService {
	private String appId = "TUdvbnxu1c97r6Fb6cUy57";
	private int timeout = 0;
	private boolean enable = false;
	private String tokenUrl = "http://192.168.2.233/ajax/push/token";
	private String tokenUrl = "http://192.168.3.233/ajax/push/token";
	private String lastLoadToken = null;
	private String token = null;

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

@@ -273,4 +273,6 @@ com_ekexiu_portal_oauth_OAuthService.handlers-ref=oauthService_handlers
oauthService_handlers::map=java.util.HashMap
oauthService_handlers.map-key-1=weixin
oauthService_handlers.map-val-1-ref=com_ekexiu_portal_oauth_weixin_WeiXinHandler
com_ekexiu_push_service_PushService.enable::boolean=false
com_ekexiu_push_service_PushService.enable::boolean=false
com_ekexiu_portal_cms_TemplateService.source::java.io.File=/kexiu/www/html1/fw_template_r3254
com_ekexiu_portal_cms_TemplateService.dir::java.io.File=/kexiu/webdata1/shtml

src/main/resources/project-test.properties

@@ -273,4 +273,6 @@ com_ekexiu_portal_oauth_OAuthService.handlers-ref=oauthService_handlers
oauthService_handlers::map=java.util.HashMap
oauthService_handlers.map-key-1=weixin
oauthService_handlers.map-val-1-ref=com_ekexiu_portal_oauth_weixin_WeiXinHandler
com_ekexiu_push_service_PushService.enable::boolean=true
com_ekexiu_push_service_PushService.enable::boolean=true
com_ekexiu_portal_cms_TemplateService.source::java.io.File=/kexiu/www/html/fw_template_r3254
com_ekexiu_portal_cms_TemplateService.dir::java.io.File=/kexiu/webdata/shtml

src/main/resources/project.properties

@@ -275,4 +275,5 @@ com_ekexiu_push_service_PushService.enable::boolean=true
com_ekexiu_push_service_PushService.secret=QewoTEuuOGAkWnBKqrbfj8
com_ekexiu_push_service_PushService.appKey=xXqSF9Gmb69SG37XVT3lL2
com_ekexiu_push_service_PushService.appId=vGS5OBXtmV6SrDVJDQ8dGA
com_ekexiu_portal_cms_TemplateService.source::java.io.File=/kexiu/www/html/fw_template_r3254
com_ekexiu_portal_cms_TemplateService.dir::java.io.File=/kexiu/webdata/shtml