Преглед на файлове

feature: 系统管理->用户管理功能

autumnal_wind@yeah.net преди 1 година
родител
ревизия
f8ceae0bbc

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

@@ -139,14 +139,10 @@ public class SysUserController extends BaseController {
             SysUserVo sysUser = userService.selectUserById(userId);
             userInfoVo.setUser(sysUser);
             userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId));
-            Long deptId = sysUser.getDeptId();
-            if (ObjectUtil.isNotNull(deptId)) {
-                SysPostBo postBo = new SysPostBo();
-//                postBo.setDeptId(deptId);
-                userInfoVo.setPosts(postService.selectPostList(postBo));
-                userInfoVo.setPostIds(postService.selectPostListByUserId(userId));
-            }
         }
+        SysPostBo postBo = new SysPostBo();
+        userInfoVo.setPosts(postService.selectPostList(postBo));
+
         return R.ok(userInfoVo);
     }
 
@@ -217,8 +213,7 @@ public class SysUserController extends BaseController {
      */
     @SaCheckPermission("system:user:query")
     @GetMapping("/optionselect")
-    public R<List<SysUserVo>> optionselect(@RequestParam(required = false) Long[] userIds,
-                                           @RequestParam(required = false) Long deptId) {
+    public R<List<SysUserVo>> optionselect(@RequestParam(required = false) Long[] userIds, @RequestParam(required = false) Long deptId) {
         return R.ok(userService.selectUserByIds(userIds == null ? null : List.of(userIds), deptId));
     }
 

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

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.dromara.common.core.constant.UserConstants;
+import org.dromara.common.encrypt.annotation.EncryptField;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
 import org.dromara.common.tenant.core.TenantEntity;
 
 import java.util.Date;
@@ -79,6 +81,7 @@ public class SysUser extends TenantEntity {
     /**
      * 手机号码
      */
+    @EncryptField(algorithm = AlgorithmType.BASE64)
     private String phone;
 
     /**

+ 0 - 14
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRegisterInfoServiceImpl.java

@@ -151,11 +151,9 @@ public class SysRegisterInfoServiceImpl implements ISysRegisterInfoService {
     @SuppressWarnings("unchecked")
     @Override
     public SysRegisterInfoVo queryRegisterInfo() {
-
         List<SysRegisterinfo> list = baseMapper.selectList();
         AtomicReference<SysRegisterInfoVo> vo = new AtomicReference<>(new SysRegisterInfoVo());
         list.stream().findFirst().ifPresent(p -> {
-
             String base64Info = p.getRegisterInfo();
             byte[] result = Base64.getDecoder().decode(base64Info.getBytes());
             JSONObject obj = JSONObject.parseObject(new String(result, StandardCharsets.UTF_8));
@@ -198,18 +196,6 @@ public class SysRegisterInfoServiceImpl implements ISysRegisterInfoService {
 
             RedisUtils.setCacheObject(CacheNames.CUSTOM_PUB_KEY,customerPublicKey);
             RedisUtils.setCacheObject(CacheNames.CUSTOM_PRI_KEY,customerPrivateKey);
-
-            //String seckey = YcEncryptUtil.getBalanceSecretKey(customerPublicKey,"20082016134101023897");
-            //byte[] key = YcEncryptUtil.hexToByte(StrUtil.subSuf(seckey,3));
-            //String cardValue = YcEncryptUtil.parseByte2HexStr("");
-            //String encryptValue = SecureUtil.desede(key).encryptHex("17.9", StandardCharsets.UTF_8);
-            //String encryptValue1 = SecureUtil.des(key).encryptHex("17.9".getBytes(StandardCharsets.UTF_8));
-            //String encryptValue2 = SecureUtil.des(key).decryptStr("ea0ea7d3e6f50986");
-            //byte[] data = YcEncryptUtil.hexToByte("01000000827801BF2D965037ED88D46FB8A8C4C9636D8BF149BB729D");
-            //String encryptValue2 = SecureUtil.desede(key).decryptStr(data);
-
-            //log.info("encryptValue-{}", encryptValue.getBytes());
-
         });
         return vo.get();
     }

+ 29 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/task/InitRunner.java

@@ -0,0 +1,29 @@
+package org.dromara.system.task;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.system.service.ISysRegisterInfoService;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+/**
+ * name: InitRunner
+ * package: org.dromara.backstage.task
+ * description: 系统启动时的初始化工作
+ * date: 2024-09-09 10:32:29 10:32
+ *
+ * @author yubo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@RequiredArgsConstructor
+@Component
+@Slf4j
+public class InitRunner implements CommandLineRunner {
+    private final ISysRegisterInfoService sysRegisterInfoService;
+    @Override
+    public void run(String... args) throws Exception {
+        //加载系统注册信息
+        sysRegisterInfoService.queryRegisterInfo();
+    }
+}