From cc59bd70ca7a57330801617b910c029a07fa2b4f Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 30 Oct 2021 09:39:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 29ddb90..f3e8702 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
@@ -1,7 +1,5 @@
package com.matrix.system.app.action;
-import com.alibaba.fastjson.JSONObject;
-import com.matrix.component.redis.RedisClient;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.*;
import com.matrix.system.app.authority.AppAuthorityManager;
@@ -12,6 +10,7 @@
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.init.LocalCache;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.common.tools.UploadUtil;
@@ -36,7 +35,10 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -60,8 +62,6 @@
@Autowired
private BusParameterSettingsDao busParameterSettingsDao;
- @Autowired
- private RedisClient redisClient;
@Value("${file_storage_path}")
private String fileStoragePath;
@@ -90,7 +90,7 @@
user.setSuPassword(null);
String token = UUIDUtil.getRandomID();
- redisClient.saveValueForever(token, JSONObject.toJSONString(user));
+ LocalCache.save(token, user);
userInfoVo.setId(user.getSuId());
userInfoVo.setName(user.getSuName());
@@ -167,14 +167,14 @@
return AjaxResult.buildFailInstance("该手机号不存在");
}
- String codeExist = redisClient.getCachedValue(smsCodeDto.getTelphone());
+ String codeExist = LocalCache.get(smsCodeDto.getTelphone());
if (StringUtils.isNotBlank(codeExist)) {
return AjaxResult.buildFailInstance("请勿重复发送验证码");
}
Integer code =(int) ((Math.random() * 9 + 1) * 100000);
Sms106Send.sendVerifyCode(smsCodeDto.getTelphone(), code.toString(), 2);
- redisClient.saveValue(smsCodeDto.getTelphone(), code.toString(), 120);
+ LocalCache.save(smsCodeDto.getTelphone(), code.toString(), 120 * 1000);
return AjaxResult.buildSuccessInstance("发送成功");
}
@@ -188,7 +188,7 @@
return AjaxResult.buildFailInstance("该手机号不存在");
}
- String code = redisClient.getCachedValue(pwdResetDto.getTelphone());
+ String code = LocalCache.get(pwdResetDto.getTelphone());
if (StringUtils.isBlank(code)) {
return AjaxResult.buildFailInstance("验证码已失效，请重新发送");
}
@@ -203,7 +203,7 @@
int i = sysUsersService.updateUserPassword(user.getSuId(), pwd);
if (i > 0) {
- redisClient.removeObject(pwdResetDto.getTelphone());
+ LocalCache.remove(pwdResetDto.getTelphone());
return AjaxResult.buildSuccessInstance("修改成功");
}
return AjaxResult.buildFailInstance("修改失败");
@@ -224,14 +224,25 @@
public AjaxResult findApiUrl() {
List<UrlDto> data = new ArrayList<>();
UrlDto urlDto = new UrlDto();
- urlDto.setUrl("http://myapp.jyymatrix.cc/");
+ urlDto.setUrl("http://myapp.jyymatrix.cc");
urlDto.setName("正式环境");
data.add(urlDto);
urlDto = new UrlDto();
- urlDto.setUrl("http://test.hive.jyymatrix.cc/");
+ 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);
+
+ urlDto = new UrlDto();
+ urlDto.setUrl("http://localhost:8080");
+ urlDto.setName("开发环境");
+ data.add(urlDto);
+
return AjaxResult.buildSuccessInstance(data);
}
--
Gitblit v1.9.1