diff --git a/chat2db-server/.apifox-helper.properties b/chat2db-server/.apifox-helper.properties index 0da78a8d..c8128de5 100644 --- a/chat2db-server/.apifox-helper.properties +++ b/chat2db-server/.apifox-helper.properties @@ -12,4 +12,9 @@ api.tag=#version constant.field.ignore=groovy:it.name()=="serialVersionUID" # sprnSupport for Jackson annotations -json.rule.field.ignore=@com.fasterxml.jackson.annotation.JsonIgnore#value \ No newline at end of file +json.rule.field.ignore=@com.fasterxml.jackson.annotation.JsonIgnore#value + +field.demo=#demo +field.default.value=#default +#apifox mock +field.mock=#mock \ No newline at end of file diff --git a/chat2db-server/.easy.api.config b/chat2db-server/.easy.api.config index 0da78a8d..85a243fa 100644 --- a/chat2db-server/.easy.api.config +++ b/chat2db-server/.easy.api.config @@ -12,4 +12,4 @@ api.tag=#version constant.field.ignore=groovy:it.name()=="serialVersionUID" # sprnSupport for Jackson annotations -json.rule.field.ignore=@com.fasterxml.jackson.annotation.JsonIgnore#value \ No newline at end of file +json.rule.field.ignore=@com.fasterxml.jackson.annotation.JsonIgnore#value diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/enums/RoleCodeEnum.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/enums/RoleCodeEnum.java index c52dc36e..11cfebd2 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/enums/RoleCodeEnum.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/enums/RoleCodeEnum.java @@ -13,25 +13,29 @@ public enum RoleCodeEnum implements BaseEnum { /** * DESKTOP */ - DESKTOP("DESKTOP", 1L), + DESKTOP("DESKTOP", 1L, "_desktop_default_user_name", "_desktop_default_user_name"), /** * ADMIN */ - ADMIN("ADMIN", 2L), + ADMIN("ADMIN", 2L, "chat2db", "chat2db"), /** * USER */ - USER("USER", null), + USER("USER", null, null, null), ; final String description; final Long defaultUserId; + final String userName; + final String password; - RoleCodeEnum(String description, Long defaultUserId) { + RoleCodeEnum(String description, Long defaultUserId, String userName, String password) { this.description = description; this.defaultUserId = defaultUserId; + this.userName = userName; + this.password = password; } @Override diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/cache/MemoryCacheManage.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/cache/MemoryCacheManage.java index 93023831..cc9595d0 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/cache/MemoryCacheManage.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/cache/MemoryCacheManage.java @@ -33,7 +33,7 @@ public class MemoryCacheManage { .createCache(CACHE, CacheConfigurationBuilder.newCacheConfigurationBuilder(String.class, byte[].class, ResourcePoolsBuilder.newResourcePoolsBuilder() - .offheap(10, MemoryUnit.MB)) + .offheap(5, MemoryUnit.MB)) .withExpiry(ExpiryPolicyBuilder.timeToLiveExpiration(Duration.ofMinutes(10)))); } diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/DataSourceDO.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/DataSourceDO.java index 5d304084..b84dfc60 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/DataSourceDO.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/DataSourceDO.java @@ -14,7 +14,7 @@ import lombok.Setter; *

* * @author chat2db - * @since 2023-07-30 + * @since 2023-08-05 */ @Getter @Setter diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/DataSourceCustomMapper.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/DataSourceCustomMapper.java index 0c95f079..249f5fcb 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/DataSourceCustomMapper.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/DataSourceCustomMapper.java @@ -1,6 +1,7 @@ package ai.chat2db.server.domain.repository.mapper; import ai.chat2db.server.domain.repository.entity.DataSourceDO; +import com.baomidou.mybatisplus.core.mapper.Mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; @@ -9,8 +10,9 @@ import org.apache.ibatis.annotations.Param; * * @author Jiaju Zhuang */ -public interface DataSourceCustomMapper { +public interface DataSourceCustomMapper extends Mapper { + IPage selectPageWithPermission(IPage page, @Param("admin") Boolean admin, + @Param("userId") Long userId, + @Param("searchKey") String searchKey); - IPage selectPageWithPermission(IPage page, @Param("admin") Boolean admin, @Param("userId") Long userId, - @Param("searchKey") String searchKey); } diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DataSourceCustomMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DataSourceCustomMapper.xml deleted file mode 100644 index f3eebc2e..00000000 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DataSourceCustomMapper.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/ChartMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/ChartMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/ChartMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/ChartMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DashboardChartRelationMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DashboardChartRelationMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DashboardChartRelationMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DashboardChartRelationMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DashboardMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DashboardMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DashboardMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DashboardMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DataSourceAccessMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceAccessMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DataSourceAccessMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceAccessMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceCustomMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceCustomMapper.xml new file mode 100644 index 00000000..4eb40f43 --- /dev/null +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceCustomMapper.xml @@ -0,0 +1,36 @@ + + + + + + diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DataSourceMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DataSourceMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DbhubUserMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DbhubUserMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/DbhubUserMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DbhubUserMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/EnvironmentMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/EnvironmentMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/EnvironmentMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/EnvironmentMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/JdbcDriverMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/JdbcDriverMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/JdbcDriverMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/JdbcDriverMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/OperationLogMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/OperationLogMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/OperationLogMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/OperationLogMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/OperationSavedMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/OperationSavedMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/OperationSavedMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/OperationSavedMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/PinTableMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/PinTableMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/PinTableMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/PinTableMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/SystemConfigMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/SystemConfigMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/SystemConfigMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/SystemConfigMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/TeamMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/TeamMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/TeamMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/TeamMapper.xml diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/TeamUserMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/TeamUserMapper.xml similarity index 100% rename from chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/TeamUserMapper.xml rename to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/TeamUserMapper.xml diff --git a/chat2db-server/chat2db-server-start/pom.xml b/chat2db-server/chat2db-server-start/pom.xml index 11083dce..7dcabffb 100644 --- a/chat2db-server/chat2db-server-start/pom.xml +++ b/chat2db-server/chat2db-server-start/pom.xml @@ -28,7 +28,10 @@ ai.chat2db chat2db-server-web-api - + + ai.chat2db + chat2db-server-admin-api + ai.chat2db diff --git a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/Application.java b/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/Application.java index f85e38cc..9501398c 100644 --- a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/Application.java +++ b/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/Application.java @@ -47,7 +47,7 @@ public class Application { ModeEnum mode = EasyEnumUtils.getEnum(ModeEnum.class, System.getProperty("chat2db.mode")); if (mode == ModeEnum.DESKTOP) { // In this mode, no user login is required, so only local access is available - args = ArrayUtils.add(args, "--server.address = 0.0.0.0"); + args = ArrayUtils.add(args, "--server.address=0.0.0.0"); } SpringApplication.run(Application.class, args); } diff --git a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/config/Chat2dbWebMvcConfigurer.java b/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/config/Chat2dbWebMvcConfigurer.java index 84a1b0d1..6d2a208d 100644 --- a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/config/Chat2dbWebMvcConfigurer.java +++ b/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/config/Chat2dbWebMvcConfigurer.java @@ -77,8 +77,9 @@ public class Chat2dbWebMvcConfigurer implements WebMvcConfigurer { } else { return true; } + } else { + userId = Long.parseLong(userIdString); } - userId = Long.parseLong(userIdString); Long finalUserId = userId; LoginUser loginUser = MemoryCacheManage.computeIfAbsent(CacheKey.getLoginUserKey(userId), () -> { User user = userService.query(finalUserId).getData(); diff --git a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/controller/oauth/OauthController.java b/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/controller/oauth/OauthController.java index 3cf1b019..1a7d6375 100644 --- a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/controller/oauth/OauthController.java +++ b/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/controller/oauth/OauthController.java @@ -1,5 +1,6 @@ package ai.chat2db.server.start.controller.oauth; +import ai.chat2db.server.domain.api.enums.RoleCodeEnum; import jakarta.annotation.Resource; import ai.chat2db.server.domain.api.model.User; @@ -47,14 +48,26 @@ public class OauthController { // 查询用户 User user = userService.query(request.getUserName()).getData(); if (user == null) { - throw new BusinessException("当前用户不存在。"); + throw new BusinessException("oauth.userNameNotExits"); } + if (RoleCodeEnum.DESKTOP.getDefaultUserId().equals(user.getId())) { + throw new BusinessException("oauth.IllegalUserName"); + } + // Successfully logged in without modifying the administrator password + if (RoleCodeEnum.ADMIN.getDefaultUserId().equals(user.getId()) && RoleCodeEnum.ADMIN.getPassword().equals( + user.getPassword())) { + return DataResult.of(doLogin(user)); + } + if (!DigestUtil.bcryptCheck(request.getPassword(), user.getPassword())) { - throw new BusinessException("您输入的密码有误。"); + throw new BusinessException("oauth.passwordIncorrect"); } + return DataResult.of(doLogin(user)); + } + + private Object doLogin(User user) { StpUtil.login(user.getId()); - Object token = SaHolder.getStorage().get(SaTokenConsts.JUST_CREATED_NOT_PREFIX); - return DataResult.of(token); + return SaHolder.getStorage().get(SaTokenConsts.JUST_CREATED_NOT_PREFIX); } /** diff --git a/chat2db-server/chat2db-server-start/src/main/resources/application.yml b/chat2db-server/chat2db-server-start/src/main/resources/application.yml index 643b27d5..b70f7f56 100644 --- a/chat2db-server/chat2db-server-start/src/main/resources/application.yml +++ b/chat2db-server/chat2db-server-start/src/main/resources/application.yml @@ -32,7 +32,7 @@ spring: multipart: max-file-size: -1 max-request-size: -1 - + chat2db: version: 1.0.0 @@ -41,6 +41,12 @@ logging: level: org: flywaydb: debug + ai: + chat2db: + server: + domain: + repository: + mapper: debug # 登录功能 sa-token: # token名称 (同时也是cookie名称) diff --git a/chat2db-server/chat2db-server-start/src/main/resources/db/migration/V2_1_0__支持环境、用户权限.sql b/chat2db-server/chat2db-server-start/src/main/resources/db/migration/V2_1_0__支持环境、用户权限.sql index 48dc0587..c2b3d358 100644 --- a/chat2db-server/chat2db-server-start/src/main/resources/db/migration/V2_1_0__支持环境、用户权限.sql +++ b/chat2db-server/chat2db-server-start/src/main/resources/db/migration/V2_1_0__支持环境、用户权限.sql @@ -38,8 +38,11 @@ ALTER TABLE `dbhub_user` update dbhub_user -set role_code= 'DESKTOP' +set role_code= 'DESKTOP',user_name='_desktop_default_user_name',password='_desktop_default_user_name',nick_name='桌面端用户' where id = 1; +INSERT INTO DBHUB_USER (USER_NAME, PASSWORD, NICK_NAME, EMAIL, ROLE_CODE) VALUES ('chat2db', 'chat2db', '管理员', null, 'ADMIN'); + +create UNIQUE INDEX uk_user_user_name on dbhub_user (user_name); CREATE TABLE IF NOT EXISTS `team` diff --git a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages.properties b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages.properties index 1b4d78d7..f08c1b7d 100644 --- a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages.properties +++ b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages.properties @@ -8,6 +8,11 @@ common.paramDetailError=The parameter: {0} is incorrect common.paramCheckError=The following parameters are not valid: common.maxUploadSize=The file exceeds the maximum limit common.permissionDenied=Permission denied + +oauth.userNameNotExits=The current account does not exist +oauth.IllegalUserName=The current account cannot be logged in. Please change your account +oauth.passwordIncorrect=The password you entered is incorrect + # dataSource dataSource.sqlAnalysisError=Invalid statements # connection diff --git a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_en_US.properties b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_en_US.properties index bcd1ff56..e6cb5311 100644 --- a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_en_US.properties +++ b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_en_US.properties @@ -8,6 +8,10 @@ common.paramCheckError=The following parameters are not valid common.maxUploadSize=The file exceeds the maximum limit common.permissionDenied=Permission denied +oauth.userNameNotExits=The current account does not exist +oauth.IllegalUserName=The current account cannot be logged in. Please change your account +oauth.passwordError=The password you entered is incorrect + dataSource.sqlAnalysisError=Invalid statements connection.error=Connection failed, please check the connection information connection.ssh.error=SSH connection failed, please check the connection information diff --git a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_zh_CN.properties b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_zh_CN.properties index 7557c5cd..a73a6d04 100644 --- a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_zh_CN.properties +++ b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_zh_CN.properties @@ -8,6 +8,10 @@ common.paramCheckError=请检查以下参数: common.maxUploadSize=您输入的文件超过最大限制 common.permissionDenied=您没有权限访问该页面 +oauth.userNameNotExits=当前账号不存在 +oauth.IllegalUserName=当前账号无法登录，请换一个账号 +oauth.passwordIncorrect=您输入的密码有误 + dataSource.sqlAnalysisError=不合法的执行语句 connection.error=数据库链接异常，请检查数据库配置 connection.ssh.error=SSH 链接异常，请检查SSH配置 diff --git a/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java b/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java index 12ea9944..daa5fb39 100644 --- a/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java +++ b/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java @@ -34,7 +34,7 @@ public class MybatisGeneratorTest extends BaseTest { //doGenerator(Lists.newArrayList("operation_saved")); //doGenerator(Lists.newArrayList("environment","data_source","team","team_dbhub_user","data_source_access", // "dbhub_user")); - doGenerator(Lists.newArrayList("team_user")); + doGenerator(Lists.newArrayList("data_source")); } private void doGenerator(List tableList) { @@ -45,7 +45,7 @@ public class MybatisGeneratorTest extends BaseTest { + "/java"; String xmlDir = System.getProperty("user.dir") + "/../chat2db-server-domain/chat2db-server-domain-repository/src/main" - + "/resources/ai/chat2db/server/domain/repository"; + + "/resources/mapper"; // 不要生成service controller Map pathInfo = new HashMap<>(); @@ -83,14 +83,12 @@ public class MybatisGeneratorTest extends BaseTest { //开启实体类配置 .entityBuilder() .formatFileName("%sDO") - // 覆盖文件 - .enableFileOverride() //.addTableFills(new Column("gmt_create", FieldFill.INSERT)) // 表字段填充 //.addTableFills(new Column("update_time", FieldFill.INSERT_UPDATE)) // 表字段填充 //开启lombok .enableLombok() .mapperBuilder() - // 覆盖文件 + //// 覆盖文件 .enableFileOverride() ; diff --git a/chat2db-server/chat2db-server-tools/chat2db-server-tools-base/src/main/java/ai/chat2db/server/tools/base/wrapper/request/PageQueryRequest.java b/chat2db-server/chat2db-server-tools/chat2db-server-tools-base/src/main/java/ai/chat2db/server/tools/base/wrapper/request/PageQueryRequest.java index 8b3ca3f8..7bf1ccbf 100644 --- a/chat2db-server/chat2db-server-tools/chat2db-server-tools-base/src/main/java/ai/chat2db/server/tools/base/wrapper/request/PageQueryRequest.java +++ b/chat2db-server/chat2db-server-tools/chat2db-server-tools-base/src/main/java/ai/chat2db/server/tools/base/wrapper/request/PageQueryRequest.java @@ -3,7 +3,6 @@ package ai.chat2db.server.tools.base.wrapper.request; import java.io.Serial; import java.io.Serializable; - import ai.chat2db.server.tools.base.constant.EasyToolsConstant; import jakarta.validation.constraints.NotNull; @@ -26,11 +25,15 @@ public class PageQueryRequest implements Serializable { private static final long serialVersionUID = EasyToolsConstant.SERIAL_VERSION_UID; /** * 页码 + * + * @mock 1 */ @NotNull(message = "分页页码不能为空") private Integer pageNo; /** * 分页条数 + * + * @demo 10 */ @NotNull(message = "分页大小不能为空") @Range(min = 1, max = EasyToolsConstant.MAX_PAGE_SIZE, diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAdminController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAdminController.java index 5f30e19d..c0ca5199 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAdminController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAdminController.java @@ -46,7 +46,7 @@ public class DataSourceAdminController { */ @GetMapping("/page") public WebPageResult page(@Valid CommonPageQueryRequest request) { - return dataSourceService.queryPage(dataSourceAdminConverter.request2param(request), null) + return dataSourceService.queryPageWithPermission(dataSourceAdminConverter.request2param(request), null) .mapToWeb(dataSourceAdminConverter::dto2vo); } @@ -81,6 +81,7 @@ public class DataSourceAdminController { * * @param request * @return + * @version 2.1.0 */ @PostMapping("/clone") public DataResult clone(@RequestBody DataSourceCloneRequest request) { @@ -92,6 +93,7 @@ public class DataSourceAdminController { * * @param id * @return + * @version 2.1.0 */ @DeleteMapping("/{id}") public ActionResult delete(@PathVariable Long id) { diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserAdminController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserAdminController.java index 603e8c79..b8f30eea 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserAdminController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserAdminController.java @@ -2,7 +2,7 @@ package ai.chat2db.server.admin.api.controller.user; import ai.chat2db.server.admin.api.controller.common.request.CommonPageQueryRequest; -import ai.chat2db.server.admin.api.controller.user.converter.DataSourceAdminConverter; +import ai.chat2db.server.admin.api.controller.user.converter.UserAdminConverter; import ai.chat2db.server.admin.api.controller.user.request.UserCreateRequest; import ai.chat2db.server.admin.api.controller.user.request.UserUpdateRequest; import ai.chat2db.server.admin.api.controller.user.vo.UserPageQueryVO; @@ -32,7 +32,7 @@ public class UserAdminController { @Resource private DataSourceService dataSourceService; @Resource - private DataSourceAdminConverter dataSourceAdminConverter; + private UserAdminConverter dataSourceAdminConverter; /** * Pagination query diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/converter/DataSourceAdminConverter.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/converter/DataSourceAdminConverter.java deleted file mode 100644 index 22625446..00000000 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/converter/DataSourceAdminConverter.java +++ /dev/null @@ -1,66 +0,0 @@ -package ai.chat2db.server.admin.api.controller.user.converter; - -import ai.chat2db.server.admin.api.controller.common.request.CommonPageQueryRequest; -import ai.chat2db.server.admin.api.controller.datasource.request.DataSourceUpdateRequest; -import ai.chat2db.server.admin.api.controller.user.request.UserCreateRequest; -import ai.chat2db.server.domain.api.param.DataSourceCreateParam; -import ai.chat2db.server.domain.api.param.DataSourcePageQueryParam; -import ai.chat2db.server.domain.api.param.DataSourceUpdateParam; -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.Mappings; - -/** - * converter - * - * @author Jiaju Zhuang - */ -@Mapper(componentModel = "spring") -public abstract class DataSourceAdminConverter { - - /** - * conversion - * - * @param request - * @return - */ - public abstract DataSourcePageQueryParam request2param(CommonPageQueryRequest request); - - /** - * conversion - * - * @param request - * @return - */ - public abstract DataSourcePageQueryParam request2paramAccess(CommonPageQueryRequest request); - - ///** - // * conversion - // * - // * @param dto - // * @return - // */ - //public abstract DataSourcePageQueryVO dto2vo(DataSource dto); - - /** - * 参数转换 - * - * @param request - * @return - */ - @Mappings({ - @Mapping(source = "user", target = "userName") - }) - public abstract DataSourceCreateParam createReq2param(UserCreateRequest request); - - /** - * 参数转换 - * - * @param request - * @return - */ - @Mappings({ - @Mapping(source = "user", target = "userName") - }) - public abstract DataSourceUpdateParam updateReq2param(DataSourceUpdateRequest request); -} diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/converter/UserAdminConverter.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/converter/UserAdminConverter.java new file mode 100644 index 00000000..409e0d59 --- /dev/null +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/converter/UserAdminConverter.java @@ -0,0 +1,58 @@ +package ai.chat2db.server.admin.api.controller.user.converter; + +import org.mapstruct.Mapper; + +/** + * converter + * + * @author Jiaju Zhuang + */ +@Mapper(componentModel = "spring") +public abstract class UserAdminConverter { + + ///** + // * conversion + // * + // * @param request + // * @return + // */ + //public abstract DataSourcePageQueryParam request2param(CommonPageQueryRequest request); + // + ///** + // * conversion + // * + // * @param request + // * @return + // */ + //public abstract DataSourcePageQueryParam request2paramAccess(CommonPageQueryRequest request); + + ///** + // * conversion + // * + // * @param dto + // * @return + // */ + //public abstract DataSourcePageQueryVO dto2vo(DataSource dto); + // + ///** + // * 参数转换 + // * + // * @param request + // * @return + // */ + //@Mappings({ + // @Mapping(source = "user", target = "userName") + //}) + //public abstract DataSourceCreateParam createReq2param(UserCreateRequest request); + // + ///** + // * 参数转换 + // * + // * @param request + // * @return + // */ + //@Mappings({ + // @Mapping(source = "user", target = "userName") + //}) + //public abstract DataSourceUpdateParam updateReq2param(DataSourceUpdateRequest request); +}