From b9d39ade7d516d714cd8df7956bf34cf3a3fb8b9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 17 Aug 2021 17:31:26 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 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 dfd5149..6090035 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
@@ -5,15 +5,13 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.*;
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;
-import com.matrix.system.app.dto.UploadPhotoDto;
+import com.matrix.system.app.dto.*;
+import com.matrix.system.app.utils.Sms106Send;
import com.matrix.system.app.vo.UserInfoVo;
-import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
import com.matrix.system.common.authority.strategy.LoginStrategy;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.common.tools.UploadUtil;
@@ -38,10 +36,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author wzy
@@ -61,6 +56,9 @@
@Autowired
private AppAuthorityManager authorityManager;
+
+ @Autowired
+ private BusParameterSettingsDao busParameterSettingsDao;
@Autowired
private RedisClient redisClient;
@@ -93,7 +91,6 @@
String token = UUIDUtil.getRandomID();
redisClient.saveValueForever(token, JSONObject.toJSONString(user));
- redisClient.saveValueForever(user.getSuId().toString(), token);
userInfoVo.setId(user.getSuId());
userInfoVo.setName(user.getSuName());
@@ -174,7 +171,10 @@
if (StringUtils.isNotBlank(codeExist)) {
return AjaxResult.buildFailInstance("请勿重复发送验证码");
}
- redisClient.saveValue(smsCodeDto.getTelphone(), "123456", 120);
+
+ Integer code =(int) ((Math.random() * 9 + 1) * 100000);
+ Sms106Send.sendVerifyCode(smsCodeDto.getTelphone(), code.toString(), 2);
+ redisClient.saveValue(smsCodeDto.getTelphone(), code.toString(), 120);
return AjaxResult.buildSuccessInstance("发送成功");
}
@@ -217,4 +217,31 @@
public AjaxResult findAppVersion() {
return AjaxResult.buildSuccessInstance(sysUsersService.findAppVersion());
}
+
+
+ @ApiOperation(value = "获取api接口地址", notes = "获取api接口地址")
+ @GetMapping(value = "/findApiUrl")
+ public AjaxResult findApiUrl() {
+ List<UrlDto> data = new ArrayList<>();
+ UrlDto urlDto = new UrlDto();
+ urlDto.setUrl("http://myapp.jyymatrix.cc");
+ urlDto.setName("正式环境");
+ data.add(urlDto);
+
+ urlDto = new UrlDto();
+ urlDto.setUrl("http://test.hive.jyymatrix.cc");
+ urlDto.setName("测试环境");
+ data.add(urlDto);
+
+ urlDto = new UrlDto();
+ urlDto.setUrl("http://hive.mydoline.com");
+ urlDto.setName("美度专线");
+ data.add(urlDto);
+
+ return AjaxResult.buildSuccessInstance(data);
+ }
+
+
+
+
}
--
Gitblit v1.9.1