Browse Source

添加修改删除用户同步oauth2,优化

dev-active_learn
chenzhihang 10 months ago
parent
commit
d869760565
32 changed files with 295 additions and 26 deletions
  1. +21
    -0
      ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteAuthService.java
  2. +2
    -2
      ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/Constant.java
  3. +30
    -0
      ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteAuthFallbackFactory.java
  4. +1
    -0
      ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  5. +25
    -2
      ruoyi-auth/pom.xml
  6. +2
    -0
      ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
  7. +26
    -0
      ruoyi-auth/src/main/java/com/ruoyi/auth/controller/Oauth2Controller.java
  8. +37
    -0
      ruoyi-auth/src/main/java/com/ruoyi/auth/domain/OauthAccount.java
  9. +10
    -0
      ruoyi-auth/src/main/java/com/ruoyi/auth/mapper/Oauth2Mapper.java
  10. +42
    -0
      ruoyi-auth/src/main/java/com/ruoyi/auth/service/Oauth2Service.java
  11. +31
    -0
      ruoyi-auth/src/main/resources/mapper/auth/Oauth2Mapper.xml
  12. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/AutoMlInsStatusTask.java
  13. +1
    -2
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java
  14. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java
  15. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java
  16. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlInsServiceImpl.java
  17. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlServiceImpl.java
  18. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java
  19. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java
  20. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
  21. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
  22. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageVersionServiceImpl.java
  23. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java
  24. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
  25. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
  26. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java
  27. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java
  28. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java
  29. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java
  30. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java
  31. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
  32. +48
    -1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

+ 21
- 0
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteAuthService.java View File

@@ -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);
}

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/constant/Constant.java → ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/Constant.java View File

@@ -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";
}

+ 30
- 0
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteAuthFallbackFactory.java View File

@@ -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<RemoteAuthService> {
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用户失败");
}
};
}
}

+ 1
- 0
ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports View File

@@ -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

+ 25
- 2
ruoyi-auth/pom.xml View File

@@ -51,9 +51,32 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-security</artifactId>
</dependency>

<!-- Mysql Connector -->
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>

<!-- RuoYi Common DataSource -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-datasource</artifactId>
</dependency>

<!-- RuoYi Common DataScope -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-datascope</artifactId>
</dependency>
</dependencies>

<!-- RuoYi Common Log -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-log</artifactId>
</dependency>

<build>
<finalName>${project.artifactId}</finalName>
<plugins>


+ 2
- 0
ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java View File

@@ -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


+ 26
- 0
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/Oauth2Controller.java View File

@@ -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));
}
}

+ 37
- 0
ruoyi-auth/src/main/java/com/ruoyi/auth/domain/OauthAccount.java View File

@@ -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;
}

+ 10
- 0
ruoyi-auth/src/main/java/com/ruoyi/auth/mapper/Oauth2Mapper.java View File

@@ -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);
}

+ 42
- 0
ruoyi-auth/src/main/java/com/ruoyi/auth/service/Oauth2Service.java View File

@@ -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);
}
}

+ 31
- 0
ruoyi-auth/src/main/resources/mapper/auth/Oauth2Mapper.xml View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.auth.mapper.Oauth2Mapper">
<insert id="insertOauth2User" useGeneratedKeys="true" keyProperty="id">
insert into oauth_account(client_id, username, password, mobile, email, enabled)
values (#{oauthAccount.clientId}, #{oauthAccount.username}, #{oauthAccount.password}, #{oauthAccount.mobile},
#{oauthAccount.email}, #{oauthAccount.enabled})
</insert>

<update id="updateOauth2User">
update oauth_account
<set>
<if test="oauthAccount.username != null and oauthAccount.username !=''">
username = #{oauthAccount.username},
</if>
<if test="oauthAccount.password != null and oauthAccount.password !=''">
password = #{oauthAccount.password},
</if>
<if test="oauthAccount.mobile != null and oauthAccount.mobile !=''">
mobile = #{oauthAccount.mobile},
</if>
<if test="oauthAccount.email != null and oauthAccount.email !=''">
email = #{oauthAccount.email},
</if>
<if test="oauthAccount.enabled != null">
enabled = #{oauthAccount.enabled},
</if>
</set>
where username = #{oauthAccount.username} and enabled = 1
</update>
</mapper>

+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/AutoMlInsStatusTask.java View File

@@ -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;


+ 1
- 2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlInsServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMlServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageVersionServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java View File

@@ -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.*;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java View File

@@ -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;


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java View File

@@ -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;


+ 48
- 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java View File

@@ -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();
}

}

Loading…
Cancel
Save