diff --git a/README.md b/README.md index 42dbaf01c349121171c238da0d2c2ee814a71b81..f2b6777813e0d3d37f764ec37e92445abaca3fd9 100644 --- a/README.md +++ b/README.md @@ -191,6 +191,8 @@ wget https://gitee.com/JPressProjects/jpress/raw/master/install.sh && bash insta - 4、在开发工具，右键运行 `starter/src/main/java/io.jpress.Starter` 下的 `main()` 方法 - 5、通过浏览器访问 `http://127.0.0.1:8080`，进行自动安装 +> Press下载、导入、运行视频教程，链接: https://pan.baidu.com/s/1bqbQ9_HjF95EW4qrQvOSag 提取码: 5jw8 + > 可能遇到的问题： > diff --git a/doc/images/jpress-wechat-group.png b/doc/images/jpress-wechat-group.png old mode 100755 new mode 100644 index 82c2c8ef1006a4477453161cc053001f4ef92488..d8d83edb27fd4345d9082c9460d7a8a948f9d6ec Binary files a/doc/images/jpress-wechat-group.png and b/doc/images/jpress-wechat-group.png differ diff --git a/jpress-commons/src/main/java/io/jpress/JPressConsts.java b/jpress-commons/src/main/java/io/jpress/JPressConsts.java index de5c96b1c958ac5efed70d9bc06806c4b9f3bfd1..749b770c4660169cfb3fb461b9e14daeda2ae2ea 100644 --- a/jpress-commons/src/main/java/io/jpress/JPressConsts.java +++ b/jpress-commons/src/main/java/io/jpress/JPressConsts.java @@ -23,7 +23,7 @@ package io.jpress; */ public class JPressConsts { - public static final String VERSION = "v3.2.5"; + public static final String VERSION = "v3.3.0"; public static final String VERSION_CODE = "25"; /** diff --git a/jpress-commons/src/main/java/io/jpress/commons/utils/JPressJson.java b/jpress-commons/src/main/java/io/jpress/commons/utils/JPressJson.java index 0f156ea923134df5826d5a22cf0abf9709734df2..3b040da2955e177dcaf499559cb69c858e7e1de5 100644 --- a/jpress-commons/src/main/java/io/jpress/commons/utils/JPressJson.java +++ b/jpress-commons/src/main/java/io/jpress/commons/utils/JPressJson.java @@ -17,7 +17,7 @@ package io.jpress.commons.utils; import com.google.common.collect.Lists; import io.jboot.utils.StrUtil; -import io.jboot.web.JbootJson; +import io.jboot.web.json.JbootJson; import io.jpress.JPressOptions; import java.util.Iterator; diff --git a/jpress-core/src/main/java/io/jpress/core/addon/AddonManager.java b/jpress-core/src/main/java/io/jpress/core/addon/AddonManager.java index 47172acd43c6bc0db0e48fe0e6bcc95c618cd9bd..3986b0190c4465980c046833ffbcb9ffbbe13caf 100644 --- a/jpress-core/src/main/java/io/jpress/core/addon/AddonManager.java +++ b/jpress-core/src/main/java/io/jpress/core/addon/AddonManager.java @@ -33,6 +33,7 @@ import com.jfinal.template.expr.ast.MethodKit; import io.jboot.Jboot; import io.jboot.aop.InterceptorBuilder; import io.jboot.aop.InterceptorBuilderManager; +import io.jboot.aop.InterceptorCache; import io.jboot.aop.cglib.JbootCglibProxyFactory; import io.jboot.components.event.JbootEvent; import io.jboot.components.event.JbootEventListener; @@ -777,7 +778,7 @@ public class AddonManager implements JbootEventListener { List builders = InterceptorBuilderManager.me().getInterceptorBuilders(); builders.removeIf(interceptorBuilder -> interceptorBuilder.getClass() == c); } - JbootCglibProxyFactory.IntersCache.clear(); + InterceptorCache.clear(); } } diff --git a/jpress-core/src/main/java/io/jpress/core/addon/controller/AddonControllerManager.java b/jpress-core/src/main/java/io/jpress/core/addon/controller/AddonControllerManager.java index 79f9845ca34ab02356d6d7a613157a7938fd6493..7ec51e17f0a047ed92a855a2a55ea80599e55d6f 100644 --- a/jpress-core/src/main/java/io/jpress/core/addon/controller/AddonControllerManager.java +++ b/jpress-core/src/main/java/io/jpress/core/addon/controller/AddonControllerManager.java @@ -87,8 +87,8 @@ public class AddonControllerManager { return; } - addonRoutes.getRouteItemList().removeIf(route -> route.getControllerKey().equals(value)); - Routes.getControllerKeySet().removeIf(actionKey -> Objects.equals(actionKey, value)); + addonRoutes.getRouteItemList().removeIf(route -> route.getControllerPath().equals(value)); +// Routes.getControllerKeySet().removeIf(actionKey -> Objects.equals(actionKey, value)); controllerAddonMapping.remove(c); } diff --git a/jpress-core/src/main/java/io/jpress/web/interceptor/UTMInterceptor.java b/jpress-core/src/main/java/io/jpress/web/interceptor/UTMInterceptor.java index c38382cf2ef1790ef51dfade5d77492c9734b709..f2c1cead8a9f0f8be0b0fd234bc159ab7e5cba61 100644 --- a/jpress-core/src/main/java/io/jpress/web/interceptor/UTMInterceptor.java +++ b/jpress-core/src/main/java/io/jpress/web/interceptor/UTMInterceptor.java @@ -19,6 +19,7 @@ import com.jfinal.aop.Inject; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; +import io.jboot.support.jwt.JwtManager; import io.jboot.utils.CookieUtil; import io.jboot.utils.RequestUtil; import io.jboot.utils.StrUtil; @@ -70,9 +71,11 @@ public class UTMInterceptor implements Interceptor { */ else if (controller instanceof JbootController) { JbootController c = (JbootController) controller; - Number userId = c.getJwtPara(JPressConsts.JWT_USERID); - if (userId != null) { - utm.setUserId(userId.longValue()); + if(JwtManager.me().getConfig().isConfigOk()) { + Number userId = c.getJwtPara(JPressConsts.JWT_USERID); + if (userId != null) { + utm.setUserId(userId.longValue()); + } } } diff --git a/jpress-web/src/main/webapp/WEB-INF/other/sys_sensitive_words.txt b/jpress-web/src/main/webapp/WEB-INF/other/sys_sensitive_words.txt index 374f0e51f16f7da794be057920b7dbaaf427741d..8c05781a22d2820f2ae0981ae9b8ad5fb5dd6825 100644 --- a/jpress-web/src/main/webapp/WEB-INF/other/sys_sensitive_words.txt +++ b/jpress-web/src/main/webapp/WEB-INF/other/sys_sensitive_words.txt @@ -375,8 +375,10 @@ tnt 私家侦探 针孔摄象 调查婚外情 -信用卡提现 -无抵押贷款 +信用卡 +提现 +无抵押 +贷款 原音铃声 借腹生子 找个妈妈 @@ -815,4 +817,8 @@ visa信用卡 ic卡 汽车干扰 汽车解锁 -干扰解锁 \ No newline at end of file +干扰解锁 +借钱 +白粉 + + diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/_layout/_left_menu.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/_layout/_left_menu.html index def7024983a469fe3676ad32da5fda0ea6db1808..d2e96933deaf83722bf937aa22e345a42d945061 100755 --- a/jpress-web/src/main/webapp/WEB-INF/views/admin/_layout/_left_menu.html +++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/_layout/_left_menu.html @@ -25,6 +25,9 @@ #end #end + + +
  • 基础
    • #for(group : systemMenuGroups) #hasPermission(group.permission) diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/template/list.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/template/list.html index 12f9afc65df59e6d5a9b9a1bcce98f08b69575cd..9eb6a4f9b39b8eaefdae6fd7e0fa33e8e396aeae 100755 --- a/jpress-web/src/main/webapp/WEB-INF/views/admin/template/list.html +++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/template/list.html @@ -6,7 +6,7 @@ $(".template-enable").on("click", function () { var templateId = $(this).attr("for-tid"); ajaxGet("#(CPATH)/admin/template/doEnable?tid=" + templateId); - }) + }); $(".template-uninstall").on("click", function () { if (confirm('确定要卸载该主题吗？卸载后不可恢复')) { @@ -15,7 +15,6 @@ } }) - #end @@ -38,92 +37,124 @@
    -

    - 模板管理 - Template Management -

    -
    - -
    + 模板管理 Template ManagementA 全部 (#(templateCount)) | PC模板 (#(templateCount)) | H5模板 (#(templateCount)) | 小程序 (#(templateCount))
    + +
    -
    -
    -
    +
    + +
    +
    -
    - -
    - -
    -
    + #for(template : templates) + #if(option('web_template') == template.id) +
    + +
    + +
    + #(template.title ??)缩略图 + +
    + +
    + + + -
    -
    - - - 安装新模板 +
    +
    + #end + #end
    - - +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    + +
    +
    + + + 安装新模板 +
    +
    +
    + +
    -
    - -
    - -
    - - #for(template : templates) -
    - -
    - -
    - - -
    - -
    - - #if(option('web_template') == template.id) - - #else -
    - - +
    + +
    + +
    + + #for(template : templates) + #if(option('web_template') != template.id) +
    + +
    + +
    + + +
    + +
    + +
    + + +
    +
    +
    +
    - #end + #end +
    + +
    -
    - #end - - +
    - - +
    +
    -
    diff --git a/pom.xml b/pom.xml index 0c69d0e64049636a7239b34f44adfce5f3834d5a..b9bb322b46a733ca307532c02aaa61e180a5b1c2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 1.8 - 3.5.4 + 3.7.3 2.6 0.9.1 1.2.3