diff --git a/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-dev.properties b/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-dev.properties index 0b2b9000..04375538 100755 --- a/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-dev.properties +++ b/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-dev.properties @@ -4,5 +4,6 @@ mybatis.print-sql=true # mysql config mysql.host=127.0.0.1:3306 +mysql.db=sop mysql.username=root mysql.password=root diff --git a/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-test.properties b/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-test.properties index bd1c17c0..2fadeb93 100755 --- a/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-test.properties +++ b/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-test.properties @@ -4,5 +4,6 @@ mybatis.print-sql=true # mysql config mysql.host=127.0.0.1:3306 +mysql.db=sop2 mysql.username=root mysql.password=root diff --git a/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application.properties b/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application.properties index 853db1bf..dd0f08fd 100755 --- a/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application.properties +++ b/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application.properties @@ -23,9 +23,9 @@ dubbo.registry.address=zookeeper://localhost:2181 ####### mysql config ####### mysql.host=127.0.0.1:3306 +mysql.db=sop mysql.username= mysql.password= -mysql.db=sop spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.url=jdbc:mysql://${mysql.host}/${mysql.db}?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai diff --git a/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/UserContext.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/UserContext.java index aa67e2f1..b6f61d77 100755 --- a/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/UserContext.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/UserContext.java @@ -1,14 +1,14 @@ package com.gitee.sop.admin.common.context; import com.auth0.jwt.interfaces.Claim; -import com.gitee.sop.admin.common.manager.UserCacheManager; -import com.gitee.sop.admin.common.user.User; import com.gitee.sop.admin.common.config.Configs; import com.gitee.sop.admin.common.enums.ConfigKeyEnum; import com.gitee.sop.admin.common.exception.ErrorTokenException; import com.gitee.sop.admin.common.exception.JwtErrorException; import com.gitee.sop.admin.common.exception.JwtExpiredException; import com.gitee.sop.admin.common.exception.LoginFailureException; +import com.gitee.sop.admin.common.manager.UserCacheManager; +import com.gitee.sop.admin.common.user.User; import com.gitee.sop.admin.common.util.JwtUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.math.NumberUtils; @@ -33,7 +33,11 @@ public class UserContext { private static Supplier tokenGetter = () -> { - HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest(); + ServletRequestAttributes requestAttributes = (ServletRequestAttributes) (RequestContextHolder.getRequestAttributes()); + if (requestAttributes == null) { + return null; + } + HttpServletRequest request = requestAttributes.getRequest(); return getToken(request); }; @@ -43,7 +47,8 @@ public class UserContext { /** * 获取当前登录用户id - * @return 返回id,没有返回null + * + * @return 返回id, 没有返回null */ public static Long getUserId() { return Optional.ofNullable(getUser()).map(User::getUserId).orElse(null); @@ -78,6 +83,9 @@ public class UserContext { } public static String getToken(HttpServletRequest request) { + if (request == null) { + return null; + } String token = request.getHeader(HEADER_AUTHORIZATION); if (StringUtils.hasText(token) && token.startsWith(JWT_PREFIX)) { return token.substring(JWT_PREFIX.length()); diff --git a/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/ConfigKeyEnum.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/ConfigKeyEnum.java index 541e3866..506fa823 100755 --- a/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/ConfigKeyEnum.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/ConfigKeyEnum.java @@ -10,7 +10,6 @@ import lombok.Getter; @AllArgsConstructor @Getter public enum ConfigKeyEnum { - PASSWORD_SALT("admin.password-salt", ""), JWT_TIMEOUT_DAYS("admin.jwt-timeout-days", "365"), JWT_SECRET("admin.jwt.secret", ""), TORNA_SERVER_ADDR("admin.torna-server-addr", ""), diff --git a/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/AddByFill.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/AddByFill.java index 5250dae1..de0496b5 100755 --- a/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/AddByFill.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/AddByFill.java @@ -24,8 +24,11 @@ public class AddByFill extends BaseFill { @Override protected Object getFillValue(Long defaultValue) { + if (defaultValue != null) { + return defaultValue; + } User user = UserContext.getUser(); - return user != null ? user.getUserId() : defaultValue; + return user != null ? user.getUserId() : 0L; } @Override diff --git a/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysAdminUser.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysAdminUser.java deleted file mode 100755 index 75a91145..00000000 --- a/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysAdminUser.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.gitee.sop.admin.dao.entity; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; -import lombok.Data; - -import java.time.LocalDateTime; - - -/** - * 表名：sys_admin_user - * 备注：系统用户表 - * - * @author 六如 - */ -@Table(name = "sys_admin_user", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class SysAdminUser { - - /** - * id - */ - private Long id; - - /** - * 用户名 - */ - private String username; - - /** - * 密码 - */ - private String password; - - /** - * 用户名 - */ - private String nickname; - - /** - * 邮箱 - */ - private String email; - - /** - * 头像 - */ - private String avatar; - - /** - * 状态，1：启用，2：禁用 - */ - private Integer status; - - /** - * 注册类型，1-系统，2-手动 - */ - private String regType; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 最后更新人id - */ - private Long updateBy; -} diff --git a/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysAdminUserMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysAdminUserMapper.java deleted file mode 100755 index c024294a..00000000 --- a/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysAdminUserMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.gitee.sop.admin.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.admin.dao.entity.SysAdminUser; - -/** - * @author 六如 - */ -public interface SysAdminUserMapper extends BaseMapper { - -} diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java index 02a1707c..ebefd864 100755 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java @@ -2,14 +2,11 @@ package com.gitee.sop.admin.service.sys; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; -import com.gitee.sop.admin.common.config.Configs; import com.gitee.sop.admin.common.dto.StatusUpdateBatchDTO; import com.gitee.sop.admin.common.dto.StatusUpdateDTO; import com.gitee.sop.admin.common.dto.UserDTO; -import com.gitee.sop.admin.common.enums.ConfigKeyEnum; import com.gitee.sop.admin.common.support.ServiceSupport; import com.gitee.sop.admin.common.util.CopyUtil; -import com.gitee.sop.admin.common.util.GenerateUtil; import com.gitee.sop.admin.dao.entity.SysUser; import com.gitee.sop.admin.dao.mapper.SysUserMapper; import com.gitee.sop.admin.service.sys.dto.DeptUserResultDTO; @@ -161,20 +158,5 @@ public class SysUserService implements ServiceSupport { return this.get(SysUser::getUsername, username); } - public String getDbPassword(String username, String password) { - return getDbPassword(username, password, getPasswordSalt()); - } - - public String getDbPassword(String username) { - return this.query().eq(SysUser::getUsername, username).getValue(SysUser::getPassword); - } - - public String getDbPassword(String username, String password, String salt) { - return GenerateUtil.getUserPassword(username, password, salt); - } - - private String getPasswordSalt() { - return Configs.getValue(ConfigKeyEnum.PASSWORD_SALT); - } } diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UpgradeService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UpgradeService.java index 5b86c59c..4e38ffe2 100755 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UpgradeService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UpgradeService.java @@ -1,6 +1,7 @@ package com.gitee.sop.admin.service.sys; import com.gitee.sop.admin.common.enums.ConfigKeyEnum; +import com.gitee.sop.admin.common.enums.StatusEnum; import com.gitee.sop.admin.common.util.PasswordUtil; import com.gitee.sop.admin.dao.entity.SysUser; import com.gitee.sop.admin.dao.mapper.UpgradeMapper; @@ -12,6 +13,8 @@ import org.springframework.security.crypto.bcrypt.BCrypt; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; +import java.time.LocalDateTime; + /** * @author 六如 @@ -50,13 +53,14 @@ public class UpgradeService { return; } String username = "admin"; - String tpl = "INSERT INTO `sys_user` ( `username`, `password`, `nickname`, `reg_type`) VALUES \n" + - "\t('%s','%s','%s','%s');"; + String tpl = "INSERT INTO `sys_user` (`id`, `username`, `password`, `nickname`, `reg_type`) VALUES \n" + + "\t(%s, '%s','%s','%s','%s');"; // 初始密码 String defPassword = "123456"; defPassword = DigestUtils.sha256Hex(defPassword); String encodedPassword = BCrypt.hashpw(defPassword, BCrypt.gensalt()); - String sql = String.format(tpl, username, encodedPassword, username, RegTypeEnum.BACKEND.getValue()); + Long userId = 1L; + String sql = String.format(tpl, userId, username, encodedPassword, username, RegTypeEnum.BACKEND.getValue()); runSql(sql); } diff --git a/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/enums/ConfigKeyEnum.java b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/enums/ConfigKeyEnum.java index 6e999c55..45612122 100755 --- a/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/enums/ConfigKeyEnum.java +++ b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/enums/ConfigKeyEnum.java @@ -11,7 +11,6 @@ import lombok.Getter; @AllArgsConstructor @Getter public enum ConfigKeyEnum { - PASSWORD_SALT("admin.password-salt", ""), JWT_TIMEOUT_DAYS("admin.jwt-timeout-days", "365"), JWT_SECRET("admin.jwt.secret", ""), TORNA_SERVER_ADDR("admin.torna-server-addr", ""), diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/ApiInfo.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/ApiInfo.java deleted file mode 100755 index c106be1c..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/ApiInfo.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; -import lombok.Data; - -import java.time.LocalDateTime; - - -/** - * 表名：api_info - * 备注：接口信息表 - * - * @author 六如 - */ -@Table(name = "api_info", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class ApiInfo { - - /** - * id - */ - private Long id; - - /** - * 所属应用 - */ - private String application; - - /** - * 接口名称 - */ - private String apiName; - - /** - * 版本号 - */ - private String apiVersion; - - /** - * 接口描述 - */ - private String description; - - /** - * 备注 - */ - private String remark; - - /** - * 接口class - */ - private String interfaceClassName; - - /** - * 方法名称 - */ - private String methodName; - - /** - * 参数信息 - */ - private String paramInfo; - - /** - * 接口是否需要授权访问 - */ - private Integer isPermission; - - /** - * 是否需要appAuthToken - */ - private Integer isNeedToken; - - /** - * 是否有公共响应参数 - */ - private Integer hasCommonResponse; - - /** - * 注册来源，1-系统注册,2-手动注册 - */ - private Integer regSource; - - /** - * 1启用，0禁用 - */ - private Integer status; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 最后更新人id - */ - private Long updateBy; - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvInfo.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvInfo.java deleted file mode 100755 index 4879e28c..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvInfo.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; -import lombok.Data; - -import java.time.LocalDateTime; - - -/** - * 表名：isv_info - * 备注：isv信息表 - * - * @author 六如 - */ -@Table(name = "isv_info", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class IsvInfo { - - /** - * id - */ - private Long id; - - /** - * appKey - */ - private String appId; - - /** - * 1启用，2禁用 - */ - private Integer status; - - /** - * 备注 - */ - private String remark; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 最后更新人id - */ - private Long updateBy; -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvKeys.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvKeys.java deleted file mode 100755 index 328bede1..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvKeys.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; -import lombok.Data; - -import java.time.LocalDateTime; - - -/** - * 表名：isv_keys - * 备注：ISV秘钥管理 - * - * @author 六如 - */ -@Table(name = "isv_keys", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class IsvKeys { - - /** - * id - */ - private Long id; - - /** - * isv_info.id - */ - private Long isvId; - - /** - * 秘钥格式，1：PKCS8(JAVA适用)，2：PKCS1(非JAVA适用) - */ - private Integer keyFormat; - - /** - * 开发者生成的公钥 - */ - private String publicKeyIsv; - - /** - * 开发者生成的私钥（交给开发者） - */ - private String privateKeyIsv; - - /** - * 平台生成的公钥（交给开发者） - */ - private String publicKeyPlatform; - - /** - * 平台生成的私钥 - */ - private String privateKeyPlatform; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 最后更新人id - */ - private Long updateBy; -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroup.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroup.java deleted file mode 100755 index 42daa7a5..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroup.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; -import lombok.Data; - -import java.time.LocalDateTime; - - -/** - * 表名：perm_group - * 备注：分组表 - * - * @author 六如 - */ -@Table(name = "perm_group", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class PermGroup { - - /** - * id - */ - private Long id; - - /** - * 分组名称 - */ - private String groupName; - - /** - * 是否删除 - */ - @com.gitee.fastmybatis.annotation.Column(logicDelete = true) - private Integer isDeleted; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 最后更新人id - */ - private Long updateBy; -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroupPermission.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroupPermission.java deleted file mode 100755 index 7676f7c7..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroupPermission.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; -import lombok.Data; - -import java.time.LocalDateTime; - - -/** - * 表名：perm_group_permission - * 备注：组权限表 - * - * @author 六如 - */ -@Table(name = "perm_group_permission", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class PermGroupPermission { - - /** - * id - */ - private Long id; - - /** - * 组id - */ - private Long groupId; - - /** - * api_info.id - */ - private Long apiId; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 最后更新人id - */ - private Long updateBy; -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermIsvGroup.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermIsvGroup.java deleted file mode 100755 index b2b49856..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermIsvGroup.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; -import lombok.Data; - -import java.time.LocalDateTime; - - -/** - * 表名：perm_isv_group - * 备注：isv分组 - * - * @author 六如 - */ -@Table(name = "perm_isv_group", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class PermIsvGroup { - - private Long id; - - /** - * isv_info表id - */ - private Long isvId; - - /** - * 组id - */ - private Long groupId; - - private LocalDateTime addTime; - - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 最后更新人id - */ - private Long updateBy; -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysAdminUser.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysAdminUser.java deleted file mode 100755 index 7a9f65e3..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysAdminUser.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; -import lombok.Data; - -import java.time.LocalDateTime; - - -/** - * 表名：sys_admin_user - * 备注：系统用户表 - * - * @author 六如 - */ -@Table(name = "sys_admin_user", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class SysAdminUser { - - /** - * id - */ - private Long id; - - /** - * 用户名 - */ - private String username; - - /** - * 密码 - */ - private String password; - - /** - * 用户名 - */ - private String nickname; - - /** - * 邮箱 - */ - private String email; - - /** - * 头像 - */ - private String avatar; - - /** - * 状态，1：启用，2：禁用 - */ - private Integer status; - - /** - * 注册类型，1-系统，2-手动 - */ - private String regType; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 最后更新人id - */ - private Long updateBy; -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysDept.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysDept.java deleted file mode 100755 index f64d7e30..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysDept.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import java.time.LocalDateTime; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; - -import lombok.Data; - - -/** - * 表名：sys_dept - * 备注：部门表 - * - * @author 六如 - */ -@Table(name = "sys_dept", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class SysDept { - - /** - * id - */ - private Long id; - - /** - * 部门名称 - */ - private String name; - - /** - * 排序 - */ - private Integer sort; - - /** - * 状态，1：启用，2：禁用 - */ - private Integer status; - - /** - * 备注 - */ - private String remark; - - /** - * 父级id - */ - private Long parentId; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 修改人id - */ - private Long updateBy; - - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysResource.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysResource.java deleted file mode 100755 index bd72ece1..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysResource.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import java.time.LocalDateTime; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; - -import lombok.Data; - - -/** - * 表名：sys_resource - * 备注：菜单资源表 - * - * @author 六如 - */ -@Table(name = "sys_resource", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class SysResource { - - /** - * id - */ - private Long id; - - /** - * 菜单类型（0代表菜单、1代表iframe、2代表外链、3代表按钮） - */ - private Integer menuType; - - /** - * 菜单名称 - */ - private String title; - - /** - * 路由名称 - */ - private String name; - - /** - * 路由路径 - */ - private String path; - - /** - * 路由路径 - */ - private String component; - - /** - * 排序 - */ - private Integer rank; - - /** - * 路由重定向 - */ - private String redirect; - - /** - * 菜单图标 - */ - private String icon; - - /** - * 右侧图标 - */ - private String extraIcon; - - /** - * 进场动画（页面加载动画） - */ - private String enterTransition; - - /** - * 离场动画（页面加载动画） - */ - private String leaveTransition; - - /** - * 菜单激活 - */ - private String activePath; - - /** - * 权限标识 - */ - private String auths; - - /** - * 链接地址（需要内嵌的`iframe`链接地址） - */ - private String frameSrc; - - /** - * 加载动画（内嵌的`iframe`页面是否开启首次加载动画） - */ - private Integer frameLoading; - - /** - * 缓存页面 - */ - private Integer keepAlive; - - /** - * 标签页（当前菜单名称或自定义信息禁止添加到标签页） - */ - private Integer hiddenTag; - - /** - * 固定标签页（当前菜单名称是否固定显示在标签页且不可关闭） - */ - private Integer fixedTag; - - /** - * 菜单（是否显示该菜单） - */ - private Integer showLink; - - /** - * 父级菜单（是否显示父级菜单 - */ - private Integer showParent; - - /** - * 父级id - */ - private Long parentId; - - /** - * 是否删除 - */ - @com.gitee.fastmybatis.annotation.Column(logicDelete = true) - private Integer isDeleted; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 修改人id - */ - private Long updateBy; - - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRole.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRole.java deleted file mode 100755 index b3708538..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRole.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import java.time.LocalDateTime; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; - -import lombok.Data; - - -/** - * 表名：sys_role - * 备注：角色表 - * - * @author 六如 - */ -@Table(name = "sys_role", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class SysRole { - - /** - * id - */ - private Long id; - - /** - * 角色名称 - */ - private String name; - - /** - * 角色code - */ - private String code; - - /** - * 备注 - */ - private String remark; - - /** - * 状态，1：启用，2：禁用 - */ - private Integer status; - - @com.gitee.fastmybatis.annotation.Column(logicDelete = true) - private Integer isDeleted; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 修改人id - */ - private Long updateBy; - - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRoleResource.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRoleResource.java deleted file mode 100755 index a0848e92..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRoleResource.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import java.time.LocalDateTime; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; - -import lombok.Data; - - -/** - * 表名：sys_role_resource - * 备注：角色资源关联表 - * - * @author 六如 - */ -@Table(name = "sys_role_resource", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class SysRoleResource { - - /** - * id - */ - private Long id; - - /** - * sys_role.id - */ - private Long roleId; - - /** - * sys_resource.id - */ - private Long resourceId; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 修改人id - */ - private Long updateBy; - - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUser.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUser.java deleted file mode 100755 index a75d0b61..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUser.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import java.time.LocalDateTime; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; - -import lombok.Data; - - -/** - * 表名：sys_user - * 备注：系统用户表 - * - * @author 六如 - */ -@Table(name = "sys_user", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class SysUser { - - /** - * id - */ - private Long id; - - /** - * 用户名 - */ - private String username; - - /** - * 密码 - */ - private String password; - - /** - * 昵称 - */ - private String nickname; - - /** - * 邮箱 - */ - private String phone; - - /** - * 邮箱 - */ - private String email; - - /** - * 头像 - */ - private String avatar; - - /** - * 性别,0-未知,1-男,2-女 - */ - private Integer gender; - - /** - * 状态，1：启用，2：禁用 - */ - private Integer status; - - /** - * 注册类型，1-系统，2-手动 - */ - private String regType; - - /** - * 备注 - */ - private String remark; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 修改人id - */ - private Long updateBy; - - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserDept.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserDept.java deleted file mode 100755 index 86273d02..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserDept.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import java.time.LocalDateTime; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; - -import lombok.Data; - - -/** - * 表名：sys_user_dept - * 备注：用户部门关联表 - * - * @author 六如 - */ -@Table(name = "sys_user_dept", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class SysUserDept { - - /** - * id - */ - private Long id; - - /** - * sys_user.id - */ - private Long userId; - - /** - * sys_dept.id - */ - private Long deptId; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 修改人id - */ - private Long updateBy; - - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserRole.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserRole.java deleted file mode 100755 index 8f837db3..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserRole.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gitee.sop.website.dao.entity; - -import java.time.LocalDateTime; - -import com.gitee.fastmybatis.annotation.Pk; -import com.gitee.fastmybatis.annotation.PkStrategy; -import com.gitee.fastmybatis.annotation.Table; - -import lombok.Data; - - -/** - * 表名：sys_user_role - * 备注：用户角色关联表 - * - * @author 六如 - */ -@Table(name = "sys_user_role", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) -@Data -public class SysUserRole { - - /** - * id - */ - private Long id; - - /** - * sys_role.id - */ - private Long roleId; - - /** - * sys_user.id - */ - private Long userId; - - /** - * 添加时间 - */ - private LocalDateTime addTime; - - /** - * 修改时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人id - */ - private Long addBy; - - /** - * 修改人id - */ - private Long updateBy; - - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/ApiInfoMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/ApiInfoMapper.java deleted file mode 100755 index c179acab..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/ApiInfoMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.ApiInfo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author 六如 - */ -@Mapper -public interface ApiInfoMapper extends BaseMapper { - - default ApiInfo getByNameVersion(String apiName, String apiVersion) { - return this.query() - .eq(ApiInfo::getApiName, apiName) - .eq(ApiInfo::getApiVersion, apiVersion) - .get(); - } - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocAppMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocAppMapper.java index e8a8c734..d7a38cca 100755 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocAppMapper.java +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocAppMapper.java @@ -9,9 +9,4 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface DocAppMapper extends BaseMapper { - default String getToken(Long id) { - return this.query() - .eq(DocApp::getId, id) - .getValue(DocApp::getToken); - } } diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvInfoMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvInfoMapper.java deleted file mode 100755 index f7efbcb8..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvInfoMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.IsvInfo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author 六如 - */ -@Mapper -public interface IsvInfoMapper extends BaseMapper { - - default IsvInfo getByAppId(String appId) { - return this.get(IsvInfo::getAppId, appId); - } - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvKeysMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvKeysMapper.java deleted file mode 100755 index eac8d22a..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvKeysMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.IsvKeys; - -/** - * @author 六如 - */ -public interface IsvKeysMapper extends BaseMapper { - - default IsvKeys getByIsvInfoId(Long isvId) { - return this.get(IsvKeys::getIsvId, isvId); - } - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupMapper.java deleted file mode 100755 index ce53d847..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.PermGroup; - -/** - * @author 六如 - */ -public interface PermGroupMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupPermissionMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupPermissionMapper.java deleted file mode 100755 index 4d9de732..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupPermissionMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.PermGroupPermission; - -/** - * @author 六如 - */ -public interface PermGroupPermissionMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermIsvGroupMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermIsvGroupMapper.java deleted file mode 100755 index 9841ccb5..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermIsvGroupMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.PermIsvGroup; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author 六如 - */ -@Mapper -public interface PermIsvGroupMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysAdminUserMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysAdminUserMapper.java deleted file mode 100755 index fef45203..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysAdminUserMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.SysAdminUser; - -/** - * @author 六如 - */ -public interface SysAdminUserMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysDeptMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysDeptMapper.java deleted file mode 100755 index dd044b6c..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysDeptMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.SysDept; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author 六如 - */ -@Mapper -public interface SysDeptMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysResourceMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysResourceMapper.java deleted file mode 100755 index 501a63dd..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysResourceMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.SysResource; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author 六如 - */ -@Mapper -public interface SysResourceMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleMapper.java deleted file mode 100755 index de5d0bd6..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.SysRole; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author 六如 - */ -@Mapper -public interface SysRoleMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleResourceMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleResourceMapper.java deleted file mode 100755 index 604076fa..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleResourceMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.SysRoleResource; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author 六如 - */ -@Mapper -public interface SysRoleResourceMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserDeptMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserDeptMapper.java deleted file mode 100755 index e3ece350..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserDeptMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.SysUserDept; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author 六如 - */ -@Mapper -public interface SysUserDeptMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserMapper.java deleted file mode 100755 index fde6a0eb..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.SysUser; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author 六如 - */ -@Mapper -public interface SysUserMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserRoleMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserRoleMapper.java deleted file mode 100755 index 290c7819..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserRoleMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.website.dao.entity.SysUserRole; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author 六如 - */ -@Mapper -public interface SysUserRoleMapper extends BaseMapper { - -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/UpgradeMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/UpgradeMapper.java deleted file mode 100755 index afda1b2e..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/UpgradeMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.gitee.sop.website.dao.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -/** - * @author tanghc - */ -@Mapper -public interface UpgradeMapper { - - void runSql(@Param("sql") String sql); - - /** - * 查看MYSQL表字段信息 - * @param tableName 表名 - * @return 返回字段信息 - */ - List> listColumnInfo(@Param("tableName") String tableName); - - List listTableName(); - - List> listTableIndex(@Param("tableName") String tableName); -} diff --git a/sop-website/sop-website-backend/website-dao/src/main/resources/mybatis/mapper/UpgradeMapper.xml b/sop-website/sop-website-backend/website-dao/src/main/resources/mybatis/mapper/UpgradeMapper.xml deleted file mode 100755 index 9c0f5700..00000000 --- a/sop-website/sop-website-backend/website-dao/src/main/resources/mybatis/mapper/UpgradeMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - ${sql} - - - - - - - - - - diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java index 39818445..31c8eeb6 100755 --- a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java @@ -2,10 +2,8 @@ package com.gitee.sop.website.service.sys; import com.gitee.fastmybatis.core.support.BaseLambdaService; import com.gitee.sop.website.common.config.IConfig; -import com.gitee.sop.website.common.util.CopyUtil; import com.gitee.sop.website.dao.entity.SysConfig; import com.gitee.sop.website.dao.mapper.SysConfigMapper; -import com.gitee.sop.website.service.sys.dto.SystemConfigDTO; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -13,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; -import java.util.Collection; import java.util.Objects; import java.util.Optional; import java.util.concurrent.TimeUnit; @@ -37,41 +34,6 @@ public class SysConfigService extends BaseLambdaService configs) { - configs.forEach(this::setConfig); - } - - public String getRawValue(String key) { - return this.query() - .eq(SysConfig::getConfigKey, key) - .getValue(SysConfig::getConfigValue); - } - - public void setConfig(String key, String value) { - setConfig(key, value, ""); - } - - public void setConfig(String key, String value, String remark) { - SystemConfigDTO systemConfigDTO = new SystemConfigDTO(); - systemConfigDTO.setConfigKey(key); - systemConfigDTO.setConfigValue(value); - systemConfigDTO.setRemark(remark); - setConfig(systemConfigDTO); - } - - public void setConfig(SystemConfigDTO systemConfigDTO) { - Objects.requireNonNull(systemConfigDTO.getConfigKey(), "need key"); - Objects.requireNonNull(systemConfigDTO.getConfigValue(), "need value"); - SysConfig systemConfig = get(SysConfig::getConfigKey, systemConfigDTO.getConfigKey()); - if (systemConfig == null) { - systemConfig = CopyUtil.copyBean(systemConfigDTO, SysConfig::new); - this.save(systemConfig); - } else { - CopyUtil.copyPropertiesIgnoreNull(systemConfigDTO, systemConfig); - this.update(systemConfig); - } - configCache.invalidate(systemConfigDTO.getConfigKey()); - } /** * 获取配置信息 diff --git a/sop.sql b/sop.sql index ce6abfa9..08ed61ee 100755 --- a/sop.sql +++ b/sop.sql @@ -133,23 +133,6 @@ CREATE TABLE `perm_isv_group` ( UNIQUE KEY `uk_isvid_groupid` (`isv_id`,`group_id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=13 COMMENT='isv分组'; -CREATE TABLE `sys_admin_user` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', - `username` varchar(128) NOT NULL DEFAULT '' COMMENT '用户名', - `password` varchar(128) NOT NULL DEFAULT '' COMMENT '密码', - `nickname` varchar(64) NOT NULL DEFAULT '' COMMENT '用户名', - `email` varchar(128) NOT NULL DEFAULT '' COMMENT '邮箱', - `avatar` varchar(128) NOT NULL DEFAULT '' COMMENT '头像', - `status` tinyint(4) unsigned NOT NULL DEFAULT '1' COMMENT '状态，1：启用，2：禁用', - `reg_type` varchar(32) NOT NULL DEFAULT '1' COMMENT '注册类型，1-系统，2-手动', - `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `add_by` bigint(20) DEFAULT '0' COMMENT '创建人id', - `update_by` bigint(20) DEFAULT '0' COMMENT '修改人id', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_username` (`username`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=3 COMMENT='系统用户表'; - CREATE TABLE `sys_config` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键id', `config_key` varchar(64) NOT NULL DEFAULT '' COMMENT '配置key', @@ -351,12 +334,8 @@ INSERT INTO `perm_isv_group` (`id`, `isv_id`, `group_id`, `add_time`, `update_ti (11, 2, 1, '2024-10-25 20:25:41', '2024-10-25 20:25:41', 0, 0), (12, 1, 1, '2024-12-22 07:40:38', '2024-12-22 07:40:38', 0, 0); -INSERT INTO `sys_admin_user` (`id`, `username`, `password`, `nickname`, `email`, `avatar`, `status`, `reg_type`, `add_time`, `update_time`, `add_by`, `update_by`) VALUES - (1, 'admin', '$2a$10$6LWUuQQ8V/rszLo50.qrsuBlNmbYY/q2KSC1BmrxxN5czvOxmF3qK', 'admin', '', '', 1, 'backend', '2024-10-03 08:37:03', '2024-10-03 19:08:48', 0, 0); INSERT INTO `sys_config` (`id`, `config_key`, `config_value`, `remark`, `is_deleted`, `add_time`, `update_time`, `add_by`, `update_by`) VALUES - (1, 'admin.jwt.secret', 'UXJC8R3NmAvj9kFKWwBgYu6y3naXh7', '', 0, '2024-10-02 21:20:41', '2024-10-02 21:20:41', 0, 0), - (2, 'admin.password-salt', 'Khq9RnXZCGsWz', '', 0, '2024-10-02 21:20:41', '2024-10-02 21:20:41', 0, 0), (3, 'admin.torna-url', '2', 'Torna服务器地址', 0, '2024-11-19 22:21:07', '2024-11-19 22:25:22', 1, 1), (4, 'admin.open-prod-url', 'https://open.xxx.com/api', '开放平台线上地址', 0, '2024-11-19 22:21:07', '2024-12-21 14:37:31', 1, 1), (5, 'admin.open-sandbox-url', 'https://open-sandbox.xxx.com/api', '开放平台沙箱地址', 0, '2024-11-19 22:21:07', '2024-12-21 14:37:32', 1, 1), @@ -438,7 +417,6 @@ INSERT INTO `sys_role_resource` (`id`, `role_id`, `resource_id`, `add_time`, `up (108, 3, 20, '2024-12-19 11:50:13', '2024-12-19 11:50:13', 1, 1); INSERT INTO `sys_user` (`id`, `username`, `password`, `nickname`, `phone`, `email`, `avatar`, `gender`, `status`, `reg_type`, `remark`, `add_time`, `update_time`, `add_by`, `update_by`) VALUES - (1, 'admin', '$2a$10$vx5WzzoQbryhC6gdV5fXfu6pykE3969tuax1cH.3ADfxrimaho1tO', 'admin', '', '', '', 1, 1, 'backend', '', '2024-12-12 10:11:19', '2024-12-12 12:25:50', 0, 1), (2, 'jim', '$2a$10$LIw8h1oewg9ORK8ikYBRQ.HXchLcxSyPvNaNV6QBP2IXKsf33kJJy', 'jim', '', '', '', 0, 1, 'backend', '', '2024-12-12 12:07:33', '2024-12-20 19:59:48', 1, 1), (3, 'tom', '$2a$10$0drvKbiVDxZ/.zeVqyYcCOucWZs2uWx6KPDu56ddvzCAF.BmEgG06', 'tom', '', '', '', 1, 1, 'backend', '', '2024-12-12 21:51:16', '2024-12-19 09:56:52', 1, 1);