Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/resources/application.yml

@@ -70,7 +70,7 @@ spring:
   # 资源信息
   messages:
     # 国际化资源文件路径
-    basename: i18n/messages
+    basename: i18n/messages_zh_CN
   profiles:
     active: @profiles.active@
   # 文件上传
@@ -195,7 +195,7 @@ mybatis-plus:
     # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl
     # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl
     # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl
-    logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     # 是否打印 Logo banner
     banner: true

dsk-system/src/main/java/com/dsk/system/service/SysLoginService.java

@@ -559,13 +559,13 @@ public class SysLoginService {
                 LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<SysUser>()
                     .select(SysUser::getUserName, SysUser::getStatus, SysUser::getTenantId)
                     .eq(SysUser::getPhonenumber, username)
-                    .orderByDesc(SysUser::getCreateTime);
+                    .orderByDesc(SysUser::getUserId);
                 sysUsers = userMapper.selectList(lqw);
             } else {
                 LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<SysUser>()
                     .select(SysUser::getUserName, SysUser::getStatus, SysUser::getTenantId)
                     .eq(SysUser::getUserName, username)
-                    .orderByDesc(SysUser::getCreateTime);
+                    .orderByDesc(SysUser::getUserId);
                 sysUsers = userMapper.selectList(lqw);
             }
             return sysUsers;

dsk-system/src/main/java/com/dsk/system/service/impl/ISysTenantServiceImpl.java

@@ -201,6 +201,7 @@ public class ISysTenantServiceImpl implements ISysTenantService {
         String password = PasswordUtils.generatePwd(8);
         user.setPassword(BCrypt.hashpw(password));
         user.setDeptId(deptId);
+        user.setCreateTime(new Date());
         userMapper.insert(user);
         //新增系统用户后，默认当前用户为部门的负责人
         SysDept sd = new SysDept();

pom.xml

@@ -75,7 +75,7 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <logging.level>warn</logging.level>
+                <logging.level>debug</logging.level>
             </properties>
         </profile>
     </profiles>