优化不符合规范的注解 30%

v1.4.1
hiparker 4 years ago
parent 7b4a28ff81
commit f4e2a59e71

@ -1,10 +1,9 @@
package org.opsli.api; package org.opsli.api;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api *
* @Author: Parker * @author Parker
* @CreateTime: 2020-11-21 15:15 * @date 2020-11-21 15:15
* @Description:
*/ */
public interface ApiFlag { } public interface ApiFlag { }

@ -12,14 +12,11 @@ import java.io.Serializable;
/** /**
* API * API
*
* @date 202051510:40:54
* @author Parker
*
* Feign * Feign
*
* @JsonProperty null * @JsonProperty null
* *
* @date 202051510:40:54
* @author Parker
*/ */
@Data @Data
@ApiModel(value="视图层返回Api对象", @ApiModel(value="视图层返回Api对象",

@ -48,7 +48,6 @@ import java.util.Date;
* *
* @author Parker * @author Parker
* @date 2019-05-11 * @date 2019-05-11
*
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)

@ -28,18 +28,15 @@ import org.opsli.api.wrapper.gentest.carinfo.TestCarModel;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.web.gentest.carinfo
* @Author: Parker
* @CreateTime: 2020-12-20 20:12:57
* @Description:
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-12-20 20:12:57
*/ */
public interface TestCarRestApi { public interface TestCarRestApi {
@ -114,7 +111,6 @@ public interface TestCarRestApi {
* *
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -130,7 +126,6 @@ public interface TestCarRestApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);

@ -28,18 +28,15 @@ import org.opsli.api.wrapper.gentest.user.TestUserModel;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.web.gentest.user
* @Author:
* @CreateTime: 2020-11-22 12:12:05
* @Description:
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-11-22 12:12:05
*/ */
public interface TestUserRestApi { public interface TestUserRestApi {
@ -106,7 +103,6 @@ public interface TestUserRestApi {
* Excel * Excel
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -122,7 +118,6 @@ public interface TestUserRestApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);

@ -28,18 +28,15 @@ import javax.servlet.http.HttpServletResponse;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.web.system.area
* @Author: Parker
* @CreateTime: 2020-11-28 18:59:59
* @Description:
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-11-28 18:59:59
*/ */
public interface SysAreaRestApi { public interface SysAreaRestApi {
@ -58,11 +55,11 @@ public interface SysAreaRestApi {
/** /**
* *
* @param parentId * @param parentId ID
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/findTree") @GetMapping("/findTree")
ResultVo<?> findTree( String parentId ); ResultVo<?> findTree(String parentId);
/** /**
* *
@ -108,7 +105,6 @@ public interface SysAreaRestApi {
* Excel * Excel
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -124,7 +120,6 @@ public interface SysAreaRestApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);

@ -28,18 +28,15 @@ import javax.servlet.http.HttpServletResponse;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface DictApi { public interface DictApi {
@ -106,7 +103,6 @@ public interface DictApi {
* Excel * Excel
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -122,7 +118,6 @@ public interface DictApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
@ -132,7 +127,7 @@ public interface DictApi {
* *
* *
* @param typeCode * @param typeCode
* @return * @return ResultVo
*/ */
@GetMapping("/getDictListByCode") @GetMapping("/getDictListByCode")
ResultVo<?> getDictListByCode(String typeCode); ResultVo<?> getDictListByCode(String typeCode);

@ -29,18 +29,15 @@ import java.util.List;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface DictDetailApi { public interface DictDetailApi {
@ -107,7 +104,6 @@ public interface DictDetailApi {
* Excel * Excel
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -123,7 +119,6 @@ public interface DictDetailApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
@ -135,7 +130,7 @@ public interface DictDetailApi {
* *
* *
* @param typeCode * @param typeCode
* @return * @return ResultVo
*/ */
@GetMapping("/findListByTypeCode") @GetMapping("/findListByTypeCode")
ResultVo<List<DictDetailModel>> findListByTypeCode(String typeCode); ResultVo<List<DictDetailModel>> findListByTypeCode(String typeCode);

@ -17,28 +17,23 @@ package org.opsli.api.web.system.logs;
import org.opsli.api.base.result.ResultVo; import org.opsli.api.base.result.ResultVo;
import org.opsli.api.wrapper.system.logs.LogsModel; import org.opsli.api.wrapper.system.logs.LogsModel;
import org.opsli.api.wrapper.system.menu.MenuModel;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface LogsApi { public interface LogsApi {

@ -30,18 +30,15 @@ import java.util.List;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface MenuApi { public interface MenuApi {
@ -53,6 +50,8 @@ public interface MenuApi {
/** /**
* *
*
* @param request request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/findMenuTreePage") @GetMapping("/findMenuTreePage")
@ -156,7 +155,6 @@ public interface MenuApi {
* Excel * Excel
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -172,7 +170,6 @@ public interface MenuApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);

@ -34,20 +34,15 @@ import java.util.Map;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.web.system.options
* @Author: Parker
* @CreateTime: 2021-02-07 18:24:38
* @Description:
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2021-02-07 18:24:38
*/ */
public interface OptionsApi { public interface OptionsApi {
@ -179,6 +174,8 @@ public interface OptionsApi {
/** /**
* *
*
* @param type
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/createCrypto") @PostMapping("/createCrypto")

@ -28,18 +28,15 @@ import org.opsli.api.wrapper.system.org.SysOrgModel;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.web.system.org
* @Author: Parker
* @CreateTime: 2020-11-28 18:59:59
* @Description:
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-11-28 18:59:59
*/ */
public interface SysOrgRestApi { public interface SysOrgRestApi {
@ -49,12 +46,27 @@ public interface SysOrgRestApi {
String SUB_TITLE = "组织机构"; String SUB_TITLE = "组织机构";
/**
* By
* @param parentId ID
* @return ResultVo
*/
@GetMapping("/findTreeLazyByUser") @GetMapping("/findTreeLazyByUser")
ResultVo<?> findTreeLazyByUser(String parentId); ResultVo<?> findTreeLazyByUser(String parentId);
/**
*
* @param parentId ID
* @return ResultVo
*/
@GetMapping("/findTreeLazy") @GetMapping("/findTreeLazy")
ResultVo<?> findTreeLazy(String parentId); ResultVo<?> findTreeLazy(String parentId);
/**
*
* @param parentId ID
* @return ResultVo
*/
@GetMapping("/findGridTree") @GetMapping("/findGridTree")
ResultVo<?> findGridTree(String parentId); ResultVo<?> findGridTree(String parentId);
@ -112,7 +124,6 @@ public interface SysOrgRestApi {
* Excel * Excel
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -128,7 +139,6 @@ public interface SysOrgRestApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);

@ -28,18 +28,15 @@ import javax.servlet.http.HttpServletResponse;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface RoleApi { public interface RoleApi {
@ -106,7 +103,6 @@ public interface RoleApi {
* Excel * Excel
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -122,7 +118,6 @@ public interface RoleApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);

@ -29,18 +29,15 @@ import javax.servlet.http.HttpServletResponse;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface RoleMenuRefApi { public interface RoleMenuRefApi {

@ -28,18 +28,15 @@ import javax.servlet.http.HttpServletResponse;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface TenantApi { public interface TenantApi {
@ -106,7 +103,6 @@ public interface TenantApi {
* Excel * Excel
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -122,7 +118,6 @@ public interface TenantApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);

@ -33,18 +33,15 @@ import java.util.List;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface UserApi { public interface UserApi {
@ -55,6 +52,7 @@ public interface UserApi {
/** /**
* *
* @param request request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/getInfo") @GetMapping("/getInfo")
@ -62,10 +60,12 @@ public interface UserApi {
/** /**
* *
*
* @param userId ID
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/getInfoById") @GetMapping("/getInfoById")
ResultVo<UserInfo> getInfoById(@RequestParam(name = "userId") String userId); ResultVo<UserInfo> getInfoById(String userId);
/** /**
* *
@ -76,10 +76,12 @@ public interface UserApi {
/** /**
* *
*
* @param userId ID
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/getOrgByUserId") @GetMapping("/getOrgByUserId")
ResultVo<UserOrgRefModel> getOrgByUserId(@RequestParam(name = "userId") String userId); ResultVo<UserOrgRefModel> getOrgByUserId(String userId);
/** /**
* userId Id * userId Id
@ -99,6 +101,8 @@ public interface UserApi {
/** /**
* ID * ID
*
* @param userPassword
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/updatePasswordById") @PostMapping("/updatePasswordById")
@ -106,6 +110,8 @@ public interface UserApi {
/** /**
* ID * ID
*
* @param userId ID
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/resetPasswordById") @PostMapping("/resetPasswordById")
@ -142,6 +148,7 @@ public interface UserApi {
* *
* @param pageNo * @param pageNo
* @param pageSize * @param pageSize
* @param org
* @param request request * @param request request
* @return ResultVo * @return ResultVo
*/ */
@ -198,7 +205,6 @@ public interface UserApi {
* Excel * Excel
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -215,7 +221,6 @@ public interface UserApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
@ -256,6 +261,8 @@ public interface UserApi {
/** /**
* *
*
* @param userId ID
* @return ResultVo * @return ResultVo
*/ */
ResultVo<UserOrgRefModel> getOrgInfoByUserId(String userId); ResultVo<UserOrgRefModel> getOrgInfoByUserId(String userId);

@ -22,18 +22,15 @@ import org.springframework.web.bind.annotation.RequestBody;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface UserOrgRefApi { public interface UserOrgRefApi {
@ -45,8 +42,7 @@ public interface UserOrgRefApi {
/** /**
* *
* @param model userId Id * @param model
* @param model roleIds Id
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/setOrg") @PostMapping("/setOrg")

@ -24,18 +24,15 @@ import org.springframework.web.bind.annotation.RequestBody;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface UserRoleRefApi { public interface UserRoleRefApi {
@ -47,8 +44,7 @@ public interface UserRoleRefApi {
/** /**
* *
* @param model userId Id * @param model
* @param model roleIds Id
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/setRoles") @PostMapping("/setRoles")

@ -1,6 +1,5 @@
package org.opsli.api.web.test; package org.opsli.api.web.test;
import io.swagger.annotations.ApiOperation;
import org.opsli.api.base.result.ResultVo; import org.opsli.api.base.result.ResultVo;
import org.opsli.api.wrapper.test.TestModel; import org.opsli.api.wrapper.test.TestModel;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -14,29 +13,30 @@ import java.util.List;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description:
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface TestApi { public interface TestApi {
/**
*
* @return ResultVo
*/
@GetMapping("/sendMail") @GetMapping("/sendMail")
ResultVo<?> sendMail(); ResultVo<?> sendMail();
/** /**
* Redis * Redis
* @return * @return ResultVo
*/ */
@GetMapping("/sendMsg") @GetMapping("/sendMsg")
ResultVo<?> sendMsg(); ResultVo<?> sendMsg();
@ -44,7 +44,7 @@ public interface TestApi {
/** /**
* Redis * Redis
* @return * @return ResultVo
*/ */
@GetMapping("/redisTest") @GetMapping("/redisTest")
ResultVo<?> redisTest(); ResultVo<?> redisTest();
@ -52,21 +52,23 @@ public interface TestApi {
/** /**
* Redis * Redis
* @return * @return ResultVo
*/ */
@GetMapping("/testLock") @GetMapping("/testLock")
ResultVo<?> testLock(); ResultVo<?> testLock();
/** /**
* *
* @return * @param entity entity
* @return ResultVo
*/ */
@GetMapping("/insert") @GetMapping("/insert")
ResultVo<TestModel> insert(TestModel entity); ResultVo<TestModel> insert(TestModel entity);
/** /**
* *
* @return * @param entity entity
* @return ResultVo
*/ */
@GetMapping("/update") @GetMapping("/update")
ResultVo<TestModel> update(TestModel entity); ResultVo<TestModel> update(TestModel entity);
@ -74,7 +76,8 @@ public interface TestApi {
/** /**
* *
* @return * @param entity entity
* @return ResultVo
*/ */
@GetMapping("/get") @GetMapping("/get")
ResultVo<TestModel> get(TestModel entity); ResultVo<TestModel> get(TestModel entity);
@ -82,7 +85,8 @@ public interface TestApi {
/** /**
* *
* @return * @param id id
* @return ResultVo
*/ */
@GetMapping("/del") @GetMapping("/del")
ResultVo<?> del(String id); ResultVo<?> del(String id);
@ -90,7 +94,7 @@ public interface TestApi {
/** /**
* *
* @return * @return ResultVo
*/ */
@GetMapping("/delAll") @GetMapping("/delAll")
ResultVo<?> delAll(); ResultVo<?> delAll();
@ -98,7 +102,8 @@ public interface TestApi {
/** /**
* *
* @return * @param request request
* @return ResultVo
*/ */
@GetMapping("/findList") @GetMapping("/findList")
ResultVo<List<TestModel>> findList(HttpServletRequest request); ResultVo<List<TestModel>> findList(HttpServletRequest request);
@ -106,7 +111,7 @@ public interface TestApi {
/** /**
* *
* @return * @return ResultVo
*/ */
@GetMapping("/findAllList") @GetMapping("/findAllList")
ResultVo<List<TestModel>> findAllList(); ResultVo<List<TestModel>> findAllList();
@ -114,7 +119,11 @@ public interface TestApi {
/** /**
* *
* @return *
* @param pageNo
* @param pageSize
* @param request request
* @return ResultVo
*/ */
@GetMapping("/findPage") @GetMapping("/findPage")
ResultVo<?> findPage( ResultVo<?> findPage(
@ -126,21 +135,26 @@ public interface TestApi {
/** /**
* Excel * Excel
* @return *
* @param request request
* @param response response
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* Excel * Excel
* @return *
* @param request request
* @return ResultVo
*/ */
@PostMapping("/importExcel") @PostMapping("/importExcel")
ResultVo<?> importExcel(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* Excel * Excel
* @return *
* @param response response
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);

@ -28,18 +28,15 @@ import javax.servlet.http.HttpServletResponse;
/** /**
* @BelongsProject: opsli-boot * API
* @BelongsPackage: org.opsli.modulars.test.web
* @Author: Parker
* @CreateTime: 2020-09-13 17:40
* @Description: API
* *
* API @GetMapping @PostMapping * API @GetMapping @PostMapping
* Mapping Controller * Mapping Controller
* *
* *
* *
* * @author Parker
* @date 2020-09-13 17:40
*/ */
public interface TestRestApi { public interface TestRestApi {
@ -106,7 +103,6 @@ public interface TestRestApi {
* Excel * Excel
* @param request request * @param request request
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
@ -122,7 +118,6 @@ public interface TestRestApi {
/** /**
* Excel * Excel
* @param response response * @param response response
* @return ResultVo
*/ */
@GetMapping("/importExcel/template") @GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);

@ -29,11 +29,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.wrapper.gentest.carinfo *
* @Author: Parker * @author Parker
* @CreateTime: 2020-12-20 20:12:57 * @date 2020-12-20 20:12:57
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -30,11 +30,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.wrapper.gentest.user *
* @Author: * @author Parker
* @CreateTime: 2020-11-22 12:12:05 * @date 2020-11-22 12:12:05
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -27,11 +27,10 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.wrapper.system.area *
* @Author: Parker * @author Parker
* @CreateTime: 2020-11-28 18:59:59 * @date 2020-11-28 18:59:59
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -27,11 +27,10 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot * -
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description: -
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -26,11 +26,10 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -19,11 +19,10 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
/** /**
* @BelongsProject: opsli-boot * -
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description: -
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -22,11 +22,10 @@ import lombok.EqualsAndHashCode;
import org.opsli.api.base.warpper.ApiWrapper; import org.opsli.api.base.warpper.ApiWrapper;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -27,11 +27,10 @@ import org.opsli.common.enums.ValiArgsType;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.wrapper.system.menu *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -28,11 +28,10 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.wrapper.system.menu *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -28,13 +28,11 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot *
*
* @BelongsPackage: org.opsli.api.wrapper.system.options *
* @author Parker
* @Author: Parker * @date 2021-02-07 18:24:38
* @CreateTime: 2021-02-07 18:24:38
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -28,11 +28,10 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.api.wrapper.system.org *
* @Author: Parker * @author Parker
* @CreateTime: 2020-11-28 18:59:59 * @date 2020-11-28 18:59:59
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -26,11 +26,10 @@ import org.opsli.common.enums.ValiArgsType;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -27,18 +27,15 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author 2020-09-16 17:33
* @CreateTime: 2020-09-16 17:33 * @date Parker
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class RoleModel extends ApiWrapper { public class RoleModel extends ApiWrapper {
/** 角色编码 */ /** 角色编码 */
@ApiModelProperty(value = "角色编码") @ApiModelProperty(value = "角色编码")
@ExcelProperty(value = "角色编码", order = 1) @ExcelProperty(value = "角色编码", order = 1)

@ -26,11 +26,10 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -28,11 +28,10 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -28,11 +28,10 @@ import org.opsli.common.enums.ValiArgsType;
import java.util.List; import java.util.List;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -28,11 +28,10 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -26,11 +26,10 @@ import org.opsli.common.enums.ValiArgsType;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -28,11 +28,10 @@ import org.opsli.common.enums.ValiArgsType;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -26,11 +26,10 @@ import org.opsli.common.enums.ValiArgsType;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @BelongsProject: opsli-boot * -
* @BelongsPackage: org.opsli.modulars.test.entity *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:33 * @date 2020-09-16 17:33
* @Description:
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -19,19 +19,18 @@ import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import org.opsli.api.base.warpper.ApiWrapper; import org.opsli.api.base.warpper.ApiWrapper;
import org.opsli.plugins.excel.annotation.ExcelInfo; import org.opsli.plugins.excel.annotation.ExcelInfo;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.modulars.test.entity
* @Author: Parker
* @CreateTime: 2020-09-16 17:33
* @Description:
*
* *
* *
* @author Parker
* @date 2020-09-16 17:33
*/ */
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="测试接口返回Model",description="测试接口返回Model") @ApiModel(value="测试接口返回Model",description="测试接口返回Model")
@Data @Data
public class TestModel extends ApiWrapper { public class TestModel extends ApiWrapper {

@ -29,11 +29,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
/** /**
* @BelongsProject: opsli-boot * 3
* @BelongsPackage: org.opsli.api.wrapper.testt *
* @Author: parker * @author Parker
* @CreateTime: 2020-12-20 18:27:04 * @date 2020-12-20 18:27:04
* @Description: 3
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

@ -20,7 +20,9 @@ import java.lang.annotation.*;
/** /**
* Api * Api
*
* @author Parker * @author Parker
* @date 202151814:46:02
*/ */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -23,7 +23,9 @@ import java.lang.annotation.*;
/** /**
* controller使 * controller使
*
* @author Parker * @author Parker
* @date 202151814:46:09
*/ */
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -24,6 +24,7 @@ import java.lang.annotation.Target;
/** /**
* *
* @author parker * @author parker
* @date 2020-09-12
*/ */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -23,7 +23,9 @@ import java.lang.annotation.*;
/** /**
* Java * Java
*
* @author Parker * @author Parker
* @date 2020-12-31
*/ */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -20,7 +20,9 @@ import java.lang.annotation.*;
/** /**
* *
*
* @author Parker * @author Parker
* @date 2020-09-22 17:07
*/ */
@Target(ElementType.FIELD) @Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -21,9 +21,10 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/** /**
* @author Parker
*
* *
*
* @author Parker
* @date 2020-09-22 17:07
*/ */
@Target({ElementType.TYPE, ElementType.METHOD}) @Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -19,10 +19,10 @@ import java.lang.annotation.*;
/** /**
* *
*
* key * key
* *
* @author Parker * @author Parker
* @date 2020-09-22 17:07
*/ */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -18,12 +18,6 @@ package org.opsli.common.annotation.hotdata;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
* @BelongsProject: opsli-boot
* @BelongsPackage: org.opsli.common.annotation
* @Author: Parker
* @CreateTime: 2020-09-16 16:36
* @Description: - Get
*
* Service get keyid * Service get keyid
* *
* *
@ -37,6 +31,8 @@ import java.lang.annotation.*;
* *
* 使 * 使
* *
* @author Parker
* @date 2020-09-16 16:36
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE) @Target(ElementType.TYPE)

@ -19,12 +19,6 @@ package org.opsli.common.annotation.hotdata;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
* @BelongsProject: opsli-boot
* @BelongsPackage: org.opsli.common.annotation
* @Author: Parker
* @CreateTime: 2020-09-16 16:36
* @Description: - Get
*
* Service get keyid * Service get keyid
* *
* *
@ -34,6 +28,8 @@ import java.lang.annotation.*;
* *
* 使 * 使
* *
* @author Parker
* @date 2020-09-16 16:36
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD) @Target(ElementType.METHOD)

@ -19,12 +19,6 @@ package org.opsli.common.annotation.hotdata;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
* @BelongsProject: opsli-boot
* @BelongsPackage: org.opsli.common.annotation
* @Author: Parker
* @CreateTime: 2020-09-16 16:36
* @Description: - Get
*
* Service get keyid * Service get keyid
* *
* *
@ -34,6 +28,8 @@ import java.lang.annotation.*;
* *
* 使 * 使
* *
* @author Parker
* @date 2020-09-16 16:36
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD) @Target(ElementType.METHOD)

@ -20,11 +20,10 @@ import org.opsli.common.enums.ValiArgsType;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.annotation *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-22 17:07 * @date 2020-09-22 17:07
* @Description:
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD) @Target(ElementType.FIELD)

@ -19,14 +19,11 @@ package org.opsli.common.annotation.validation;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
* @BelongsProject: opsli-boot * -
* @BelongsPackage: org.opsli.common.annotation
* @Author: Parker
* @CreateTime: 2020-09-22 17:07
* @Description: -
*
* *
* *
* @author Parker
* @date 2020-09-22 17:07
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD) @Target(ElementType.FIELD)

@ -19,14 +19,11 @@ package org.opsli.common.annotation.validation;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
* @BelongsProject: opsli-boot * -
* @BelongsPackage: org.opsli.common.annotation
* @Author: Parker
* @CreateTime: 2020-09-22 17:07
* @Description: -
*
* *
* *
* @author Parker
* @date 2020-09-22 17:07
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD) @Target(ElementType.FIELD)

@ -26,13 +26,12 @@ import java.util.Map;
/** /**
* *
* *
* @date 202051510:40:54
* @author Parker
*
* Feign * Feign
* *
* @JsonProperty null * @JsonProperty null
* *
* @author Parker
* @date 2020-09-22 17:07
*/ */
public class ResultDto<T> implements Serializable { public class ResultDto<T> implements Serializable {

@ -26,9 +26,8 @@ import java.util.Map;
/** /**
* Web * Web
* *
* @date 202051510:40:54
* @author Parker * @author Parker
* * @date 2020-09-22 17:07
*/ */
public class ResultVoMap extends HashMap<String,Object> implements Serializable { public class ResultVoMap extends HashMap<String,Object> implements Serializable {

@ -16,15 +16,11 @@
package org.opsli.common.base.msg; package org.opsli.common.base.msg;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.base.msg
* @Author: Parker
* @CreateTime: 2020-09-13 19:34
* @Description:
*
*
* opsli * opsli
* *
* @author Parker
* @date 2020-09-22 17:07
*/ */
public interface BaseMsg { public interface BaseMsg {

@ -16,11 +16,10 @@
package org.opsli.common.constants; package org.opsli.common.constants;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.constants *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:42 * @date 2020-09-22 17:07
* @Description:
*/ */
public interface CacheConstants { public interface CacheConstants {

@ -16,11 +16,10 @@
package org.opsli.common.constants; package org.opsli.common.constants;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.constants *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:42 * @date 2020-09-16 17:42
* @Description:
*/ */
public interface DictConstants { public interface DictConstants {

@ -18,11 +18,10 @@ package org.opsli.common.constants;
/** /**
* @BelongsProject: opsli-boot * MyBatis
* @BelongsPackage: org.opsli.common.constants *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-18 18:46 * @date 2020-09-16 17:42
* @Description: MyBatis
*/ */
public interface MyBatisConstants { public interface MyBatisConstants {

@ -16,9 +16,10 @@
package org.opsli.common.constants; package org.opsli.common.constants;
/** /**
* Order * Order
* @author parker *
* @date 2020-09-16 * @author Parker
* @date 2020-09-16 17:42
*/ */
public interface OrderConstants { public interface OrderConstants {

@ -1,9 +1,10 @@
package org.opsli.common.constants; package org.opsli.common.constants;
/** /**
* @Author: *
* @CreateTime: 2020-09-16 17:42 *
* @Description: * @author Parker
* @date 2020-09-16 17:42
*/ */
public interface SignConstants { public interface SignConstants {

@ -16,11 +16,10 @@
package org.opsli.common.constants; package org.opsli.common.constants;
/** /**
* @BelongsProject: opsli-boot * Token
* @BelongsPackage: org.opsli.common.constants *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-16 17:42 * @date 2020-09-16 17:42
* @Description: Token
*/ */
public interface TokenConstants { public interface TokenConstants {

@ -1,9 +1,10 @@
package org.opsli.common.constants; package org.opsli.common.constants;
/** /**
* @Author: * Token
* @CreateTime: 2020-09-16 17:42 *
* @Description: Token * @author Parker
* @date 2020-09-16 17:42
*/ */
public interface TokenTypeConstants { public interface TokenTypeConstants {

@ -17,9 +17,10 @@ package org.opsli.common.enums;
/** /**
* @Author: Parker *
* @CreateTime: 2020-09-17 23:40 *
* @Description: * @author Parker
* @date 2020-09-16 17:42
*/ */
public enum AlertType { public enum AlertType {

@ -19,6 +19,7 @@ package org.opsli.common.enums;
* *
* *
* @author Parker * @author Parker
* @date 2020-09-16 17:42
*/ */
public enum CacheType { public enum CacheType {

@ -19,6 +19,7 @@ package org.opsli.common.enums;
* *
* *
* @author Parker * @author Parker
* @date 2020-09-16 17:42
*/ */
public enum CryptoAsymmetricType { public enum CryptoAsymmetricType {

@ -17,11 +17,10 @@ package org.opsli.common.enums;
/** /**
* @BelongsProject: opsli-boot * Excel
* @BelongsPackage: org.opsli.common.enums *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-17 23:40 * @date 2020-09-16 17:42
* @Description: Excel
*/ */
public enum ExcelOperate { public enum ExcelOperate {

@ -17,11 +17,10 @@ package org.opsli.common.enums;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.enums *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-17 23:40 * @date 2020-09-17 23:40
* @Description:
*/ */
public enum LoginLimitRefuse { public enum LoginLimitRefuse {

@ -19,6 +19,7 @@ package org.opsli.common.enums;
* *
* *
* @author Parker * @author Parker
* @date 2020-09-17 23:40
*/ */
public enum OptionsType { public enum OptionsType {

@ -18,11 +18,10 @@ package org.opsli.common.enums;
import java.util.UUID; import java.util.UUID;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.enums *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-17 23:40 * @date 2020-09-17 23:40
* @Description:
*/ */
public enum SystemInfo { public enum SystemInfo {

@ -17,11 +17,10 @@ package org.opsli.common.enums;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.enums *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-17 23:40 * @date 2020-09-17 23:40
* @Description:
*/ */
public enum ValiArgsType { public enum ValiArgsType {

@ -17,11 +17,10 @@ package org.opsli.common.exception;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.base.excption *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-13 19:41 * @date 2020-09-17 23:40
* @Description:
*/ */
public class EmptyException extends ServiceException{ public class EmptyException extends ServiceException{

@ -18,11 +18,10 @@ package org.opsli.common.exception;
import org.opsli.common.base.msg.BaseMsg; import org.opsli.common.base.msg.BaseMsg;
/** /**
* @BelongsProject: opsli-boot * Jwt
* @BelongsPackage: org.opsli.plugins.mail.exception *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-14 18:44 * @date 2020-09-17 23:40
* @Description: Jwt
*/ */
public class JwtException extends ServiceException { public class JwtException extends ServiceException {

@ -18,11 +18,10 @@ package org.opsli.common.exception;
import org.opsli.common.base.msg.BaseMsg; import org.opsli.common.base.msg.BaseMsg;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.base.excption *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-13 19:41 * @date 2020-09-13 19:41
* @Description:
*/ */
public class ServiceException extends RuntimeException{ public class ServiceException extends RuntimeException{

@ -18,11 +18,10 @@ package org.opsli.common.exception;
import org.opsli.common.base.msg.BaseMsg; import org.opsli.common.base.msg.BaseMsg;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.plugins.mail.exception *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-14 18:44 * @date 2020-09-13 19:41
* @Description:
*/ */
public class TokenException extends ServiceException { public class TokenException extends ServiceException {

@ -18,11 +18,10 @@ package org.opsli.common.msg;
import org.opsli.common.base.msg.BaseMsg; import org.opsli.common.base.msg.BaseMsg;
/** /**
* @BelongsProject: opsli-boot * -
* @BelongsPackage: org.opsli.core.msg *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-13 19:36 * @date 2020-09-13 19:41
* @Description: -
*/ */
public enum CommonMsg implements BaseMsg { public enum CommonMsg implements BaseMsg {

@ -5,9 +5,10 @@ import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
/** /**
* @Author: * 线
* @CreateTime: 2020-10-08 10:24 *
* @Description: 线 * @author
* @date 2020-10-08 10:24
*/ */
@Slf4j @Slf4j
public class AsyncProcessQueueReFuse { public class AsyncProcessQueueReFuse {
@ -44,8 +45,8 @@ public class AsyncProcessQueueReFuse {
/** /**
* *
* *
* @param task * @param task
* @return * @return boolean
*/ */
public static boolean execute(final Runnable task) { public static boolean execute(final Runnable task) {
return AsyncProcessorReFuse.executeTask(new TaskWrapper(task)); return AsyncProcessorReFuse.executeTask(new TaskWrapper(task));

@ -6,9 +6,10 @@ import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import java.util.concurrent.*; import java.util.concurrent.*;
/** /**
* @Author: * 线 - 线
* @CreateTime: 2020-10-08 10:24 *
* @Description: 线 - 线 * @author
* @date 2020-10-08 10:24
*/ */
@Slf4j @Slf4j
public class AsyncProcessorReFuse { public class AsyncProcessorReFuse {
@ -97,8 +98,8 @@ public class AsyncProcessorReFuse {
* <br> * <br>
* {@link } * {@link }
* *
* @param task * @param task
* @return * @return boolean
*/ */
public static boolean executeTask(Runnable task) { public static boolean executeTask(Runnable task) {
try { try {
@ -114,8 +115,8 @@ public class AsyncProcessorReFuse {
* <br> * <br>
* {@link } * {@link }
* *
* @param task * @param task
* @return * @return <T>
*/ */
public static <T> Future<T> submitTask(Callable<T> task) { public static <T> Future<T> submitTask(Callable<T> task) {
try { try {

@ -8,9 +8,10 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
* @Author: * 线 - 线
* @CreateTime: 2020-10-08 10:24 *
* @Description: 线 - 线 * @author
* @date 2020-10-08 10:24
*/ */
@Slf4j @Slf4j
public class AsyncProcessQueueWait { public class AsyncProcessQueueWait {
@ -55,8 +56,8 @@ public class AsyncProcessQueueWait {
/** /**
* *
* *
* @param task * @param task
* @return * @return boolean
*/ */
public static boolean execute(final Runnable task, final AtomicInteger count, final CountDownLatch latch) { public static boolean execute(final Runnable task, final AtomicInteger count, final CountDownLatch latch) {
return AsyncProcessorWait.executeTask(new TaskWrapper(task, count, latch)); return AsyncProcessorWait.executeTask(new TaskWrapper(task, count, latch));

@ -24,12 +24,11 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
* @Author: Parker * 线
* @CreateTime: 2020-12-10 10:36
* @Description: 线
*
* 线线 * 线线
* *
* @author Parker
* @date 2020-12-10 10:36
*/ */
@Slf4j @Slf4j
public class AsyncProcessWaitExecutor { public class AsyncProcessWaitExecutor {

@ -6,9 +6,10 @@ import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import java.util.concurrent.*; import java.util.concurrent.*;
/** /**
* @Author: * 线 - 线
* @CreateTime: 2020-10-08 10:24 *
* @Description: 线 - 线 * @author
* @date 2020-10-08 10:24
*/ */
@Slf4j @Slf4j
public class AsyncProcessorWait { public class AsyncProcessorWait {

@ -18,11 +18,10 @@ package org.opsli.common.utils;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.utils *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-19 23:21 * @date 2020-09-19 23:21
* @Description:
*/ */
public class BigDecimalUtil { public class BigDecimalUtil {
/** /**

@ -1,3 +1,18 @@
/**
* Copyright 2020 OPSLI https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.common.utils; package org.opsli.common.utils;
@ -5,6 +20,7 @@ package org.opsli.common.utils;
* *
* *
* @author venshine * @author venshine
* @date 2020-09-19 23:21
*/ */
public class CheckStrength { public class CheckStrength {

@ -16,11 +16,10 @@
package org.opsli.common.utils; package org.opsli.common.utils;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.utils *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-19 23:21 * @date 2020-09-19 23:21
* @Description:
*/ */
public final class ConvertBytesUtil { public final class ConvertBytesUtil {

@ -16,11 +16,10 @@
package org.opsli.common.utils; package org.opsli.common.utils;
/** /**
* @BelongsProject: opsli-boot *
* @BelongsPackage: org.opsli.common.utils *
* @Author: Parker * @author Parker
* @CreateTime: 2020-09-19 23:21 * @date 2020-09-19 23:21
* @Description:
*/ */
public final class HumpUtil { public final class HumpUtil {
@ -33,10 +32,9 @@ public final class HumpUtil {
/*** /***
* 线 * 线
* *
* @param para * @param para 线
* 线 * @return String
*/ */
public static String underlineToHump(String para) { public static String underlineToHump(String para) {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
String[] a = para.split(UNDERLINE); String[] a = para.split(UNDERLINE);
@ -58,10 +56,9 @@ public final class HumpUtil {
/*** /***
* 线 * 线
* *
* @param para * @param para
* * @return String
*/ */
public static String humpToUnderline(String para) { public static String humpToUnderline(String para) {
StringBuilder sb = new StringBuilder(para); StringBuilder sb = new StringBuilder(para);
//定位 //定位
@ -79,8 +76,8 @@ public final class HumpUtil {
/** /**
* *
* @param str * @param str
* @return * @return String
*/ */
public static String captureName(String str) { public static String captureName(String str) {
char[] cs = str.toCharArray(); char[] cs = str.toCharArray();

@ -15,46 +15,24 @@
*/ */
package org.opsli.common.utils; package org.opsli.common.utils;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.net.NetUtil; import cn.hutool.core.net.NetUtil;
import cn.hutool.core.util.StrUtil;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
/** /**
* @BelongsProject: opsli-boot * IP
* @BelongsPackage: org.opsli.common.utils *
* @Author: Parker * @author Parker
* @CreateTime: 2020-10-08 10:24 * @date 2020-09-19 23:21
* @Description: IP
*/ */
public final class IPUtil { public final class IPUtil {
/** 排除结果 */
private static final String UNKNOWN = "unknown"; private static final String UNKNOWN = "unknown";
/** 分割符 */
/** private static final String SPLIT = ",";
* ip(穿) /** 尝试字段 */
*
* @param request
* @return
*/
public static String getRemoteAddr(HttpServletRequest request) {
String ip = request.getHeader("X-Forwarded-For");
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_CLIENT_IP");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
return ip;
}
private static final String[] HEADERS_TO_TRY = { private static final String[] HEADERS_TO_TRY = {
"X-Forwarded-For", "X-Forwarded-For",
"Proxy-Client-IP", "Proxy-Client-IP",
@ -67,95 +45,69 @@ public final class IPUtil {
"HTTP_FORWARDED", "HTTP_FORWARDED",
"HTTP_VIA", "HTTP_VIA",
"REMOTE_ADDR", "REMOTE_ADDR",
"X-Real-IP"}; "X-Real-IP"
};
/*** /***
* ip(穿) *
* @param request *
* @return * @param request request
* @return String
*/ */
public static String getClientIpAddress(HttpServletRequest request) { public static String getClientAddress(HttpServletRequest request) {
for (String header : HEADERS_TO_TRY) { for (String header : HEADERS_TO_TRY) {
String ip = request.getHeader(header); String address = request.getHeader(header);
if (ip != null && ip.length() != 0 && !UNKNOWN.equalsIgnoreCase(ip)) { if (StrUtil.isNotBlank(address)
return ip; && !UNKNOWN.equalsIgnoreCase(address)) {
return address;
} }
} }
return request.getRemoteAddr(); return request.getRemoteAddr();
} }
/*** /***
* ip(穿) * ()
* @param request *
* @return * @param request request
* @return String
*/ */
public static String getMultistageReverseProxyIp(HttpServletRequest request) { public static String getClientAddressBySingle(HttpServletRequest request) {
String clientIpAddress = getClientIpAddress(request); String clientAddress = getClientAddress(request);
return NetUtil.getMultistageReverseProxyIp(clientIpAddress); return NetUtil.getMultistageReverseProxyIp(clientAddress);
} }
/*** /***
* ip(穿) * IP
* @param request *
* @return * @param request request
* @return String
*/ */
public static String getClientIpAddr(HttpServletRequest request) { public static String getClientId(HttpServletRequest request) {
String ip = request.getHeader("X-Forwarded-For"); for (String header : HEADERS_TO_TRY) {
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { String ip = request.getHeader(header);
ip = request.getHeader("Proxy-Client-IP"); if (StrUtil.isNotBlank(ip) && !UNKNOWN.equalsIgnoreCase(ip)) {
} String reverseProxyIp = NetUtil.getMultistageReverseProxyIp(ip);
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { if(Validator.isIpv4(reverseProxyIp) || Validator.isIpv6(reverseProxyIp)){
ip = request.getHeader("WL-Proxy-Client-IP"); // 判断是否为IP 返回原始IP
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_CLUSTER_CLIENT_IP");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_CLIENT_IP");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_FORWARDED_FOR");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_FORWARDED");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_VIA");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("REMOTE_ADDR");
}
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
return ip;
}
public static String getIpAddr(HttpServletRequest request) {
String ip = request.getHeader("X-Real-IP");
if (null != ip && !"".equals(ip.trim())
&& !UNKNOWN.equalsIgnoreCase(ip)) {
return ip; return ip;
} }
ip = request.getHeader("X-Forwarded-For");
if (null != ip && !"".equals(ip.trim())
&& !UNKNOWN.equalsIgnoreCase(ip)) {
// get first ip from proxy ip
int index = ip.indexOf(',');
if (index != -1) {
return ip.substring(0, index);
} else {
return ip;
} }
} }
return request.getRemoteAddr(); // 否则返回 空地址
return "";
} }
/***
* IP ()
*
* @param request request
* @return String
*/
public static String getClientIdBySingle(HttpServletRequest request) {
String clientIp = getClientId(request);
return NetUtil.getMultistageReverseProxyIp(clientIp);
}
// =============== // ===============

@ -57,7 +57,7 @@ public final class RateLimiterUtil {
*/ */
public static boolean enter(HttpServletRequest request) { public static boolean enter(HttpServletRequest request) {
// 获得IP // 获得IP
String clientIpAddress = IPUtil.getClientIpAddress(request); String clientIpAddress = IPUtil.getClientIdBySingle(request);
// 获得URI // 获得URI
String clientUri = request.getRequestURI(); String clientUri = request.getRequestURI();
return RateLimiterUtil.enter(clientIpAddress, clientUri); return RateLimiterUtil.enter(clientIpAddress, clientUri);
@ -70,7 +70,7 @@ public final class RateLimiterUtil {
*/ */
public static boolean enter(HttpServletRequest request, Double dfQps) { public static boolean enter(HttpServletRequest request, Double dfQps) {
// 获得IP // 获得IP
String clientIpAddress = IPUtil.getClientIpAddress(request); String clientIpAddress = IPUtil.getClientIdBySingle(request);
// 获得URI // 获得URI
String clientUri = request.getRequestURI(); String clientUri = request.getRequestURI();
return RateLimiterUtil.enter(clientIpAddress, clientUri, dfQps); return RateLimiterUtil.enter(clientIpAddress, clientUri, dfQps);

@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import static org.opsli.common.constants.OrderConstants.LIMITER_AOP_SORT; import static org.opsli.common.constants.OrderConstants.LIMITER_AOP_SORT;
/** /**
* *
* *

@ -29,6 +29,9 @@ import static com.google.common.collect.Maps.newHashMap;
/** /**
* *
*
* @author Parker
* @date 202151813:57:46
*/ */
@Slf4j @Slf4j
@Component @Component

@ -51,6 +51,7 @@ import java.util.*;
* https://www.cnblogs.com/qingshan-tang/p/13299701.html * https://www.cnblogs.com/qingshan-tang/p/13299701.html
* *
* @author Parker * @author Parker
* @date 2020-03-01
*/ */
@Component @Component
@Slf4j @Slf4j

@ -92,7 +92,7 @@ public final class LogUtil {
// 操作方法 // 操作方法
String methodName = request.getMethod(); String methodName = request.getMethod();
// 获得IP // 获得IP
String clientIpAddress = IPUtil.getMultistageReverseProxyIp(request); String clientIpAddress = IPUtil.getClientIdBySingle(request);
// 设置标题 // 设置标题
setTitle(point, method, logsModel, user); setTitle(point, method, logsModel, user);

@ -140,7 +140,7 @@ public class LoginRestController {
// 异步保存IP // 异步保存IP
AsyncProcessQueueReFuse.execute(()->{ AsyncProcessQueueReFuse.execute(()->{
// 保存用户最后登录IP // 保存用户最后登录IP
String clientIpAddress = IPUtil.getMultistageReverseProxyIp(request); String clientIpAddress = IPUtil.getClientIdBySingle(request);
user.setLoginIp(clientIpAddress); user.setLoginIp(clientIpAddress);
iUserService.updateLoginIp(user); iUserService.updateLoginIp(user);
}); });

Loading…
Cancel
Save