fix：待发布版本

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

src/main/java/net/mingsoft/cms/action/CategoryAction.java

@@ -7,10 +7,10 @@
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
-
+ * <p>
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
-
+ * <p>
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@
 package net.mingsoft.cms.action;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -89,7 +90,7 @@ public class CategoryAction extends BaseAction {
     @ResponseBody
     public ResultData list(@ModelAttribute @ApiIgnore CategoryEntity category) {
         BasicUtil.startPage();
-		List categoryList = categoryBiz.query(category);
+        List categoryList = categoryBiz.list(new LambdaQueryWrapper<CategoryEntity>(category));
         return ResultData.build().success(new EUListBean(categoryList, (int) BasicUtil.endPage(categoryList).getTotal()));
     }
 
@@ -122,7 +123,6 @@ public class CategoryAction extends BaseAction {
     }
 
 
-
     /**
      * 保存分类
      * @param category 分类实体
@@ -171,6 +171,9 @@ public class CategoryAction extends BaseAction {
         }
         //判断拼音是否重复
         if (StrUtil.isNotBlank(category.getCategoryPinyin())) {
+            if (!category.getCategoryPinyin().matches("^[a-zA-Z0-9]*$")){
+                return ResultData.build().error(this.getResString("err.format"));
+            }
             CategoryEntity _category = new CategoryEntity();
             _category.setCategoryPinyin(category.getCategoryPinyin());
             List<CategoryEntity> query = categoryBiz.query(_category);
@@ -253,6 +256,9 @@ public class CategoryAction extends BaseAction {
         }
         //判断拼音是否重复并且是否和原拼音相同
         if (StrUtil.isNotBlank(category.getCategoryPinyin()) && !categoryBiz.getById(category.getId()).getCategoryPinyin().equals(category.getCategoryPinyin())) {
+            if (!category.getCategoryPinyin().matches("^[a-zA-Z0-9]*$")){
+                return ResultData.build().error(this.getResString("err.format"));
+            }
             CategoryEntity _category = new CategoryEntity();
             _category.setCategoryPinyin(category.getCategoryPinyin());
             List<CategoryEntity> query = categoryBiz.query(_category);

src/main/java/net/mingsoft/cms/entity/CategoryEntity.java

@@ -7,10 +7,10 @@
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
-
+ * <p>
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
-
+ * <p>
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -24,6 +24,11 @@ package net.mingsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import net.mingsoft.base.entity.BaseEntity;
+import net.mingsoft.basic.util.BasicUtil;
+import net.mingsoft.config.MSProperties;
+import net.mingsoft.mdiy.util.ConfigUtil;
+
+import java.io.File;
 
 /**
  * 分类实体
@@ -131,6 +136,21 @@ public class CategoryEntity extends BaseEntity {
      */
     private String topId;
 
+    /**
+     * 路径url
+     */
+    @TableField(exist = false)
+    private String url;
+
+    /**
+     * 设置url路径
+     *
+     * @param url 路径的字符串
+     */
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
     public Boolean getLeaf() {
         return leaf;
     }
@@ -419,7 +439,8 @@ public class CategoryEntity extends BaseEntity {
      * 获取栏目Id（标签使用）
      */
     public Boolean getTypeleaf() {
-        return this.leaf; }
+        return this.leaf;
+    }
 
 
     /**
@@ -431,6 +452,7 @@ public class CategoryEntity extends BaseEntity {
 
     @TableField(exist = false)
     private String typepath;
+
     /**
      * 获取栏目图片 (标签使用）
      */
@@ -462,4 +484,22 @@ public class CategoryEntity extends BaseEntity {
         this.childsize = childsize;
     }
 
+    /**
+     * 获取url路径
+     *
+     * @return url路径的字符串
+     */
+    public String getUrl() {
+        String appDir = "";
+        String htmlDir = MSProperties.diy.htmlDir;
+        String categoryPath = this.getCategoryPath();
+        String categoryPinyin = this.getCategoryPinyin();
+        if (!(ConfigUtil.getBoolean("短链配置", "shortLinkSwitch", false))) {
+            //未开启短链
+            appDir = "/" + BasicUtil.getApp().getAppDir();
+            return url = "/" + htmlDir + appDir + categoryPath + "/index.html";
+        }
+        //开启短链后的url拼接
+        return url = "/" + htmlDir + appDir + "/" + categoryPinyin + ".html";
+    }
 }

src/main/java/net/mingsoft/config/WebConfig.java

@@ -132,7 +132,8 @@ public class WebConfig implements WebMvcConfigurer {
     @Bean
     public FilterRegistrationBean xssFilterRegistration(@Value("${ms.xss.enable:true}") boolean xssEnable,
                                                         @Value("${ms.xss.filter-url}") String filterUrl,
-                                                        @Value("${ms.xss.exclude-url}") String excludeUrl) {
+                                                        @Value("${ms.xss.exclude-url}") String excludeUrl,
+                                                        @Value("${ms.xss.exclude-filed}") String excludeFiled) {
         XSSEscapeFilter xssFilter = new XSSEscapeFilter();
         Map<String, String> initParameters = new HashMap();
         FilterRegistrationBean registration = new FilterRegistrationBean();
@@ -149,6 +150,9 @@ public class WebConfig implements WebMvcConfigurer {
         }else {
             xssFilter.excludes.add(MSProperties.manager.path + "/**");
         }
+        if (excludeFiled != null && StrUtil.isNotBlank(excludeFiled)) {
+            xssFilter.excludesFiled.addAll(Arrays.asList(excludeFiled.split(",")));
+        }
         initParameters.put("isIncludeRichText", "false");
         registration.setInitParameters(initParameters);
         registration.setFilter(xssFilter);

src/main/webapp/template/1/default/news-detail.htm

@@ -92,7 +92,6 @@
             },
         },
         created() {
-            this.likeTotal()
         }
     })
 </script>