diff --git a/java/src/main/java/vip/xumy/picture/conf/PictureApplicationRunner.java b/java/src/main/java/vip/xumy/picture/conf/PictureApplicationRunner.java index 2fc2fe6..0f9c2c5 100644 --- a/java/src/main/java/vip/xumy/picture/conf/PictureApplicationRunner.java +++ b/java/src/main/java/vip/xumy/picture/conf/PictureApplicationRunner.java @@ -19,14 +19,12 @@ import vip.xumy.admin.sys.service.ConfigService; @Component @Configuration public class PictureApplicationRunner implements ApplicationRunner { - private static final String HOSTR_CFG_KEY = "intranet_host"; - private static final String HOSTE_CFG_KEY = "internet_host"; - public static Map HOST_MAP = new HashMap<>();; + private static final String HOST_CFG_KEY = "host_url"; + public static Map CONF_MAP = new HashMap<>();; @Autowired public void setConfigService(ConfigService configService) { - HOST_MAP.put("traHost", configService.getStringConfig(HOSTR_CFG_KEY, null)); - HOST_MAP.put("tertHost", configService.getStringConfig(HOSTE_CFG_KEY, null)); + CONF_MAP.put("host", configService.getStringConfig(HOST_CFG_KEY, null)); } @Override diff --git a/java/src/main/java/vip/xumy/picture/ctrl/MyUserController.java b/java/src/main/java/vip/xumy/picture/ctrl/MyUserController.java new file mode 100644 index 0000000..53e95df --- /dev/null +++ b/java/src/main/java/vip/xumy/picture/ctrl/MyUserController.java @@ -0,0 +1,67 @@ +package vip.xumy.picture.ctrl; + +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; + +import vip.xumy.admin.verify.controller.PublicController; +import vip.xumy.admin.verify.pojo.User; +import vip.xumy.core.pojo.base.BasePageParam; +import vip.xumy.core.pojo.com.AjaxResponse; +import vip.xumy.core.pojo.com.PageResponse; +import vip.xumy.picture.service.MyUserService; + +/** + * Do not use for any commercial purposes without permission + * + * @author: mengyxu + * @date: 2022年1月7日 + */ + +@RestController +@RequestMapping("my/user") +public class MyUserController { + @Autowired + private MyUserService userService; + + @GetMapping + public PageResponse save(BasePageParam param, HttpServletRequest request) { + User user = (User) request.getSession().getAttribute(PublicController.KEY); + PageResponse rsp = new PageResponse<>(); + if (!"1".equals(user.getPermission())) { + rsp.setRows(new ArrayList()); + rsp.setTotal(0L); + } else { + Page pages = PageHelper.startPage(param.getPage(), param.getSize()); + List list = userService.list(); + rsp.setRows(list); + rsp.setTotal(pages.getTotal()); + } + return rsp; + } + + @PostMapping + public AjaxResponse save(@RequestBody User user) { + userService.save(user); + return AjaxResponse.successed(); + } + + @DeleteMapping + public AjaxResponse delete(@RequestBody User user) { + userService.delete(user.getUserId()); + return AjaxResponse.successed(); + } + +} diff --git a/java/src/main/java/vip/xumy/picture/ctrl/PictureController.java b/java/src/main/java/vip/xumy/picture/ctrl/PictureController.java index ac42980..539c175 100644 --- a/java/src/main/java/vip/xumy/picture/ctrl/PictureController.java +++ b/java/src/main/java/vip/xumy/picture/ctrl/PictureController.java @@ -1,5 +1,6 @@ package vip.xumy.picture.ctrl; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -18,6 +19,8 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import vip.xumy.admin.utils.LoginUtil; +import vip.xumy.admin.verify.controller.PublicController; +import vip.xumy.admin.verify.pojo.User; import vip.xumy.core.exception.CoreException; import vip.xumy.core.pojo.com.AjaxResponse; import vip.xumy.core.pojo.com.PageResponse; @@ -39,12 +42,18 @@ public class PictureController { @GetMapping public PageResponse list(Picture example, HttpServletRequest request) { - example.setUser(LoginUtil.getUserId(request)); - Page pages = PageHelper.startPage(example.getPage(), example.getSize()); - List list = pictureService.list(example); + User user = (User) request.getSession().getAttribute(PublicController.KEY); PageResponse rsp = new PageResponse<>(); - rsp.setRows(list); - rsp.setTotal(pages.getTotal()); + if (!"1".equals(user.getPermission())) { + rsp.setRows(new ArrayList()); + rsp.setTotal(0L); + }else { + example.setUser(user.getUserId()); + Page pages = PageHelper.startPage(example.getPage(), example.getSize()); + List list = pictureService.list(example); + rsp.setRows(list); + rsp.setTotal(pages.getTotal()); + } return rsp; } diff --git a/java/src/main/java/vip/xumy/picture/ctrl/PublicControoler.java b/java/src/main/java/vip/xumy/picture/ctrl/PublicControoler.java index 2e1119e..566369f 100644 --- a/java/src/main/java/vip/xumy/picture/ctrl/PublicControoler.java +++ b/java/src/main/java/vip/xumy/picture/ctrl/PublicControoler.java @@ -17,9 +17,9 @@ import vip.xumy.picture.conf.PictureApplicationRunner; @RequestMapping("public") public class PublicControoler { - @GetMapping("host") + @GetMapping("conf") public Map getHost(){ - return PictureApplicationRunner.HOST_MAP; + return PictureApplicationRunner.CONF_MAP; } } diff --git a/java/src/main/java/vip/xumy/picture/mapper/MyUserMapper.java b/java/src/main/java/vip/xumy/picture/mapper/MyUserMapper.java new file mode 100644 index 0000000..3014eab --- /dev/null +++ b/java/src/main/java/vip/xumy/picture/mapper/MyUserMapper.java @@ -0,0 +1,27 @@ +package vip.xumy.picture.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Select; + +import vip.xumy.admin.verify.pojo.User; + +/** + * @author:mengyxu + * @date:2020年10月28日 + */ + +public interface MyUserMapper { + + @Select({ "SELECT * FROM user" }) + List list(); + + @Delete({ "DELETE FROM user WHERE user_id = #{id}" }) + void delete(String id); + + @Insert({ "INSERT INTO user VALUES (#{userId}, #{name}, #{password}, #{desc}, '0')" }) + int save(User user); + +} diff --git a/java/src/main/java/vip/xumy/picture/service/MyUserService.java b/java/src/main/java/vip/xumy/picture/service/MyUserService.java new file mode 100644 index 0000000..6fad259 --- /dev/null +++ b/java/src/main/java/vip/xumy/picture/service/MyUserService.java @@ -0,0 +1,38 @@ +package vip.xumy.picture.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.DigestUtils; + +import vip.xumy.admin.verify.pojo.User; +import vip.xumy.picture.mapper.MyUserMapper; + +/** Do not use for any commercial purposes without permission + * @author: mengyxu + * @date: 2022年1月7日 + */ + +@Service +public class MyUserService { + @Autowired + private MyUserMapper userMapper; + @Autowired + private PictureService pictureService; + + public List list() { + return userMapper.list(); + } + + public void save(User user) { + user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes())); + userMapper.save(user); + } + + public void delete(String id) { + userMapper.delete(id); + pictureService.deleteAll(id); + } + +} diff --git a/vue/src/components/template/mainHeader.vue b/vue/src/components/template/mainHeader.vue index e38fb66..24a854e 100644 --- a/vue/src/components/template/mainHeader.vue +++ b/vue/src/components/template/mainHeader.vue @@ -21,7 +21,7 @@ 查询 - + 添加{{name}} diff --git a/vue/src/components/template/manage.vue b/vue/src/components/template/manage.vue index 5fc5176..f72acd4 100644 --- a/vue/src/components/template/manage.vue +++ b/vue/src/components/template/manage.vue @@ -1,6 +1,6 @@