This commit is contained in:
六如
2024-10-10 11:35:34 +08:00
parent d9fb25dc0a
commit e23911b075
193 changed files with 2435 additions and 1008 deletions

View File

@@ -0,0 +1,14 @@
package com.gitee.sop.adminbackend.common.dto;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author 六如
*/
@Data
public class IdDTO {
@NotNull(message = "id不能为空")
private Long id;
}

View File

@@ -0,0 +1,16 @@
package com.gitee.sop.adminbackend.common.dto;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author 六如
*/
@Data
public class StatusUpdateDTO extends IdDTO {
@NotNull(message = "状态不能为空")
private Integer status;
}

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common;
package com.gitee.sop.adminbackend.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common;
package com.gitee.sop.adminbackend.common.enums;
import lombok.Getter;
@@ -9,9 +9,9 @@ import java.util.Objects;
*/
@Getter
public enum StatusEnum {
DISABLED((byte)0),
DISABLED((byte)2),
ENABLE((byte)1),
SET_PWD((byte)2),
SET_PWD((byte)3),
;
private final int status;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common;
package com.gitee.sop.adminbackend.common.req;
import lombok.Data;

View File

@@ -0,0 +1,16 @@
package com.gitee.sop.adminbackend.common.req;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author 六如
*/
@Data
public class StatusUpdateParam extends IdParam {
@NotNull(message = "状态不能为空")
private Integer status;
}

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common;
package com.gitee.sop.adminbackend.common.resp;
import lombok.Data;

View File

@@ -1,6 +1,6 @@
package com.gitee.sop.adminbackend.config;
import com.gitee.sop.adminbackend.common.ConfigKeyEnum;
import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum;
import com.gitee.sop.adminbackend.common.IConfig;
import com.gitee.sop.adminbackend.common.SpringContext;

View File

@@ -1,6 +1,6 @@
package com.gitee.sop.adminbackend.controller;
import com.gitee.sop.adminbackend.common.Result;
import com.gitee.sop.adminbackend.common.resp.Result;
import com.gitee.sop.adminbackend.common.exception.BizException;
import com.gitee.sop.adminbackend.common.exception.ErrorCode;
import com.gitee.sop.adminbackend.common.exception.ExceptionCode;

View File

@@ -0,0 +1,91 @@
package com.gitee.sop.adminbackend.controller.isv;
import com.gitee.fastmybatis.core.PageInfo;
import com.gitee.fastmybatis.core.query.Query;
import com.gitee.fastmybatis.core.query.param.PageParam;
import com.gitee.sop.adminbackend.common.req.IdParam;
import com.gitee.sop.adminbackend.common.resp.Result;
import com.gitee.sop.adminbackend.controller.isv.dto.IsvKeysDTO;
import com.gitee.sop.adminbackend.dao.entity.IsvInfo;
import com.gitee.sop.adminbackend.service.isv.IsvInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author 六如
*/
@RestController
@RequestMapping("isv")
public class IsvInfoController {
@Autowired
private IsvInfoService isvInfoService;
/**
* 分页查询
*
* @param param
* @return
*/
@GetMapping("/page")
public Result<PageInfo<IsvInfo>> page(PageParam param) {
Query query = param.toQuery();
PageInfo<IsvInfo> pageInfo = isvInfoService.page(query);
return Result.ok(pageInfo);
}
/**
* 获取秘钥信息
*
* @param appId
* @return
*/
@GetMapping("/getKeys")
public Result<IsvKeysDTO> getKeys(String appId) {
IsvKeysDTO isvKeysDTO = isvInfoService.getKeys(appId);
return Result.ok(isvKeysDTO);
}
/**
* 新增记录
*
* @param user
* @return 返回添加后的主键值
*/
@PostMapping("/add")
public Result<Long> add(@Validated @RequestBody IsvInfo user) {
isvInfoService.save(user);
// 返回添加后的主键值
return Result.ok(user.getId());
}
/**
* 修改记录
*
* @param user 表单数据
* @return 返回影响行数
*/
@PostMapping("/update")
public Result<Integer> update(@Validated @RequestBody IsvInfo user) {
return Result.ok(isvInfoService.update(user));
}
/**
* 删除记录
*
* @param param 参数
* @return 返回影响行数
*/
@PostMapping("/delete")
public Result<Integer> delete(@Validated @RequestBody IdParam param) {
return Result.ok(isvInfoService.deleteById(param.getId()));
}
}

View File

@@ -0,0 +1,31 @@
package com.gitee.sop.adminbackend.controller.isv.dto;
import lombok.Data;
/**
* @author 六如
*/
@Data
public class IsvKeysDTO {
/**
* 开发者生成的公钥, 数据库字段public_key_isv
*/
private String publicKeyIsv;
/**
* 开发者生成的私钥(交给开发者), 数据库字段private_key_isv
*/
private String privateKeyIsv;
/**
* 平台生成的公钥(交给开发者), 数据库字段public_key_platform
*/
private String publicKeyPlatform;
/**
* 平台生成的私钥, 数据库字段private_key_platform
*/
private String privateKeyPlatform;
}

View File

@@ -2,11 +2,14 @@ package com.gitee.sop.adminbackend.controller.serve;
import com.gitee.fastmybatis.core.PageInfo;
import com.gitee.fastmybatis.core.query.Query;
import com.gitee.sop.adminbackend.common.IdParam;
import com.gitee.sop.adminbackend.common.Result;
import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO;
import com.gitee.sop.adminbackend.common.req.IdParam;
import com.gitee.sop.adminbackend.common.req.StatusUpdateParam;
import com.gitee.sop.adminbackend.common.resp.Result;
import com.gitee.sop.adminbackend.controller.serve.req.ApiInfoParam;
import com.gitee.sop.adminbackend.dao.entity.ApiInfo;
import com.gitee.sop.adminbackend.service.serve.ApiInfoService;
import com.gitee.sop.adminbackend.util.CopyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -66,6 +69,18 @@ public class ApiInfoController {
return Result.ok(apiInfoService.update(user));
}
/**
* 修改状态
*
* @param param 表单数据
* @return 返回影响行数
*/
@PostMapping("/updateStatus")
public Result<Integer> updateStatus(@Validated @RequestBody StatusUpdateParam param) {
StatusUpdateDTO statusUpdateDTO = CopyUtil.copyBean(param, StatusUpdateDTO::new);
return Result.ok(apiInfoService.updateStatus(statusUpdateDTO));
}
/**
* 删除记录
*

View File

@@ -14,5 +14,7 @@ public class ApiInfoParam extends PageParam {
@Condition(operator = Operator.like)
private String apiName;
@Condition
private Integer status;
}

View File

@@ -1,6 +1,6 @@
package com.gitee.sop.adminbackend.controller.sys;
import com.gitee.sop.adminbackend.common.Result;
import com.gitee.sop.adminbackend.common.resp.Result;
import com.gitee.sop.adminbackend.controller.sys.req.LoginParam;
import com.gitee.sop.adminbackend.controller.sys.resp.LoginResultVO;
import com.gitee.sop.adminbackend.service.sys.login.LoginService;

View File

@@ -3,14 +3,15 @@ package com.gitee.sop.adminbackend.controller.sys;
import com.gitee.fastmybatis.core.PageInfo;
import com.gitee.fastmybatis.core.query.Query;
import com.gitee.fastmybatis.core.query.param.PageParam;
import com.gitee.sop.adminbackend.common.Result;
import com.gitee.sop.adminbackend.common.req.IdParam;
import com.gitee.sop.adminbackend.common.resp.Result;
import com.gitee.sop.adminbackend.dao.entity.SysAdminUser;
import com.gitee.sop.adminbackend.service.sys.SysAdminUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -28,8 +29,8 @@ public class SysAdminUserController {
/**
* 分页查询
*
* @param param
* @return
* @param param 查询参数
* @return 返回分页结果
*/
@GetMapping("/page")
public Result<PageInfo<SysAdminUser>> page(PageParam param) {
@@ -41,36 +42,36 @@ public class SysAdminUserController {
/**
* 新增记录
*
* @param user
* @return
* @param sysAdminUser 表单参数
* @return 返回添加后的主键值
*/
@PostMapping("/save")
public Result<Long> save(SysAdminUser user) {
sysAdminUserService.save(user);
@PostMapping("/add")
public Result<Long> add(@Validated @RequestBody SysAdminUser sysAdminUser) {
sysAdminUserService.save(sysAdminUser);
// 返回添加后的主键值
return Result.ok(user.getId());
return Result.ok(sysAdminUser.getId());
}
/**
* 修改记录
*
* @param user 表单数据
* @return
* @param sysAdminUser 表单数据
* @return 返回影响行数
*/
@PutMapping("/update")
public Result<Integer> update(SysAdminUser user) {
return Result.ok(sysAdminUserService.update(user));
@PostMapping("/update")
public Result<Integer> update(@Validated @RequestBody SysAdminUser sysAdminUser) {
return Result.ok(sysAdminUserService.update(sysAdminUser));
}
/**
* 删除记录
*
* @param id 主键id
* @return
* @param param 参数
* @return 返回影响行数
*/
@DeleteMapping("/delete")
public Result<?> delete(Long id) {
return Result.ok(sysAdminUserService.deleteById(id));
@PostMapping("/delete")
public Result<Integer> delete(@Validated @RequestBody IdParam param) {
return Result.ok(sysAdminUserService.deleteById(param.getId()));
}
}

View File

@@ -71,6 +71,11 @@ public class ApiInfo {
*/
private Integer isNeedToken;
/**
* 注册来源1-系统注册,2-手动注册
*/
private Integer regSource;
/**
* 1启用2禁用
*/

View File

@@ -0,0 +1,29 @@
package com.gitee.sop.adminbackend.service.isv;
import com.gitee.fastmybatis.core.support.LambdaService;
import com.gitee.sop.adminbackend.controller.isv.dto.IsvKeysDTO;
import com.gitee.sop.adminbackend.dao.entity.IsvInfo;
import com.gitee.sop.adminbackend.dao.entity.IsvKeys;
import com.gitee.sop.adminbackend.dao.mapper.IsvInfoMapper;
import com.gitee.sop.adminbackend.dao.mapper.IsvKeysMapper;
import com.gitee.sop.adminbackend.util.CopyUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* @author 六如
*/
@Service
public class IsvInfoService implements LambdaService<IsvInfo, IsvInfoMapper> {
@Resource
private IsvKeysMapper isvKeysMapper;
public IsvKeysDTO getKeys(String appId) {
IsvKeys isvKeys = isvKeysMapper.get(IsvKeys::getAppId, appId);
return CopyUtil.copyBean(isvKeys, IsvKeysDTO::new);
}
}

View File

@@ -1,6 +1,7 @@
package com.gitee.sop.adminbackend.service.serve;
import com.gitee.fastmybatis.core.support.LambdaService;
import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO;
import com.gitee.sop.adminbackend.dao.entity.ApiInfo;
import com.gitee.sop.adminbackend.dao.mapper.ApiInfoMapper;
import org.springframework.stereotype.Service;
@@ -12,4 +13,11 @@ import org.springframework.stereotype.Service;
@Service
public class ApiInfoService implements LambdaService<ApiInfo, ApiInfoMapper> {
public int updateStatus(StatusUpdateDTO statusUpdateDTO) {
return this.query()
.eq(ApiInfo::getId, statusUpdateDTO.getId())
.set(ApiInfo::getStatus, statusUpdateDTO.getStatus())
.update();
}
}

View File

@@ -1,8 +1,7 @@
package com.gitee.sop.adminbackend.service.sys;
import com.gitee.fastmybatis.core.support.LambdaService;
import com.gitee.sop.adminbackend.common.ConfigKeyEnum;
import com.gitee.sop.adminbackend.config.AdminConfig;
import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum;
import com.gitee.sop.adminbackend.config.Configs;
import com.gitee.sop.adminbackend.dao.entity.SysAdminUser;
import com.gitee.sop.adminbackend.dao.mapper.SysAdminUserMapper;

View File

@@ -1,6 +1,6 @@
package com.gitee.sop.adminbackend.service.sys;
import com.gitee.sop.adminbackend.common.ConfigKeyEnum;
import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum;
import com.gitee.sop.adminbackend.dao.entity.SysAdminUser;
import com.gitee.sop.adminbackend.dao.mapper.UpgradeMapper;
import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum;

View File

@@ -1,7 +1,7 @@
package com.gitee.sop.adminbackend.service.sys.login;
import com.alibaba.nacos.shaded.com.google.common.collect.Sets;
import com.gitee.sop.adminbackend.common.ConfigKeyEnum;
import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum;
import com.gitee.sop.adminbackend.common.exception.BizException;
import com.gitee.sop.adminbackend.config.Configs;
import com.gitee.sop.adminbackend.dao.entity.SysAdminUser;
@@ -10,7 +10,7 @@ import com.gitee.sop.adminbackend.service.sys.login.dto.LoginDTO;
import com.gitee.sop.adminbackend.service.sys.login.dto.LoginForm;
import com.gitee.sop.adminbackend.service.sys.login.dto.LoginResult;
import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser;
import com.gitee.sop.adminbackend.common.StatusEnum;
import com.gitee.sop.adminbackend.common.enums.StatusEnum;
import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum;
import com.gitee.sop.adminbackend.util.CopyUtil;
import com.gitee.sop.adminbackend.util.GenerateUtil;

View File

@@ -5,7 +5,7 @@ import com.gitee.sop.adminbackend.dao.entity.SysAdminUser;
import com.gitee.sop.adminbackend.service.sys.SysAdminUserService;
import com.gitee.sop.adminbackend.service.sys.login.UserCacheManager;
import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser;
import com.gitee.sop.adminbackend.common.StatusEnum;
import com.gitee.sop.adminbackend.common.enums.StatusEnum;
import com.gitee.sop.adminbackend.util.CopyUtil;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;