员工认证

ruoyi-admin/src/main/java/org/dromara/web/controller/CommonController.java

@@ -9,8 +9,6 @@ import org.dromara.common.core.utils.ImageSizeUtil;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.file.FileUploadUtils;
 import org.dromara.common.core.utils.file.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -31,8 +29,6 @@ import java.util.Map;
 @RequestMapping("/common")
 public class CommonController
 {
-    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
-
 
     private final ServerConfig serverConfig;
 

ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java

@@ -25,6 +25,7 @@ import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.system.service.ISysUserService;
 import org.springframework.stereotype.Service;
 
+import static org.dromara.common.core.constant.Constants.TENANT_ID;
 import static org.dromara.common.core.constant.Constants.TWO;
 
 /**
@@ -62,6 +63,9 @@ public class SysRegisterService {
             validateSmsCode(tenantId, username, registerBody.getCode(),registerBody.getPhonenumber());
         }
         SysUserBo sysUser = new SysUserBo();
+        if (TenantHelper.isEnable()){
+            sysUser.setTenantId(TENANT_ID);
+        }
         sysUser.setUserName(username);
         sysUser.setNickName(username);
         sysUser.setPassword(BCrypt.hashpw(password));

ruoyi-common/ruoyi-common-core/pom.xml

@@ -125,6 +125,10 @@
             <artifactId>fastjson2</artifactId>
             <version>2.0.53</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ResourcesConfig.java

@@ -0,0 +1,26 @@
+package org.dromara.common.core.config;
+
+
+import org.dromara.common.core.constant.Constants;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 通用配置
+ *
+ * @author ruoyi
+ */
+
+
+@Configuration
+public class ResourcesConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        //* 本地文件上传路径
+        registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**")
+            .addResourceLocations("file:" + BoManConfig.getProfile() + "/");
+    }
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java

@@ -77,6 +77,10 @@ public interface Constants {
      */
     String RESOURCE_PREFIX = "/profile";
 
+    /**
+     * 默认租户id
+     */
+    String TENANT_ID = "000000";
     String ONE = "1";
     String TWO = "2";
     String THR = "3";

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -38,6 +38,9 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.dromara.common.core.constant.Constants.N;
+import static org.dromara.common.core.constant.Constants.Y;
+
 /**
  * 用户信息
  *
@@ -117,11 +120,12 @@ public class SysUserController extends BaseController {
         userInfoVo.setUser(user);
         userInfoVo.setPermissions(loginUser.getMenuPermission());
         userInfoVo.setRoles(loginUser.getRolePermission());
+        userInfoVo.setAuthenticationUser(N);
         //判断是否需要进行用户认证
         boolean enable = TenantHelper.isEnable();
         if (enable) {
-            if (StringUtils.isBlank(user.getTenantId())) {
-                userInfoVo.setAuthenticationUser("Y");
+            if (user.getIsAuthentication().equals(Y)) {
+                userInfoVo.setAuthenticationUser(Y);
             }
         }
         return R.ok(userInfoVo);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java

@@ -102,6 +102,10 @@ public class SysUser extends TenantEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 是否认证过 N:未认证 Y:认证 当非系统用户租户id不为000000时是认证过
+     */
+    private String isAuthentication;
 
 
     public SysUser(Long userId) {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java

@@ -121,6 +121,11 @@ public class SysUserBo extends BaseEntity {
      */
     private String excludeUserIds;
 
+    /**
+     * 是否认证过 N:未认证 Y:认证 当非系统用户租户id不为000000时是认证过
+     */
+    private String isAuthentication;
+
     public SysUserBo(Long userId) {
         this.userId = userId;
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java

@@ -139,4 +139,9 @@ public class SysUserVo implements Serializable {
      */
     private Long roleId;
 
+    /**
+     * 是否认证过 N:未认证 Y:认证 当非系统用户租户id不为000000时是认证过
+     */
+    private String isAuthentication;
+
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/staffManage/StaffManageController.java

@@ -109,7 +109,6 @@ public class StaffManageController extends BaseController {
      *
      * @param bo 员工信息
      */
-    @SaCheckPermission("wuYe:staffManage:examine")
     @PostMapping("/examineStaff")
     public R<Void> examineStaff(@RequestBody StaffManageBo bo) {
         return toAjax(staffManageService.examineStaff(bo));

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/StaffManageServiceImpl.java

@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 
 import static org.dromara.common.core.constant.Constants.TWO;
+import static org.dromara.common.core.constant.Constants.Y;
 
 /**
  * 员工管理Service业务层处理
@@ -168,6 +169,7 @@ public class StaffManageServiceImpl implements IStaffManageService {
             if (TenantHelper.isEnable()) {
                 //把租户id更新到sys_user表/sys_user_tenant表中
                 sysUser.setTenantId(examineStaffManage.getTenantId());
+                sysUser.setIsAuthentication(Y);
                 sysUserService.updateUserById(sysUser);
                 SysUserTenant sysUserTenant = new SysUserTenant();
                 sysUserTenant.setUserId(examineStaffManage.getUserId());