diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UserController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UserController.java index f69ef27..1a5f262 100644 --- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UserController.java +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UserController.java @@ -1,6 +1,7 @@ package com.zhangmeng.admin.manager.controller; import com.github.pagehelper.PageInfo; +import com.zhangmeng.admin.manager.utils.UserUtil; import com.zhangmeng.api.service.admin_manager.UserControllerApi; import com.zhangmeng.model.base.baseController.BaseController; import com.zhangmeng.model.base.baseUtil.CommonUtil; @@ -33,6 +34,9 @@ public class UserController extends BaseController implements UserControllerApi @Autowired private TokenTools tokenTools; + @Autowired + private UserUtil userUtil; + @Override @PostMapping("/save") public Result save(@RequestParam @RequestBody Map parms) { @@ -80,9 +84,8 @@ public class UserController extends BaseController implements UserControllerApi @Override @GetMapping("/current") - public Result current(){ - Map userInfo = this.tokenTools.getUserInfo(); - return new Result(true,StatusCode.OK,"查询成功",userInfo); + public User current(){ + return this.userUtil.currentUser(); } @Override diff --git a/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js b/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js index ad7d4ec..8b984e3 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js +++ b/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js @@ -6,6 +6,8 @@ var admin_manager_url = "mystyle-cloud-admin-manager"; var user_oauth_url = "mystyle-cloud-oauth"; //博客微服务 var blog_url = "mystyle-cloud-blog"; +//文件微服务 +var file_url = "mystyle-cloud-file"; //验证码 var v_code = gate_way_url + "/" + admin_manager_url + "/verificationCode/generate"; var access_token = localStorage.getItem("access_token"); @@ -61,6 +63,23 @@ var permission_batchRemove_url = gate_way_url + "/" + admin_manager_url + ""; //----------------------------------------------------------------------------------------------------------------------- //文章列表 var article_list_url = gate_way_url + "/" + blog_url + "/article/list"; +//添加文章 +var article_add_url = gate_way_url + "/" + admin_manager_url + "/article/add" + access_token_url; +//修改文章 +var article_edit_url = gate_way_url + "/" + admin_manager_url + "/article/edit" + access_token_url; +//md 上传 +var upload_md_url = gate_way_url + "/" + file_url + "/upload/md" + access_token_url; +//文章保存 +var article_save_url = gate_way_url + "/" + blog_url + "/article/save"; +//文章删除 +var article_delete_url = gate_way_url + "/" + blog_url + "/article/delete"; +//文章批量删除 +var article_batchRemove_url = gate_way_url + "/" + blog_url + "/article/batchRemove"; +//----------------------------------------------------------------------------------------------------------------- +//文件上传 +var file_upload_url = gate_way_url + "/" + file_url + "/upload/file"; + + //页面跳转 function postToPage(url, token) { diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/article/add.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/article/add.ftl index 64f9158..0489c8e 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/article/add.ftl +++ b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/article/add.ftl @@ -3,9 +3,9 @@ 文章添加 - - - + + +
@@ -98,10 +98,11 @@
- - - - + + + + + - - - + + + + +