JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix bug】删除注释掉的请求注解

Browse Source
This commit is contained in:
tianwenbo
2023-04-06 15:08:27 +08:00
parent 07e4b2f892
commit 7d10fc3faa
21 changed files with 10 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java
-1
View File
@@ -35,7 +35,6 @@ public class MockController {
* @param filename
* @return
*/
// @RequestMapping(value = "/json/{filename}", method = RequestMethod.GET)
@GetMapping("/json/{filename}")
public String getJsonData(@PathVariable String filename) {
String jsonpath = "classpath:com/jero/modules/demo/mock/json/"+filename+".json";
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java
+1 -1
View File
@@ -198,7 +198,7 @@ public class JoaDemoController {
* @param response
* @return
*/
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel")
public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java
-5
View File
@@ -79,7 +79,6 @@ public class QuartzJobController {
* @return
*/
//@RequiresRoles("admin")
// @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add")
public Results<T> add(@RequestBody QuartzJob quartzJob) {
quartzJobService.saveAndScheduleJob(quartzJob);
@@ -93,7 +92,6 @@ public class QuartzJobController {
* @return
*/
//@RequiresRoles("admin")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit")
public Results<T> eidt(@RequestBody QuartzJob quartzJob) {
try {
@@ -134,7 +132,6 @@ public class QuartzJobController {
* @return
*/
//@RequiresRoles("admin")
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch")
public Results<T> deleteBatch(@RequestBody Map<String,String> map) {
String ids = map.get("ids");
@@ -190,7 +187,6 @@ public class QuartzJobController {
* @param id
* @return
*/
// @RequestMapping(value = "/queryById", method = RequestMethod.GET)
@GetMapping("/queryById")
public Results<QuartzJob> queryById(@RequestParam(name = "id", required = true) String id) {
QuartzJob quartzJob = quartzJobService.getById(id);
@@ -225,7 +221,6 @@ public class QuartzJobController {
* @param response
* @return
*/
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel")
public Results<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java
-1
View File
@@ -37,7 +37,6 @@ public class DuplicateCheckController {
*
* @return
*/
// @RequestMapping(value = "/check", method = RequestMethod.GET)
@GetMapping("/check")
@ApiOperation("重复校验接口")
public Results<Object> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
-4
View File
@@ -30,7 +30,6 @@ public class LoginController {
private ILoginService loginService;
@ApiOperation("登录接口")
// @RequestMapping(value = "/login", method = RequestMethod.POST)
@PostMapping("/login")
public Results<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){
return loginService.login(sysLoginModel);
@@ -70,7 +69,6 @@ public class LoginController {
* @param user
* @return
*/
// @RequestMapping(value = "/selectDepart", method = RequestMethod.PUT)
@PostMapping("/selectDepart")
public Results<JSONObject> selectDepart(@RequestBody SysUser user) {
return loginService.selectDepart(user);
@@ -126,7 +124,6 @@ public class LoginController {
* @return
* @throws Exception
*/
// @RequestMapping(value = "/mLogin", method = RequestMethod.POST)
@PostMapping("/mLogin")
public Results<JSONObject> mLogin(@RequestBody SysLoginModel sysLoginModel) {
return loginService.mLogin(sysLoginModel);
@@ -137,7 +134,6 @@ public class LoginController {
* @param sysLoginModel
* @return
*/
// @RequestMapping(value = "/checkCaptcha", method = RequestMethod.POST)
@PostMapping("/checkCaptcha")
public Results<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel){
return loginService.checkCaptcha(sysLoginModel);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java
-10
View File
@@ -83,7 +83,6 @@ public class SysAnnouncementController {
* @param req
* @return
*/
// @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Results<IPage<SysAnnouncement>> queryPageList(SysAnnouncement sysAnnouncement,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -114,7 +113,6 @@ public class SysAnnouncementController {
* @param sysAnnouncement
* @return
*/
// @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add")
public Results<Object> add(@RequestBody SysAnnouncement sysAnnouncement) {
try {
@@ -137,7 +135,6 @@ public class SysAnnouncementController {
* @param sysAnnouncement
* @return
*/
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit")
public Results<Object> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
@@ -162,7 +159,6 @@ public class SysAnnouncementController {
* @param map
* @return
*/
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete")
public Results<Object> delete(@RequestBody Map<String, String> map) {
String id = map.get("id");
@@ -188,7 +184,6 @@ public class SysAnnouncementController {
* @param map
* @return
*/
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch")
public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
@@ -210,7 +205,6 @@ public class SysAnnouncementController {
* @param id
* @return
*/
// @RequestMapping(value = "/queryById", method = RequestMethod.GET)
@GetMapping("/queryById")
public Results<SysAnnouncement> queryById(@RequestParam(name="id",required=true) String id) {
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
@@ -226,7 +220,6 @@ public class SysAnnouncementController {
* @param id
* @return
*/
// @RequestMapping(value = "/doReleaseData", method = RequestMethod.GET)
@GetMapping("/doReleaseData")
public Results<SysAnnouncement> doReleaseData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
@@ -267,7 +260,6 @@ public class SysAnnouncementController {
* @param id
* @return
*/
// @RequestMapping(value = "/doReovkeData", method = RequestMethod.GET)
@GetMapping("/doReovkeData")
public Results<Object> doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
@@ -289,7 +281,6 @@ public class SysAnnouncementController {
* @功能：补充用户数据，并返回系统消息
* @return
*/
// @RequestMapping(value = "/listByUser", method = RequestMethod.GET)
@GetMapping("/listByUser")
public Results<Map<String,Object>> listByUser() {
Results<Map<String,Object>> result = new Results<>();
@@ -406,7 +397,6 @@ public class SysAnnouncementController {
* @param anntId
* @return
*/
// @RequestMapping(value = "/syncNotic", method = RequestMethod.GET)
@GetMapping("/syncNotic")
public Results<SysAnnouncement> syncNotic(@RequestParam(name="anntId",required=false) String anntId, HttpServletRequest request) {
Results<SysAnnouncement> result = new Results<>();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+1 -1
View File
@@ -217,7 +217,7 @@ public class SysCategoryController {
* @return
*/
@RequiresPermissions("sys:category:import")
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel")
public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java
+3 -3
View File
@@ -25,7 +25,7 @@ public class SysDataLogController {
@Autowired
private ISysDataLogService service;
// @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Results<IPage<SysDataLog>> queryPageList(SysDataLog dataLog, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
@@ -47,7 +47,7 @@ public class SysDataLogController {
* @param req
* @return
*/
// @RequestMapping(value = "/queryCompareList", method = RequestMethod.GET)
@GetMapping("/queryCompareList")
public Results<List<SysDataLog>> queryCompareList(HttpServletRequest req) {
Results<List<SysDataLog>> result = new Results<>();
@@ -71,7 +71,7 @@ public class SysDataLogController {
* @param req
* @return
*/
// @RequestMapping(value = "/queryDataVerList", method = RequestMethod.GET)
@GetMapping("/queryDataVerList")
public Results<List<SysDataLog>> queryDataVerList(HttpServletRequest req) {
Results<List<SysDataLog>> result = new Results<>();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+3 -9
View File
@@ -67,7 +67,7 @@ public class SysDepartController {
*
* @return
*/
// @RequestMapping(value = "/queryMyDeptTreeList", method = RequestMethod.GET)
@GetMapping("/queryMyDeptTreeList")
public Results<List<SysDepartTreeModel>> queryMyDeptTreeList() {
Results<List<SysDepartTreeModel>> result = new Results<>();
@@ -98,7 +98,7 @@ public class SysDepartController {
*
* @return
*/
// @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
@GetMapping("/queryTreeList")
public Results<List<SysDepartTreeModel>> queryTreeList() {
Results<List<SysDepartTreeModel>> result = new Results<>();
@@ -117,7 +117,7 @@ public class SysDepartController {
*
* @return
*/
// @RequestMapping(value = "/queryDepartTreeSync", method = RequestMethod.GET)
@GetMapping("/queryDepartTreeSync")
public Results<List<SysDepartTreeModel>> queryDepartTreeSync(@RequestParam(name = "pid", required = false) String parentId) {
Results<List<SysDepartTreeModel>> result = new Results<>();
@@ -166,7 +166,6 @@ public class SysDepartController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:depart:add")
// @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Results<Object> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
@@ -189,7 +188,6 @@ public class SysDepartController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:depart:edit")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Results<Object> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
@@ -214,7 +212,6 @@ public class SysDepartController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:depart:del")
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Results<Object> delete(@RequestBody Map<String,String> map) {
@@ -260,7 +257,6 @@ public class SysDepartController {
*
* @return
*/
// @RequestMapping(value = "/queryIdTree", method = RequestMethod.GET)
@GetMapping("/queryIdTree")
public Results<List<DepartIdModel>> queryIdTree() {
try {
@@ -280,7 +276,6 @@ public class SysDepartController {
* @param keyWord
* @return
*/
// @RequestMapping(value = "/searchBy", method = RequestMethod.GET)
@GetMapping("/searchBy")
public Results<List<SysDepartTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord, @RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) {
//部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据
@@ -427,7 +422,6 @@ public class SysDepartController {
*
* @return
*/
// @RequestMapping(value = "/queryTreeByKeyWord", method = RequestMethod.GET)
@GetMapping("/queryTreeByKeyWord")
public Results<Map<String,Object>> queryTreeByKeyWord(@RequestParam(name = "keyWord", required = false) String keyWord) {
Results<Map<String,Object>> result = new Results<>();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java
-1
View File
@@ -162,7 +162,6 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
* @param response
* @return
*/
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel")
public Results<SysDepartPermission> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, SysDepartPermission.class);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
-12
View File
@@ -75,7 +75,6 @@ public class SysDictController {
private static final String OPTION_SUCCESS = "操作成功!";
private static final String DEL_SUCCESS = "删除成功!";
// @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
@ApiOperation(value = "字典控制器-分页列表查询", notes = "字典控制器-分页列表查询")
public Results<IPage<SysDict>> queryPageList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -102,7 +101,6 @@ public class SysDictController {
* @return
*/
@ApiOperation(value = "字典控制器-树形字典数据", notes = "字典控制器-树形字典数据")
// @RequestMapping(value = "/treeList", method = RequestMethod.GET)
@GetMapping("/treeList")
public Results<List<SysDictTree>> treeList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
@@ -130,7 +128,6 @@ public class SysDictController {
* @return
*/
@ApiOperation(value = "字典控制器-获取全部字典数据", notes = "字典控制器-获取全部字典数据")
// @RequestMapping(value = "/queryAllDictItems", method = RequestMethod.GET)
@GetMapping("/queryAllDictItems")
public Results<Map<String, List<DictModel>>> queryAllDictItems(HttpServletRequest request) {
Map<String, List<DictModel>> res ;
@@ -144,7 +141,6 @@ public class SysDictController {
* @return
*/
@ApiOperation(value = "字典控制器-通过字典code和字典值key获取字典数据", notes = "字典控制器-通过字典code和字典值key获取字典数据")
// @RequestMapping(value = "/getDictText/{dictCode}/{key}", method = RequestMethod.GET)
@GetMapping("/getDictText/{dictCode}/{key}")
public Results<String> getDictText(@PathVariable("dictCode") String dictCode, @PathVariable("key") String key) {
log.info(" dictCode : "+ dictCode);
@@ -167,7 +163,6 @@ public class SysDictController {
* @param dictCode 表名,文本字段,code字段 | 举例：sys_user,realname,id
* @return
*/
// @RequestMapping(value = "/getDictItems/{dictCode}", method = RequestMethod.GET)
@GetMapping("/getDictItems/{dictCode}")
public Results<List<DictModel>> getDictItems(@PathVariable String dictCode, @RequestParam(value = "sign",required = false) String sign, HttpServletRequest request) {
log.info(" dictCode : "+ dictCode);
@@ -194,7 +189,6 @@ public class SysDictController {
* @param dictCode 字典code格式：table,text,code
* @return
*/
// @RequestMapping(value = "/loadDict/{dictCode}", method = RequestMethod.GET)
@GetMapping("/loadDict/{dictCode}")
public Results<List<DictModel>> loadDict(@PathVariable String dictCode,
@RequestParam(name="keyword") String keyword,
@@ -225,7 +219,6 @@ public class SysDictController {
* @param pageSize
* @return
*/
// @RequestMapping(value = "/loadDictOrderByValue/{dictCode}", method = RequestMethod.GET)
@GetMapping("/loadDictOrderByValue/{dictCode}")
public Results<List<DictModel>> loadDictOrderByValue(
@PathVariable String dictCode,
@@ -268,7 +261,6 @@ public class SysDictController {
* @param request
* @return
*/
// @RequestMapping(value = "/loadDictItem/{dictCode}", method = RequestMethod.GET)
@GetMapping("/loadDictItem/{dictCode}")
public Results<List<String>> loadDictItem(@PathVariable String dictCode, @RequestParam(name="key") String keys, @RequestParam(value = "sign",required = false) String sign, @RequestParam(value = "delNotExist",required = false,defaultValue = "true") boolean delNotExist, HttpServletRequest request) {
Results<List<String>> result = new Results<>();
@@ -299,7 +291,6 @@ public class SysDictController {
* 根据表名——显示字段-存储字段 pid 加载树形数据
*/
@ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据")
// @RequestMapping(value = "/loadTreeData", method = RequestMethod.GET)
@GetMapping("/loadTreeData")
public Results<List<TreeSelectModel>> loadTreeData(@RequestParam(name="pid") String pid, @RequestParam(name="pidField") String pidField,
@RequestParam(name="tableName") String tbname,
@@ -322,7 +313,6 @@ public class SysDictController {
* 查询后返回树型数据
*/
@ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 加载树形数据")
// @RequestMapping(value = "/queryAllTreeData", method = RequestMethod.GET)
@GetMapping("/queryAllTreeData")
public Results<List<TreeSelectModel>> queryAllTreeData(@RequestParam(name="pidField") String pidField,
@RequestParam(name="tableName") String tbname,
@@ -346,7 +336,6 @@ public class SysDictController {
* @return
*/
@ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典")
// @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add")
public Results<Object> add(@RequestBody SysDict sysDict) {
try {
@@ -368,7 +357,6 @@ public class SysDictController {
* @return
*/
@ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit")
public Results<Object> edit(@RequestBody SysDict sysDict) {
SysDict sysdict = sysDictService.getById(sysDict.getId());
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
-6
View File
@@ -52,7 +52,6 @@ public class SysDictItemController {
* @return
*/
@RequiresPermissions("sys:dict:list")
// @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Results<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
@@ -72,7 +71,6 @@ public class SysDictItemController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:dict:list")
// @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add")
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Results<Object> add(@RequestBody SysDictItem sysDictItem) {
@@ -93,7 +91,6 @@ public class SysDictItemController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:dict:list")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Results<Object> edit(@RequestBody SysDictItem sysDictItem) {
@@ -117,7 +114,6 @@ public class SysDictItemController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:dict:list")
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Results<T> delete(@RequestBody Map<String, String> map) {
@@ -144,7 +140,6 @@ public class SysDictItemController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:dict:list")
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Results<Object> deleteBatch(@RequestBody Map<String, String> map) {
@@ -164,7 +159,6 @@ public class SysDictItemController {
* @return
*/
@RequiresPermissions("sys:dict:list")
// @RequestMapping(value = "/dictItemCheck", method = RequestMethod.GET)
@GetMapping("/dictItemCheck")
@ApiOperation("字典重复校验接口")
public Results<Object> doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java
-3
View File
@@ -43,7 +43,6 @@ public class SysLogController {
* @param req
* @return
*/
// @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Results<IPage<SysLog>> queryPageList(SysLog syslog, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
@@ -71,7 +70,6 @@ public class SysLogController {
* @param map
* @return
*/
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete")
public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id");
@@ -95,7 +93,6 @@ public class SysLogController {
* @param map
* @return
*/
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch")
public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java
-19
View File
@@ -67,7 +67,6 @@ public class SysPermissionController {
*
* @return
*/
// @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Results<List<SysPermissionTree>> list() {
long start = System.currentTimeMillis();
@@ -94,7 +93,6 @@ public class SysPermissionController {
*
* @return
*/
// @RequestMapping(value = "/getSystemMenuList", method = RequestMethod.GET)
@GetMapping("/getSystemMenuList")
public Results<List<SysPermissionTree>> getSystemMenuList() {
long start = System.currentTimeMillis();
@@ -124,7 +122,6 @@ public class SysPermissionController {
* @param parentId
* @return
*/
// @RequestMapping(value = "/getSystemSubmenu", method = RequestMethod.GET)
@GetMapping("/getSystemSubmenu")
public Results<List<SysPermissionTree>> getSystemSubmenu(@RequestParam("parentId") String parentId){
Results<List<SysPermissionTree>> result = new Results<>();
@@ -188,7 +185,6 @@ public class SysPermissionController {
*
* @return
*/
// @RequestMapping(value = "/getUserPermissionByToken", method = RequestMethod.GET)
@GetMapping("/getUserPermissionByToken")
public Results<JSONObject> getUserPermissionByToken() {
Results<JSONObject> result = new Results<>();
@@ -233,7 +229,6 @@ public class SysPermissionController {
* @return
*/
//@RequiresRoles({ "admin" })
// @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add")
public Results<Object> add(@RequestBody SysPermission permission) {
try {
@@ -252,7 +247,6 @@ public class SysPermissionController {
* @return
*/
//@RequiresRoles({ "admin" })
// @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
@PostMapping("/edit")
public Results<Object> edit(@RequestBody SysPermission permission) {
try {
@@ -271,7 +265,6 @@ public class SysPermissionController {
* @return
*/
//@RequiresRoles({ "admin" })
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete")
public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id");
@@ -293,7 +286,6 @@ public class SysPermissionController {
* @return
*/
//@RequiresRoles({ "admin" })
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch")
public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
@@ -319,7 +311,6 @@ public class SysPermissionController {
*
* @return
*/
// @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
@GetMapping("/queryTreeList")
public Results<Map<String, Object>> queryTreeList() {
Results<Map<String, Object>> result = new Results<>();
@@ -352,7 +343,6 @@ public class SysPermissionController {
*
* @return
*/
// @RequestMapping(value = "/queryListAsync", method = RequestMethod.GET)
@GetMapping("/queryListAsync")
public Results<List<TreeModel>> queryAsync(@RequestParam(name = "pid", required = false) String parentId) {
Results<List<TreeModel>> result = new Results<>();
@@ -376,7 +366,6 @@ public class SysPermissionController {
*
* @return
*/
// @RequestMapping(value = "/queryRolePermission", method = RequestMethod.GET)
@GetMapping("/queryRolePermission")
public Results<List<String>> queryRolePermission(@RequestParam(name = "roleId", required = true) String roleId) {
Results<List<String>> result = new Results<>();
@@ -395,7 +384,6 @@ public class SysPermissionController {
*
* @return
*/
// @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST)
@PostMapping("/saveRolePermission")
//@RequiresRoles({ "admin" })
public Results<String> saveRolePermission(@RequestBody JSONObject json) {
@@ -666,7 +654,6 @@ public class SysPermissionController {
* @param sysPermissionDataRule
* @return
*/
// @RequestMapping(value = "/getPermRuleListByPermId", method = RequestMethod.GET)
@GetMapping("/getPermRuleListByPermId")
public Results<List<SysPermissionDataRule>> getPermRuleListByPermId(SysPermissionDataRule sysPermissionDataRule) {
List<SysPermissionDataRule> permRuleList = sysPermissionDataRuleService.getPermRuleListByPermId(sysPermissionDataRule.getPermissionId());
@@ -683,7 +670,6 @@ public class SysPermissionController {
* @return
*/
//@RequiresRoles({ "admin" })
// @RequestMapping(value = "/addPermissionRule", method = RequestMethod.POST)
@PostMapping("/addPermissionRule")
public Results<Object> addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
try {
@@ -697,7 +683,6 @@ public class SysPermissionController {
}
//@RequiresRoles({ "admin" })
// @RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST })
@PostMapping("/editPermissionRule")
public Results<Object> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
try {
@@ -716,7 +701,6 @@ public class SysPermissionController {
* @return
*/
//@RequiresRoles({ "admin" })
// @RequestMapping(value = "/deletePermissionRule", method = RequestMethod.DELETE)
@PostMapping("/deletePermissionRule")
public Results<Object> deletePermissionRule(@RequestBody Map<String,String> map) {
try {
@@ -738,7 +722,6 @@ public class SysPermissionController {
* @param sysPermissionDataRule
* @return
*/
// @RequestMapping(value = "/queryPermissionRule", method = RequestMethod.GET)
@GetMapping("/queryPermissionRule")
public Results<List<SysPermissionDataRule>> queryPermissionRule(SysPermissionDataRule sysPermissionDataRule) {
try {
@@ -755,7 +738,6 @@ public class SysPermissionController {
* @param departId
* @return
*/
// @RequestMapping(value = "/queryDepartPermission", method = RequestMethod.GET)
@GetMapping("/queryDepartPermission")
public Results<List<String>> queryDepartPermission(@RequestParam(name = "departId", required = true) String departId) {
Results<List<String>> result = new Results<>();
@@ -774,7 +756,6 @@ public class SysPermissionController {
*
* @return
*/
// @RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST)
@PostMapping("/saveDepartPermission")
//@RequiresRoles({ "admin" })
public Results<String> saveDepartPermission(@RequestBody JSONObject json) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
-10
View File
@@ -82,7 +82,6 @@ public class SysRoleController {
* @return
*/
//@RequiresPermissions("sys:role:list")
// @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Results<IPage<SysRole>> queryPageList(SysRole role,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -103,7 +102,6 @@ public class SysRoleController {
* @return
*/
@RequiresPermissions("sys:role:add")
// @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add")
//@RequiresRoles({"admin"})
public Results<Object> add(@RequestBody SysRole role) {
@@ -124,7 +122,6 @@ public class SysRoleController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:role:edit")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit")
public Results<Object> edit(@RequestBody SysRole role) {
SysRole sysrole = sysRoleService.getById(role.getId());
@@ -148,7 +145,6 @@ public class SysRoleController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:role:del")
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete")
public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id");
@@ -166,7 +162,6 @@ public class SysRoleController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:role:del")
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch")
public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
@@ -187,7 +182,6 @@ public class SysRoleController {
* @return
*/
//@RequiresPermissions("sys:role:list")
// @RequestMapping(value = "/queryById", method = RequestMethod.GET)
@GetMapping("/queryById")
public Results<SysRole> queryById(@RequestParam(name="id",required=true) String id) {
SysRole sysRole = sysRoleService.getById(id);
@@ -198,7 +192,6 @@ public class SysRoleController {
}
}
//@RequiresPermissions("sys:role:list")
// @RequestMapping(value = "/queryall", method = RequestMethod.GET)
@GetMapping("/queryall")
public Results<List<SysRole>> queryall() {
List<SysRole> list = sysRoleService.list();
@@ -213,7 +206,6 @@ public class SysRoleController {
* 校验角色编码唯一
*/
//@RequiresPermissions("sys:role:list")
// @RequestMapping(value = "/checkRoleCode", method = RequestMethod.GET)
@GetMapping("/checkRoleCode")
public Results<Boolean> checkUsername(String id, String roleCode) {
Results<Boolean> result = new Results<>();
@@ -271,7 +263,6 @@ public class SysRoleController {
* @return
*/
@RequiresPermissions("sys:role:import")
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel")
public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
@@ -361,7 +352,6 @@ public class SysRoleController {
* @return
*/
//@RequiresPermissions("sys:role:list")
// @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
@GetMapping("/queryTreeList")
public Results<Map<String,Object>> queryTreeList(HttpServletRequest request) {
Results<Map<String,Object>> result = new Results<>();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java
-1
View File
@@ -42,7 +42,6 @@ public class SysTenantController {
* @return
*/
@PermissionData(pageComponent = "system/TenantList")
// @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Results<IPage<SysTenant>> queryPageList(SysTenant sysTenant, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java
+1 -1
View File
@@ -206,7 +206,7 @@ public class SysUserAgentController {
* @param response
* @return
*/
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel")
public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
-8
View File
@@ -117,7 +117,6 @@ public class SysUserController {
*/
@RequiresPermissions("sys:user:list")
@PermissionData(pageComponent = "system/UserList")
// @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Results<IPage<SysUser>> queryPageList(SysUser user,
@RequestParam(name="departId", required = false) String departId,
@@ -159,7 +158,6 @@ public class SysUserController {
}
@RequiresPermissions("user:add")
// @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add")
public Results<Object> add(@RequestBody JSONObject jsonObject) {
try {
@@ -207,7 +205,6 @@ public class SysUserController {
}
@RequiresPermissions("user:edit")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit")
public Results<SysUser> edit(@RequestBody JSONObject jsonObject) {
String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY);
@@ -256,7 +253,6 @@ public class SysUserController {
return user;
}
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete")
public Results<T> delete(@RequestBody Map<String,String> map) {
String id = map.get("id");
@@ -268,7 +264,6 @@ public class SysUserController {
return Results.OK("删除用户成功");
}
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch")
public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
@@ -282,7 +277,6 @@ public class SysUserController {
//@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
@PostMapping("/frozenBatch")
public Results<Object> frozenBatch(@RequestBody JSONObject jsonObject) {
try {
@@ -629,7 +623,6 @@ public class SysUserController {
* @return
*/
//@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
@GetMapping("/queryByIds")
public Results<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
Results<Collection<SysUser>> result = new Results<>();
@@ -644,7 +637,6 @@ public class SysUserController {
/**
* 首页用户重置密码
*/
// @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
@PostMapping("/updatePassword")
public Results<T> updatePassword(@RequestBody JSONObject json) {
String username = json.getString(USER_NAME);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ThirdLoginController.java
-1
View File
@@ -208,7 +208,6 @@ public class ThirdLoginController {
}
@SuppressWarnings("unchecked")
// @RequestMapping(value = "/getLoginUser/{token}/{thirdType}", method = RequestMethod.GET)
@GetMapping("/getLoginUser/{token}/{thirdType}")
@ResponseBody
public Results<JSONObject> getThirdLoginUser(@PathVariable("token") String token, @PathVariable("thirdType") String thirdType) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/job/SendMsgJob.java → jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/job/SendMsgJob.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.modules.message.job;
package com.jero.modules.system.controller.job;
import java.util.List;
jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/IndexController.java
-2
View File
@@ -54,7 +54,6 @@ public class IndexController {
return "login";
}
// @RequestMapping(value="login", method=RequestMethod.POST)
@PostMapping("login")
@ResponseBody
@PermissionLimit(limit=false)
@@ -63,7 +62,6 @@ public class IndexController {
return loginService.login(request, response, userName, password, ifRem);
}
// @RequestMapping(value="logout", method=RequestMethod.POST)
@PostMapping("logout")
@ResponseBody
@PermissionLimit(limit=false)