From 15d6d20c8f5e36f79b420cf6ebdcbbf41cb2cdc8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 一月 2025 18:21:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java | 8 +++++---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/utils/AliyunCloudAuthUtil.java | 4 ++--
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 2 +-
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/CompanyController.java | 7 ++++---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/CompanyService.java | 1 +
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 2e2395c..b90186a 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -197,7 +197,7 @@
if (r.getData() == null) {
throw new ServiceException("账号不存在");
}
- if (!SecurityUtils.matchesPassword(r.getData().getPassword(), password)) {
+ if (!SecurityUtils.matchesPassword(password, r.getData().getPassword())) {
throw new ServiceException("密码错误");
}
return r.getData();
diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/CompanyController.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/CompanyController.java
index 76af8bf..9151200 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/CompanyController.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/CompanyController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.company.api.domain.Company;
+import com.ruoyi.company.api.domain.dto.MgtCompanyDTO;
import com.ruoyi.company.service.CompanyService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -47,12 +48,12 @@
*/
@Operation(summary = "修改企业信息", tags = {"企业端"})
@PutMapping("/updateCompany")
- public R<Void> updateCompany(Company company){
+ public R<Void> updateCompany(MgtCompanyDTO mgtCompanyDTO){
Long userId = SecurityUtils.getAppLoginUser().getUserId();
Company companyDb = companyService.getOne(new LambdaQueryWrapper<Company>()
.eq(Company::getUserId, userId));
- company.setId(companyDb.getId());
- companyService.updateById(company);
+ mgtCompanyDTO.setId(companyDb.getId());
+ companyService.editCompany(mgtCompanyDTO);
return R.ok();
}
}
diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
index 1cc644c..f26193f 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
@@ -52,6 +52,7 @@
UserDetail userDetail = new UserDetail();
BeanUtils.copyProperties(user, userDetail);
BeanUtils.copyProperties(company, userDetail);
+ userDetail.setRegisterTime(user.getCreateTime());
return R.ok(userDetail);
}
@@ -83,7 +84,9 @@
@PutMapping("/updateUserDetail")
@Operation(summary = "编辑联系人信息",tags = {"企业端"})
public R<Void> updateUserDetail(@RequestBody UserDetail userDetail) {
- User user = userService.getById(userDetail.getUserId());
+ AppUser appLoginUser = SecurityUtils.getAppLoginUser();
+ userDetail.setUserId(appLoginUser.getUserId());
+ User user = userService.getById(appLoginUser.getUserId());
BeanUtils.copyProperties(userDetail, user);
userService.updateById(user);
return R.ok();
@@ -110,8 +113,7 @@
throw new CaptchaException("验证码错误");
}
- String password = SecurityUtils.encryptPassword(updatePhone.getPassword());
- if (!user.getPassword().equals(password)) {
+ if (!SecurityUtils.matchesPassword(updatePhone.getPassword(), user.getPassword())) {
return R.fail("密码错误");
}
user.setPhone(updatePhone.getNewPhone());
diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/CompanyService.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/CompanyService.java
index 32d2b8c..c5d82d2 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/CompanyService.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/CompanyService.java
@@ -49,4 +49,5 @@
* @param query
*/
void export(MgtCompanyQuery query) throws IOException;
+
}
diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/utils/AliyunCloudAuthUtil.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/utils/AliyunCloudAuthUtil.java
index 22b7d3a..b4fe4d1 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/utils/AliyunCloudAuthUtil.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/utils/AliyunCloudAuthUtil.java
@@ -17,9 +17,9 @@
@Slf4j
@Component
public class AliyunCloudAuthUtil {
- @Value("aliyun.accessKeyId")
+ @Value("${aliyun.accessKeyId}")
private String accessKeyId;
- @Value("aliyun.accessKeySecret")
+ @Value("${aliyun.accessKeySecret}")
private String accessKeySecret;
private Client createClient() throws Exception {
// 工程代码泄露可能会导致 AccessKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考。
--
Gitblit v1.7.1