Home Explore Help
Register Sign In
usoft
/
usoftchina-jpress
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/uuhelper' into uuhelper/01

hangb 8 years ago
parent
6492a8ae05 03971ae60b
commit
0e8efbce1c
3 changed files with 66 additions and 21 deletions
Split View Show Diff Stats
  1. 14 15
      jpress-model/src/main/java/io/jpress/model/Content.java
  2. 20 4
      jpress-model/src/main/java/io/jpress/model/base/BaseComment.java
  3. 32 2
      jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/content_uuhelper.html

+ 14 - 15
jpress-model/src/main/java/io/jpress/model/Content.java
View File 

@@ -15,28 +15,15 @@
 
  */
 
 package io.jpress.model;
 
 
-import java.io.File;
 
-import java.math.BigInteger;
 
-import java.util.ArrayList;
 
-import java.util.HashSet;
 
-import java.util.List;
 
-import java.util.Set;
 
-
 
 import com.jfinal.core.JFinal;
 
 import com.jfinal.kit.PathKit;
 
 import com.jfinal.plugin.ehcache.CacheKit;
 
 import com.jfinal.plugin.ehcache.IDataLoader;
 
-
 
 import io.jpress.Consts;
 
 import io.jpress.model.ModelSorter.ISortModel;
 
 import io.jpress.model.base.BaseContent;
 
 import io.jpress.model.core.Table;
 
-import io.jpress.model.query.CommentQuery;
 
-import io.jpress.model.query.ContentQuery;
 
-import io.jpress.model.query.MappingQuery;
 
-import io.jpress.model.query.MetaDataQuery;
 
-import io.jpress.model.query.TaxonomyQuery;
 
-import io.jpress.model.query.UserQuery;
 
+import io.jpress.model.query.*;
 
 import io.jpress.model.router.ContentRouter;
 
 import io.jpress.model.router.PageRouter;
 
 import io.jpress.template.TemplateManager;
 
@@ -44,6 +31,13 @@ import io.jpress.template.Thumbnail;
 
 import io.jpress.utils.JsoupUtils;
 
 import io.jpress.utils.StringUtils;
 
 
+import java.io.File;
 
+import java.math.BigInteger;
 
+import java.util.ArrayList;
 
+import java.util.HashSet;
 
+import java.util.List;
 
+import java.util.Set;
 
+
 
 @Table(tableName = "content", primaryKey = "id")
 
 public class Content extends BaseContent<Content> implements ISortModel<Content> {
 
 
@@ -441,7 +435,12 @@ public class Content extends BaseContent<Content> implements ISortModel<Content>
 
 	public String getSummary() {
 
 		String summary = super.getSummary();
 
 		if (StringUtils.isBlank(summary)) {
 
-			summary = summaryWithLen(100);
 
+			//uu软文摘要不填默认截取前54个字
 
+			if ("uuhelper".equals(super.getModule())) {
 
+				summary = summaryWithLen(54);
 
+			} else {
 
+				summary = summaryWithLen(100);
 
+			}
 
 		}
 
 		return summary;
 
 	}

+ 20 - 4
jpress-model/src/main/java/io/jpress/model/base/BaseComment.java
View File 

@@ -15,15 +15,15 @@
 
  */
 
 package io.jpress.model.base;
 
 
+import com.jfinal.plugin.activerecord.IBean;
 
+import com.jfinal.plugin.ehcache.CacheKit;
 
+import com.jfinal.plugin.ehcache.IDataLoader;
 
 import io.jpress.message.MessageKit;
 
 import io.jpress.model.Metadata;
 
 import io.jpress.model.core.JModel;
 
 import io.jpress.model.query.MetaDataQuery;
 
-import java.math.BigInteger;
 
 
-import com.jfinal.plugin.activerecord.IBean;
 
-import com.jfinal.plugin.ehcache.CacheKit;
 
-import com.jfinal.plugin.ehcache.IDataLoader;
 
+import java.math.BigInteger;
 
 
 /**
 
  *  Auto generated by JPress, do not modify this file.
 
@@ -300,4 +300,20 @@ public abstract class BaseComment<M extends BaseComment<M>> extends JModel<M> im
 
 		return get("lng");
 
 	}
 
 
+	public void setUuUserId(java.math.BigInteger uuUserId) {
 
+		set("uu_user_id", uuUserId);
 
+	}
 
+
 
+	public java.math.BigInteger getUuUserId() {
 
+		return get("uu_user_id");
 
+	}
 
+
 
+    public void setUuUserAvatar(java.lang.String uuUserAvatar) {
 
+        set("uu_user_avatar", uuUserAvatar);
 
+    }
 
+
 
+    public java.lang.String getUuUserAvatar() {
 
+        return get("uu_user_avatar");
 
+    }
 
+
 
 }

+ 32 - 2
jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/content_uuhelper.html
View File 

@@ -4,6 +4,7 @@
 
 <head lang="en">
 
     <meta charset="UTF-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0,maximum-scale=1.0, user-scalable=no">
 
+    <script type="text/javascript" src="${CTPATH}/assets/js/jquery.min.js"></script>
 
     <title></title>
 
     <style>
 
         .main{
 
@@ -168,6 +169,7 @@
 
             <div><span>${(content.getMetadataByKey("push_time"))!}</span><span>${content.author!}</span></div>
 
         </div>
 
         <div class="section">
 
+            ${content.text!}
 
             <!--&lt;!&ndash;音频&ndash;&gt;-->
 
             <!--<div class="audio">-->
 
                 <!--<audio controls="controls">-->
 
@@ -185,7 +187,7 @@
 
                 <!--</video>-->
 
             <!--</div>-->
 
             <!--文本-->
 
-            <p>${content.text!}</p>
 
+            <!--<p></p>-->
 
             <div class="readCount"><div><span>阅读 <em>${content.view_count!'0'}</em></span><span><i class="fa fa-thumbs-up"></i><em>${content.vote_up!'0'}</em></span></div><p>${(content.getMetadataByKey("copy_right"))!}</p></div>
 
         </div>
 
         <div class="footer">
 
@@ -252,6 +254,34 @@
 
 </div>
 
 </body>
 
 <script>
 
-    $('html').css('fontSize',$(window).width()/640 * 30);
 
+    jQuery('html').css('fontSize',$(window).width()/640 * 30);
 
+    jQuery(window).load(function () {
 
+        jQuery("img").each(function () {
 
+            DrawImage(this, 100, 100);
 
+        });
 
+    });
 
+    function DrawImage(ImgD, FitWidth, FitHeight) {
 
+        var image = new Image();
 
+        image.src = ImgD.src;
 
+        if (image.width > 0 && image.height > 0) {
 
+            if (image.width / image.height >= FitWidth / FitHeight) {
 
+                if (image.width > FitWidth) {
 
+                    ImgD.width = FitWidth;
 
+                    ImgD.height = (image.height * FitWidth) / image.width;
 
+                } else {
 
+                    ImgD.width = image.width;
 
+                    ImgD.height = image.height;
 
+                }
 
+            } else {
 
+                if (image.height > FitHeight) {
 
+                    ImgD.height = FitHeight;
 
+                    ImgD.width = (image.width * FitHeight) / image.height;
 
+                } else {
 
+                    ImgD.width = image.width;
 
+                    ImgD.height = image.height;
 
+                }
 
+            }
 
+        }
 
+    }
 
 </script>
 
 </html>