Merge branch 'banner'

pom.xml

@@ -107,6 +107,11 @@
			<artifactId>slf4j-log4j12</artifactId>
			<version>1.7.21</version>
		</dependency>
		<dependency>
			<groupId>org.freemarker</groupId>
			<artifactId>freemarker</artifactId>
			<version>2.3.26-incubating</version>
		</dependency>
	</dependencies>
	<build>
		<resources>

src/main/java/com/ekexiu/console/system/dao/ArticleDao.java

@@ -6,6 +6,7 @@ import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Where;
@@ -39,11 +40,13 @@ public interface ArticleDao {
    @PageQuery
    @OrderBy(" ORDER BY publish_time DESC NULLS LAST")
    @Where("status='1'")
    @Exclude("articleContent")
    PageQueryResult<ArticleInfo> queryByTime(Connection con, @Nullable @Like String articleTitle, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("publishTime") String bt, @Nullable @Alias("publishTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    @Where("status='1'")
    @Exclude("articleContent")
    PageQueryResult<ArticleInfo> queryByPV(Connection con, @Nullable @Like String articleTitle, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("publishTime") String bt, @Nullable @Alias("publishTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @Batch
@@ -67,4 +70,10 @@ public interface ArticleDao {
    @UpdateWith
    @From(Article.class)
    int updateSubject(Connection con, String articleId, @Set String subject) throws SQLException;
    @Nullable
    @QueryVal
    @Column(handlerClass = StringHandler.class, value = "article_img")
    @From(Article.class)
    String queryImagePath(Connection con, String articleId) throws SQLException;
}

src/main/java/com/ekexiu/console/system/dao/AuthApplyDao.java

@@ -71,7 +71,7 @@ public abstract class AuthApplyDao {
    }
    @QueryList
    @OrderBy("ORDER BY CREATE_TIME")
    @OrderBy("ORDER BY CREATE_TIME DESC")
    public abstract List<AuthApplyInfo> queryInfo(Connection con, Integer applyType) throws SQLException;
    @QueryOne
@@ -79,7 +79,7 @@ public abstract class AuthApplyDao {
    public abstract AuthApplyInfo queryInfo(Connection con, String authApplyId) throws SQLException;
    @QueryList
    @OrderBy("ORDER BY CREATE_TIME")
    @OrderBy("ORDER BY CREATE_TIME DESC")
    public abstract List<OrgApplyInfo> queryOrgInfo(Connection con, Integer applyType)throws SQLException;
    @QueryOne

src/main/java/com/ekexiu/console/system/dao/DiscoverBannerDao.java

@@ -0,0 +1,48 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.DiscoverBanner;
import org.jfw.apt.annotation.Nullable;
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.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.*;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/8/25.
 */
@DAO
public interface DiscoverBannerDao {
    @Nullable
    @SelectOne
    DiscoverBanner query(Connection con, long id) throws SQLException;
    @Update
    int update(Connection con, DiscoverBanner discoverBanner) throws SQLException;
    @InsertAndGenKey(value = "id")
    long insert(Connection con, DiscoverBanner discoverBanner) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY location, create_time DESC")
    PageQueryResult<DiscoverBanner> query(Connection con, @Nullable @Like String title, int pageSize, int pageNo) throws SQLException;
    @UpdateWith
    @From(DiscoverBanner.class)
    @SetSentence("end_time = TO_CHAR(NOW(),'YYYYMMDDHH24MISS') ")
    @Where("begin_time is not null and end_time is null")
    int end(Connection con)throws SQLException;
    @UpdateWith
    @From(DiscoverBanner.class)
    @SetSentence("location = null")
    @Where("location is not null")
    int clearLocation(Connection con) throws SQLException;
}

src/main/java/com/ekexiu/console/system/dao/PpaperDao.java

@@ -4,6 +4,7 @@ import com.ekexiu.console.system.po.Ppaper;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
@@ -35,10 +36,12 @@ public interface PpaperDao {
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC NULLS LAST")
    @Exclude("summary")
    PageQueryResult<Ppaper> queryByTime(Connection con, @Nullable @Like String name, @Nullable @Like String authors, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    @Exclude("summary")
    PageQueryResult<Ppaper> queryByPV(Connection con, @Nullable @Like String name,@Nullable @Like String authors, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @UpdateWith

src/main/java/com/ekexiu/console/system/dao/PpatentDao.java

@@ -4,6 +4,7 @@ import com.ekexiu.console.system.po.Ppatent;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
@@ -35,10 +36,12 @@ public interface PpatentDao {
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC NULLS LAST")
    @Exclude("summary")
    PageQueryResult<Ppatent> queryByTime(Connection con, @Nullable @Like String name, @Nullable @Like String authors, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    @Exclude("summary")
    PageQueryResult<Ppatent> queryByPV(Connection con, @Nullable @Like String name,@Nullable @Like String authors, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @UpdateWith

src/main/java/com/ekexiu/console/system/dao/ResourceDao.java

@@ -6,6 +6,7 @@ import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Where;
@@ -39,11 +40,13 @@ public interface ResourceDao {
    @PageQuery
    @OrderBy(" ORDER BY publish_time DESC NULLS LAST")
    @Where("status='1'")
    @Exclude("descp")
    PageQueryResult<ResourceInfo> queryByTime(Connection con, @Nullable @Like String resourceName, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("publishTime") String bt, @Nullable @Alias("publishTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    @Where("status='1'")
    @Exclude("descp")
    PageQueryResult<ResourceInfo> queryByPV(Connection con, @Nullable @Like String resourceName,@SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("publishTime") String bt, @Nullable @Alias("publishTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @Batch

src/main/java/com/ekexiu/console/system/po/DiscoverBanner.java

@@ -0,0 +1,149 @@
package com.ekexiu.console.system.po;
import com.ekexiu.console.basepo.CreateTimeSupported;
import com.ekexiu.console.basepo.ModifyTimeSupported;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/8/25.
 */
@PrimaryKey("id")
@Table
public class DiscoverBanner implements CreateTimeSupported, ModifyTimeSupported {
    private long id;
    private String title;
    private int banner;
    private String beginTime;
    private String endTime;
    private long clicks;
    private String descp;
    private String articleId;
    private String modifyTime;
    private String modifier;
    private String createTime;
    private String creator;
    private Integer location;
    @Column(DE.bigSerial)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(DE.Text_de)
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    @Column(DE.int_de)
    public int getBanner() {
        return banner;
    }
    public void setBanner(int banner) {
        this.banner = banner;
    }
    @Column(DE.Text_de)
    public String getBeginTime() {
        return beginTime;
    }
    public void setBeginTime(String beginTime) {
        this.beginTime = beginTime;
    }
    @Column(DE.Text_de)
    public String getEndTime() {
        return endTime;
    }
    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }
    @Column(handlerClass = LongHandler.class, dbType = "BIGINT", fixSqlValueWithInsert = "0", insertable = true, renewable = false, nullable = false, queryable = true)
    public long getClicks() {
        return clicks;
    }
    public void setClicks(long clicks) {
        this.clicks = clicks;
    }
    @Column(DE.Text_de)
    public String getDescp() {
        return descp;
    }
    public void setDescp(String descp) {
        this.descp = descp;
    }
    @Column(DE.Text_de)
    public String getArticleId() {
        return articleId;
    }
    public void setArticleId(String articleId) {
        this.articleId = articleId;
    }
    @Column(DE.Text_de)
    public String getModifier() {
        return modifier;
    }
    public void setModifier(String modifier) {
        this.modifier = modifier;
    }
    @Column(DE.Text_de)
    public String getCreator() {
        return creator;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    }
    @Column(DE.Int_de)
    public Integer getLocation() {
        return location;
    }
    public void setLocation(Integer location) {
        this.location = location;
    }
    @Override
    public String getModifyTime() {
        return this.modifyTime;
    }
    @Override
    public void setModifyTime(String modifyTime) {
        this.modifyTime = modifyTime;
    }
    @Override
    public String getCreateTime() {
        return this.createTime;
    }
    @Override
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
}

src/main/java/com/ekexiu/console/system/service/ArticleService.java

@@ -81,7 +81,7 @@ public class ArticleService {
    @Post
    @Path("/subject")
    public void updateSubject(@JdbcConn(true) Connection con,String articleId,@Nullable String subject) throws SQLException {
    public void updateSubject(@JdbcConn(true) Connection con, String articleId, @Nullable String subject) throws SQLException {
        this.articleDao.updateSubject(con, articleId, subject);
        this.keyWordService.refreshArticle(con, articleId, subject);
    }

src/main/java/com/ekexiu/console/system/service/DiscoverBannerService.java

@@ -0,0 +1,362 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.ArticleDao;
import com.ekexiu.console.system.dao.DiscoverBannerDao;
import com.ekexiu.console.system.po.DiscoverBanner;
import com.ekexiu.console.system.vo.ConsoleAuthUser;
import freemarker.cache.StringTemplateLoader;
import freemarker.template.Configuration;
import freemarker.template.TemplateException;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.LoginUser;
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.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestParam;
import org.jfw.util.DateUtil;
import org.jfw.util.PageQueryResult;
import java.io.File;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
/**
 * Created by TT on 2017/8/25.
 */
@Path("/disBanner")
public class DiscoverBannerService {
    private File generatePath;
    //private Configuration cfg = new Configuration(Configuration.VERSION_2_3_26);
    private String templatePc = "<ul id=\"slide-list\" class=\"slide-list floatL\">\n" +
            "    <li class=\"slide-item slide-item-active\" data-id=\"${banner[0].articleId}\" data-col=\"${banner[0].bannerId}\">\n" +
            "        <a href=\"articalShow.html?articleId=${banner[0].articleId}\" target=\"_blank\" style=\"background-image:url('/data/article/${banner[0].image}');\">\n" +
            "            <p class=\"title\">${banner[0].title}</p>\n" +
            "        </a>\n" +
            "    </li>\n" +
            "    <li class=\"slide-item\" data-id=\"${banner[1].articleId}\" data-col=\"${banner[1].bannerId}\">\n" +
            "        <a href=\"articalShow.html?articleId=${banner[1].articleId}\" target=\"_blank\" style=\"background-image:url('/data/article/${banner[1].image}');\">\n" +
            "            <p class=\"title\">${banner[1].title}</p>\n" +
            "        </a>\n" +
            "    </li>\n" +
            "    <li class=\"slide-item\" data-id=\"${banner[2].articleId}\" data-col=\"${banner[2].bannerId}\">\n" +
            "        <a href=\"articalShow.html?articleId=${banner[2].articleId}\" target=\"_blank\" style=\"background-image:url('/data/article/${banner[2].image}');\">\n" +
            "            <p class=\"title\">${banner[2].title}</p>\n" +
            "        </a>\n" +
            "    </li>\n" +
            "    <li class=\"slide-item\" data-id=\"${banner[3].articleId}\" data-col=\"${banner[3].bannerId}\">\n" +
            "        <a href=\"articalShow.html?articleId=${banner[3].articleId}\" target=\"_blank\" style=\"background-image:url('/data/article/${banner[3].image}');\">\n" +
            "            <p class=\"title\">${banner[3].title}</p>\n" +
            "        </a>\n" +
            "    </li>\n" +
            "    <li class=\"slide-item\" data-id=\"${banner[4].articleId}\" data-col=\"${banner[4].bannerId}\">\n" +
            "        <a href=\"articalShow.html?articleId=${banner[4].articleId}\" target=\"_blank\" style=\"background-image:url('/data/article/${banner[4].image}');\">\n" +
            "            <p class=\"title\">${banner[4].title}</p>\n" +
            "        </a>\n" +
            "    </li>\n" +
            "</ul>\n" +
            "<ul id=\"slide-tab\" class=\"slide-tab floatR\">\n" +
            "    <li class=\"slide-tab-item slide-tab-item-active\">\n" +
            "        ${banner[0].banner}\n" +
            "    </li>\n" +
            "    <li class=\"slide-tab-item\">\n" +
            "        ${banner[1].banner}\n" +
            "    </li>\n" +
            "    <li class=\"slide-tab-item\">\n" +
            "        ${banner[2].banner}\n" +
            "    </li>\n" +
            "    <li class=\"slide-tab-item\">\n" +
            "        ${banner[3].banner}\n" +
            "    </li>\n" +
            "    <li class=\"slide-tab-item\">\n" +
            "        ${banner[4].banner}\n" +
            "    </li>\n" +
            "</ul>";
    private String templateApp = "<div class=\"mui-slider-group mui-slider-loop\">\n" +
            "\n" +
            "    <div class=\"mui-slider-item mui-slider-item-duplicate\" data-id=\"${banner[4].articleId}\" col-id=\"${banner[4].bannerId}\">\n" +
            "        <a href=\"#\" style=\"background-image:url('http://www.ekexiu.com/data/article/${banner[4].image}');\">\n" +
            "            <p class=\"mui-slider-title\">${banner[4].title}</p>\n" +
            "        </a>\n" +
            "    </div>\n" +
            "\n" +
            "    <#list banner as banner>\n" +
            "        <div class=\"mui-slider-item\" data-id=\"${banner.articleId}\" col-id=\"${banner.bannerId}\">\n" +
            "            <a href=\"#\" style=\"background-image:url('http://www.ekexiu.com/data/article/${banner.image}');\">\n" +
            "                <p class=\"mui-slider-title\">${banner.title}</p>\n" +
            "            </a>\n" +
            "        </div>\n" +
            "    </#list>\n" +
            "\n" +
            "    <div class=\"mui-slider-item mui-slider-item-duplicate\" data-id=\"${banner[0].articleId}\" col-id=\"${banner[0].bannerId}\">\n" +
            "        <a href=\"#\" style=\"background-image:url('http://www.ekexiu.com/data/article/${banner[0].image}');\">\n" +
            "            <p class=\"mui-slider-title \">${banner[0].title}</p>\n" +
            "        </a>\n" +
            "    </div>\n" +
            "\n" +
            "</div>\n" +
            "<div class=\"mui-slider-indicator\">\n" +
            "    <div class=\"mui-indicator mui-active\"></div>\n" +
            "    <div class=\"mui-indicator\"></div>\n" +
            "    <div class=\"mui-indicator\"></div>\n" +
            "    <div class=\"mui-indicator\"></div>\n" +
            "    <div class=\"mui-indicator\"></div>\n" +
            "</div>";
    @Autowrie
    private DiscoverBannerDao discoverBannerDao;
    @Autowrie
    private ImageService imageService;
    @Autowrie
    private ArticleDao articleDao;
    @Autowrie
    private TemplateService templateService;
    public DiscoverBannerDao getDiscoverBannerDao() {
        return discoverBannerDao;
    }
    public void setDiscoverBannerDao(DiscoverBannerDao discoverBannerDao) {
        this.discoverBannerDao = discoverBannerDao;
    }
    public ImageService getImageService() {
        return imageService;
    }
    public void setImageService(ImageService imageService) {
        this.imageService = imageService;
    }
    public ArticleDao getArticleDao() {
        return articleDao;
    }
    public void setArticleDao(ArticleDao articleDao) {
        this.articleDao = articleDao;
    }
    public TemplateService getTemplateService() {
        return templateService;
    }
    public void setTemplateService(TemplateService templateService) {
        this.templateService = templateService;
    }
    public File getGeneratePath() {
        return generatePath;
    }
    public void setGeneratePath(File generatePath) {
        this.generatePath = generatePath;
    }
    //public File getSource() {
    //    return source;
    //}
    //public void setSource(File source) {
    //    this.source = source;
    //    try {
    //        this.cfg.setDirectoryForTemplateLoading(source);
    //    } catch (IOException e) {
    //        this.source = null;
    //        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");
    //                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 {
    //            }
    //        });
    //    }
    //    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");
    //        }
    //    }
    //    Template template = this.cfg.getTemplate(templateName,"UTF-8");
    //    OutputStream out = new FileOutputStream(dest);
    //    try {
    //        template.process(root, new OutputStreamWriter(out, ConstData.UTF8));
    //        out.flush();
    //    } finally {
    //        out.close();
    //    }
    //}
    @Path
    @Post
    public void insert(@JdbcConn(true) Connection con,@RequestParam(excludeFields = {"createTime", "modifyTime", "id"}) DiscoverBanner discoverBanner,@LoginUser ConsoleAuthUser user,@Nullable String fn) throws SQLException, IOException {
        discoverBanner.setCreator(user.getId());
        long id = this.discoverBannerDao.insert(con, discoverBanner);
        if (fn != null) {
            this.imageService.saveBannerImage(id, fn);
        }
    }
    @Path("/id/{id}")
    @Get
    public DiscoverBanner query(@JdbcConn Connection con,@PathVar long id)throws SQLException {
        return this.discoverBannerDao.query(con, id);
    }
    @Path("/update")
    @Post
    public void update(@JdbcConn(true) Connection con, DiscoverBanner banner,@Nullable String fn) throws SQLException, IOException {
        this.discoverBannerDao.update(con, banner);
        this.imageService.saveBannerImage(banner.getId(), fn);
    }
    @Path("/pq")
    @Get
    public PageQueryResult<DiscoverBanner> pageQuery(@JdbcConn Connection con, @Nullable String title, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize) throws SQLException {
        return this.discoverBannerDao.query(con,title == null ? null : "%" + title + "%",pageSize,pageNo);
    }
    @Path("/putUp")
    @Post
    public void putOn(@JdbcConn(true) Connection con, Long id1, Long id2, Long id3, Long id4, Long id5, @LoginUser ConsoleAuthUser user) throws SQLException {
        //this.setSource(new File("D:/tmp/banner"));
        StringTemplateLoader stringLoader = new StringTemplateLoader();
        stringLoader.putTemplate("slideTab.html", templatePc);
        stringLoader.putTemplate("appfound.html", templateApp);
        Configuration cfg = templateService.getCfg();
        cfg.setTemplateLoader(stringLoader);
        this.discoverBannerDao.end(con);
        this.discoverBannerDao.clearLocation(con);
        ArrayList<Banner> banners = new ArrayList<>();
        queryId(con, id1, user.getId(), 1, banners);
        queryId(con, id2, user.getId(), 2, banners);
        queryId(con, id3, user.getId(), 3, banners);
        queryId(con, id4, user.getId(), 4, banners);
        queryId(con, id5, user.getId(), 5, banners);
        Map<String, Object> root = new HashMap<String, Object>();
        root.put("banner", banners);
        try {
            //this.genCnt("slideTab.html", new File(generatePath+"/col_banner.html"), root);
            //this.genCnt("appfound.html", new File(generatePath+"/col_bannerApp.html"), root);
            templateService.genCnt(cfg,"slideTab.html", new File(generatePath+"/col_banner.html"), root);
            templateService.genCnt(cfg,"appfound.html", new File(generatePath+"/col_bannerApp.html"), root);
        } catch (IOException | TemplateException e) {
            e.printStackTrace();
        }
    }
    private void queryId(Connection con, Long id, String userId, int location, ArrayList<Banner> banners) throws SQLException {
        DiscoverBanner discoverBanner = this.discoverBannerDao.query(con, id);
        discoverBanner.setBeginTime(DateUtil.formatDateTime(System.currentTimeMillis()));
        discoverBanner.setEndTime(null);
        discoverBanner.setModifier(userId);
        discoverBanner.setLocation(location);
        this.discoverBannerDao.update(con, discoverBanner);
        Banner b = new Banner();
        b.setArticleId(discoverBanner.getArticleId());
        String image = this.articleDao.queryImagePath(con, discoverBanner.getArticleId());
        b.setImage(image);
        b.setBanner(dictBanner(discoverBanner.getBanner()));
        b.setTitle(discoverBanner.getTitle());
        b.setBannerId(id);
        banners.add(b);
    }
    private String dictBanner(int banner) {
        if (Objects.equals(banner, 1) || Objects.equals(banner, 2)) {
            return "原创";
        } else if (Objects.equals(banner, 3)) {
            return "前沿";
        } else if (Objects.equals(banner, 4)) {
            return "经验";
        } else if (Objects.equals(banner, 5)) {
            return "检测";
        } else if (Objects.equals(banner, 6)) {
            return "会议";
        } else if (Objects.equals(banner, 7)) {
            return "访谈";
        } else if (Objects.equals(banner, 8)) {
            return "招聘";
        } else if (Objects.equals(banner, 9)) {
            return "新闻";
        } else {
            return "未设定";
        }
    }
    public static class Banner{
        private String articleId;
        private String image;
        private String title;
        private String banner;
        private Long bannerId;
        public String getArticleId() {
            return articleId;
        }
        public void setArticleId(String articleId) {
            this.articleId = articleId;
        }
        public String getImage() {
            return image;
        }
        public void setImage(String image) {
            this.image = image;
        }
        public String getTitle() {
            return title;
        }
        public void setTitle(String title) {
            this.title = title;
        }
        public String getBanner() {
            return banner;
        }
        public void setBanner(String banner) {
            this.banner = banner;
        }
        public long getBannerId() {
            return bannerId;
        }
        public void setBannerId(Long bannerId) {
            this.bannerId = bannerId;
        }
    }
    
}

src/main/java/com/ekexiu/console/system/service/ImageService.java

@@ -0,0 +1,151 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.service.Upload;
import org.jfw.apt.web.annotation.Path;
import org.jfw.util.JpgUtil;
import org.jfw.util.io.IoUtil;
import java.io.*;
/**
 * Created by TT on 2017/8/24.
 */
@Path("/image")
public class ImageService extends Upload {
    private File imagePath;
    private File tmpPath;
    private File orgPath;
    private File bannerPath;
    private int largeHeadPhotoWidth = 200;
    private int largeHeadPhotoHeight = 200;
    private int middleHeadPhotoWidth = 200;
    private int middleHeadPhotoHeight = 200;
    private int smallHeadPhotoWidth = 200;
    private int smallHeadPhotoHeight = 200;
    private File defaultHeadPhoto;
    private File defaultOrgLogo;
    private File defaultResourcePhoto;
    private byte[] dli;
    private byte[] dmi;
    private byte[] dsi;
    private byte[] dol;
    private byte[] dsl;
    public File getDefaultHeadPhoto() {
        return defaultHeadPhoto;
    }
    public void setDefaultHeadPhoto(File defaultHeadPhoto) {
        this.defaultHeadPhoto = defaultHeadPhoto;
    }
    public File getDefaultOrgLogo() {
        return defaultOrgLogo;
    }
    public void setDefaultOrgLogo(File defaultOrgLogo) {
        this.defaultOrgLogo = defaultOrgLogo;
    }
    public File getDefaultResourcePhoto() {
        return defaultResourcePhoto;
    }
    public void setDefaultResourcePhoto(File defaultResourcePhoto) {
        this.defaultResourcePhoto = defaultResourcePhoto;
    }
    public File getImagePath() {
        return imagePath;
    }
    public void setImagePath(File imagePath) {
        this.imagePath = imagePath;
        this.orgPath = new File(this.imagePath, "org");
        this.bannerPath = new File(this.imagePath, "banner");
    }
    public File getTmpPath() {
        return tmpPath;
    }
    public void setTmpPath(File tmpPath) {
        this.tmpPath = tmpPath;
    }
    public File getOrgPath() {
        return orgPath;
    }
    public void setOrgPath(File orgPath) {
        this.orgPath = orgPath;
    }
    public void saveOrgLogo(String id, String fn) throws IOException {
        InputStream in = new FileInputStream(new File(this.tmpPath, fn));
        try {
            IoUtil.copy(in, new FileOutputStream(new File(this.orgPath, id + ".jpg")), false, true);
        } finally {
            in.close();
        }
    }
    public void saveBannerImage(long id, String fn) throws IOException{
        InputStream in = new FileInputStream(new File(this.tmpPath, fn));
        try {
            IoUtil.copy(in,new FileOutputStream(new File(this.bannerPath, id +".jpg")),false,true);
        }finally {
            in.close();
        }
    }
    public void saveDefaultOrgLogo(String id) throws IOException {
        this.initDefaultImage();
        IoUtil.saveStream(new FileOutputStream(new File(this.orgPath, id + ".jpg")), this.dol, true);
    }
    private byte[] zoomImage(byte[] src, int w, int h) throws IOException {
        ByteArrayInputStream in = new ByteArrayInputStream(src);
        ByteArrayOutputStream out = new ByteArrayOutputStream();
        JpgUtil.zoom(in, out, w, h);
        out.flush();
        return out.toByteArray();
    }
    private void initDefaultImage() {
        if (this.dli != null)
            return;
        synchronized (this) {
            if (this.dli != null)
                return;
            try {
                byte[] dd = IoUtil.readStream(new FileInputStream(this.defaultHeadPhoto), true);
                this.dli = this.zoomImage(dd, this.largeHeadPhotoWidth, this.largeHeadPhotoHeight);
                this.dmi = this.zoomImage(dd, this.middleHeadPhotoWidth, this.middleHeadPhotoHeight);
                this.dsi = this.zoomImage(dd, this.smallHeadPhotoWidth, this.smallHeadPhotoHeight);
                this.dol = IoUtil.readStream(new FileInputStream(this.defaultOrgLogo), true);
                this.dsl = IoUtil.readStream(new FileInputStream(this.defaultResourcePhoto), true);
            } catch (IOException e) {
                this.dli = null;
                this.dmi = null;
                this.dsi = null;
                this.dol = null;
                this.dsl = null;
                throw new RuntimeException("init image error", e);
            }
        }
    }
    public boolean hasOrgLogo(String id) {
        String orgPath = this.orgPath+"/"+id+".jpg";
        File file = new File(orgPath);
        if(file.exists()){
            return true;
        }else{
            return false;
        }
    }
}

src/main/java/com/ekexiu/console/system/service/OrgService.java

@@ -20,19 +20,17 @@ import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestParam;
import org.jfw.util.DateUtil;
import org.jfw.util.JpgUtil;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.io.IoUtil;
import java.io.*;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Objects;
@Path("/sys/org")
public class OrgService extends com.ekexiu.console.service.Upload {
public class OrgService {
    private String defaultOrgType;
    /**
@@ -40,25 +38,6 @@ public class OrgService extends com.ekexiu.console.service.Upload {
     */
    private String defaultAuthStatus = "0";
    private File imagePath;
    private File tmpPath;
    private File orgPath;
    private int largeHeadPhotoWidth = 200;
    private int largeHeadPhotoHeight = 200;
    private int middleHeadPhotoWidth = 200;
    private int middleHeadPhotoHeight = 200;
    private int smallHeadPhotoWidth = 200;
    private int smallHeadPhotoHeight = 200;
    private File defaultHeadPhoto;
    private File defaultOrgLogo;
    private File defaultResourcePhoto;
    private byte[] dli;
    private byte[] dmi;
    private byte[] dsi;
    private byte[] dol;
    private byte[] dsl;
    public static final String DEFAULT_PW_STR = StringUtil.md5("123456");
    @Autowrie
@@ -68,6 +47,8 @@ public class OrgService extends com.ekexiu.console.service.Upload {
    @Autowrie
    private OrgRecordDao orgRecordDao;
    @Autowrie
    private ImageService imageService;
    @Autowrie
    private KeyWordService keyWordService;
    public OrgRecordDao getOrgRecordDao() {
@@ -78,30 +59,6 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        this.orgRecordDao = orgRecordDao;
    }
    public File getDefaultHeadPhoto() {
        return defaultHeadPhoto;
    }
    public void setDefaultHeadPhoto(File defaultHeadPhoto) {
        this.defaultHeadPhoto = defaultHeadPhoto;
    }
    public File getDefaultOrgLogo() {
        return defaultOrgLogo;
    }
    public void setDefaultOrgLogo(File defaultOrgLogo) {
        this.defaultOrgLogo = defaultOrgLogo;
    }
    public File getDefaultResourcePhoto() {
        return defaultResourcePhoto;
    }
    public void setDefaultResourcePhoto(File defaultResourcePhoto) {
        this.defaultResourcePhoto = defaultResourcePhoto;
    }
    public String getDefaultOrgType() {
        return defaultOrgType;
    }
@@ -118,31 +75,6 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        this.defaultAuthStatus = defaultAuthStatus;
    }
    public File getImagePath() {
        return imagePath;
    }
    public void setImagePath(File imagePath) {
        this.imagePath = imagePath;
        this.orgPath = new File(this.imagePath, "org");
    }
    public File getTmpPath() {
        return tmpPath;
    }
    public void setTmpPath(File tmpPath) {
        this.tmpPath = tmpPath;
    }
    public File getOrgPath() {
        return orgPath;
    }
    public void setOrgPath(File orgPath) {
        this.orgPath = orgPath;
    }
    public OrgUserDao getOrgUserDao() {
        return orgUserDao;
    }
@@ -159,60 +91,20 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        this.orgDao = orgDao;
    }
    public KeyWordService getKeyWordService() {
        return keyWordService;
    }
    public void setKeyWordService(KeyWordService keyWordService) {
        this.keyWordService = keyWordService;
    }
    public int getLargeHeadPhotoWidth() {
        return largeHeadPhotoWidth;
    }
    public void setLargeHeadPhotoWidth(int largeHeadPhotoWidth) {
        this.largeHeadPhotoWidth = largeHeadPhotoWidth;
    public ImageService getImageService() {
        return imageService;
    }
    public int getLargeHeadPhotoHeight() {
        return largeHeadPhotoHeight;
    public void setImageService(ImageService imageService) {
        this.imageService = imageService;
    }
    public void setLargeHeadPhotoHeight(int largeHeadPhotoHeight) {
        this.largeHeadPhotoHeight = largeHeadPhotoHeight;
    }
    public int getMiddleHeadPhotoWidth() {
        return middleHeadPhotoWidth;
    }
    public void setMiddleHeadPhotoWidth(int middleHeadPhotoWidth) {
        this.middleHeadPhotoWidth = middleHeadPhotoWidth;
    }
    public int getMiddleHeadPhotoHeight() {
        return middleHeadPhotoHeight;
    }
    public void setMiddleHeadPhotoHeight(int middleHeadPhotoHeight) {
        this.middleHeadPhotoHeight = middleHeadPhotoHeight;
    }
    public int getSmallHeadPhotoWidth() {
        return smallHeadPhotoWidth;
    }
    public void setSmallHeadPhotoWidth(int smallHeadPhotoWidth) {
        this.smallHeadPhotoWidth = smallHeadPhotoWidth;
    }
    public int getSmallHeadPhotoHeight() {
        return smallHeadPhotoHeight;
    public KeyWordService getKeyWordService() {
        return keyWordService;
    }
    public void setSmallHeadPhotoHeight(int smallHeadPhotoHeight) {
        this.smallHeadPhotoHeight = smallHeadPhotoHeight;
    public void setKeyWordService(KeyWordService keyWordService) {
        this.keyWordService = keyWordService;
    }
    @Post
@@ -225,63 +117,6 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        return id;
    }
    public void saveOrgLogo(String id, String fn) throws IOException {
        InputStream in = new FileInputStream(new File(this.tmpPath, fn));
        try {
            IoUtil.copy(in, new FileOutputStream(new File(this.orgPath, id + ".jpg")), false, true);
        } finally {
            in.close();
        }
    }
    public void saveDefaultOrgLogo(String id) throws IOException {
        this.initDefaultImage();
        IoUtil.saveStream(new FileOutputStream(new File(this.orgPath, id + ".jpg")), this.dol, true);
    }
    private byte[] zoomImage(byte[] src, int w, int h) throws IOException {
        ByteArrayInputStream in = new ByteArrayInputStream(src);
        ByteArrayOutputStream out = new ByteArrayOutputStream();
        JpgUtil.zoom(in, out, w, h);
        out.flush();
        return out.toByteArray();
    }
    private void initDefaultImage() {
        if (this.dli != null)
            return;
        synchronized (this) {
            if (this.dli != null)
                return;
            try {
                byte[] dd = IoUtil.readStream(new FileInputStream(this.defaultHeadPhoto), true);
                this.dli = this.zoomImage(dd, this.largeHeadPhotoWidth, this.largeHeadPhotoHeight);
                this.dmi = this.zoomImage(dd, this.middleHeadPhotoWidth, this.middleHeadPhotoHeight);
                this.dsi = this.zoomImage(dd, this.smallHeadPhotoWidth, this.smallHeadPhotoHeight);
                this.dol = IoUtil.readStream(new FileInputStream(this.defaultOrgLogo), true);
                this.dsl = IoUtil.readStream(new FileInputStream(this.defaultResourcePhoto), true);
            } catch (IOException e) {
                this.dli = null;
                this.dmi = null;
                this.dsi = null;
                this.dol = null;
                this.dsl = null;
                throw new RuntimeException("init image error", e);
            }
        }
    }
    public boolean hasOrgLogo(String id) {
        String orgPath = this.orgPath+"/"+id+".jpg";
        File file = new File(orgPath);
        if(file.exists()){
            return true;
        }else{
            return false;
        }
    }
    @Path("/entryCheck")
    @Get
    public int entryCheck(@JdbcConn Connection con, String name, String email) throws SQLException {
@@ -405,7 +240,7 @@ public class OrgService extends com.ekexiu.console.service.Upload {
    @Path("/update")
    public void update(@JdbcConn(true) Connection con, Organization orgn, @Nullable String fn,@LoginUser ConsoleAuthUser user) throws SQLException, IOException {
        if (fn != null) {
            this.saveOrgLogo(orgn.getId(), fn);
            this.imageService.saveOrgLogo(orgn.getId(), fn);
        }
        this.orgDao.update(con, orgn);
        OrgRecord orgRecord = this.orgRecordDao.queryById(con, orgn.getId());
@@ -454,7 +289,7 @@ public class OrgService extends com.ekexiu.console.service.Upload {
    public OrganizationInfo query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        OrganizationInfo organizationInfo = this.orgDao.query(con, id);
        if (organizationInfo != null) {
            organizationInfo.setHasOrgLogo(this.hasOrgLogo(organizationInfo.getId()));
            organizationInfo.setHasOrgLogo(this.imageService.hasOrgLogo(organizationInfo.getId()));
        }
        return organizationInfo;
    }
@@ -482,7 +317,7 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        org.setAuthStatus(this.defaultAuthStatus);
        try {
            orgDao.insert(con, org);
            this.saveDefaultOrgLogo(id);
            this.imageService.saveDefaultOrgLogo(id);
        } catch (SQLException e) {
            if ("23505".equals(e.getSQLState())) {
                con.rollback();

src/main/java/com/ekexiu/console/system/service/ProfessorService.java

@@ -135,32 +135,32 @@ public class ProfessorService {
    @Path
    public void update(@JdbcConn(true) Connection con, @RequestBody ProfessorInfo professor) throws SQLException, JfwBaseException, IOException {
        UserDetail userDetail = this.professorDao.queryDetail(con, professor.getId());
        if (!Objects.equals(userDetail.getActiveStatus(), "1")) {
            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);
            if (professor.getResearchAreas() != null && !professor.getResearchAreas().isEmpty()) {
                this.researchAreaService.saveResearchArea(con, professor.getResearchAreas());
        //if (!Objects.equals(userDetail.getActiveStatus(), "1")) {
        if (professor.getOrgName() != null) {
            if (null != this.orgDao.queryByName(con, professor.getOrgName())) {
                professor.setOrgId(this.orgDao.queryByName(con, professor.getOrgName()));
            } else {
                this.researchAreaService.delete(con, professor.getId());
            }
            Professor p = this.professorDao.query(con, professor.getId());
            String subject = p.getSubject();
            if (subject == null) {
                subject = "";
                professor.setOrgId(this.orgService.createOrganization(con, professor.getOrgName()));
            }
            String industry = p.getIndustry();
            if (industry == null)
                industry = "";
            this.keyWordService.refreshProfessor(con, professor.getId(), subject + "," + industry);
        }
        this.professorDao.update(con, professor);
        if (professor.getResearchAreas() != null && !professor.getResearchAreas().isEmpty()) {
            this.researchAreaService.saveResearchArea(con, professor.getResearchAreas());
        } else {
            throw new JfwBaseException(50000, "只能修改未激活用户信息");
            this.researchAreaService.delete(con, professor.getId());
        }
        Professor p = this.professorDao.query(con, professor.getId());
        String subject = p.getSubject();
        if (subject == null) {
            subject = "";
        }
        String industry = p.getIndustry();
        if (industry == null)
            industry = "";
        this.keyWordService.refreshProfessor(con, professor.getId(), subject + "," + industry);
        //} else {
        //    throw new JfwBaseException(50000, "只能修改未激活用户信息");
        //}
    }
    @Get

src/main/java/com/ekexiu/console/system/service/TemplateService.java

@@ -0,0 +1,107 @@
package com.ekexiu.console.system.service;
import freemarker.cache.TemplateLoader;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import freemarker.template.TemplateExceptionHandler;
import org.jfw.apt.annotation.Bean;
import org.jfw.util.ConstData;
import java.io.*;
import java.util.Map;
/**
 * Created by TT on 2017/8/24.
 */
@Bean
public class TemplateService {
    private File source;
    private Configuration cfg = new Configuration(Configuration.VERSION_2_3_26);
    public Configuration getCfg() {
        return cfg;
    }
    public void setSource(File source) {
        this.source = source;
        try {
            this.cfg.setDirectoryForTemplateLoading(source);
        } catch (IOException e) {
            this.source = null;
            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");
                    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 {
                }
            });
        }
        cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
    }
    public void genCnt(Configuration cfg,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 = cfg.getTemplate(templateName,"UTF-8");
        OutputStream out = new FileOutputStream(dest);
        try {
            template.process(root, new OutputStreamWriter(out, ConstData.UTF8));
            out.flush();
        } finally {
            out.close();
        }
    }
    public static void main(String[] args) {
        //BannerService templateService = new BannerService();
        ////templateService.setSource(new File("D:/tmp/banner"));
        //StringTemplateLoader stringLoader = new StringTemplateLoader();
        //stringLoader.putTemplate("slideTab",templatePc);
        //stringLoader.putTemplate("appfound",templateApp);
        //templateService.cfg.setTemplateLoader(stringLoader);
        //ArrayList<Banner> banners = new ArrayList<>();
        //ArrayList<Integer> ids = new ArrayList<>();
        //ids.add(30);
        //ids.add(20);
        //ids.add(10);
        //ids.add(50);
        //ids.add(60);
        //for (int i=0;i<5;i++) {
        //    Banner b = new Banner();
        //    b.setId(String.valueOf(ids.get(i)));
        //    b.setImage("image"+i);
        //    b.setBanner("banner"+i);
        //    b.setTitle("title"+i);
        //    banners.add(b);
        //}
        //Map<String, Object> root = new HashMap<String, Object>();
        //root.put("banner", banners);
        //try {
        //    templateService.genCnt("slideTab",new File("D:/tmp/banner/generate.html"),root);
        //    templateService.genCnt("appfound",new File("D:/tmp/banner/generateApp.html"),root);
        //} catch (IOException | TemplateException e) {
        //    e.printStackTrace();
        //}
    }
}

src/main/java/com/ekexiu/console/system/service/TestService.java

@@ -44,4 +44,22 @@ public class TestService {
		}
		
	}
	//private TestService(int i) {
	//	this.anInt = i;
	//}
	//
	//public static TestService build(int i) {
	//	return new TestService(i);
	//}
	//
	//public int getAnInt() {
	//	return anInt;
	//}
	//
	//public static void main(String[] args) {
	//	TestService testService = TestService.build(10);
	//	int i = testService.getAnInt();
	//	System.out.println(i);
	//}
}

src/main/resources/database.sql

@@ -59,4 +59,37 @@ ALTER TABLE article ADD COLUMN sort_num  int8 default 0 not null;
COMMENT ON COLUMN article.sort_num IS '排序字段，人工权重';
ALTER TABLE resource ADD COLUMN sort_num  int8 default 0 not null;
COMMENT ON COLUMN resource.sort_num IS '排序字段，人工权重';
COMMENT ON COLUMN resource.sort_num IS '排序字段，人工权重';
-----begin version 1.9.2------------------------
-- ------------------------------------
-- Table structure for discover_banner
-- ------------------------------------
CREATE TABLE discover_banner (
  id bigserial PRIMARY KEY NOT NULL, -- 编号id
  title CHARACTER VARYING(50) NOT NULL, -- 外显标题
  banner SMALLINT NOT NULL, -- 栏目
  begin_time CHARACTER(14), -- 上架时间
  end_time CHARACTER(14), -- 下架时间
  clicks BIGINT NOT NULL DEFAULT 0, -- 点击量
  descp TEXT, -- 备注
  article_id CHARACTER(32) NOT NULL, -- 文章ID
  modify_time CHARACTER(14) NOT NULL, -- 修改时间
  modifier CHARACTER VARYING(32), -- 最后修改人ID
  create_time CHARACTER(14) NOT NULL, -- 创建时间
  creator CHARACTER VARYING(32) NOT NULL -- 创建人ID
);
COMMENT ON COLUMN discover_banner.id IS '编号id';
COMMENT ON COLUMN discover_banner.title IS '外显标题';
COMMENT ON COLUMN discover_banner.banner IS '栏目';
COMMENT ON COLUMN discover_banner.begin_time IS '上架时间';
COMMENT ON COLUMN discover_banner.end_time IS '下架时间';
COMMENT ON COLUMN discover_banner.clicks IS '点击量';
COMMENT ON COLUMN discover_banner.descp IS '备注';
COMMENT ON COLUMN discover_banner.article_id IS '文章ID';
COMMENT ON COLUMN discover_banner.modify_time IS '修改时间';
COMMENT ON COLUMN discover_banner.modifier IS '最后修改人ID';
COMMENT ON COLUMN discover_banner.create_time IS '创建时间';
COMMENT ON COLUMN discover_banner.creator IS '创建人ID';

src/main/resources/project-dev.properties

@@ -35,26 +35,26 @@ dataSource.defaultAutoCommit::boolean=false
#com_ekexiu_console_system_service_UserService.path::java.io.File=D:/tmp/data
#com_ekexiu_console_system_service_OrgService.tmpPath::java.io.File=D:/tmp/data/images/tmp
#com_ekexiu_console_system_service_OrgService.imagePath::java.io.File=D:/tmp/data/images
#com_ekexiu_console_system_service_ImageService.tmpPath::java.io.File=D:/tmp/data/images/tmp
#com_ekexiu_console_system_service_ImageService.imagePath::java.io.File=D:/tmp/data/images
#cachedFileUploadServlet.cachePath::java.io.File=D:/tmp/data/images/tmp
#com_ekexiu_console_system_service_OrgService.defaultHeadPhoto::java.io.File=D:/tmp/data/images/default-icon.jpg
#com_ekexiu_console_system_service_ImageService.defaultHeadPhoto::java.io.File=D:/tmp/data/images/default-icon.jpg
##机构默认图片保存路径
#com_ekexiu_console_system_service_OrgService.defaultOrgLogo::java.io.File=D:/tmp/data/images/default-icon.jpg
#com_ekexiu_console_system_service_ImageService.defaultOrgLogo::java.io.File=D:/tmp/data/images/default-icon.jpg
##资源默认图片保存路径
#com_ekexiu_console_system_service_OrgService.defaultResourcePhoto::java.io.File=D:/tmp/data/images/default-icon.jpg
#com_ekexiu_console_system_service_ImageService.defaultResourcePhoto::java.io.File=D:/tmp/data/images/default-icon.jpg
com_ekexiu_console_system_service_OrgService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
com_ekexiu_console_system_service_OrgService.imagePath::java.io.File=/kexiu/www/html/images
com_ekexiu_console_system_service_ImageService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
com_ekexiu_console_system_service_ImageService.imagePath::java.io.File=/kexiu/www/html/images
cachedFileUploadServlet.cachePath::java.io.File=/kexiu/www/html/images/tmp
#用户默认头像保存路径
com_ekexiu_console_system_service_OrgService.defaultHeadPhoto::java.io.File=/kexiu/www/html/images/default-photo.jpg
com_ekexiu_console_system_service_ImageService.defaultHeadPhoto::java.io.File=/kexiu/www/html/images/default-photo.jpg
#机构默认图片保存路径
com_ekexiu_console_system_service_OrgService.defaultOrgLogo::java.io.File=/kexiu/www/html/images/default-icon.jpg
com_ekexiu_console_system_service_ImageService.defaultOrgLogo::java.io.File=/kexiu/www/html/images/default-icon.jpg
#资源默认图片保存路径
com_ekexiu_console_system_service_OrgService.defaultResourcePhoto::java.io.File=/kexiu/www/html/images/default-icon.jpg
com_ekexiu_console_system_service_ImageService.defaultResourcePhoto::java.io.File=/kexiu/www/html/images/default-icon.jpg
@@ -95,3 +95,5 @@ mailService_Map.map-val-2::java.lang.String=true
com_ekexiu_console_system_service_OrgService.defaultOrgType=1
#com_ekexiu_console_system_service_DiscoverBannerService.generatePath::java.io.File=D:/tmp/data
com_ekexiu_console_system_service_DiscoverBannerService.generatePath::java.io.File=/kexiu/webdata/data/inc

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

@@ -30,14 +30,14 @@ dataSource.maxPoolPreparedStatementPerConnectionSize::int=20
#默认的SQL语句自动提交状态(开启或关闭)设置由连接池本身设置(false由连接池定)
dataSource.defaultAutoCommit::boolean=false
com_ekexiu_console_system_service_OrgService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
com_ekexiu_console_system_service_OrgService.imagePath::java.io.File=/kexiu/www/html/images
com_ekexiu_console_system_service_ImageService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
com_ekexiu_console_system_service_ImageService.imagePath::java.io.File=/kexiu/www/html/images
#用户默认头像保存路径
com_ekexiu_console_system_service_OrgService.defaultHeadPhoto::java.io.File=/kexiu/www/html/images/default-photo.jpg
com_ekexiu_console_system_service_ImageService.defaultHeadPhoto::java.io.File=/kexiu/www/html/images/default-photo.jpg
#机构默认图片保存路径
com_ekexiu_console_system_service_OrgService.defaultOrgLogo::java.io.File=/kexiu/www/html/images/default-icon.jpg
com_ekexiu_console_system_service_ImageService.defaultOrgLogo::java.io.File=/kexiu/www/html/images/default-icon.jpg
#资源默认图片保存路径
com_ekexiu_console_system_service_OrgService.defaultResourcePhoto::java.io.File=/kexiu/www/html/images/default-icon.jpg
com_ekexiu_console_system_service_ImageService.defaultResourcePhoto::java.io.File=/kexiu/www/html/images/default-icon.jpg
cachedFileUploadServlet=org.jfw.web.servlet.fileupload.cached.CachedUploadServletConfig
cachedFileUploadServlet.cacheByMemory::boolean=false
@@ -76,3 +76,5 @@ mailService_Map.map-key-2::java.lang.String=mail.smtp.auth
mailService_Map.map-val-2::java.lang.String=true
com_ekexiu_console_system_service_OrgService.defaultOrgType=1
com_ekexiu_console_system_service_DiscoverBannerService.generatePath::java.io.File=/kexiu/webdata/data/inc

src/main/resources/project-test.properties

@@ -30,14 +30,14 @@ dataSource.maxPoolPreparedStatementPerConnectionSize::int=20
#默认的SQL语句自动提交状态(开启或关闭)设置由连接池本身设置(false由连接池定)
dataSource.defaultAutoCommit::boolean=false
com_ekexiu_console_system_service_OrgService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
com_ekexiu_console_system_service_OrgService.imagePath::java.io.File=/kexiu/www/html/images
com_ekexiu_console_system_service_ImageService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
com_ekexiu_console_system_service_ImageService.imagePath::java.io.File=/kexiu/www/html/images
#用户默认头像保存路径
com_ekexiu_console_system_service_OrgService.defaultHeadPhoto::java.io.File=/kexiu/www/html/images/default-photo.jpg
com_ekexiu_console_system_service_ImageService.defaultHeadPhoto::java.io.File=/kexiu/www/html/images/default-photo.jpg
#机构默认图片保存路径
com_ekexiu_console_system_service_OrgService.defaultOrgLogo::java.io.File=/kexiu/www/html/images/default-icon.jpg
com_ekexiu_console_system_service_ImageService.defaultOrgLogo::java.io.File=/kexiu/www/html/images/default-icon.jpg
#资源默认图片保存路径
com_ekexiu_console_system_service_OrgService.defaultResourcePhoto::java.io.File=/kexiu/www/html/images/default-icon.jpg
com_ekexiu_console_system_service_ImageService.defaultResourcePhoto::java.io.File=/kexiu/www/html/images/default-icon.jpg
cachedFileUploadServlet=org.jfw.web.servlet.fileupload.cached.CachedUploadServletConfig
cachedFileUploadServlet.cacheByMemory::boolean=false
@@ -75,4 +75,6 @@ mailService_Map.map-val-1::java.lang.String=smtp
mailService_Map.map-key-2::java.lang.String=mail.smtp.auth
mailService_Map.map-val-2::java.lang.String=true
com_ekexiu_console_system_service_OrgService.defaultOrgType=1
com_ekexiu_console_system_service_OrgService.defaultOrgType=1
com_ekexiu_console_system_service_DiscoverBannerService.generatePath::java.io.File=/kexiu/webdata/data/inc

src/main/resources/project.properties

@@ -30,15 +30,15 @@ dataSource.maxPoolPreparedStatementPerConnectionSize::int=20
#默认的SQL语句自动提交状态(开启或关闭)设置由连接池本身设置(false由连接池定)
dataSource.defaultAutoCommit::boolean=false
com_ekexiu_console_system_service_OrgService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
com_ekexiu_console_system_service_OrgService.imagePath::java.io.File=/kexiu/www/html/images
com_ekexiu_console_system_service_ImageService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
com_ekexiu_console_system_service_ImageService.imagePath::java.io.File=/kexiu/www/html/images
#用户默认头像保存路径
com_ekexiu_console_system_service_OrgService.defaultHeadPhoto::java.io.File=/kexiu/www/html/images/default-photo.jpg
com_ekexiu_console_system_service_ImageService.defaultHeadPhoto::java.io.File=/kexiu/www/html/images/default-photo.jpg
#机构默认图片保存路径
com_ekexiu_console_system_service_OrgService.defaultOrgLogo::java.io.File=/kexiu/www/html/images/default-icon.jpg
com_ekexiu_console_system_service_ImageService.defaultOrgLogo::java.io.File=/kexiu/www/html/images/default-icon.jpg
#资源默认图片保存路径
com_ekexiu_console_system_service_OrgService.defaultResourcePhoto::java.io.File=/kexiu/www/html/images/default-icon.jpg
com_ekexiu_console_system_service_ImageService.defaultResourcePhoto::java.io.File=/kexiu/www/html/images/default-icon.jpg
cachedFileUploadServlet=org.jfw.web.servlet.fileupload.cached.CachedUploadServletConfig
cachedFileUploadServlet.cacheByMemory::boolean=false
@@ -77,4 +77,6 @@ mailService_Map.map-val-1::java.lang.String=smtp
mailService_Map.map-key-2::java.lang.String=mail.smtp.auth
mailService_Map.map-val-2::java.lang.String=true
com_ekexiu_console_system_service_OrgService.defaultOrgType=1
com_ekexiu_console_system_service_OrgService.defaultOrgType=1
com_ekexiu_console_system_service_DiscoverBannerService.generatePath::java.io.File=/kexiu/webdata/data/inc