up：5.3.5

Signed-off-by: mingsoft <killfen@126.com>

src/main/java/net/mingsoft/MSApplication.java

@@ -19,6 +19,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+
+
 package net.mingsoft;
 
 import org.mybatis.spring.annotation.MapperScan;

src/main/java/net/mingsoft/MSServletInitializer.java

@@ -19,6 +19,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+
+
 package net.mingsoft;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/net/mingsoft/cms/action/web/MCmsAction.java

@@ -224,8 +224,8 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
             }
         });
 
-        //查询数量
+        //查询数量 站群会自动拼appId区分
-        int count = contentBiz.getSearchCount(contentModel, fieldValueList, searchMap, BasicUtil.getApp().getAppId(), categoryIds);
+        int count = contentBiz.getSearchCount(contentModel, fieldValueList, searchMap, categoryIds);
         page.setRcount(count);
         params.put("search", searchMap);
 

src/main/java/net/mingsoft/cms/biz/IContentBiz.java

@@ -61,11 +61,10 @@ public interface IContentBiz extends IBaseBiz<ContentEntity> {
      * @param contentModel 文章模型，
      * @param diyList 扩展模型字段 List<Map> key:自定义模型字段:值
      * @param whereMap 条件
-     * @param websiteId 站点编号
      * @param categoryIds 栏目编号集合 格式：1,2,3
      * @return
      */
-    int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, String websiteId, String categoryIds);
+    int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, String categoryIds);
     /**
      * 根据文章属性查询,不包括单篇
      * @param contentBean

src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java

@@ -94,11 +94,11 @@ public class ContentBizImpl  extends BaseBizImpl<IContentDao, ContentEntity> imp
 	}
 
 	@Override
-	public int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, String appId, String categoryIds) {
+	public int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, String categoryIds) {
 		if (contentModel!=null) {
-			return contentDao.getSearchCount(contentModel.getModelTableName(),diyList,whereMap, appId,categoryIds);
+			return contentDao.getSearchCount(contentModel.getModelTableName(),diyList,whereMap, categoryIds);
 		}
-		return contentDao.getSearchCount(null,null,whereMap, appId,categoryIds);
+		return contentDao.getSearchCount(null,null,whereMap, categoryIds);
 	}
 
 	@Override

src/main/java/net/mingsoft/cms/dao/IContentDao.java

@@ -20,6 +20,8 @@
  */
 
 
+
+
 package net.mingsoft.cms.dao;
 
 import net.mingsoft.base.dao.IBaseDao;
@@ -70,12 +72,11 @@ public interface IContentDao extends IBaseDao<ContentEntity> {
      * @param map
      *            key:字段名 value:List 字段的各种判断值 list[0]:是否为自定义字段 list[1]:是否为整形
      *            list[2]:是否是等值查询 list[3]:字段的值
-     * @param appId 站点id
      * @param categoryIds 栏目id集合
      * @return 文章实体总数
      */
     int getSearchCount(@Param("tableName") String tableName, @Param("diyList") List diyList, @Param("map") Map<String, Object> map,
-                       @Param("appId") String appId, @Param("categoryIds") String categoryIds);
+                        @Param("categoryIds") String categoryIds);
 
     /**
      * 分类编号删除文章

src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties

@@ -35,5 +35,5 @@ category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
 content.keyword=\u5173\u952E\u5B57
 template.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6
 category.pinyin=\u62FC\u97F3
-datetime.format=时间格式
+datetime.format=\u65F6\u95F4\u683C\u5F0F
 

src/main/webapp/WEB-INF/manager/cms/category/index.ftl

@@ -42,7 +42,7 @@
                     </el-popover>
                 </template>
                 <template slot-scope="scope">
-                    <span style="cursor: pointer" class="copyBtn cell-tooltip "  :data-clipboard-text="scope.row.id"
+                    <span style="cursor: pointer" class="copyBtn" :data-clipboard-text="scope.row.id"
                           @click="copyContent(true)">{{scope.row.id}}</span>
                 </template>
             </el-table-column>
@@ -354,8 +354,3 @@
         }
     });
 </script>
-<style scoped>
-    .el-table .cell.el-tooltip {
-        width: 100px;
-    }
-</style>

src/main/webapp/static/css/app.css

@@ -84,7 +84,7 @@ html *, body * {
 /*搜索*/
 .ms-search{
     background: #fff;
-    padding: 10px 14px 0 14px;
+    padding: 10px 10px 0 10px;
     border-bottom: 1px dashed #ebeef5;
 }
 .ms-search .ms-search-footer{