diff --git a/README.md b/README.md index b33e6a540b2fa5c5f0b560ad3d80a9cd3025d98f..bca439976d50a44f2a3e98528c209d9b1609130c 100644 --- a/README.md +++ b/README.md @@ -186,6 +186,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-core/src/main/java/io/jpress/core/template/TemplateManager.java b/jpress-core/src/main/java/io/jpress/core/template/TemplateManager.java index fd5fad904263b74f55612e5b098c71eb8f8acf80..689712f3eaa519878b1937141926cd1dac6fc7bc 100644 --- a/jpress-core/src/main/java/io/jpress/core/template/TemplateManager.java +++ b/jpress-core/src/main/java/io/jpress/core/template/TemplateManager.java @@ -191,7 +191,7 @@ public class TemplateManager { public void setCurrentTemplate(String templateId) { Template template = getTemplateById(templateId); if (template == null) { - throw new NullPointerException("template is null"); + throw new NullPointerException("Template \"" + templateId +"\" is not exist."); } this.currentTemplateId.set(templateId); this.currentTemplate = template; 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..de31bfcef56f3a4eb095f57b064603b59f506d14 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; @@ -26,6 +27,7 @@ import io.jboot.web.controller.JbootController; import io.jpress.JPressConsts; import io.jpress.model.Utm; import io.jpress.service.UtmService; +import io.jpress.web.base.ApiControllerBase; /** @@ -68,9 +70,9 @@ public class UTMInterceptor implements Interceptor { /** * 可能是API的用户,API 通过 jwt 获取用户信息 */ - else if (controller instanceof JbootController) { - JbootController c = (JbootController) controller; - Number userId = c.getJwtPara(JPressConsts.JWT_USERID); + else if (controller instanceof ApiControllerBase) { + ApiControllerBase c = (ApiControllerBase) controller; + Number userId = c.getJwtPara(JPressConsts.JWT_USERID, false); if (userId != null) { utm.setUserId(userId.longValue()); }