登陆

ebike-gateway/src/main/resources/application-dev.yml

@@ -64,11 +64,11 @@ spring:
       # Redis数据库索引（默认为0）
       database: 1
       # Redis服务器地址
-      host: 192.168.1.31
+      host: 47.109.71.130
       # Redis服务器连接端口
       port: 6379
       # Redis服务器连接密码（默认为空）
-      # password:
+      password: 970529
       # 连接超时时间
       lettuce:
         pool:
@@ -104,7 +104,7 @@ cdzy:
   gateway:
     secure:
       request-switch:
-        enable: false
+        enable: true
       response-switch:
         enable: false
 

ebike-staff/src/main/java/com/cdzy/staff/controller/EbikeOperatorStaffController.java

@@ -47,7 +47,7 @@ public class EbikeOperatorStaffController {
 
     /**
      * 运营商员工添加。
-     *
+     *`
      * @param staffVo 登录信息
      * @return 结果
      */

ebike-staff/src/main/java/com/cdzy/staff/model/dto/StaffInfo.java

@@ -1,17 +1,41 @@
 package com.cdzy.staff.model.dto;
 
-import com.cdzy.staff.model.entity.EbikeOperatorStaff;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class StaffInfo implements Serializable {
 
-    private EbikeOperatorStaff staff;
+    private Long staffId;
+
+    private String username;
+
+    private Long operatorId;
+
+    private String operatorName;
+
+    private Integer status;
+
+    private LocalDateTime lastLogin;
+
+    private Long createBy;
+
+    private LocalDateTime createTime;
+
+    private Long updateBy;
+
+    private LocalDateTime updateTime;
+
+    private Boolean isDeleted;
 
 //    private List<EbikeRole> roles;
 

ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeOperatorStaffServiceImpl.java

@@ -57,19 +57,22 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
     public StaffInfo getStaffInfo() {
         Long loginId = StpUtil.getLoginIdAsLong();
         QueryWrapper queryWrapper = QueryWrapper.create()
+                .select(
+                        EBIKE_OPERATOR_STAFF.STAFF_ID,EBIKE_OPERATOR_STAFF.OPERATOR_ID,
+                        EBIKE_OPERATOR_STAFF.USERNAME,EBIKE_OPERATOR_STAFF.CREATE_BY,EBIKE_OPERATOR_STAFF.CREATE_TIME,
+                        EBIKE_OPERATOR_STAFF.UPDATE_BY,EBIKE_OPERATOR_STAFF.UPDATE_TIME,
+                        EBIKE_OPERATOR_STAFF.LAST_LOGIN,EBIKE_OPERATOR_STAFF.STATUS
+                )
                 .where(EBIKE_OPERATOR_STAFF.STAFF_ID.eq(loginId));
-        EbikeOperatorStaff ebikeOperatorStaff = staffMapper.selectOneByQuery(queryWrapper);
+        StaffInfo info = staffMapper.selectOneByQueryAs(queryWrapper,StaffInfo.class);
         List<String> permissions = new ArrayList<>();
         permissions.add("common:btn:add");
         permissions.add("common:btn:edit");
         permissions.add("common:btn:delete");
         List<String> roles = new ArrayList<>();
         permissions.add("common");
-        return StaffInfo.builder()
-                .staff(ebikeOperatorStaff)
-                .roles(null)
-                .permissions(permissions)
-                .build();
+        info.setPermissions(permissions);
+        return info;
     }
 
     @Override