diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteAuthService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteAuthService.java new file mode 100644 index 00000000..df8e4ebd --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteAuthService.java @@ -0,0 +1,21 @@ +package com.ruoyi.system.api; + +import com.ruoyi.common.core.constant.ServiceNameConstants; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.system.api.domain.SysUser; +import com.ruoyi.system.api.factory.RemoteAuthFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(contextId = "remoteAuthService", value = ServiceNameConstants.AUTH_SERVICE, fallbackFactory = RemoteAuthFallbackFactory.class) +public interface RemoteAuthService { + + @PostMapping("/oauth2") + public AjaxResult add(@Validated @RequestBody SysUser user); + + @PutMapping("/oauth2") + public AjaxResult edit(@Validated @RequestBody SysUser user); +} diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/constant/Constant.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/Constant.java similarity index 96% rename from ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/constant/Constant.java rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/Constant.java index f6b273b4..dbf90f5f 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/constant/Constant.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/Constant.java @@ -1,7 +1,6 @@ -package com.ruoyi.platform.constant; +package com.ruoyi.system.api.constant; public class Constant { - public final static int Image_Type_Pub = 1; // 公共镜像 public final static int Image_Type_Pri = 0; // 私有镜像 @@ -56,4 +55,5 @@ public class Constant { public final static String TaskType_Ray = "ray"; public final static String TaskType_ActiveLearn = "active_learn"; public final static String TaskType_Service = "service"; + public final static String DelFlag = "2"; } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteAuthFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteAuthFallbackFactory.java new file mode 100644 index 00000000..e75e791c --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteAuthFallbackFactory.java @@ -0,0 +1,30 @@ +package com.ruoyi.system.api.factory; + +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.system.api.RemoteAuthService; +import com.ruoyi.system.api.domain.SysUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +@Component +public class RemoteAuthFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(RemoteAuthFallbackFactory.class); + + @Override + public RemoteAuthService create(Throwable throwable) { + log.error("Auth服务调用失败:{}", throwable.getMessage()); + return new RemoteAuthService() { + @Override + public AjaxResult add(SysUser user) { + return AjaxResult.error("新增Oauth2用户失败"); + } + + @Override + public AjaxResult edit(SysUser user) { + return AjaxResult.error("更新Oauth2用户失败"); + } + }; + } +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index e7663eba..05626c9d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -2,3 +2,4 @@ com.ruoyi.system.api.factory.RemoteUserFallbackFactory com.ruoyi.system.api.factory.RemoteLogFallbackFactory com.ruoyi.system.api.factory.RemoteFileFallbackFactory com.ruoyi.system.api.factory.RemoteMmpFallbackFactory +com.ruoyi.system.api.factory.RemoteAuthFallbackFactory diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 96f78cf0..c47253ff 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -51,9 +51,32 @@ com.ruoyi ruoyi-common-security - + + + + com.mysql + mysql-connector-j + + + + + com.ruoyi + ruoyi-common-datasource + + + + + com.ruoyi + ruoyi-common-datascope + - + + + + com.ruoyi + ruoyi-common-log + + ${project.artifactId} diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java index 1e3a0874..8a8d2b84 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java @@ -1,5 +1,6 @@ package com.ruoyi.auth; +import com.ruoyi.common.security.annotation.EnableCustomConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -10,6 +11,7 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients; * * @author ruoyi */ +@EnableCustomConfig @EnableRyFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) public class RuoYiAuthApplication diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/Oauth2Controller.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/Oauth2Controller.java new file mode 100644 index 00000000..23c9e924 --- /dev/null +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/Oauth2Controller.java @@ -0,0 +1,26 @@ +package com.ruoyi.auth.controller; + +import com.ruoyi.auth.service.Oauth2Service; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.system.api.domain.SysUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/oauth2") +public class Oauth2Controller extends BaseController { + @Autowired + private Oauth2Service oauth2Service; + + @PostMapping + public AjaxResult add(@Validated @RequestBody SysUser user) { + return toAjax(oauth2Service.insertOauth2User(user)); + } + + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysUser user) { + return toAjax(oauth2Service.updateOauth2User(user)); + } +} diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/domain/OauthAccount.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/domain/OauthAccount.java new file mode 100644 index 00000000..b99467bc --- /dev/null +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/domain/OauthAccount.java @@ -0,0 +1,37 @@ +package com.ruoyi.auth.domain; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.Data; + +import java.util.Date; + +@Data +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +public class OauthAccount { + private Long id; + + private String clientId; + + private String username; + + private String password; + + private String mobile; + + private String email; + + private Integer enabled; + + private Integer accountNonExpired; + + private Integer credentialsNonExpired; + + private Integer accountNonLocked; + + private Integer accountNonDeleted; + + private Date createdTime; + + private Date updatedTime; +} diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/mapper/Oauth2Mapper.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/mapper/Oauth2Mapper.java new file mode 100644 index 00000000..bc739599 --- /dev/null +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/mapper/Oauth2Mapper.java @@ -0,0 +1,10 @@ +package com.ruoyi.auth.mapper; + +import com.ruoyi.auth.domain.OauthAccount; +import org.apache.ibatis.annotations.Param; + +public interface Oauth2Mapper { + int insertOauth2User(@Param("oauthAccount")OauthAccount oauthAccount); + + int updateOauth2User(@Param("oauthAccount")OauthAccount oauthAccount); +} diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/Oauth2Service.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/Oauth2Service.java new file mode 100644 index 00000000..ca646842 --- /dev/null +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/Oauth2Service.java @@ -0,0 +1,42 @@ +package com.ruoyi.auth.service; + +import com.ruoyi.auth.domain.OauthAccount; +import com.ruoyi.auth.mapper.Oauth2Mapper; +import com.ruoyi.system.api.constant.Constant; +import com.ruoyi.system.api.domain.SysUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component +public class Oauth2Service { + @Value("${oauth2.client-id}") + String clientId; + + @Autowired + private Oauth2Mapper oauth2Mapper; + + public int insertOauth2User(SysUser user) { + OauthAccount oauthAccount = new OauthAccount(); + oauthAccount.setClientId(clientId); + oauthAccount.setUsername(user.getUserName()); + oauthAccount.setPassword(user.getPassword()); + oauthAccount.setMobile(user.getPhonenumber()); + oauthAccount.setEmail(user.getEmail()); + oauthAccount.setEnabled(Constant.State_valid); + return oauth2Mapper.insertOauth2User(oauthAccount); + } + + public int updateOauth2User(SysUser user) { + OauthAccount oauthAccount = new OauthAccount(); + oauthAccount.setClientId(clientId); + oauthAccount.setUsername(user.getUserName()); + oauthAccount.setPassword(user.getPassword()); + oauthAccount.setMobile(user.getPhonenumber()); + oauthAccount.setEmail(user.getEmail()); + if (Constant.DelFlag.equals(user.getDelFlag())) { + oauthAccount.setEnabled(Constant.State_invalid); + } + return oauth2Mapper.updateOauth2User(oauthAccount); + } +} diff --git a/ruoyi-auth/src/main/resources/mapper/auth/Oauth2Mapper.xml b/ruoyi-auth/src/main/resources/mapper/auth/Oauth2Mapper.xml new file mode 100644 index 00000000..16d46aed --- /dev/null +++ b/ruoyi-auth/src/main/resources/mapper/auth/Oauth2Mapper.xml @@ -0,0 +1,31 @@ + + + + + insert into oauth_account(client_id, username, password, mobile, email, enabled) + values (#{oauthAccount.clientId}, #{oauthAccount.username}, #{oauthAccount.password}, #{oauthAccount.mobile}, + #{oauthAccount.email}, #{oauthAccount.enabled}) + + + + update oauth_account + + + username = #{oauthAccount.username}, + + + password = #{oauthAccount.password}, + + + mobile = #{oauthAccount.mobile}, + + + email = #{oauthAccount.email}, + + + enabled = #{oauthAccount.enabled}, + + + where username = #{oauthAccount.username} and enabled = 1 + + \ No newline at end of file diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/AutoMlInsStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/AutoMlInsStatusTask.java index fa07acf6..0c71cb7d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/AutoMlInsStatusTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/AutoMlInsStatusTask.java @@ -1,6 +1,6 @@ package com.ruoyi.platform.scheduling; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.AutoMl; import com.ruoyi.platform.domain.AutoMlIns; import com.ruoyi.platform.mapper.AutoMlDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java index 36256742..f1cf303a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java @@ -1,9 +1,8 @@ package com.ruoyi.platform.scheduling; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.Experiment; import com.ruoyi.platform.domain.ExperimentIns; -import com.ruoyi.platform.domain.ResourceOccupy; import com.ruoyi.platform.mapper.ExperimentDao; import com.ruoyi.platform.mapper.ExperimentInsDao; import com.ruoyi.platform.service.AimService; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java index 533431d0..2bd5d429 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java @@ -1,6 +1,6 @@ package com.ruoyi.platform.scheduling; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.Ray; import com.ruoyi.platform.domain.RayIns; import com.ruoyi.platform.mapper.RayDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java index c13dce32..3fc162f4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java @@ -1,6 +1,6 @@ package com.ruoyi.platform.scheduling; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.DevEnvironment; import com.ruoyi.platform.domain.ServiceVersion; import com.ruoyi.platform.mapper.DevEnvironmentDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlInsServiceImpl.java index 89358f00..8e32e5e7 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlInsServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.platform.service.impl; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.AutoMl; import com.ruoyi.platform.domain.AutoMlIns; import com.ruoyi.platform.mapper.AutoMlDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlServiceImpl.java index 560f76dd..d2cb6a17 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.AutoMl; import com.ruoyi.platform.domain.AutoMlIns; import com.ruoyi.platform.mapper.AutoMlDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java index b27e9df6..fcdb7663 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.platform.service.impl; import com.alibaba.fastjson2.JSON; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.AssetWorkflow; import com.ruoyi.platform.domain.CodeConfig; import com.ruoyi.platform.mapper.AssetWorkflowDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index a47abee3..b0cf550c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.platform.service.impl; import com.alibaba.fastjson2.JSON; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.DatasetTempStorage; import com.ruoyi.platform.domain.Experiment; import com.ruoyi.platform.domain.ExperimentIns; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java index cdfda57c..6cf44f19 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.platform.annotations.CheckDuplicate; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.*; import com.ruoyi.platform.domain.dependencydomain.ProjectDepency; import com.ruoyi.platform.domain.dependencydomain.TrainTaskDepency; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java index af211a58..d47944c8 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.platform.service.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.util.DateUtils; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.*; import com.ruoyi.platform.mapper.*; import com.ruoyi.platform.service.ImageService; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageVersionServiceImpl.java index b1b55878..1582766d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageVersionServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.platform.service.impl; import com.alibaba.fastjson2.JSON; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.AssetWorkflow; import com.ruoyi.platform.domain.ImageVersion; import com.ruoyi.platform.domain.Ray; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java index 747b2f60..7cd30203 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.DevEnvironment; import com.ruoyi.platform.domain.PodStatus; import com.ruoyi.platform.mapper.DevEnvironmentDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java index 6bd9a9fb..2b0f321c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson2.JSONObject; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.platform.annotations.CheckDuplicate; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.*; import com.ruoyi.platform.domain.dependencydomain.TrainTaskDepency; import com.ruoyi.platform.mapper.*; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java index 8510c0ea..8eda6f26 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.platform.service.impl; import com.alibaba.fastjson2.JSON; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.*; import com.ruoyi.platform.mapper.AssetWorkflowDao; import com.ruoyi.platform.mapper.AutoMlDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java index 42701bc0..124a18a2 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.platform.service.impl; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.Ray; import com.ruoyi.platform.domain.RayIns; import com.ruoyi.platform.mapper.RayDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java index b9541ac4..8f4643ed 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.platform.service.impl; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.Ray; import com.ruoyi.platform.domain.RayIns; import com.ruoyi.platform.mapper.RayDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java index 326de2fd..48373b2a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.ComputingResource; import com.ruoyi.platform.domain.ResourceOccupy; import com.ruoyi.platform.mapper.ComputingResourceDao; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java index 09941c67..d20cfc5b 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.platform.service.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.AssetWorkflow; import com.ruoyi.platform.domain.ComputingResource; import com.ruoyi.platform.domain.ServiceVersion; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java index f3c7387b..48068af6 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.platform.annotations.CheckDuplicate; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.AssetWorkflow; import com.ruoyi.platform.domain.Experiment; import com.ruoyi.platform.domain.ImageVersion; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java index 0ee811b0..215e94d5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java @@ -1,6 +1,6 @@ package com.ruoyi.platform.utils; -import com.ruoyi.platform.constant.Constant; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.platform.domain.ComputingResource; import com.ruoyi.platform.domain.DevEnvironment; import com.ruoyi.platform.mapper.ComputingResourceDao; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 055f208e..7419c4b3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -7,6 +7,8 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.bean.BeanValidators; import com.ruoyi.common.datascope.annotation.DataScope; import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.system.api.RemoteAuthService; +import com.ruoyi.system.api.constant.Constant; import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.domain.SysPost; @@ -57,6 +59,9 @@ public class SysUserServiceImpl implements ISysUserService { @Autowired protected Validator validator; + @Autowired + protected RemoteAuthService remoteAuthService; + /** * 根据条件分页查询用户列表 * @@ -247,6 +252,16 @@ public class SysUserServiceImpl implements ISysUserService { insertUserPost(user); // 新增用户与角色管理 insertUserRole(user); + + // 新增oauth2用户 + remoteAuthService.add(user); + + // todo 新增gitlink用户 + + // todo 新增label studio用户 + + // todo 新增火石平台用户 + return rows; } @@ -279,6 +294,16 @@ public class SysUserServiceImpl implements ISysUserService { userPostMapper.deleteUserPostByUserId(userId); // 新增用户与岗位管理 insertUserPost(user); + + // 更新oauth2用户 + remoteAuthService.edit(user); + + // todo 更新gitlink用户 + + // todo 更新label studio用户 + + // todo 更新火石平台用户 + return userMapper.updateUser(user); } @@ -337,6 +362,15 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public int resetPwd(SysUser user) { + // 更新oauth2用户 + remoteAuthService.edit(user); + + // todo 更新gitlink用户 + + // todo 更新label studio用户 + + // todo 更新火石平台用户 + return userMapper.updateUser(user); } @@ -434,6 +468,20 @@ public class SysUserServiceImpl implements ISysUserService { userRoleMapper.deleteUserRole(userIds); // 删除用户与岗位关联 userPostMapper.deleteUserPost(userIds); + + for (Long userId : userIds) { + SysUser user = userMapper.selectUserById(userId); + user.setDelFlag(Constant.DelFlag); + // 删除oauth2用户 + remoteAuthService.edit(user); + + // todo 删除gitlink用户 + + // todo 删除label studio用户 + + // todo 删除火石平台用户 + } + return userMapper.deleteUserByIds(userIds); } @@ -494,5 +542,4 @@ public class SysUserServiceImpl implements ISysUserService { } return successMsg.toString(); } - }