From 16da0ad1fda1dffa3019425a6887d38ed4217f44 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 10 Jan 2021 14:26:02 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index c48fe6d..e353f19 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -2,12 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.matrix.component.redis.RedisClient;
-import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.UUIDUtil;
-import com.matrix.core.tools.WebUtil;
+import com.matrix.system.app.authority.AppAuthorityManager;
import com.matrix.system.app.dto.LoginDto;
import com.matrix.system.app.dto.PwdResetDto;
import com.matrix.system.app.dto.SmsCodeDto;
@@ -53,7 +52,7 @@
private SysShopInfoService sysShopInfoService;
@Autowired
- private DefaultAuthorityManager authorityManager;
+ private AppAuthorityManager authorityManager;
@Autowired
private RedisClient redisClient;
@@ -94,6 +93,7 @@
userInfoVo.setPhoto(user.getSuPhoto());
AjaxResult result = AjaxResult.buildSuccessInstance("登陆成功");
+ authorityManager.initUserPower(result,user);
result.putInMap("user", userInfoVo);
result.putInMap("token", token);
return result;
@@ -122,7 +122,7 @@
LogUtil.info("fileName : {}", fileName);
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功");
- ajaxResult.putInMap("file", fileName);
+ ajaxResult.putInMap("file", saveUrl + fileName);
return ajaxResult;
}
@@ -140,7 +140,7 @@
if (StringUtils.isNotBlank(codeExist)) {
return AjaxResult.buildFailInstance("请勿重复发送验证码");
}
- redisClient.saveValue(smsCodeDto.getTelphone(), "123456", 2000);
+ redisClient.saveValue(smsCodeDto.getTelphone(), "123456", 120);
return AjaxResult.buildSuccessInstance("发送成功");
}
--
Gitblit v1.9.1