|
@@ -8,11 +8,13 @@ import com.caimei.modules.order.service.NewOrderService;
|
|
import com.caimei.modules.order.service.WeChatService;
|
|
import com.caimei.modules.order.service.WeChatService;
|
|
import com.caimei.modules.sys.utils.CmMsgUtils;
|
|
import com.caimei.modules.sys.utils.CmMsgUtils;
|
|
import com.caimei.modules.sys.utils.SMSUtils;
|
|
import com.caimei.modules.sys.utils.SMSUtils;
|
|
|
|
+import com.caimei.modules.user.aop.OperationLogAnnotation;
|
|
import com.caimei.modules.user.dao.CmUserDao;
|
|
import com.caimei.modules.user.dao.CmUserDao;
|
|
import com.caimei.modules.user.dao.MessageCenterDao;
|
|
import com.caimei.modules.user.dao.MessageCenterDao;
|
|
import com.caimei.modules.user.dao.NewCmShopDao;
|
|
import com.caimei.modules.user.dao.NewCmShopDao;
|
|
import com.caimei.modules.user.entity.*;
|
|
import com.caimei.modules.user.entity.*;
|
|
import com.caimei.modules.user.service.*;
|
|
import com.caimei.modules.user.service.*;
|
|
|
|
+import com.caimei.redis.RedisService;
|
|
import com.caimei.utils.AppKeys;
|
|
import com.caimei.utils.AppKeys;
|
|
import com.caimei.utils.DateUtils;
|
|
import com.caimei.utils.DateUtils;
|
|
import com.caimei.utils.MD5Util;
|
|
import com.caimei.utils.MD5Util;
|
|
@@ -27,6 +29,7 @@ import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
import org.apache.commons.collections.map.HashedMap;
|
|
import org.apache.commons.collections.map.HashedMap;
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.ui.Model;
|
|
import org.springframework.ui.Model;
|
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
|
@@ -38,6 +41,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
+import java.security.SecureRandom;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
@@ -78,6 +82,8 @@ public class NewCmShopController extends BaseController {
|
|
private NewShopOrderDao newShopOrderDao;
|
|
private NewShopOrderDao newShopOrderDao;
|
|
@Resource
|
|
@Resource
|
|
private WeChatService weChatService;
|
|
private WeChatService weChatService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private RedisService redisService;
|
|
|
|
|
|
@ModelAttribute
|
|
@ModelAttribute
|
|
public NewCmShop get(@RequestParam(required = false) String id) {
|
|
public NewCmShop get(@RequestParam(required = false) String id) {
|
|
@@ -492,6 +498,33 @@ public class NewCmShopController extends BaseController {
|
|
return map;
|
|
return map;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @ResponseBody
|
|
|
|
+ @RequestMapping(value = "login/password")
|
|
|
|
+ public Map<String, String> loginPass(Integer userId, HttpServletRequest request, HttpServletResponse response) {
|
|
|
|
+ String pasKey = "pas-" + userId;
|
|
|
|
+ boolean exists = redisService.exists(pasKey);
|
|
|
|
+ HashMap<String, String> pasMap = new HashMap<>();
|
|
|
|
+ if (exists) {
|
|
|
|
+ String val = (String) redisService.get(pasKey);
|
|
|
|
+ pasMap.put("pasKey", val);
|
|
|
|
+ return pasMap;
|
|
|
|
+ } else {
|
|
|
|
+ SecureRandom random = new SecureRandom();
|
|
|
|
+ StringBuilder sb = new StringBuilder(10);
|
|
|
|
+ // 定义可用于生成随机码的字符集
|
|
|
|
+ String allowedChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
|
|
|
+ for (int i = 0; i < 10; i++) {
|
|
|
|
+ // 生成一个随机索引,用于从允许的字符集中选取一个字符
|
|
|
|
+ int randomIndex = random.nextInt(allowedChars.length());
|
|
|
|
+ char randomChar = allowedChars.charAt(randomIndex);
|
|
|
|
+ sb.append(randomChar);
|
|
|
|
+ }
|
|
|
|
+ redisService.set(pasKey, sb, 600L);
|
|
|
|
+ pasMap.put("pasKey", sb.toString());
|
|
|
|
+ return pasMap;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 修改手机号码--目前只适用于企业
|
|
* 修改手机号码--目前只适用于企业
|
|
*
|
|
*
|