Merge branch 'test' into dev

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginProperties.java
#	eladmin-system/src/main/resources/config/application-pre.yml

eladmin-system/src/main/java/cn/ysk/cashier/config/RestTemplateConfig.java

@@ -0,0 +1,25 @@
+package cn.ysk.cashier.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration//加上这个注解作用，可以被Spring扫描
+public class RestTemplateConfig {
+    @Bean
+    public RestTemplate restTemplate(ClientHttpRequestFactory factory){
+        return new RestTemplate(factory);
+    }
+
+    @Bean
+    public ClientHttpRequestFactory simpleClientHttpRequestFactory(){
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setReadTimeout(500000);//单位为ms
+        factory.setConnectTimeout(500000);//单位为ms
+        return factory;
+    }
+
+}

eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginProperties.java

@@ -108,8 +108,7 @@ public class LoginProperties {
         @Override
         protected char[] alphas() {
             // 生成随机数字和运算符
-//            int n1 = num(1, 10), n2 = num(1, 10);
-            int n1 = num(1, 5), n2 = num(1, 5);
+            int n1 = num(1, 10), n2 = num(1, 10);
             int opt = num(3);
 
             // 计算结果

eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java

@@ -43,6 +43,7 @@ import cn.ysk.cashier.config.security.service.dto.JwtUserDto;
 import cn.ysk.cashier.config.security.service.OnlineUserService;
 import cn.ysk.cashier.pojo.shop.TbShopInfo;
 import cn.ysk.cashier.repository.shop.TbShopInfoRepository;
+import org.springframework.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -232,6 +233,14 @@ public class AuthorizationController {
         return ResponseEntity.ok(imgResult);
     }
 
+    @ApiOperation("设置验证码")
+    @AnonymousGetMapping(value = "/setCode")
+    public ResponseEntity<Object> setCode(@RequestParam String uuid, @RequestParam String code) {
+        // 保存
+        redisUtils.set(uuid, code, loginProperties.getLoginCode().getExpiration(), TimeUnit.MINUTES);
+        return ResponseEntity.ok("ok");
+    }
+
     @ApiOperation("退出登录")
     @AnonymousDeleteMapping(value = "/logout")
     public ResponseEntity<Object> logout(HttpServletRequest request) {