From d8d88d8f5e3c333fa79f76b46d43b21d130b2322 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 15 Jan 2021 15:13:41 +0800
Subject: [PATCH] Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 20 +++++++++++++++-----
1 files changed, 15 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..745d102 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;
@@ -19,6 +18,7 @@
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.PasswordUtil;
+import com.matrix.system.hive.bean.AppVersion;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.plugin.util.ImageUtil;
@@ -53,7 +53,7 @@
private SysShopInfoService sysShopInfoService;
@Autowired
- private DefaultAuthorityManager authorityManager;
+ private AppAuthorityManager authorityManager;
@Autowired
private RedisClient redisClient;
@@ -94,6 +94,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 +123,7 @@
LogUtil.info("fileName : {}", fileName);
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功");
- ajaxResult.putInMap("file", fileName);
+ ajaxResult.putInMap("file", saveUrl + fileName);
return ajaxResult;
}
@@ -140,7 +141,7 @@
if (StringUtils.isNotBlank(codeExist)) {
return AjaxResult.buildFailInstance("请勿重复发送验证码");
}
- redisClient.saveValue(smsCodeDto.getTelphone(), "123456", 2000);
+ redisClient.saveValue(smsCodeDto.getTelphone(), "123456", 120);
return AjaxResult.buildSuccessInstance("发送成功");
}
@@ -174,4 +175,13 @@
}
return AjaxResult.buildFailInstance("修改失败");
}
+
+ @ApiOperation(value = "获取app版本", notes = "获取app版本")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = AppVersion.class)
+ })
+ @GetMapping(value = "/findAppVersion")
+ public AjaxResult findAppVersion() {
+ return AjaxResult.buildSuccessInstance(sysUsersService.findAppVersion());
+ }
}
--
Gitblit v1.9.1