Merge branch 'dev' into dev.caojiawei

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

@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.model.LoginBody;
+import org.dromara.common.core.domain.model.PasswordLoginBody;
 import org.dromara.common.core.domain.model.RegisterBody;
 import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -81,6 +82,25 @@ public class AuthController {
         return R.ok(loginVo);
     }
 
+    @SaIgnore
+    @PostMapping("/passwordLogin")
+    public R<LoginVo> loginClient(@RequestBody PasswordLoginBody loginBody) {
+        // 授权类型和客户端id
+        String clientId = loginBody.getClientId();
+        String grantType = loginBody.getGrantType();
+        SysClient client = clientService.queryByClientId(clientId);
+        // 查询不到 client 或 client 内不包含 grantType
+        if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {
+            log.info("客户端id: {} 认证类型：{} 异常!.", clientId, grantType);
+            return R.fail(MessageUtils.message("auth.grant.type.error"));
+        } else if (!UserConstants.NORMAL.equals(client.getStatus())) {
+            return R.fail(MessageUtils.message("auth.grant.type.blocked"));
+        }
+        // 登录
+        LoginVo loginVo = IAuthStrategy.login(JsonUtils.toJsonString(loginBody), client, grantType);
+        return R.ok(loginVo);
+    }
+
     /**
      * 退出登录
      */

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

@@ -8,7 +8,7 @@ ruoyi:
   copyrightYear: 2023
 
 captcha:
-  enable: true
+  enable: false
   # 页面 <参数设置> 可开启关闭 验证码校验
   # 验证码类型 math 数组计算 char 字符验证
   type: MATH

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java

@@ -21,6 +21,8 @@ import org.dromara.scale.mapper.SysEvaluationRecordMapper;
 import org.dromara.scale.mapper.SysScaleMapper;
 import org.dromara.scale.mapper.SysScalePublishMapper;
 import org.dromara.scale.service.ISysScalePublishService;
+import org.dromara.system.domain.SysOss;
+import org.dromara.system.mapper.SysOssMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -47,6 +49,7 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
     private final SysScaleMapper scaleMapper;
 
     private final SysEvaluationRecordMapper recordMapper;
+    private final SysOssMapper sysOssMapper;
 
     /**
      * 查询量发布
@@ -160,6 +163,7 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
             LambdaQueryWrapper<SysScalePublish> lqw = Wrappers.lambdaQuery();
             lqw.eq(SysScalePublish::getDeptId, deptId);
             lqw.eq(SysScalePublish::getStatus, 0);
+            lqw.last("limit 1");
             sysScalePublishVo = baseMapper.selectVoOne(lqw);
         }
         //如果没用户组或者有用户组的发布为空，则查针对全部的发布
@@ -172,6 +176,11 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
         Long batchNo = sysScalePublishVo.getBatchNo();
         String scaleIds = sysScalePublishVo.getScaleIds();
         List<SysScaleVo> publishScaleVos = sysScaleMapper.findSysScaleByIds(StrUtil.join(StrUtil.COMMA, scaleIds));
+        for (SysScaleVo publishScaleVo : publishScaleVos) {
+            SysOss sysOss = sysOssMapper.selectById(publishScaleVo.getCover());
+            publishScaleVo.setCoverUrl(sysOss.getUrl());
+        }
+
         List<SysEvaluationRecordVo> recordVos = recordMapper.selectSclaeRecordListByUserAndBatch(userId, batchNo);
         for (SysEvaluationRecordVo recordVo : recordVos) {
             publishScaleVos.stream().filter(p -> p.getScaleId().equals(recordVo.getScaleId()))