From c927f41447336b339e62f783028484f6e5dbf787 Mon Sep 17 00:00:00 2001 From: zlg <482370576@qq.com> Date: Wed, 17 Jul 2024 17:37:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- schisandra-cloud-storage-admin/pom.xml | 54 ++++++ .../pom.xml | 20 ++ .../pom.xml | 26 +++ .../pom.xml | 77 ++++++++ .../controller/SchisandraAdminController.java | 147 +++++++++++++++ .../pom.xml | 21 +++ .../pom.xml | 20 ++ .../pom.xml | 20 ++ .../pom.xml | 20 ++ .../pom.xml | 56 ++++++ .../pom.xml | 150 +++++++++++++++ .../schisandra/admin/AdminApplication.java | 25 +++ .../src/main/resources/application.yml | 98 ++++++++++ .../src/main/resources/banner.txt | 18 ++ .../src/main/resources/bootstrap.yml | 16 ++ .../src/main/resources/log4j2-spring.xml | 87 +++++++++ .../src/main/resources/mybatis-flex.config | 3 + schisandra-cloud-storage-auth/pom.xml | 6 +- .../schisandra-cloud-storage-auth-api/pom.xml | 1 + .../auth/api/SchisandraAuthFeignService.java | 17 ++ .../pom.xml | 9 +- .../pom.xml | 4 +- .../SchisandraAuthPermissionController.java | 11 ++ .../SchisandraAuthRoleController.java | 23 ++- .../SchisandraAuthUserController.java | 38 ++-- .../SchisandraSocialUserController.java | 176 ++++++++++++++++++ .../SchisandraAuthPermissionDTOConvert.java | 5 + .../SchisandraAuthRoleDTOConverter.java | 5 +- .../SchisandraAuthUserDTOConverter.java | 10 + .../SchisandraSocialUserDTOConverter.java | 9 +- .../dto/SchisandraSocialUserDTO.java | 6 +- .../pom.xml | 3 +- .../pom.xml | 4 +- .../domain/bo/SchisandraSocialUserBO.java | 6 +- .../SchisandraAuthPermissionBOConverter.java | 5 + .../SchisandraAuthRoleBOConverter.java | 4 + .../SchisandraAuthUserBOConverter.java | 3 + .../SchisandraSocialUserBOConverter.java | 10 +- ...SchisandraAuthPermissionDomainService.java | 3 + .../SchisandraAuthRoleDomainService.java | 11 ++ .../SchisandraAuthUserDomainService.java | 2 + .../SchisandraSocialUserDomainService.java | 10 + ...sandraAuthPermissionDomainServiceImpl.java | 5 + .../SchisandraAuthRoleDomainServiceImpl.java | 7 + .../SchisandraAuthUserDomainServiceImpl.java | 6 + ...SchisandraSocialUserDomainServiceImpl.java | 7 + .../SchisandraAuthPermissionService.java | 1 + .../service/SchisandraAuthRoleService.java | 4 + .../service/SchisandraAuthUserService.java | 3 + .../service/SchisandraSocialUserService.java | 4 + .../SchisandraAuthPermissionServiceImpl.java | 5 + .../impl/SchisandraAuthRoleServiceImpl.java | 6 + .../impl/SchisandraAuthUserServiceImpl.java | 6 + .../impl/SchisandraSocialUserServiceImpl.java | 6 + .../oss/api/SchisandraOssFeignService.java | 22 +++ 55 files changed, 1270 insertions(+), 51 deletions(-) create mode 100644 schisandra-cloud-storage-admin/pom.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-api/pom.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/pom.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/pom.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/src/main/java/com/schisandra/admin/application/controller/SchisandraAdminController.java create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-job/pom.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-mq/pom.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-common/pom.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-domain/pom.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-infra/pom.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/pom.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/java/com/schisandra/admin/AdminApplication.java create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/application.yml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/banner.txt create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/bootstrap.yml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/log4j2-spring.xml create mode 100644 schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/mybatis-flex.config create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSocialUserController.java create mode 100644 schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-api/src/main/java/com/schisandra/oss/api/SchisandraOssFeignService.java diff --git a/schisandra-cloud-storage-admin/pom.xml b/schisandra-cloud-storage-admin/pom.xml new file mode 100644 index 0000000..cf58cd5 --- /dev/null +++ b/schisandra-cloud-storage-admin/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + com.schisandra + schisandra-cloud-storage-admin + 1.0-SNAPSHOT + pom + schisandra-cloud-storage-admin + + schisandra-cloud-storage-admin-api + schisandra-cloud-storage-admin-application + schisandra-cloud-storage-admin-common + schisandra-cloud-storage-admin-domain + schisandra-cloud-storage-admin-infra + schisandra-cloud-storage-admin-starter + + + + org.springframework.boot + spring-boot-dependencies + 2.4.2 + pom + import + + + + 8 + 8 + 1.8 + UTF-8 + UTF-8 + 2.4.2 + 2021.1 + 2020.0.6 + + + + central + aliyun maven + http://maven.aliyun.com/nexus/content/groups/public/ + default + + true + + + true + + + + + \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-api/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-api/pom.xml new file mode 100644 index 0000000..5719d70 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-api/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.schisandra + schisandra-cloud-storage-admin + 1.0-SNAPSHOT + + + schisandra-cloud-storage-admin-api + + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/pom.xml new file mode 100644 index 0000000..5933cd7 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.schisandra + schisandra-cloud-storage-admin + 1.0-SNAPSHOT + + + schisandra-cloud-storage-admin-application + pom + + schisandra-cloud-storage-admin-application-controller + schisandra-cloud-storage-admin-application-job + schisandra-cloud-storage-admin-application-mq + + schisandra-cloud-storage-admin-application + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/pom.xml new file mode 100644 index 0000000..753b995 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + com.schisandra.admin + schisandra-cloud-storage-admin-application + 1.0-SNAPSHOT + + + schisandra-cloud-storage-admin-application-controller + schisandra-cloud-storage-admin-application-controller + + 8 + 8 + 1.8 + UTF-8 + UTF-8 + + + + org.springframework.boot + spring-boot-starter-web + 2.4.2 + + + + com.schisandra + schisandra-cloud-storage-auth-api + 1.0-SNAPSHOT + + + com.schisandra + schisandra-cloud-storage-oss-api + 1.0-SNAPSHOT + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 1.8 + 1.8 + UTF-8 + + + org.projectlombok + lombok + 1.18.24 + + + + org.mapstruct + mapstruct-processor + 1.4.2.Final + + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + + com.mybatis-flex + mybatis-flex-processor + 1.9.0 + + + + + + + \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/src/main/java/com/schisandra/admin/application/controller/SchisandraAdminController.java b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/src/main/java/com/schisandra/admin/application/controller/SchisandraAdminController.java new file mode 100644 index 0000000..074011c --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/src/main/java/com/schisandra/admin/application/controller/SchisandraAdminController.java @@ -0,0 +1,147 @@ +package com.schisandra.admin.application.controller; + +import com.schisandra.auth.api.SchisandraAuthFeignService; +import com.schisandra.auth.entity.Result; +import com.schisandra.oss.api.SchisandraOssFeignService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@Slf4j +@RequestMapping("/admin/") +public class SchisandraAdminController { + @Resource + private SchisandraAuthFeignService schisandraSysUserService; + + @Resource + SchisandraOssFeignService schisandraOssFeignService; + /** + * @description: 获取用户信息 + * @param: [] + * @return: com.schisandra.auth.entity.Result + * @author zlg + * @date: 2024/7/17 15:08 + */ + @GetMapping("selectAllUserDetail") + public Result selectAllUserDetail(){ + try { + return Result.ok(schisandraSysUserService.getAllUser()); + }catch (Exception e){ + return Result.fail("获取用户信息失败"); + } + } + /** + * @description: 获取角色信息 + * @param: [] + * @return: com.schisandra.auth.entity.Result + * @author zlg + * @date: 2024/7/17 15:08 + */ + @GetMapping("selectRoleDetail") + public Result selectRoleDetail(){ + try { + return Result.ok(schisandraSysUserService.selectAllRole()); + }catch (Exception e){ + return Result.fail("获取角色信息失败"); + } + } + /** + * @description: 获取权限信息 + * @param: [] + * @return: com.schisandra.auth.entity.Result + * @author zlg + * @date: 2024/7/17 15:08 + */ + + @GetMapping("selectPermissionDetail") + public Result selectPermissionDetail(){ + try { + return Result.ok(schisandraSysUserService.selectAllPermission()); + }catch (Exception e){ + return Result.fail("获取权限信息失败"); + } + } + /** + * @description: 获取用户社会信息 + * @param: [] + * @return: com.schisandra.auth.entity.Result + * @author zlg + * @date: 2024/7/17 15:13 + */ + @GetMapping("selectSocialDetail") + public Result selectSocialUsersDetail(){ + try { + return Result.ok(schisandraSysUserService.getAllSocialUsers()); + }catch (Exception e){ + return Result.fail("获取用户社会信息失败"); + } + } + /** + * @description: 获取阿里云配置信息 + * @param: [] + * @return: com.schisandra.auth.entity.Result + * @author zlg + * @date: 2024/7/17 15:13 + */ + @GetMapping("selectAliConfig") + public Result selectAliConfig(){ + try { + return Result.ok(schisandraOssFeignService.returnAliAll()); + }catch (Exception e){ + return Result.fail("获取Ali配置信息失败"); + } + } + /** + * @description: 获取Minio配置信息 + * @param: [] + * @return: com.schisandra.auth.entity.Result + * @author zlg + * @date: 2024/7/17 15:13 + */ + @GetMapping("selectMinioConfig") + public Result selectMinioConfig(){ + try { + return Result.ok(schisandraOssFeignService.returnMinioAll()); + }catch (Exception e){ + return Result.fail("获取Minio配置信息失败"); + } + } + /** + * @description: 获取腾讯云配置信息 + * @param: [] + * @return: com.schisandra.auth.entity.Result + * @author zlg + * @date: 2024/7/17 15:13 + */ + @GetMapping("selectTencentConfig") + public Result selectTencentConfig(){ + try { + return Result.ok(schisandraOssFeignService.returnTencentAll()); + }catch (Exception e){ + return Result.fail("获取Tencent配置信息失败"); + } + } + /** + * @description: 获取Qiniu配置信息 + * @param: [] + * @return: com.schisandra.auth.entity.Result + * @author zlg + * @date: 2024/7/17 15:13 + */ + @GetMapping("selectQiniuConfig") + public Result selectQiniuConfig(){ + try { + return Result.ok(schisandraOssFeignService.returnQiniuAll()); + }catch (Exception e){ + return Result.fail("获取Qiniu配置信息失败"); + } + } + + +} diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-job/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-job/pom.xml new file mode 100644 index 0000000..ce620d8 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-job/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + com.schisandra.admin + schisandra-cloud-storage-admin-application + 1.0-SNAPSHOT + + + + schisandra-cloud-storage-admin-application-job + + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-mq/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-mq/pom.xml new file mode 100644 index 0000000..ff2d821 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-mq/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.schisandra.admin + schisandra-cloud-storage-admin-application + 1.0-SNAPSHOT + + + schisandra-cloud-storage-admin-application-mq + + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-common/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-common/pom.xml new file mode 100644 index 0000000..beb0391 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-common/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.schisandra + schisandra-cloud-storage-admin + 1.0-SNAPSHOT + + + schisandra-cloud-storage-admin-common + + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-domain/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-domain/pom.xml new file mode 100644 index 0000000..f9b7198 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-domain/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.schisandra + schisandra-cloud-storage-admin + 1.0-SNAPSHOT + + + schisandra-cloud-storage-admin-domain + + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-infra/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-infra/pom.xml new file mode 100644 index 0000000..710ab5b --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-infra/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + com.schisandra + schisandra-cloud-storage-admin + 1.0-SNAPSHOT + + + schisandra-cloud-storage-admin-infra + + + 8 + 8 + UTF-8 + + + + org.springframework.boot + spring-boot-starter-jdbc + 2.4.2 + + + + com.alibaba + druid-spring-boot-starter + 1.1.21 + + + + mysql + mysql-connector-java + 8.0.33 + + + + com.mybatis-flex + mybatis-flex-spring-boot-starter + 1.9.3 + + + com.mybatis-flex + mybatis-flex-processor + 1.9.3 + provided + + + com.schisandra.system + schisandra-cloud-storage-system-common + 1.0-SNAPSHOT + + + + \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/pom.xml new file mode 100644 index 0000000..4f29eee --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/pom.xml @@ -0,0 +1,150 @@ + + + 4.0.0 + + com.schisandra + schisandra-cloud-storage-admin + 1.0-SNAPSHOT + + + schisandra-cloud-storage-admin-starter + jar + + schisandra-cloud-storage-admin-starter + + + org.springframework.boot + spring-boot-starter-web + 2.4.2 + + + spring-boot-starter-logging + org.springframework.boot + + + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.schisandra.admin + schisandra-cloud-storage-admin-application-controller + 1.0-SNAPSHOT + + + com.schisandra.admin + schisandra-cloud-storage-admin-infra + 1.0-SNAPSHOT + + + + + 8 + 8 + 1.8 + UTF-8 + UTF-8 + 2.4.2 + 2021.1 + 2020.0.6 + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + + ${project.artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + 2.3.0.RELEASE + + + + repackage + + + + + + + + org.projectlombok + lombok + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 1.8 + 1.8 + UTF-8 + + + org.projectlombok + lombok + 1.18.24 + + + + org.mapstruct + mapstruct-processor + 1.4.2.Final + + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + + com.mybatis-flex + mybatis-flex-processor + 1.9.0 + + + + + + + \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/java/com/schisandra/admin/AdminApplication.java b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/java/com/schisandra/admin/AdminApplication.java new file mode 100644 index 0000000..73f0606 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/java/com/schisandra/admin/AdminApplication.java @@ -0,0 +1,25 @@ +package com.schisandra.admin; + + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.ComponentScan; + +/** + * @description: 管理员启动类 + * @param: + * @return: + * @author zlg + * @date: 2024/7/17 16:54 + */ +@SpringBootApplication +@ComponentScan("com.schisandra") +@EnableFeignClients(basePackages = "com.schisandra") +//@MapperScan("com.schisandra.admin.**.dao") +public class AdminApplication { + public static void main(String[] args) { + SpringApplication.run(AdminApplication.class); + } +} diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/application.yml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/application.yml new file mode 100644 index 0000000..2146985 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/application.yml @@ -0,0 +1,98 @@ +server: + port: 6000 +spring: + datasource: + username: root + password: BZbVbGDBePiA2q8/mt0eMxKNpHniDzxBtOxFadQiAOTDzCDlopC4qOKwwBEi9CAZcuFsCrRJdwn0wP6jwsnzxw== + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://1.95.0.111:3306/schisandra-cloud-storage?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=true + type: com.alibaba.druid.pool.DruidDataSource + druid: + initial-size: 20 + min-idle: 20 + max-active: 100 + max-wait: 60000 + connectionProperties: config.decrypt=true;config.decrypt.key=${publicKey}; + stat-view-servlet: + enabled: true + url-pattern: /druid/* + login-username: admin + login-password: 123456 + filter: + stat: + enabled: true + slow-sql-millis: 2000 + log-slow-sql: true + wall: + enabled: true + config: + enabled: true + # redis配置 + redis: + # Redis数据库索引（默认为0） + database: 1 + # Redis服务器地址 + host: 1.95.0.111 + # Redis服务器连接端口 + port: 6379 + # Redis服务器连接密码（默认为空） + password: LDQ20020618xxx + # 连接超时时间 + timeout: 2s + lettuce: + pool: + # 连接池最大连接数 + max-active: 200 + # 连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms + # 连接池中的最大空闲连接 + max-idle: 10 + # 连接池中的最小空闲连接 + min-idle: 0 +publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUVxjcrVoirBZaNmDrUqatHEW4FOHbO5ynW6zvhIbRMo6hEFGgglbURkjuHOlgEduxJVz6Xa+sG+FMrxTguOJECAwEAAQ== +logging: + config: classpath:log4j2-spring.xml +############## Sa-Token 配置 (文档: https://sa-token.cc) ############## +sa-token: + # token 名称（同时也是 cookie 名称） + token-name: token + # token 有效期（单位：秒） 默认30天，-1 代表永久有效 + timeout: 2592000 + # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结 + active-timeout: -1 + # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录） + is-concurrent: true + # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token） + is-share: true + # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik） + token-style: random-32 + # 是否输出操作日志 + is-log: false + token-prefix: schisandra + is-print: false + +mybatis-flex: + global-config: + print-banner: false + key-config: + key-type: generator + normal-value-of-logic-delete: 0 + deleted-value-of-logic-delete: 1 + logic-delete-column: is_deleted + mapper-locations: + - "classpath*:/mapper/**/*.xml" + +# xxl-job配置 +xxl: + job: + admin: + addresses: http://1.95.0.111:8088/xxl-job-admin + accessToken: default_token + executor: + appname: schisandra-cloud-storage-system + address: + ip: 1.95.0.111 + port: 9999 + logpath: /data/applogs/xxl-job/jobhandler + logretentiondays: 30 + diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/banner.txt b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/banner.txt new file mode 100644 index 0000000..a8184f3 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/banner.txt @@ -0,0 +1,18 @@ + + + ,---, + ,--.' | ,--, ,---, + | | : ,--.'| ,---, ,---.'| __ ,-. + .--.--. : : : | |, .--.--. ,-+-. / | | | :,' ,'/ /| + / / ' ,---. : | |,--.`--'_ / / ' ,--.--. ,--.'|' | | | |' | |' | ,--.--. +| : /`./ / \ | : ' |,' ,'| | : /`./ / \ | | ,"' | ,--.__| || | ,'/ \ +| : ;_ / / ' | | /' :' | | | : ;_ .--. .-. | | | / | | / ,' |' : / .--. .-. | + \ \ `. . ' / ' : | | || | : \ \ `. \__\/: . . | | | | |. ' / || | ' \__\/: . . + `----. \' ; :__ | | ' | :' : |__ `----. \ ," .--.; | | | | |/ ' ; |: |; : | ," .--.; | + / /`--' /' | '.'|| : :_:,'| | '.'| / /`--' // / ,. | | | |--' | | '/ '| , ; / / ,. | +'--'. / | : :| | ,' ; : ;'--'. /; : .' \| |/ | : :| ---' ; : .' \ + `--'---' \ \ / `--'' | , / `--'---' | , .-./'---' \ \ / | , .-./ + `----' ---`-' `--`---' `----' `--`---' + +Spring Boot: ${spring-boot.formatted-version} +五味子云存储 \ No newline at end of file diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/bootstrap.yml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..03bef03 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/bootstrap.yml @@ -0,0 +1,16 @@ +spring: + application: + name: schisandra-cloud-storage-admin + cloud: + nacos: + config: + server-addr: 1.95.0.111:8848 + prefix: ${spring.application.name} + group: DEFAULT_GROUP + namespace: + file-extension: yaml + timeout: 60000 + discovery: + enabled: true + server-addr: 1.95.0.111:8848 + diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/log4j2-spring.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/log4j2-spring.xml new file mode 100644 index 0000000..56e1bcb --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/log4j2-spring.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/mybatis-flex.config b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/mybatis-flex.config new file mode 100644 index 0000000..a77b0d0 --- /dev/null +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/src/main/resources/mybatis-flex.config @@ -0,0 +1,3 @@ +processor.enable=true +processor.allInTables.enable=false +processor.allInTables.package=com.schisandra.admin \ No newline at end of file diff --git a/schisandra-cloud-storage-auth/pom.xml b/schisandra-cloud-storage-auth/pom.xml index bbdbb85..ea1ed5a 100644 --- a/schisandra-cloud-storage-auth/pom.xml +++ b/schisandra-cloud-storage-auth/pom.xml @@ -14,9 +14,9 @@ schisandra-cloud-storage-auth-domain schisandra-cloud-storage-auth-infra schisandra-cloud-storage-auth-starter - schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller - schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-job - schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq + + + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index 66f78f6..4d015fe 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -7,6 +7,7 @@ 1.0-SNAPSHOT schisandra-cloud-storage-auth-api + jar schisandra-cloud-storage-auth-api diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/src/main/java/com/schisandra/auth/api/SchisandraAuthFeignService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/src/main/java/com/schisandra/auth/api/SchisandraAuthFeignService.java index 5e1ca83..8ba4251 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/src/main/java/com/schisandra/auth/api/SchisandraAuthFeignService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/src/main/java/com/schisandra/auth/api/SchisandraAuthFeignService.java @@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + @FeignClient("schisandra-cloud-storage-auth") public interface SchisandraAuthFeignService { @PostMapping("/auth/user/wechatRegister") @@ -14,4 +16,19 @@ public interface SchisandraAuthFeignService { @GetMapping("/auth/user/getUserInfo") Result getUserInfo(@RequestParam("userId") String userId); + + @GetMapping("/auth/user/getAllUser") + Result getAllUser(); + + @GetMapping("/auth/role/selectAllRole") + Result selectAllRole(); + + @GetMapping("/auth/permission/selectAllPermission") + Result selectAllPermission(); + + @GetMapping("/auth/social/getAllSocialUsers") + Result getAllSocialUsers(); + + + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/pom.xml index 99634f9..96b27bc 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/pom.xml @@ -6,13 +6,18 @@ schisandra-cloud-storage-auth 1.0-SNAPSHOT + schisandra-cloud-storage-auth-application schisandra-cloud-storage-auth-application - + pom UTF-8 - + + schisandra-cloud-storage-auth-application-controller + schisandra-cloud-storage-auth-application-job + schisandra-cloud-storage-auth-application-mq + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml index d770be4..6aac075 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.schisandra - schisandra-cloud-storage-auth + schisandra-cloud-storage-auth-application 1.0-SNAPSHOT - ../../pom.xml schisandra-cloud-storage-auth-application-controller schisandra-cloud-storage-auth-application-controller + jar diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java index e018531..372ff6b 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java @@ -134,6 +134,17 @@ public class SchisandraAuthPermissionController { } return schisandraAuthPermissionDomainService.selectUserPermissionTree(userId); } + @GetMapping("selectAllPermission") + public Result selectAllPermission() { + try { + return Result.ok(SchisandraAuthPermissionDTOConvert.INSTANCE.convertBOListToDTOList(schisandraAuthPermissionDomainService.selectAllUserList())); + }catch (Exception e){ + log.error("authPermissionController.select.error:{}", e.getMessage(), e); + return Result.fail("查询权限信息失败"); + } + + + } private void checkRoleInfo(@RequestBody SchisandraAuthPermissionDTO schisandraAuthPermissionDTO) { Preconditions.checkArgument(!StringUtils.isBlank(schisandraAuthPermissionDTO.getId().toString()), "角色名不能为空"); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthRoleController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthRoleController.java index 4d6ca9f..5c482dc 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthRoleController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthRoleController.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; * @Version: v1.0 */ @RestController -@RequestMapping("/role/") +@RequestMapping("auth/role/") @Slf4j public class SchisandraAuthRoleController { @Resource @@ -58,9 +58,9 @@ public class SchisandraAuthRoleController { * @date 2024/4/3 22:05 */ @PostMapping("query") - public Result query(@RequestBody SchisandraAuthRoleDTO schisandraAuthRoleDTO){ - try{ - if(log.isInfoEnabled()){ + public Result query(@RequestBody SchisandraAuthRoleDTO schisandraAuthRoleDTO) { + try { + if (log.isInfoEnabled()) { log.info("RoleController.select.dto:{}", JSON.toJSONString(schisandraAuthRoleDTO)); } checkRoleInfo(schisandraAuthRoleDTO); @@ -111,6 +111,21 @@ public class SchisandraAuthRoleController { return Result.fail("删除角色信息失败"); } } + + @GetMapping("selectAllRole") + public Result selectAllRole() { + try { + if (log.isInfoEnabled()) { + log.info("RoleController.selectAllRole.dto:{}", JSON.toJSONString(null)); + } + return Result.ok(SchisandraAuthRoleDTOConverter.INSTANCE.convertBOListToDTOList(schisandraAuthRoleDomainService.selectAllRole())); + } catch (Exception e) { + log.error("RoleController.selectAllRole.error:{}", e.getMessage(), e); + return Result.fail("查询角色信息失败"); + } + } + + private void checkRoleInfo(@RequestBody SchisandraAuthRoleDTO schisandraAuthRoleDTO) { Preconditions.checkArgument(!StringUtils.isBlank(schisandraAuthRoleDTO.getRoleName()), "角色名不能为空"); Preconditions.checkArgument(!StringUtils.isBlank(schisandraAuthRoleDTO.getRoleKey()), "角色key值不能为空"); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java index 55bebcc..681f712 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java @@ -1,7 +1,6 @@ package com.schisandra.auth.application.controller; import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Preconditions; @@ -23,20 +22,14 @@ import com.schisandra.auth.domain.service.SchisandraAuthRolePermissionDomainServ import com.schisandra.auth.domain.service.SchisandraAuthUserDomainService; import com.schisandra.auth.infra.basic.entity.SchisandraAuthPermission; import com.schisandra.auth.infra.basic.entity.SchisandraAuthRole; -import com.schisandra.auth.infra.basic.entity.SchisandraAuthRolePermission; import com.schisandra.auth.infra.basic.entity.SchisandraAuthUser; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.http.HttpRequest; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -54,27 +47,19 @@ import java.util.stream.Collectors; @RequestMapping("/auth/user/") @Slf4j public class SchisandraAuthUserController { + private final String AUTH_PHONE_PREFIX = "auth:user:phone"; + private final String AUTH_PERMISSION_PREFIX = "auth:user:permission"; + private final String AUTH_ROLE_PREFIX = "auth:user:role"; + private final String WX_LOGIN_TEMPORARY_CLIENT_ID = "wechat:client:id"; + private final String WX_LOGIN_TOKEN = "wechat:login:token"; @Resource RedisUtil redisUtil; @Resource private SchisandraAuthUserDomainService schisandraAuthUserDomainService; - - private final String AUTH_PHONE_PREFIX = "auth:user:phone"; - @Resource private CheckRouteCaptcha checkRouteCaptcha; - @Resource private SchisandraAuthRoleDomainService schisandraAuthRoleDomainService; - - private final String AUTH_PERMISSION_PREFIX = "auth:user:permission"; - - private final String AUTH_ROLE_PREFIX = "auth:user:role"; - - private final String WX_LOGIN_TEMPORARY_CLIENT_ID = "wechat:client:id"; - - private final String WX_LOGIN_TOKEN = "wechat:login:token"; - @Resource private SchisandraAuthRolePermissionDomainService schisandraAuthRolePermissionDomainService; @@ -374,6 +359,7 @@ public class SchisandraAuthUserController { } return Result.ok(JSONObject.parseObject(result)); } + /** * @description: 获取用户信息 * @param: [userId] @@ -384,13 +370,19 @@ public class SchisandraAuthUserController { @GetMapping("getUserInfo") public Result getUserInfo(@RequestParam("userId") String userId) { SchisandraAuthUserDTO schisandraAuthUserDTO = SchisandraAuthUserDTOConverter.INSTANCE.convertBOToDTO(schisandraAuthUserDomainService.queryById(userId)); - if ( schisandraAuthUserDTO== null) { + if (schisandraAuthUserDTO == null) { return Result.fail("该用户不存在"); - }else { - return Result.ok(schisandraAuthUserDTO); + } else { + return Result.ok(schisandraAuthUserDTO); } } + @GetMapping("getAllUser") + public Result> getAllUser() { + List listUsers = schisandraAuthUserDomainService.listAllUsers(); + List schisandraAuthUserDTOList = SchisandraAuthUserDTOConverter.INSTANCE.convertBOListToDTOList(listUsers); + return Result.ok(schisandraAuthUserDTOList); + } } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSocialUserController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSocialUserController.java new file mode 100644 index 0000000..52a4aee --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSocialUserController.java @@ -0,0 +1,176 @@ +package com.schisandra.auth.application.controller; + +import com.alibaba.fastjson.JSON; +import com.google.common.base.Preconditions; +import com.schisandra.auth.application.convert.SchisandraSocialUserDTOConverter; +import com.schisandra.auth.application.dto.SchisandraSocialUserDTO; +import com.schisandra.auth.common.entity.Result; +import com.schisandra.auth.domain.bo.SchisandraSocialUserBO; +import com.schisandra.auth.domain.service.SchisandraSocialUserDomainService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 社会用户信息表 controller + * + * @author zlg + * @since 2024-07-17 11:53:29 + */ +@RestController +@RequestMapping("/auth/social/") +@Slf4j +public class SchisandraSocialUserController { + + @Resource + private SchisandraSocialUserDomainService schisandraSocialUserDomainService; + + + @GetMapping("getAllSocialUsers") + public Result getAllSocialUsers() { + try { + return Result.ok(schisandraSocialUserDomainService.queryAll()); + }catch (Exception e) { + return Result.fail(); + } + + + } + + /** + * 新增社会用户信息表 + */ + @RequestMapping("add") + public Result add(@RequestBody SchisandraSocialUserDTO schisandraSocialUserDTO) { + + try { + if (log.isInfoEnabled()) { + log.info("SchisandraSocialUserController.add.dto:{}", JSON.toJSONString(schisandraSocialUserDTO)); + } + Preconditions.checkNotNull(schisandraSocialUserDTO.getId(), "不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUuid(), "第三方系统的唯一ID不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getSource(), "第三方用户来源不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getAccessToken(), "用户的授权令牌不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getExpireIn(), "第三方用户的授权令牌的有效期不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getRefreshToken(), "刷新令牌不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getOpenId(), "第三方用户的 open id不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUid(), "第三方用户的 ID不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getAccessCode(), "个别平台的授权信息不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUnionId(), "第三方用户的 union id不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getScope(), "第三方用户授予的权限不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getTokenType(), "个别平台的授权信息不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getIdToken(), "id token不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getMacAlgorithm(), "小米平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getMacKey(), "小米平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getCode(), "用户的授权code不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getOauthToken(), "Twitter平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getOauthTokenSecret(), "Twitter平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getStatus(), "状态不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getExtJson(), "不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getCreatedBy(), "创建人不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getCreatedTime(), "创建时间不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUpdateBy(), "更新人不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUpdateTime(), "更新时间不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getIsDeleted(), "不能为空"); + SchisandraSocialUserBO SchisandraSocialUserBO = SchisandraSocialUserDTOConverter.INSTANCE.convertDTOToBO(schisandraSocialUserDTO); + return Result.ok(schisandraSocialUserDomainService.add(SchisandraSocialUserBO)); + } catch (Exception e) { + log.error("SchisandraSocialUserController.register.error:{}", e.getMessage(), e); + return Result.fail("新增社会用户信息表失败"); + } + + } + + /** + * 修改社会用户信息表 + */ + @RequestMapping("update") + public Result update(@RequestBody SchisandraSocialUserDTO schisandraSocialUserDTO) { + + try { + if (log.isInfoEnabled()) { + log.info("SchisandraSocialUserController.update.dto:{}", JSON.toJSONString(schisandraSocialUserDTO)); + } + Preconditions.checkNotNull(schisandraSocialUserDTO.getId(), "不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUuid(), "第三方系统的唯一ID不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getSource(), "第三方用户来源不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getAccessToken(), "用户的授权令牌不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getExpireIn(), "第三方用户的授权令牌的有效期不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getRefreshToken(), "刷新令牌不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getOpenId(), "第三方用户的 open id不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUid(), "第三方用户的 ID不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getAccessCode(), "个别平台的授权信息不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUnionId(), "第三方用户的 union id不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getScope(), "第三方用户授予的权限不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getTokenType(), "个别平台的授权信息不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getIdToken(), "id token不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getMacAlgorithm(), "小米平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getMacKey(), "小米平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getCode(), "用户的授权code不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getOauthToken(), "Twitter平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getOauthTokenSecret(), "Twitter平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getStatus(), "状态不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getExtJson(), "不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getCreatedBy(), "创建人不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getCreatedTime(), "创建时间不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUpdateBy(), "更新人不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUpdateTime(), "更新时间不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getIsDeleted(), "不能为空"); + SchisandraSocialUserBO schisandraSocialUserBO = SchisandraSocialUserDTOConverter.INSTANCE.convertDTOToBO(schisandraSocialUserDTO); + return Result.ok(schisandraSocialUserDomainService.update(schisandraSocialUserBO)); + } catch (Exception e) { + log.error("SchisandraSocialUserController.update.error:{}", e.getMessage(), e); + return Result.fail("更新社会用户信息表信息失败"); + } + + } + + /** + * 删除社会用户信息表 + */ + @RequestMapping("delete") + public Result delete(@RequestBody SchisandraSocialUserDTO schisandraSocialUserDTO) { + + try { + if (log.isInfoEnabled()) { + log.info("SchisandraSocialUserController.delete.dto:{}", JSON.toJSONString(schisandraSocialUserDTO)); + } + Preconditions.checkNotNull(schisandraSocialUserDTO.getId(), "不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUuid(), "第三方系统的唯一ID不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getSource(), "第三方用户来源不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getAccessToken(), "用户的授权令牌不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getExpireIn(), "第三方用户的授权令牌的有效期不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getRefreshToken(), "刷新令牌不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getOpenId(), "第三方用户的 open id不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUid(), "第三方用户的 ID不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getAccessCode(), "个别平台的授权信息不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUnionId(), "第三方用户的 union id不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getScope(), "第三方用户授予的权限不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getTokenType(), "个别平台的授权信息不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getIdToken(), "id token不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getMacAlgorithm(), "小米平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getMacKey(), "小米平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getCode(), "用户的授权code不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getOauthToken(), "Twitter平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getOauthTokenSecret(), "Twitter平台用户的附带属性不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getStatus(), "状态不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getExtJson(), "不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getCreatedBy(), "创建人不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getCreatedTime(), "创建时间不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUpdateBy(), "更新人不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getUpdateTime(), "更新时间不能为空"); + Preconditions.checkNotNull(schisandraSocialUserDTO.getIsDeleted(), "不能为空"); + SchisandraSocialUserBO schisandraSocialUserBO = SchisandraSocialUserDTOConverter.INSTANCE.convertDTOToBO(schisandraSocialUserDTO); + return Result.ok(schisandraSocialUserDomainService.delete(schisandraSocialUserBO)); + } catch (Exception e) { + log.error("SchisandraSocialUserController.delete.error:{}", e.getMessage(), e); + return Result.fail("删除社会用户信息表信息失败"); + } + + } + +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthPermissionDTOConvert.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthPermissionDTOConvert.java index 65878d3..a8b2981 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthPermissionDTOConvert.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthPermissionDTOConvert.java @@ -5,6 +5,9 @@ import com.schisandra.auth.application.dto.SchisandraAuthPermissionDTO; import com.schisandra.auth.domain.bo.SchisandraAuthPermissionBO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; + +import java.util.List; + /** * @description: 权限转换类 * @author: landaiqing @@ -33,4 +36,6 @@ public interface SchisandraAuthPermissionDTOConvert { */ SchisandraAuthPermissionDTO convertBOToDTO(SchisandraAuthPermissionBO authRoleBO); + List convertBOListToDTOList(List authRoleBOList); + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthRoleDTOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthRoleDTOConverter.java index ab90f3e..88d929c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthRoleDTOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthRoleDTOConverter.java @@ -7,6 +7,8 @@ import com.schisandra.auth.domain.bo.SchisandraAuthUserBO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.List; + /** * ClassName:SchisandraAuthRoleDTOConvert * Package:com.schisandra.auth.application.convert @@ -16,7 +18,7 @@ import org.mapstruct.factory.Mappers; * @Create:2024/4/4 - 21:40 * @Version: v1.0 */ -@Mapper(componentModel = "spring") +@Mapper public interface SchisandraAuthRoleDTOConverter { SchisandraAuthRoleDTOConverter INSTANCE = Mappers.getMapper(SchisandraAuthRoleDTOConverter.class); @@ -39,5 +41,6 @@ public interface SchisandraAuthRoleDTOConverter { * @date: 2024/3/21 23:26 */ SchisandraAuthRoleDTO convertBOToDTO(SchisandraAuthRoleBO authRoleBO); + List convertBOListToDTOList(List authRoleBOList); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthUserDTOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthUserDTOConverter.java index bec2e34..a2fc7ae 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthUserDTOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthUserDTOConverter.java @@ -6,6 +6,8 @@ import com.schisandra.auth.domain.bo.SchisandraAuthUserBO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.List; + /** * dto转换器 * @@ -34,5 +36,13 @@ public interface SchisandraAuthUserDTOConverter { * @date: 2024/6/6 22:09 */ SchisandraAuthUserDTO convertBOToDTO(SchisandraAuthUserBO schisandraAuthUserBO); + /** + * @description: BO列表转DTO列表 + * @param: [schisandraAuthUserBOList] + * @return: java.util.List + * @author zlg + * @date: 2024/7/17 11:14 + */ + List convertBOListToDTOList(List schisandraAuthUserBOList); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraSocialUserDTOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraSocialUserDTOConverter.java index cd132c6..32eec23 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraSocialUserDTOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraSocialUserDTOConverter.java @@ -5,11 +5,13 @@ import com.schisandra.auth.domain.bo.SchisandraSocialUserBO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.List; + /** - * dto转换器 + * 社会用户信息表 dto转换器 * - * @author landaiqing - * @since 2024-06-24 11:07:49 + * @author zlg + * @since 2024-07-17 11:53:29 */ @Mapper public interface SchisandraSocialUserDTOConverter { @@ -18,5 +20,6 @@ public interface SchisandraSocialUserDTOConverter { SchisandraSocialUserBO convertDTOToBO(SchisandraSocialUserDTO schisandraSocialUserDTO); SchisandraSocialUserDTO convertBOToDTO(SchisandraSocialUserBO schisandraSocialUserBO); + List convertBOToDTOList(List schisandraSocialUserBOList); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraSocialUserDTO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraSocialUserDTO.java index f63d3fd..a43c18f 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraSocialUserDTO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraSocialUserDTO.java @@ -6,10 +6,10 @@ import java.io.Serializable; import java.util.Date; /** - * dto + * 社会用户信息表 dto * - * @author landaiqing - * @since 2024-06-24 11:07:49 + * @author zlg + * @since 2024-07-17 11:53:29 */ @Data public class SchisandraSocialUserDTO implements Serializable { diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-job/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-job/pom.xml index 6261cad..f3db1d1 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-job/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-job/pom.xml @@ -3,9 +3,8 @@ 4.0.0 com.schisandra - schisandra-cloud-storage-auth + schisandra-cloud-storage-auth-application 1.0-SNAPSHOT - ../../pom.xml schisandra-cloud-storage-auth-application-job schisandra-cloud-storage-auth-application-job diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml index 993ce0c..19d0a8f 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml @@ -3,9 +3,9 @@ 4.0.0 com.schisandra - schisandra-cloud-storage-auth + schisandra-cloud-storage-auth-application 1.0-SNAPSHOT - ../../pom.xml + schisandra-cloud-storage-auth-application-mq schisandra-cloud-storage-auth-application-mq diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSocialUserBO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSocialUserBO.java index 91f20f2..99025b5 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSocialUserBO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSocialUserBO.java @@ -5,10 +5,10 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; /** - * bo + * 社会用户信息表 bo * - * @author landaiqing - * @since 2024-06-24 11:07:49 + * @author zlg + * @since 2024-07-17 11:53:29 */ @Data public class SchisandraSocialUserBO implements Serializable { diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthPermissionBOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthPermissionBOConverter.java index afc07c3..a33a620 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthPermissionBOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthPermissionBOConverter.java @@ -4,6 +4,9 @@ import com.schisandra.auth.domain.bo.SchisandraAuthPermissionBO; import com.schisandra.auth.infra.basic.entity.SchisandraAuthPermission; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; + +import java.util.List; + @Mapper(componentModel = "spring") public interface SchisandraAuthPermissionBOConverter { SchisandraAuthPermissionBOConverter INSTANCE = Mappers.getMapper(SchisandraAuthPermissionBOConverter.class); @@ -23,4 +26,6 @@ public interface SchisandraAuthPermissionBOConverter { * @date: 2024/4/17 17:00 */ SchisandraAuthPermissionBO convertEntityToBO(SchisandraAuthPermission schisandraAuthPermission); + + List convertEntityListToBOList(List schisandraAuthPermissionList); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthRoleBOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthRoleBOConverter.java index 1869d42..8370ebf 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthRoleBOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthRoleBOConverter.java @@ -5,6 +5,8 @@ import com.schisandra.auth.infra.basic.entity.SchisandraAuthRole; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.List; + /** * ClassName:SchisandraAuthRoleBOConverter * Package:com.schisandra.auth.domain.convert @@ -35,4 +37,6 @@ public interface SchisandraAuthRoleBOConverter { * @date 2024/3/21 23:13 */ SchisandraAuthRoleBO convertEntityToBO(SchisandraAuthRole schisandraAuthRole); + + List convertEntityListToBOList(List schisandraAuthRoles); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthUserBOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthUserBOConverter.java index d1c4743..899a7c8 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthUserBOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthUserBOConverter.java @@ -6,6 +6,8 @@ import com.schisandra.auth.infra.basic.entity.SchisandraAuthUser; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.List; + /** * bo转换器 * @@ -21,4 +23,5 @@ public interface SchisandraAuthUserBOConverter { SchisandraAuthUserBO convertEntityToBO(SchisandraAuthUser schisandraAuthUser); + ListconvertEntityListToBOList(List schisandraAuthUserList); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraSocialUserBOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraSocialUserBOConverter.java index 6959b18..c19d02b 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraSocialUserBOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraSocialUserBOConverter.java @@ -5,11 +5,13 @@ import com.schisandra.auth.infra.basic.entity.SchisandraSocialUser; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.List; + /** - * bo转换器 + * 社会用户信息表 bo转换器 * - * @author landaiqing - * @since 2024-06-24 11:07:49 + * @author zlg + * @since 2024-07-17 11:53:29 */ @Mapper public interface SchisandraSocialUserBOConverter { @@ -19,4 +21,6 @@ public interface SchisandraSocialUserBOConverter { SchisandraSocialUser convertBOToEntity(SchisandraSocialUserBO schisandraSocialUserBO); SchisandraSocialUserBO convertEntityToBO(SchisandraSocialUser schisandraSocialUser); + List convertEntityListToBOList(List schisandraSocialUserList); + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java index 18d7c46..2714adb 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java @@ -18,4 +18,7 @@ public interface SchisandraAuthPermissionDomainService { SchisandraAuthPermissionBO select(SchisandraAuthPermissionBO schisandraAuthPermissionBO); List queryListByIds(List permissionIdList); + + List selectAllUserList(); + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthRoleDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthRoleDomainService.java index 63ecf5f..56fd5fd 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthRoleDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthRoleDomainService.java @@ -3,6 +3,8 @@ package com.schisandra.auth.domain.service; import com.schisandra.auth.domain.bo.SchisandraAuthRoleBO; import com.schisandra.auth.infra.basic.entity.SchisandraAuthRole; +import java.util.List; + /** * ClassName:SchisandraAuthRoleDomainService * Package:com.schisandra.auth.domain.service @@ -53,4 +55,13 @@ public interface SchisandraAuthRoleDomainService { Object select(SchisandraAuthRoleBO schisandraAuthRoleBO); SchisandraAuthRole queryByRoleId(String code); + + /** + * @description: + * @param: + * @return: + * @author zlg + * @date: 2024/7/17 11:18 + */ + List selectAllRole(); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java index 0750998..0cc2184 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java @@ -10,6 +10,7 @@ import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import java.util.HashMap; +import java.util.List; /** * 用户领域service @@ -20,6 +21,7 @@ import java.util.HashMap; public interface SchisandraAuthUserDomainService { + List listAllUsers(); /** * @description: 找回密码 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSocialUserDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSocialUserDomainService.java index 90dc9b6..ce2c9aa 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSocialUserDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSocialUserDomainService.java @@ -2,6 +2,8 @@ package com.schisandra.auth.domain.service; import com.schisandra.auth.domain.bo.SchisandraSocialUserBO; +import java.util.List; + /** * 领域service * @@ -24,5 +26,13 @@ public interface SchisandraSocialUserDomainService { * 删除 信息 */ Boolean delete(SchisandraSocialUserBO schisandraSocialUserBO); + /** + * @description: 查询全部social + * @param: + * @return: + * @author zlg + * @date: 2024/7/17 12:07 + */ + public List queryAll(); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java index 83f8e71..1dee3d9 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java @@ -133,6 +133,11 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth return schisandraAuthPermissionBO1; } + @Override + public List selectAllUserList() { + return SchisandraAuthPermissionBOConverter.INSTANCE.convertEntityListToBOList(schisandraAuthPermissionService.queryAll()); + } + @Override public List queryListByIds(List permissionIdList) { return schisandraAuthPermissionService.queryListByIds(permissionIdList); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRoleDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRoleDomainServiceImpl.java index 4cbab4a..2c5d263 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRoleDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRoleDomainServiceImpl.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * ClassName:SchisandraAuthRoleDomainServiceImpl @@ -58,4 +59,10 @@ public class SchisandraAuthRoleDomainServiceImpl implements SchisandraAuthRoleDo public SchisandraAuthRole queryByRoleId(String code) { return schisandraAuthRoleService.queryByRoleId(code); } + + @Override + public List selectAllRole() { + List schisandraAuthRoles = schisandraAuthRoleService.selectAllRole(); + return SchisandraAuthRoleBOConverter.INSTANCE.convertEntityListToBOList(schisandraAuthRoles); + } } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java index 1e1f391..cbbc996 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java @@ -71,6 +71,12 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo private SchisandraAuthPermissionService schisandraAuthPermissionService; + @Override + public List listAllUsers() { + List schisandraAuthUsers = schisandraAuthUserService.listAllUsers(); + return SchisandraAuthUserBOConverter.INSTANCE.convertEntityListToBOList(schisandraAuthUsers); + } + /** * @description: 找回密码 * @param: [schisandraAuthUserBO] diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSocialUserDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSocialUserDomainServiceImpl.java index 4756a98..a8e1ea8 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSocialUserDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSocialUserDomainServiceImpl.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 领域service实现了 @@ -45,4 +46,10 @@ public class SchisandraSocialUserDomainServiceImpl implements SchisandraSocialUs return schisandraSocialUserService.update(schisandraSocialUser) > 0; } + @Override + public List queryAll() { + List schisandraSocialUsers = schisandraSocialUserService.queryAll(); + return SchisandraSocialUserBOConverter.INSTANCE.convertEntityListToBOList(schisandraSocialUsers); + } + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthPermissionService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthPermissionService.java index 3dffcc1..456ee4a 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthPermissionService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthPermissionService.java @@ -44,6 +44,7 @@ public interface SchisandraAuthPermissionService { * @return 是否成功 */ boolean deleteById(Long id); + List queryAll(); List queryListByIds(List permissionIdList); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRoleService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRoleService.java index 061f067..7e6a541 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRoleService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRoleService.java @@ -4,6 +4,8 @@ import com.schisandra.auth.infra.basic.entity.SchisandraAuthRole; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import java.util.List; + /** * (SchisandraAuthRole)表服务接口 * @@ -45,5 +47,7 @@ public interface SchisandraAuthRoleService { */ boolean deleteById(String id); + + List selectAllRole(); SchisandraAuthRole queryByRoleId(String code); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthUserService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthUserService.java index 71f4087..b104719 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthUserService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthUserService.java @@ -2,6 +2,8 @@ package com.schisandra.auth.infra.basic.service; import com.schisandra.auth.infra.basic.entity.SchisandraAuthUser; +import java.util.List; + /** * (SchisandraAuthUser)表服务接口 * @@ -11,6 +13,7 @@ import com.schisandra.auth.infra.basic.entity.SchisandraAuthUser; public interface SchisandraAuthUserService { + List listAllUsers(); SchisandraAuthUser queryByEmail(String email); SchisandraAuthUser queryByPhone(String phone); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSocialUserService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSocialUserService.java index 12e69a4..2986bbd 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSocialUserService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSocialUserService.java @@ -2,6 +2,8 @@ package com.schisandra.auth.infra.basic.service; import com.schisandra.auth.infra.basic.entity.SchisandraSocialUser; +import java.util.List; + /** * 表服务接口 * @@ -10,6 +12,8 @@ import com.schisandra.auth.infra.basic.entity.SchisandraSocialUser; */ public interface SchisandraSocialUserService { + List queryAll(); + /** * 通过ID查询单条数据 * diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java index d053aa3..b2a2ad8 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java @@ -70,6 +70,11 @@ public class SchisandraAuthPermissionServiceImpl extends CacheableServiceImpl 0; } + @Override + public List queryAll() { + return this.schisandraAuthPermissionDao.selectAll(); + } + @Override public List queryListByIds(List permissionIdList) { return schisandraAuthPermissionDao.selectListByIds(permissionIdList); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRoleServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRoleServiceImpl.java index 7cda713..be58e96 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRoleServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRoleServiceImpl.java @@ -7,6 +7,7 @@ import com.schisandra.auth.infra.basic.service.SchisandraAuthRoleService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * (SchisandraAuthRole)表服务实现类 @@ -72,4 +73,9 @@ public class SchisandraAuthRoleServiceImpl implements SchisandraAuthRoleService public SchisandraAuthRole queryByRoleId(String code) { return schisandraAuthRoleDao.selectOneByCondition(SchisandraAuthRoleTableDef.SCHISANDRA_AUTH_ROLE.ID.eq(code)); } + + @Override + public List selectAllRole() { + return schisandraAuthRoleDao.selectAll(); + } } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthUserServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthUserServiceImpl.java index 8b9f63e..681477e 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthUserServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthUserServiceImpl.java @@ -9,6 +9,7 @@ import com.schisandra.auth.infra.basic.service.SchisandraAuthUserService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * (SchisandraAuthUser)表服务实现类 @@ -22,6 +23,11 @@ public class SchisandraAuthUserServiceImpl implements SchisandraAuthUserService @Resource private SchisandraAuthUserDao schisandraAuthUserDao; + @Override + public List listAllUsers() { + return schisandraAuthUserDao.selectAll(); + } + @Override public SchisandraAuthUser queryByEmail(String email) { return schisandraAuthUserDao.selectOneByCondition(SchisandraAuthUserTableDef.SCHISANDRA_AUTH_USER.EMAIL.eq(email) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserServiceImpl.java index 7ef44bd..70f7e76 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserServiceImpl.java @@ -7,6 +7,7 @@ import com.schisandra.auth.infra.basic.service.SchisandraSocialUserService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 表服务实现类 @@ -20,6 +21,11 @@ public class SchisandraSocialUserServiceImpl implements SchisandraSocialUserServ @Resource private SchisandraSocialUserDao schisandraSocialUserDao; + @Override + public List queryAll() { + return schisandraSocialUserDao.selectAll(); + } + /** * 通过ID查询单条数据 * diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-api/src/main/java/com/schisandra/oss/api/SchisandraOssFeignService.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-api/src/main/java/com/schisandra/oss/api/SchisandraOssFeignService.java new file mode 100644 index 0000000..5fd5b83 --- /dev/null +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-api/src/main/java/com/schisandra/oss/api/SchisandraOssFeignService.java @@ -0,0 +1,22 @@ +package com.schisandra.oss.api; +import com.schisandra.oss.entity.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import java.util.List; + + +@FeignClient("schisandra-cloud-storage-oss") +public interface SchisandraOssFeignService { + @GetMapping("/oss/ali/returnAll") + Result returnAliAll(); + + @GetMapping("/oss/minio/returnAll") + Result returnMinioAll(); + + @GetMapping("/oss/tencent/returnAll") + Result returnTencentAll(); + + @GetMapping("/oss/qiniu/returnAll") + Result returnQiniuAll(); +}