Commit 54e8b799427f101509197b8250df6d965f816265

Authored by xingyu
1 parent c7924e04

vue2 新增行为验证码

Showing 77 changed files with 1502 additions and 459 deletions
yudao-dependencies/pom.xml
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
57 <commons-net.version>3.8.0</commons-net.version> 57 <commons-net.version>3.8.0</commons-net.version>
58 <jsch.version>0.1.55</jsch.version> 58 <jsch.version>0.1.55</jsch.version>
59 <tika-core.version>2.4.1</tika-core.version> 59 <tika-core.version>2.4.1</tika-core.version>
  60 + <aj-captcha.version>1.3.0</aj-captcha.version>
60 <!-- 三方云服务相关 --> 61 <!-- 三方云服务相关 -->
61 <minio.version>8.2.2</minio.version> 62 <minio.version>8.2.2</minio.version>
62 <aliyun-java-sdk-core.version>4.5.25</aliyun-java-sdk-core.version> 63 <aliyun-java-sdk-core.version>4.5.25</aliyun-java-sdk-core.version>
@@ -129,6 +130,11 @@ @@ -129,6 +130,11 @@
129 <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId> 130 <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId>
130 <version>${revision}</version> 131 <version>${revision}</version>
131 </dependency> 132 </dependency>
  133 + <dependency>
  134 + <groupId>cn.iocoder.boot</groupId>
  135 + <artifactId>yudao-spring-boot-starter-captcha</artifactId>
  136 + <version>${revision}</version>
  137 + </dependency>
132 138
133 <!-- Spring 核心 --> 139 <!-- Spring 核心 -->
134 <dependency> 140 <dependency>
@@ -452,6 +458,12 @@ @@ -452,6 +458,12 @@
452 </dependency> 458 </dependency>
453 459
454 <dependency> 460 <dependency>
  461 + <groupId>com.anji-plus</groupId>
  462 + <artifactId>spring-boot-starter-captcha</artifactId>
  463 + <version>${aj-captcha.version}</version>
  464 + </dependency>
  465 +
  466 + <dependency>
455 <groupId>org.apache.velocity</groupId> 467 <groupId>org.apache.velocity</groupId>
456 <artifactId>velocity-engine-core</artifactId> 468 <artifactId>velocity-engine-core</artifactId>
457 <version>${velocity.version}</version> 469 <version>${velocity.version}</version>
yudao-framework/pom.xml
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
39 <module>yudao-spring-boot-starter-biz-error-code</module> 39 <module>yudao-spring-boot-starter-biz-error-code</module>
40 40
41 <module>yudao-spring-boot-starter-flowable</module> 41 <module>yudao-spring-boot-starter-flowable</module>
  42 + <module>yudao-spring-boot-starter-captcha</module>
42 </modules> 43 </modules>
43 44
44 <artifactId>yudao-framework</artifactId> 45 <artifactId>yudao-framework</artifactId>
yudao-framework/yudao-spring-boot-starter-captcha/pom.xml 0 → 100644
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <groupId>cn.iocoder.boot</groupId>
  7 + <artifactId>yudao-framework</artifactId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 + <artifactId>yudao-spring-boot-starter-captcha</artifactId>
  12 + <packaging>jar</packaging>
  13 +
  14 + <name>${project.artifactId}</name>
  15 + <description>
  16 + 验证码
  17 + </description>
  18 +
  19 + <dependencies>
  20 + <dependency>
  21 + <groupId>cn.iocoder.boot</groupId>
  22 + <artifactId>yudao-common</artifactId>
  23 + </dependency>
  24 +
  25 + <!-- Spring 核心 -->
  26 + <dependency>
  27 + <groupId>org.springframework.boot</groupId>
  28 + <artifactId>spring-boot-starter</artifactId>
  29 + </dependency>
  30 +
  31 + <dependency>
  32 + <groupId>cn.iocoder.boot</groupId>
  33 + <artifactId>yudao-spring-boot-starter-redis</artifactId>
  34 + </dependency>
  35 +
  36 + <!-- 验证码相关 -->
  37 + <dependency>
  38 + <groupId>com.anji-plus</groupId>
  39 + <artifactId>spring-boot-starter-captcha</artifactId>
  40 + </dependency>
  41 +
  42 + </dependencies>
  43 +
  44 +</project>
yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/captcha/core/service/CaptchaServiceImpl.java 0 → 100644
  1 +package cn.iocoder.yudao.captcha.core.service;
  2 +
  3 +import com.anji.captcha.service.CaptchaCacheService;
  4 +import org.springframework.data.redis.core.StringRedisTemplate;
  5 +import org.springframework.stereotype.Service;
  6 +
  7 +import javax.annotation.Resource;
  8 +import java.util.concurrent.TimeUnit;
  9 +
  10 +@Service
  11 +public class CaptchaServiceImpl implements CaptchaCacheService {
  12 +
  13 + @Override
  14 + public String type() {
  15 + return "redis";
  16 + }
  17 +
  18 + @Resource
  19 + private StringRedisTemplate stringRedisTemplate;
  20 +
  21 + @Override
  22 + public void set(String key, String value, long expiresInSeconds) {
  23 + stringRedisTemplate.opsForValue().set(key, value, expiresInSeconds, TimeUnit.SECONDS);
  24 + }
  25 +
  26 + @Override
  27 + public boolean exists(String key) {
  28 + return Boolean.TRUE.equals(stringRedisTemplate.hasKey(key));
  29 + }
  30 +
  31 + @Override
  32 + public void delete(String key) {
  33 + stringRedisTemplate.delete(key);
  34 + }
  35 +
  36 + @Override
  37 + public String get(String key) {
  38 + return stringRedisTemplate.opsForValue().get(key);
  39 + }
  40 +
  41 + @Override
  42 + public Long increment(String key, long val) {
  43 + return stringRedisTemplate.opsForValue().increment(key,val);
  44 + }
  45 +}
yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService 0 → 100644
  1 +cn.iocoder.yudao.captcha.core.service.CaptchaServiceImpl
0 \ No newline at end of file 2 \ No newline at end of file
yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png 0 → 100644

67.2 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png 0 → 100644

97.2 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png 0 → 100644

93.8 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png 0 → 100644

96.7 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png 0 → 100644

88.6 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png 0 → 100644

83.3 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png 0 → 100644

84.9 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png 0 → 100644

103 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png 0 → 100644

106 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png 0 → 100644

6.91 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png 0 → 100644

6.08 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png 0 → 100644

6.08 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png 0 → 100644

6.07 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png 0 → 100644

6.21 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png 0 → 100644

6.21 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png 0 → 100644

6.21 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png 0 → 100644

6.3 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png 0 → 100644

6.3 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png 0 → 100644

6.3 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png 0 → 100644

6.3 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png 0 → 100644

6.07 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png 0 → 100644

6.07 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/xin替换.zip 0 → 100644
No preview for this file type
yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/xin替换/1.png 0 → 100644

3.49 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/xin替换/2.png 0 → 100644

3.49 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/xin替换/3.png 0 → 100644

3.49 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/xin替换/4.png 0 → 100644

3.49 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/xin替换/5.png 0 → 100644

3.48 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/xin替换/6.png 0 → 100644

3.48 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/xin替换/7.png 0 → 100644

3.48 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png 0 → 100644

20.9 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png 0 → 100644

21.2 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png 0 → 100644

21.4 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png 0 → 100644

35.4 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png 0 → 100644

50.6 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png 0 → 100644

42.9 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png 0 → 100644

40.2 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png 0 → 100644

51 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png 0 → 100644

27 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png 0 → 100644

29.4 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png 0 → 100644

57.9 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png 0 → 100644

36.8 KB

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png 0 → 100644

39.4 KB

yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
@@ -81,7 +81,7 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap @@ -81,7 +81,7 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap
81 81
82 /** 82 /**
83 * 配置 URL 的安全配置 83 * 配置 URL 的安全配置
84 - * 84 + * <p>
85 * anyRequest | 匹配所有请求路径 85 * anyRequest | 匹配所有请求路径
86 * access | SpringEl表达式结果为true时可以访问 86 * access | SpringEl表达式结果为true时可以访问
87 * anonymous | 匿名可以访问 87 * anonymous | 匿名可以访问
@@ -109,8 +109,8 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap @@ -109,8 +109,8 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap
109 .headers().frameOptions().disable().and() 109 .headers().frameOptions().disable().and()
110 // 一堆自定义的 Spring Security 处理器 110 // 一堆自定义的 Spring Security 处理器
111 .exceptionHandling().authenticationEntryPoint(authenticationEntryPoint) 111 .exceptionHandling().authenticationEntryPoint(authenticationEntryPoint)
112 - .accessDeniedHandler(accessDeniedHandler);  
113 - // 登录、登录暂时不使用 Spring Security 的拓展点,主要考虑一方面拓展多用户、多种登录方式相对复杂,一方面用户的学习成本较高 112 + .accessDeniedHandler(accessDeniedHandler);
  113 + // 登录、登录暂时不使用 Spring Security 的拓展点,主要考虑一方面拓展多用户、多种登录方式相对复杂,一方面用户的学习成本较高
114 114
115 // 获得 @PermitAll 带来的 URL 列表,免登录 115 // 获得 @PermitAll 带来的 URL 列表,免登录
116 Multimap<HttpMethod, String> permitAllUrls = getPermitAllUrlsFromAnnotations(); 116 Multimap<HttpMethod, String> permitAllUrls = getPermitAllUrlsFromAnnotations();
@@ -118,23 +118,25 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap @@ -118,23 +118,25 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap
118 httpSecurity 118 httpSecurity
119 // ①:全局共享规则 119 // ①:全局共享规则
120 .authorizeRequests() 120 .authorizeRequests()
121 - // 1.1 静态资源,可匿名访问  
122 - .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll()  
123 - // 1.2 设置 @PermitAll 无需认证  
124 - .antMatchers(HttpMethod.GET, permitAllUrls.get(HttpMethod.GET).toArray(new String[0])).permitAll()  
125 - .antMatchers(HttpMethod.POST, permitAllUrls.get(HttpMethod.POST).toArray(new String[0])).permitAll()  
126 - .antMatchers(HttpMethod.PUT, permitAllUrls.get(HttpMethod.PUT).toArray(new String[0])).permitAll()  
127 - .antMatchers(HttpMethod.DELETE, permitAllUrls.get(HttpMethod.DELETE).toArray(new String[0])).permitAll()  
128 - // 1.3 基于 yudao.security.permit-all-urls 无需认证  
129 - .antMatchers(securityProperties.getPermitAllUrls().toArray(new String[0])).permitAll()  
130 - // 1.4 设置 App API 无需认证  
131 - .antMatchers(buildAppApi("/**")).permitAll() 121 + // 1.1 静态资源,可匿名访问
  122 + .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll()
  123 + // 1.2 设置 @PermitAll 无需认证
  124 + .antMatchers(HttpMethod.GET, permitAllUrls.get(HttpMethod.GET).toArray(new String[0])).permitAll()
  125 + .antMatchers(HttpMethod.POST, permitAllUrls.get(HttpMethod.POST).toArray(new String[0])).permitAll()
  126 + .antMatchers(HttpMethod.PUT, permitAllUrls.get(HttpMethod.PUT).toArray(new String[0])).permitAll()
  127 + .antMatchers(HttpMethod.DELETE, permitAllUrls.get(HttpMethod.DELETE).toArray(new String[0])).permitAll()
  128 + // 1.3 基于 yudao.security.permit-all-urls 无需认证
  129 + .antMatchers(securityProperties.getPermitAllUrls().toArray(new String[0])).permitAll()
  130 + // 1.4 设置 App API 无需认证
  131 + .antMatchers(buildAppApi("/**")).permitAll()
  132 + // 1.5 验证码captcha 允许匿名访问
  133 + .antMatchers("/captcha/get", "/captcha/check").permitAll()
132 // ②:每个项目的自定义规则 134 // ②:每个项目的自定义规则
133 .and().authorizeRequests(registry -> // 下面,循环设置自定义规则 135 .and().authorizeRequests(registry -> // 下面,循环设置自定义规则
134 authorizeRequestsCustomizers.forEach(customizer -> customizer.customize(registry))) 136 authorizeRequestsCustomizers.forEach(customizer -> customizer.customize(registry)))
135 // ③:兜底规则,必须认证 137 // ③:兜底规则,必须认证
136 .authorizeRequests() 138 .authorizeRequests()
137 - .anyRequest().authenticated() 139 + .anyRequest().authenticated()
138 ; 140 ;
139 141
140 // 添加 Token Filter 142 // 添加 Token Filter
yudao-module-system/yudao-module-system-biz/pom.xml
@@ -72,6 +72,11 @@ @@ -72,6 +72,11 @@
72 <artifactId>yudao-spring-boot-starter-redis</artifactId> 72 <artifactId>yudao-spring-boot-starter-redis</artifactId>
73 </dependency> 73 </dependency>
74 74
  75 + <dependency>
  76 + <groupId>cn.iocoder.boot</groupId>
  77 + <artifactId>yudao-spring-boot-starter-captcha</artifactId>
  78 + </dependency>
  79 +
75 <!-- Job 定时任务相关 --> 80 <!-- Job 定时任务相关 -->
76 <dependency> 81 <dependency>
77 <groupId>cn.iocoder.boot</groupId> 82 <groupId>cn.iocoder.boot</groupId>
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
@@ -55,7 +55,6 @@ public class AuthController { @@ -55,7 +55,6 @@ public class AuthController {
55 private PermissionService permissionService; 55 private PermissionService permissionService;
56 @Resource 56 @Resource
57 private SocialUserService socialUserService; 57 private SocialUserService socialUserService;
58 -  
59 @Resource 58 @Resource
60 private SecurityProperties securityProperties; 59 private SecurityProperties securityProperties;
61 60
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
@@ -33,16 +33,6 @@ public class AuthLoginReqVO { @@ -33,16 +33,6 @@ public class AuthLoginReqVO {
33 @Length(min = 4, max = 16, message = "密码长度为 4-16 位") 33 @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
34 private String password; 34 private String password;
35 35
36 - // ========== 图片验证码相关 ==========  
37 -  
38 - @ApiModelProperty(value = "验证码", required = true, example = "1024", notes = "验证码开启时,需要传递")  
39 - @NotEmpty(message = "验证码不能为空", groups = CodeEnableGroup.class)  
40 - private String code;  
41 -  
42 - @ApiModelProperty(value = "验证码的唯一标识", required = true, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62", notes = "验证码开启时,需要传递")  
43 - @NotEmpty(message = "唯一标识不能为空", groups = CodeEnableGroup.class)  
44 - private String uuid;  
45 -  
46 // ========== 绑定社交登录时,需要传递如下参数 ========== 36 // ========== 绑定社交登录时,需要传递如下参数 ==========
47 37
48 @ApiModelProperty(value = "社交平台的类型", required = true, example = "10", notes = "参见 SysUserSocialTypeEnum 枚举值") 38 @ApiModelProperty(value = "社交平台的类型", required = true, example = "10", notes = "参见 SysUserSocialTypeEnum 枚举值")
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/common/CaptchaController.http deleted
1 -### 请求 /captcha/get-image 接口 => 成功  
2 -GET {{baseUrl}}/system/captcha/get-image  
3 -tenant-id: {{adminTenentId}}  
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/common/CaptchaController.java deleted
1 -package cn.iocoder.yudao.module.system.controller.admin.common;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.CommonResult;  
4 -import cn.iocoder.yudao.module.system.controller.admin.common.vo.CaptchaImageRespVO;  
5 -import cn.iocoder.yudao.module.system.service.common.CaptchaService;  
6 -import io.swagger.annotations.Api;  
7 -import io.swagger.annotations.ApiOperation;  
8 -import org.springframework.web.bind.annotation.GetMapping;  
9 -import org.springframework.web.bind.annotation.RequestMapping;  
10 -import org.springframework.web.bind.annotation.RestController;  
11 -  
12 -import javax.annotation.Resource;  
13 -import javax.annotation.security.PermitAll;  
14 -  
15 -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;  
16 -  
17 -@Api(tags = "管理后台 - 验证码")  
18 -@RestController  
19 -@RequestMapping("/system/captcha")  
20 -public class CaptchaController {  
21 -  
22 - @Resource  
23 - private CaptchaService captchaService;  
24 -  
25 - @GetMapping("/get-image")  
26 - @PermitAll  
27 - @ApiOperation("生成图片验证码")  
28 - public CommonResult<CaptchaImageRespVO> getCaptchaImage() {  
29 - return success(captchaService.getCaptchaImage());  
30 - }  
31 -  
32 -}  
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/common/vo/CaptchaImageRespVO.java deleted
1 -package cn.iocoder.yudao.module.system.controller.admin.common.vo;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -import lombok.AllArgsConstructor;  
6 -import lombok.Builder;  
7 -import lombok.Data;  
8 -import lombok.NoArgsConstructor;  
9 -  
10 -@ApiModel("管理后台 - 验证码图片 Response VO")  
11 -@Data  
12 -@Builder  
13 -@NoArgsConstructor  
14 -@AllArgsConstructor  
15 -public class CaptchaImageRespVO {  
16 -  
17 - @ApiModelProperty(value = "是否开启", required = true, example = "true", notes = "如果为 false,则关闭验证码功能")  
18 - private Boolean enable;  
19 -  
20 - @ApiModelProperty(value = "uuid", example = "1b3b7d00-83a8-4638-9e37-d67011855968",  
21 - notes = "enable = true 时,非空!通过该 uuid 作为该验证码的标识")  
22 - private String uuid;  
23 -  
24 - @ApiModelProperty(value = "图片", notes = "enable = true 时,非空!验证码的图片内容,使用 Base64 编码")  
25 - private String img;  
26 -  
27 -}  
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/common/CaptchaConvert.java deleted
1 -package cn.iocoder.yudao.module.system.convert.common;  
2 -  
3 -import cn.hutool.captcha.AbstractCaptcha;  
4 -import cn.iocoder.yudao.module.system.controller.admin.common.vo.CaptchaImageRespVO;  
5 -import org.mapstruct.Mapper;  
6 -import org.mapstruct.factory.Mappers;  
7 -  
8 -@Mapper  
9 -public interface CaptchaConvert {  
10 -  
11 - CaptchaConvert INSTANCE = Mappers.getMapper(CaptchaConvert.class);  
12 -  
13 - default CaptchaImageRespVO convert(String uuid, AbstractCaptcha captcha) {  
14 - return CaptchaImageRespVO.builder().uuid(uuid).img(captcha.getImageBase64()).build();  
15 - }  
16 -  
17 -}  
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
5 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 5 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
6 import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; 6 import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
7 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; 7 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
8 -import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;  
9 import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; 8 import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO;
10 import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; 9 import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi;
11 import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; 10 import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO;
@@ -17,13 +16,11 @@ import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; @@ -17,13 +16,11 @@ import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum;
17 import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; 16 import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum;
18 import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2ClientConstants; 17 import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2ClientConstants;
19 import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; 18 import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum;
20 -import cn.iocoder.yudao.module.system.service.common.CaptchaService;  
21 import cn.iocoder.yudao.module.system.service.logger.LoginLogService; 19 import cn.iocoder.yudao.module.system.service.logger.LoginLogService;
22 import cn.iocoder.yudao.module.system.service.member.MemberService; 20 import cn.iocoder.yudao.module.system.service.member.MemberService;
23 import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; 21 import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService;
24 import cn.iocoder.yudao.module.system.service.social.SocialUserService; 22 import cn.iocoder.yudao.module.system.service.social.SocialUserService;
25 import cn.iocoder.yudao.module.system.service.user.AdminUserService; 23 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
26 -import com.google.common.annotations.VisibleForTesting;  
27 import lombok.extern.slf4j.Slf4j; 24 import lombok.extern.slf4j.Slf4j;
28 import org.springframework.stereotype.Service; 25 import org.springframework.stereotype.Service;
29 26
@@ -47,8 +44,6 @@ public class AdminAuthServiceImpl implements AdminAuthService { @@ -47,8 +44,6 @@ public class AdminAuthServiceImpl implements AdminAuthService {
47 @Resource 44 @Resource
48 private AdminUserService userService; 45 private AdminUserService userService;
49 @Resource 46 @Resource
50 - private CaptchaService captchaService;  
51 - @Resource  
52 private LoginLogService loginLogService; 47 private LoginLogService loginLogService;
53 @Resource 48 @Resource
54 private OAuth2TokenService oauth2TokenService; 49 private OAuth2TokenService oauth2TokenService;
@@ -86,9 +81,6 @@ public class AdminAuthServiceImpl implements AdminAuthService { @@ -86,9 +81,6 @@ public class AdminAuthServiceImpl implements AdminAuthService {
86 81
87 @Override 82 @Override
88 public AuthLoginRespVO login(AuthLoginReqVO reqVO) { 83 public AuthLoginRespVO login(AuthLoginReqVO reqVO) {
89 - // 判断验证码是否正确  
90 - verifyCaptcha(reqVO);  
91 -  
92 // 使用账号密码,进行登录 84 // 使用账号密码,进行登录
93 AdminUserDO user = authenticate(reqVO.getUsername(), reqVO.getPassword()); 85 AdminUserDO user = authenticate(reqVO.getUsername(), reqVO.getPassword());
94 86
@@ -97,7 +89,6 @@ public class AdminAuthServiceImpl implements AdminAuthService { @@ -97,7 +89,6 @@ public class AdminAuthServiceImpl implements AdminAuthService {
97 socialUserService.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(), 89 socialUserService.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
98 reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState())); 90 reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState()));
99 } 91 }
100 -  
101 // 创建 Token 令牌,记录登录日志 92 // 创建 Token 令牌,记录登录日志
102 return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); 93 return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME);
103 } 94 }
@@ -127,32 +118,6 @@ public class AdminAuthServiceImpl implements AdminAuthService { @@ -127,32 +118,6 @@ public class AdminAuthServiceImpl implements AdminAuthService {
127 return createTokenAfterLoginSuccess(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_MOBILE); 118 return createTokenAfterLoginSuccess(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_MOBILE);
128 } 119 }
129 120
130 - @VisibleForTesting  
131 - void verifyCaptcha(AuthLoginReqVO reqVO) {  
132 - // 如果验证码关闭,则不进行校验  
133 - if (!captchaService.isCaptchaEnable()) {  
134 - return;  
135 - }  
136 - // 校验验证码  
137 - ValidationUtils.validate(validator, reqVO, AuthLoginReqVO.CodeEnableGroup.class);  
138 - // 验证码不存在  
139 - final LoginLogTypeEnum logTypeEnum = LoginLogTypeEnum.LOGIN_USERNAME;  
140 - String code = captchaService.getCaptchaCode(reqVO.getUuid());  
141 - if (code == null) {  
142 - // 创建登录失败日志(验证码不存在)  
143 - createLoginLog(null, reqVO.getUsername(), logTypeEnum, LoginResultEnum.CAPTCHA_NOT_FOUND);  
144 - throw exception(AUTH_LOGIN_CAPTCHA_NOT_FOUND);  
145 - }  
146 - // 验证码不正确  
147 - if (!code.equals(reqVO.getCode())) {  
148 - // 创建登录失败日志(验证码不正确)  
149 - createLoginLog(null, reqVO.getUsername(), logTypeEnum, LoginResultEnum.CAPTCHA_CODE_ERROR);  
150 - throw exception(AUTH_LOGIN_CAPTCHA_CODE_ERROR);  
151 - }  
152 - // 正确,所以要删除下验证码  
153 - captchaService.deleteCaptchaCode(reqVO.getUuid());  
154 - }  
155 -  
156 private void createLoginLog(Long userId, String username, 121 private void createLoginLog(Long userId, String username,
157 LoginLogTypeEnum logTypeEnum, LoginResultEnum loginResult) { 122 LoginLogTypeEnum logTypeEnum, LoginResultEnum loginResult) {
158 // 插入登录日志 123 // 插入登录日志
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/common/CaptchaService.java deleted
1 -package cn.iocoder.yudao.module.system.service.common;  
2 -  
3 -import cn.iocoder.yudao.module.system.controller.admin.common.vo.CaptchaImageRespVO;  
4 -  
5 -/**  
6 - * 验证码 Service 接口  
7 - */  
8 -public interface CaptchaService {  
9 -  
10 - /**  
11 - * 获得验证码图片  
12 - *  
13 - * @return 验证码图片  
14 - */  
15 - CaptchaImageRespVO getCaptchaImage();  
16 -  
17 - /**  
18 - * 是否开启图片验证码  
19 - *  
20 - * @return 是否  
21 - */  
22 - Boolean isCaptchaEnable();  
23 -  
24 - /**  
25 - * 获得 uuid 对应的验证码  
26 - *  
27 - * @param uuid 验证码编号  
28 - * @return 验证码  
29 - */  
30 - String getCaptchaCode(String uuid);  
31 -  
32 - /**  
33 - * 删除 uuid 对应的验证码  
34 - *  
35 - * @param uuid 验证码编号  
36 - */  
37 - void deleteCaptchaCode(String uuid);  
38 -  
39 -}  
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/common/CaptchaServiceImpl.java deleted
1 -package cn.iocoder.yudao.module.system.service.common;  
2 -  
3 -import cn.hutool.captcha.CaptchaUtil;  
4 -import cn.hutool.captcha.CircleCaptcha;  
5 -import cn.hutool.core.util.IdUtil;  
6 -import cn.iocoder.yudao.module.system.convert.common.CaptchaConvert;  
7 -import cn.iocoder.yudao.module.system.framework.captcha.config.CaptchaProperties;  
8 -import cn.iocoder.yudao.module.system.controller.admin.common.vo.CaptchaImageRespVO;  
9 -import cn.iocoder.yudao.module.system.dal.redis.common.CaptchaRedisDAO;  
10 -import org.springframework.beans.factory.annotation.Value;  
11 -import org.springframework.stereotype.Service;  
12 -  
13 -import javax.annotation.Resource;  
14 -  
15 -/**  
16 - * 验证码 Service 实现类  
17 - */  
18 -@Service  
19 -public class CaptchaServiceImpl implements CaptchaService {  
20 -  
21 - @Resource  
22 - private CaptchaProperties captchaProperties;  
23 -  
24 - /**  
25 - * 验证码是否开关  
26 - *  
27 - * 虽然 {@link CaptchaProperties#getEnable()} 有该属性,但是 Apollo 在 Spring Boot 下无法刷新 @ConfigurationProperties 注解,  
28 - * 所以暂时只能这么处理~  
29 - */  
30 - @Value("${yudao.captcha.enable}")  
31 - private Boolean enable;  
32 -  
33 - @Resource  
34 - private CaptchaRedisDAO captchaRedisDAO;  
35 -  
36 - @Override  
37 - public CaptchaImageRespVO getCaptchaImage() {  
38 - if (!Boolean.TRUE.equals(enable)) {  
39 - return CaptchaImageRespVO.builder().enable(enable).build();  
40 - }  
41 - // 生成验证码  
42 - CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(captchaProperties.getWidth(), captchaProperties.getHeight());  
43 - // 缓存到 Redis 中  
44 - String uuid = IdUtil.fastSimpleUUID();  
45 - captchaRedisDAO.set(uuid, captcha.getCode(), captchaProperties.getTimeout());  
46 - // 返回  
47 - return CaptchaConvert.INSTANCE.convert(uuid, captcha).setEnable(enable);  
48 - }  
49 -  
50 - @Override  
51 - public Boolean isCaptchaEnable() {  
52 - return enable;  
53 - }  
54 -  
55 - @Override  
56 - public String getCaptchaCode(String uuid) {  
57 - return captchaRedisDAO.get(uuid);  
58 - }  
59 -  
60 - @Override  
61 - public void deleteCaptchaCode(String uuid) {  
62 - captchaRedisDAO.delete(uuid);  
63 - }  
64 -  
65 -}  
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
@@ -11,13 +11,12 @@ import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; @@ -11,13 +11,12 @@ import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
11 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; 11 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
12 import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; 12 import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum;
13 import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; 13 import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum;
14 -import cn.iocoder.yudao.module.system.service.common.CaptchaService;  
15 import cn.iocoder.yudao.module.system.service.logger.LoginLogService; 14 import cn.iocoder.yudao.module.system.service.logger.LoginLogService;
16 import cn.iocoder.yudao.module.system.service.member.MemberService; 15 import cn.iocoder.yudao.module.system.service.member.MemberService;
17 import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; 16 import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService;
18 import cn.iocoder.yudao.module.system.service.social.SocialUserService; 17 import cn.iocoder.yudao.module.system.service.social.SocialUserService;
19 import cn.iocoder.yudao.module.system.service.user.AdminUserService; 18 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
20 -import org.junit.jupiter.api.BeforeEach; 19 +import com.anji.captcha.service.CaptchaService;
21 import org.junit.jupiter.api.Test; 20 import org.junit.jupiter.api.Test;
22 import org.springframework.boot.test.mock.mockito.MockBean; 21 import org.springframework.boot.test.mock.mockito.MockBean;
23 import org.springframework.context.annotation.Import; 22 import org.springframework.context.annotation.Import;
@@ -57,11 +56,6 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest { @@ -57,11 +56,6 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest {
57 @MockBean 56 @MockBean
58 private Validator validator; 57 private Validator validator;
59 58
60 - @BeforeEach  
61 - public void setUp() {  
62 - when(captchaService.isCaptchaEnable()).thenReturn(true);  
63 - }  
64 -  
65 @Test 59 @Test
66 public void testAuthenticate_success() { 60 public void testAuthenticate_success() {
67 // 准备参数 61 // 准备参数
@@ -138,82 +132,82 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest { @@ -138,82 +132,82 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest {
138 ); 132 );
139 } 133 }
140 134
141 - @Test  
142 - public void testCaptcha_success() {  
143 - // 准备参数  
144 - AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class);  
145 -  
146 - // mock 验证码正确  
147 - when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode());  
148 -  
149 - // 调用  
150 - authService.verifyCaptcha(reqVO);  
151 - // 断言  
152 - verify(captchaService).deleteCaptchaCode(reqVO.getUuid());  
153 - }  
154 -  
155 - @Test  
156 - public void testCaptcha_notFound() {  
157 - // 准备参数  
158 - AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class);  
159 -  
160 - // 调用, 并断言异常  
161 - assertServiceException(() -> authService.verifyCaptcha(reqVO), AUTH_LOGIN_CAPTCHA_NOT_FOUND);  
162 - // 校验调用参数  
163 - verify(loginLogService, times(1)).createLoginLog(  
164 - argThat(o -> o.getLogType().equals(LoginLogTypeEnum.LOGIN_USERNAME.getType())  
165 - && o.getResult().equals(LoginResultEnum.CAPTCHA_NOT_FOUND.getResult()))  
166 - );  
167 - }  
168 -  
169 - @Test  
170 - public void testCaptcha_codeError() {  
171 - // 准备参数  
172 - AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class);  
173 -  
174 - // mock 验证码不正确  
175 - String code = randomString();  
176 - when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(code);  
177 -  
178 - // 调用, 并断言异常  
179 - assertServiceException(() -> authService.verifyCaptcha(reqVO), AUTH_LOGIN_CAPTCHA_CODE_ERROR);  
180 - // 校验调用参数  
181 - verify(loginLogService).createLoginLog(  
182 - argThat(o -> o.getLogType().equals(LoginLogTypeEnum.LOGIN_USERNAME.getType())  
183 - && o.getResult().equals(LoginResultEnum.CAPTCHA_CODE_ERROR.getResult()))  
184 - );  
185 - }  
186 -  
187 - @Test  
188 - public void testLogin_success() {  
189 - // 准备参数  
190 - AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class, o ->  
191 - o.setUsername("test_username").setPassword("test_password"));  
192 -  
193 - // mock 验证码正确  
194 - when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode());  
195 - // mock user 数据  
196 - AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L).setUsername("test_username")  
197 - .setPassword("test_password").setStatus(CommonStatusEnum.ENABLE.getStatus()));  
198 - when(userService.getUserByUsername(eq("test_username"))).thenReturn(user);  
199 - // mock password 匹配  
200 - when(userService.isPasswordMatch(eq("test_password"), eq(user.getPassword()))).thenReturn(true);  
201 - // mock 缓存登录用户到 Redis  
202 - OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class, o -> o.setUserId(1L)  
203 - .setUserType(UserTypeEnum.ADMIN.getValue()));  
204 - when(oauth2TokenService.createAccessToken(eq(1L), eq(UserTypeEnum.ADMIN.getValue()), eq("default"), isNull()))  
205 - .thenReturn(accessTokenDO);  
206 -  
207 - // 调用, 并断言异常  
208 - AuthLoginRespVO loginRespVO = authService.login(reqVO);  
209 - assertPojoEquals(accessTokenDO, loginRespVO);  
210 - // 校验调用参数  
211 - verify(loginLogService).createLoginLog(  
212 - argThat(o -> o.getLogType().equals(LoginLogTypeEnum.LOGIN_USERNAME.getType())  
213 - && o.getResult().equals(LoginResultEnum.SUCCESS.getResult())  
214 - && o.getUserId().equals(user.getId()))  
215 - );  
216 - } 135 +// @Test
  136 +// public void testCaptcha_success() {
  137 +// // 准备参数
  138 +// AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class);
  139 +//
  140 +// // mock 验证码正确
  141 +// when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode());
  142 +//
  143 +// // 调用
  144 +// authService.verifyCaptcha(reqVO);
  145 +// // 断言
  146 +// verify(captchaService).deleteCaptchaCode(reqVO.getUuid());
  147 +// }
  148 +//
  149 +// @Test
  150 +// public void testCaptcha_notFound() {
  151 +// // 准备参数
  152 +// AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class);
  153 +//
  154 +// // 调用, 并断言异常
  155 +// assertServiceException(() -> authService.verifyCaptcha(reqVO), AUTH_LOGIN_CAPTCHA_NOT_FOUND);
  156 +// // 校验调用参数
  157 +// verify(loginLogService, times(1)).createLoginLog(
  158 +// argThat(o -> o.getLogType().equals(LoginLogTypeEnum.LOGIN_USERNAME.getType())
  159 +// && o.getResult().equals(LoginResultEnum.CAPTCHA_NOT_FOUND.getResult()))
  160 +// );
  161 +// }
  162 +
  163 +// @Test
  164 +// public void testCaptcha_codeError() {
  165 +// // 准备参数
  166 +// AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class);
  167 +//
  168 +// // mock 验证码不正确
  169 +// String code = randomString();
  170 +// when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(code);
  171 +//
  172 +// // 调用, 并断言异常
  173 +// assertServiceException(() -> authService.verifyCaptcha(reqVO), AUTH_LOGIN_CAPTCHA_CODE_ERROR);
  174 +// // 校验调用参数
  175 +// verify(loginLogService).createLoginLog(
  176 +// argThat(o -> o.getLogType().equals(LoginLogTypeEnum.LOGIN_USERNAME.getType())
  177 +// && o.getResult().equals(LoginResultEnum.CAPTCHA_CODE_ERROR.getResult()))
  178 +// );
  179 +// }
  180 +
  181 +// @Test
  182 +// public void testLogin_success() {
  183 +// // 准备参数
  184 +// AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class, o ->
  185 +// o.setUsername("test_username").setPassword("test_password"));
  186 +//
  187 +// // mock 验证码正确
  188 +// when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode());
  189 +// // mock user 数据
  190 +// AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L).setUsername("test_username")
  191 +// .setPassword("test_password").setStatus(CommonStatusEnum.ENABLE.getStatus()));
  192 +// when(userService.getUserByUsername(eq("test_username"))).thenReturn(user);
  193 +// // mock password 匹配
  194 +// when(userService.isPasswordMatch(eq("test_password"), eq(user.getPassword()))).thenReturn(true);
  195 +// // mock 缓存登录用户到 Redis
  196 +// OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class, o -> o.setUserId(1L)
  197 +// .setUserType(UserTypeEnum.ADMIN.getValue()));
  198 +// when(oauth2TokenService.createAccessToken(eq(1L), eq(UserTypeEnum.ADMIN.getValue()), eq("default"), isNull()))
  199 +// .thenReturn(accessTokenDO);
  200 +//
  201 +// // 调用, 并断言异常
  202 +// AuthLoginRespVO loginRespVO = authService.login(reqVO);
  203 +// assertPojoEquals(accessTokenDO, loginRespVO);
  204 +// // 校验调用参数
  205 +// verify(loginLogService).createLoginLog(
  206 +// argThat(o -> o.getLogType().equals(LoginLogTypeEnum.LOGIN_USERNAME.getType())
  207 +// && o.getResult().equals(LoginResultEnum.SUCCESS.getResult())
  208 +// && o.getUserId().equals(user.getId()))
  209 +// );
  210 +// }
217 211
218 @Test 212 @Test
219 public void testLogout_success() { 213 public void testLogout_success() {
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/common/CaptchaServiceTest.java deleted
1 -package cn.iocoder.yudao.module.system.service.common;  
2 -  
3 -import cn.iocoder.yudao.module.system.controller.admin.common.vo.CaptchaImageRespVO;  
4 -import cn.iocoder.yudao.module.system.dal.redis.common.CaptchaRedisDAO;  
5 -import cn.iocoder.yudao.module.system.framework.captcha.config.CaptchaProperties;  
6 -import cn.iocoder.yudao.framework.test.core.ut.BaseRedisUnitTest;  
7 -import org.junit.jupiter.api.Test;  
8 -import org.springframework.context.annotation.Import;  
9 -  
10 -import javax.annotation.Resource;  
11 -  
12 -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;  
13 -import static org.junit.jupiter.api.Assertions.*;  
14 -  
15 -@Import({CaptchaServiceImpl.class, CaptchaProperties.class, CaptchaRedisDAO.class})  
16 -public class CaptchaServiceTest extends BaseRedisUnitTest {  
17 -  
18 - @Resource  
19 - private CaptchaServiceImpl captchaService;  
20 -  
21 - @Resource  
22 - private CaptchaRedisDAO captchaRedisDAO;  
23 - @Resource  
24 - private CaptchaProperties captchaProperties;  
25 -  
26 - @Test  
27 - public void testGetCaptchaImage() {  
28 - // 调用  
29 - CaptchaImageRespVO respVO = captchaService.getCaptchaImage();  
30 - // 断言  
31 - assertNotNull(respVO.getUuid());  
32 - assertNotNull(respVO.getImg());  
33 - String captchaCode = captchaRedisDAO.get(respVO.getUuid());  
34 - assertNotNull(captchaCode);  
35 - }  
36 -  
37 - @Test  
38 - public void testGetCaptchaCode() {  
39 - // 准备参数  
40 - String uuid = randomString();  
41 - String code = randomString();  
42 - // mock 数据  
43 - captchaRedisDAO.set(uuid, code, captchaProperties.getTimeout());  
44 -  
45 - // 调用  
46 - String resultCode = captchaService.getCaptchaCode(uuid);  
47 - // 断言  
48 - assertEquals(code, resultCode);  
49 - }  
50 -  
51 - @Test  
52 - public void testDeleteCaptchaCode() {  
53 - // 准备参数  
54 - String uuid = randomString();  
55 - String code = randomString();  
56 - // mock 数据  
57 - captchaRedisDAO.set(uuid, code, captchaProperties.getTimeout());  
58 -  
59 - // 调用  
60 - captchaService.deleteCaptchaCode(uuid);  
61 - // 断言  
62 - assertNull(captchaRedisDAO.get(uuid));  
63 - }  
64 -  
65 -}  
yudao-server/src/main/resources/application.yaml
@@ -57,6 +57,43 @@ mybatis-plus: @@ -57,6 +57,43 @@ mybatis-plus:
57 logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) 57 logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
58 type-aliases-package: ${yudao.info.base-package}.module.*.dal.dataobject 58 type-aliases-package: ${yudao.info.base-package}.module.*.dal.dataobject
59 59
  60 +--- #################### 验证码相关配置 ####################
  61 +
  62 +aj:
  63 + captcha:
  64 + # 滑动验证,底图路径,不配置将使用默认图片
  65 + # 支持全路径
  66 + # 支持项目路径,以classpath:开头,取resource目录下路径,例:classpath:images/jigsaw
  67 + jigsaw: classpath:images/jigsaw
  68 + #滑动验证,底图路径,不配置将使用默认图片
  69 + ##支持全路径
  70 + # 支持项目路径,以classpath:开头,取resource目录下路径,例:classpath:images/pic-click
  71 + pic-click: classpath:images/pic-click
  72 + # 缓存local/redis...
  73 + cache-type: redis
  74 + # local缓存的阈值,达到这个值,清除缓存
  75 + cache-number: 1000
  76 + # local定时清除过期缓存(单位秒),设置为0代表不执行
  77 + timing-clear: 180
  78 + # 验证码类型default两种都实例化。
  79 + type: default
  80 + # 右下角水印文字(我的水印)https://tool.chinaz.com/tools/unicode.aspx 中文转Unicode
  81 + water-mark: 芋道源码
  82 + # 滑动干扰项(0/1/2)
  83 + interference-options: 2
  84 + # 接口请求次数一分钟限制是否开启 true|false
  85 + req-frequency-limit-enable: false
  86 + # 验证失败5次,get接口锁定
  87 + req-get-lock-limit: 5
  88 + # 验证失败后,锁定时间间隔,s
  89 + req-get-lock-seconds: 360
  90 + # get接口一分钟内请求数限制
  91 + req-get-minute-limit: 30
  92 + # check接口一分钟内请求数限制
  93 + req-check-minute-limit: 60
  94 + # verify接口一分钟内请求数限制
  95 + req-verify-minute-limit: 60
  96 +
60 --- #################### 芋道相关配置 #################### 97 --- #################### 芋道相关配置 ####################
61 98
62 yudao: 99 yudao:
@@ -92,7 +129,8 @@ yudao: @@ -92,7 +129,8 @@ yudao:
92 enable: true 129 enable: true
93 ignore-urls: 130 ignore-urls:
94 - /admin-api/system/tenant/get-id-by-name # 基于名字获取租户,不许带租户编号 131 - /admin-api/system/tenant/get-id-by-name # 基于名字获取租户,不许带租户编号
95 - - /admin-api/system/captcha/get-image # 获取图片验证码,和租户无关 132 + - /captcha/get # 获取图片验证码,和租户无关
  133 + - /captcha/check # 校验图片验证码,和租户无关
96 - /admin-api/infra/file/*/get/** # 获取图片,和租户无关 134 - /admin-api/infra/file/*/get/** # 获取图片,和租户无关
97 - /admin-api/system/sms/callback/* # 短信回调接口,无法带上租户编号 135 - /admin-api/system/sms/callback/* # 短信回调接口,无法带上租户编号
98 - /app-api/pay/order/notify/* # 支付回调通知,不携带租户编号 136 - /app-api/pay/order/notify/* # 支付回调通知,不携带租户编号
yudao-ui-admin-vue3/src/hooks/web/useAxios.ts
@@ -20,31 +20,37 @@ const request = (option: AxiosConfig) =&gt; { @@ -20,31 +20,37 @@ const request = (option: AxiosConfig) =&gt; {
20 20
21 async function getFn<T = any>(option: AxiosConfig): Promise<T> { 21 async function getFn<T = any>(option: AxiosConfig): Promise<T> {
22 const res = await request({ method: 'GET', ...option }) 22 const res = await request({ method: 'GET', ...option })
  23 + console.info(res)
23 return res.data 24 return res.data
24 } 25 }
25 26
26 async function postFn<T = any>(option: AxiosConfig): Promise<T> { 27 async function postFn<T = any>(option: AxiosConfig): Promise<T> {
27 const res = await request({ method: 'POST', ...option }) 28 const res = await request({ method: 'POST', ...option })
  29 + console.info(res)
28 return res.data 30 return res.data
29 } 31 }
30 32
31 async function deleteFn<T = any>(option: AxiosConfig): Promise<T> { 33 async function deleteFn<T = any>(option: AxiosConfig): Promise<T> {
32 const res = await request({ method: 'DELETE', ...option }) 34 const res = await request({ method: 'DELETE', ...option })
  35 + console.info(res)
33 return res.data 36 return res.data
34 } 37 }
35 38
36 async function putFn<T = any>(option: AxiosConfig): Promise<T> { 39 async function putFn<T = any>(option: AxiosConfig): Promise<T> {
37 const res = await request({ method: 'PUT', ...option }) 40 const res = await request({ method: 'PUT', ...option })
  41 + console.info(res)
38 return res.data 42 return res.data
39 } 43 }
40 async function downloadFn<T = any>(option: AxiosConfig): Promise<T> { 44 async function downloadFn<T = any>(option: AxiosConfig): Promise<T> {
41 const res = await request({ method: 'GET', responseType: 'blob', ...option }) 45 const res = await request({ method: 'GET', responseType: 'blob', ...option })
  46 + console.info(res)
42 return res as unknown as Promise<T> 47 return res as unknown as Promise<T>
43 } 48 }
44 49
45 async function uploadFn<T = any>(option: AxiosConfig): Promise<T> { 50 async function uploadFn<T = any>(option: AxiosConfig): Promise<T> {
46 option.headersType = 'multipart/form-data' 51 option.headersType = 'multipart/form-data'
47 const res = await request({ method: 'PUT', ...option }) 52 const res = await request({ method: 'PUT', ...option })
  53 + console.info(res)
48 return res as unknown as Promise<T> 54 return res as unknown as Promise<T>
49 } 55 }
50 56
yudao-ui-admin/package.json
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
51 "highlight.js": "9.18.5", 51 "highlight.js": "9.18.5",
52 "js-beautify": "1.13.0", 52 "js-beautify": "1.13.0",
53 "jsencrypt": "3.0.0-rc.1", 53 "jsencrypt": "3.0.0-rc.1",
  54 + "crypto-js": "^4.0.0",
54 "nprogress": "0.2.0", 55 "nprogress": "0.2.0",
55 "quill": "1.3.7", 56 "quill": "1.3.7",
56 "screenfull": "5.0.2", 57 "screenfull": "5.0.2",
yudao-ui-admin/src/api/login.js
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 -import {getRefreshToken} from "@/utils/auth";  
3 -import service from "@/utils/request"; 2 +import { getRefreshToken } from '@/utils/auth'
  3 +import service from '@/utils/request'
4 4
5 // 登录方法 5 // 登录方法
6 -export function login(username, password, code, uuid,  
7 - socialType, socialCode, socialState) { 6 +export function login(username, password, socialType, socialCode, socialState) {
8 const data = { 7 const data = {
9 username, 8 username,
10 password, 9 password,
11 - code,  
12 - uuid,  
13 // 社交相关 10 // 社交相关
14 - socialType, socialCode, socialState 11 + socialType,
  12 + socialCode,
  13 + socialState
15 } 14 }
16 return request({ 15 return request({
17 url: '/system/auth/login', 16 url: '/system/auth/login',
@@ -36,15 +35,6 @@ export function logout() { @@ -36,15 +35,6 @@ export function logout() {
36 }) 35 })
37 } 36 }
38 37
39 -// 获取验证码  
40 -export function getCodeImg() {  
41 - return request({  
42 - url: '/system/captcha/get-image',  
43 - method: 'get',  
44 - timeout: 20000  
45 - })  
46 -}  
47 -  
48 // 社交授权的跳转 38 // 社交授权的跳转
49 export function socialAuthRedirect(type, redirectUri) { 39 export function socialAuthRedirect(type, redirectUri) {
50 return request({ 40 return request({
@@ -108,20 +98,20 @@ export function getAuthorize(clientId) { @@ -108,20 +98,20 @@ export function getAuthorize(clientId) {
108 } 98 }
109 99
110 export function authorize(responseType, clientId, redirectUri, state, 100 export function authorize(responseType, clientId, redirectUri, state,
111 - autoApprove, checkedScopes, uncheckedScopes) { 101 + autoApprove, checkedScopes, uncheckedScopes) {
112 // 构建 scopes 102 // 构建 scopes
113 - const scopes = {}; 103 + const scopes = {}
114 for (const scope of checkedScopes) { 104 for (const scope of checkedScopes) {
115 - scopes[scope] = true; 105 + scopes[scope] = true
116 } 106 }
117 for (const scope of uncheckedScopes) { 107 for (const scope of uncheckedScopes) {
118 - scopes[scope] = false; 108 + scopes[scope] = false
119 } 109 }
120 // 发起请求 110 // 发起请求
121 return service({ 111 return service({
122 url: '/system/oauth2/authorize', 112 url: '/system/oauth2/authorize',
123 - headers:{  
124 - 'Content-type': 'application/x-www-form-urlencoded', 113 + headers: {
  114 + 'Content-type': 'application/x-www-form-urlencoded'
125 }, 115 },
126 params: { 116 params: {
127 response_type: responseType, 117 response_type: responseType,
yudao-ui-admin/src/assets/images/default.jpg 0 → 100644

19.7 KB

yudao-ui-admin/src/components/Verifition/Verify.vue 0 → 100644
  1 +<template>
  2 + <div v-show="showBox" :class="mode==='pop'?'mask':''">
  3 + <div :class="mode==='pop'?'verifybox':''" :style="{'max-width':parseInt(imgSize.width)+30+'px'}">
  4 + <div v-if="mode==='pop'" class="verifybox-top">
  5 + 请完成安全验证
  6 + <span class="verifybox-close" @click="closeBox">
  7 + <i class="iconfont icon-close" />
  8 + </span>
  9 + </div>
  10 + <div class="verifybox-bottom" :style="{padding:mode==='pop'?'15px':'0'}">
  11 + <!-- 验证码容器 -->
  12 + <components
  13 + :is="componentType"
  14 + v-if="componentType"
  15 + ref="instance"
  16 + :captcha-type="captchaType"
  17 + :type="verifyType"
  18 + :figure="figure"
  19 + :arith="arith"
  20 + :mode="mode"
  21 + :v-space="vSpace"
  22 + :explain="explain"
  23 + :img-size="imgSize"
  24 + :block-size="blockSize"
  25 + :bar-size="barSize"
  26 + :default-img="defaultImg"
  27 + />
  28 + </div>
  29 + </div>
  30 + </div>
  31 +</template>
  32 +<script type="text/babel">
  33 +/**
  34 + * Verify 验证码组件
  35 + * @description 分发验证码使用
  36 + * */
  37 +import VerifySlide from './Verify/VerifySlide'
  38 +import VerifyPoints from './Verify/VerifyPoints'
  39 +
  40 +export default {
  41 + name: 'Vue2Verify',
  42 + components: {
  43 + VerifySlide,
  44 + VerifyPoints
  45 + },
  46 + props: {
  47 + captchaType: {
  48 + type: String,
  49 + required: true
  50 + },
  51 + figure: {
  52 + type: Number
  53 + },
  54 + arith: {
  55 + type: Number
  56 + },
  57 + mode: {
  58 + type: String,
  59 + default: 'pop'
  60 + },
  61 + vSpace: {
  62 + type: Number
  63 + },
  64 + explain: {
  65 + type: String
  66 + },
  67 + imgSize: {
  68 + type: Object,
  69 + default() {
  70 + return {
  71 + width: '310px',
  72 + height: '155px'
  73 + }
  74 + }
  75 + },
  76 + blockSize: {
  77 + type: Object
  78 + },
  79 + barSize: {
  80 + type: Object
  81 + },
  82 + },
  83 + data() {
  84 + return {
  85 + // showBox:true,
  86 + clickShow: false,
  87 + // 内部类型
  88 + verifyType: undefined,
  89 + // 所用组件类型
  90 + componentType: undefined,
  91 + // 默认图片
  92 + defaultImg: require('@/assets/images/default.jpg')
  93 + }
  94 + },
  95 + computed: {
  96 + instance() {
  97 + return this.$refs.instance || {}
  98 + },
  99 + showBox() {
  100 + if (this.mode === 'pop') {
  101 + return this.clickShow
  102 + } else {
  103 + return true
  104 + }
  105 + }
  106 + },
  107 + watch: {
  108 + captchaType: {
  109 + immediate: true,
  110 + handler(captchaType) {
  111 + switch (captchaType.toString()) {
  112 + case 'blockPuzzle':
  113 + this.verifyType = '2'
  114 + this.componentType = 'VerifySlide'
  115 + break
  116 + case 'clickWord':
  117 + this.verifyType = ''
  118 + this.componentType = 'VerifyPoints'
  119 + break
  120 + }
  121 + }
  122 + },
  123 + },
  124 + mounted() {
  125 + this.uuid()
  126 + },
  127 + methods: {
  128 + // 生成 uuid
  129 + uuid() {
  130 + let s = []
  131 + let hexDigits = '0123456789abcdef'
  132 + for (let i = 0; i < 36; i++) {
  133 + s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1)
  134 + }
  135 + s[14] = '4' // bits 12-15 of the time_hi_and_version field to 0010
  136 + s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1) // bits 6-7 of the clock_seq_hi_and_reserved to 01
  137 + s[8] = s[13] = s[18] = s[23] = '-'
  138 +
  139 + let slider = 'slider' + '-' + s.join('')
  140 + let point = 'point' + '-' + s.join('')
  141 + // 判断下是否存在 slider
  142 + console.log(localStorage.getItem('slider'))
  143 + if (!localStorage.getItem('slider')) {
  144 + localStorage.setItem('slider', slider)
  145 + }
  146 + if (!localStorage.getItem('point')) {
  147 + localStorage.setItem('point', point)
  148 + }
  149 + },
  150 + /**
  151 + * refresh
  152 + * @description 刷新
  153 + * */
  154 + refresh() {
  155 + if (this.instance.refresh) {
  156 + this.instance.refresh()
  157 + }
  158 + },
  159 + closeBox() {
  160 + this.clickShow = false
  161 + this.refresh()
  162 + },
  163 + show() {
  164 + if (this.mode === 'pop') {
  165 + this.clickShow = true
  166 + }
  167 + }
  168 + },
  169 +}
  170 +</script>
  171 +<style>
  172 +.verifybox{
  173 + position: relative;
  174 + box-sizing: border-box;
  175 + border-radius: 2px;
  176 + border: 1px solid #e4e7eb;
  177 + background-color: #fff;
  178 + box-shadow: 0 0 10px rgba(0,0,0,.3);
  179 + left: 50%;
  180 + top:50%;
  181 + transform: translate(-50%,-50%);
  182 +}
  183 +.verifybox-top{
  184 + padding: 0 15px;
  185 + height: 50px;
  186 + line-height: 50px;
  187 + text-align: left;
  188 + font-size: 16px;
  189 + color: #45494c;
  190 + border-bottom: 1px solid #e4e7eb;
  191 + box-sizing: border-box;
  192 +}
  193 +.verifybox-bottom{
  194 + padding: 15px;
  195 + box-sizing: border-box;
  196 +}
  197 +.verifybox-close{
  198 + position: absolute;
  199 + top: 13px;
  200 + right: 9px;
  201 + width: 24px;
  202 + height: 24px;
  203 + text-align: center;
  204 + cursor: pointer;
  205 +}
  206 +.mask{
  207 + position: fixed;
  208 + top: 0;
  209 + left:0;
  210 + z-index: 1001;
  211 + width: 100%;
  212 + height: 100vh;
  213 + background: rgba(0,0,0,.3);
  214 + /* display: none; */
  215 + transition: all .5s;
  216 +}
  217 +.verify-tips{
  218 + position: absolute;
  219 + left: 0px;
  220 + bottom:0px;
  221 + width: 100%;
  222 + height: 30px;
  223 + line-height:30px;
  224 + color: #fff;
  225 +}
  226 +.suc-bg{
  227 + background-color:rgba(92, 184, 92,.5);
  228 + filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
  229 +}
  230 +.err-bg{
  231 + background-color:rgba(217, 83, 79,.5);
  232 + filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7fD9534F, endcolorstr=#7fD9534F);
  233 +}
  234 +.tips-enter,.tips-leave-to{
  235 + bottom: -30px;
  236 +}
  237 +.tips-enter-active,.tips-leave-active{
  238 + transition: bottom .5s;
  239 +}
  240 +/* ---------------------------- */
  241 +/*常规验证码*/
  242 +.verify-code {
  243 + font-size: 20px;
  244 + text-align: center;
  245 + cursor: pointer;
  246 + margin-bottom: 5px;
  247 + border: 1px solid #ddd;
  248 +}
  249 +
  250 +.cerify-code-panel {
  251 + height: 100%;
  252 + overflow: hidden;
  253 +}
  254 +
  255 +.verify-code-area {
  256 + float: left;
  257 +}
  258 +
  259 +.verify-input-area {
  260 + float: left;
  261 + width: 60%;
  262 + padding-right: 10px;
  263 +
  264 +}
  265 +
  266 +.verify-change-area {
  267 + line-height: 30px;
  268 + float: left;
  269 +}
  270 +
  271 +.varify-input-code {
  272 + display: inline-block;
  273 + width: 100%;
  274 + height: 25px;
  275 +}
  276 +
  277 +.verify-change-code {
  278 + color: #337AB7;
  279 + cursor: pointer;
  280 +}
  281 +
  282 +.verify-btn {
  283 + width: 200px;
  284 + height: 30px;
  285 + background-color: #337AB7;
  286 + color: #FFFFFF;
  287 + border: none;
  288 + margin-top: 10px;
  289 +}
  290 +
  291 +/*滑动验证码*/
  292 +.verify-bar-area {
  293 + position: relative;
  294 + background: #FFFFFF;
  295 + text-align: center;
  296 + -webkit-box-sizing: content-box;
  297 + -moz-box-sizing: content-box;
  298 + box-sizing: content-box;
  299 + border: 1px solid #ddd;
  300 + -webkit-border-radius: 4px;
  301 +}
  302 +
  303 +.verify-bar-area .verify-move-block {
  304 + position: absolute;
  305 + top: 0px;
  306 + left: 0;
  307 + background: #fff;
  308 + cursor: pointer;
  309 + -webkit-box-sizing: content-box;
  310 + -moz-box-sizing: content-box;
  311 + box-sizing: content-box;
  312 + box-shadow: 0 0 2px #888888;
  313 + -webkit-border-radius: 1px;
  314 +}
  315 +
  316 +.verify-bar-area .verify-move-block:hover {
  317 + background-color: #337ab7;
  318 + color: #FFFFFF;
  319 +}
  320 +
  321 +.verify-bar-area .verify-left-bar {
  322 + position: absolute;
  323 + top: -1px;
  324 + left: -1px;
  325 + background: #f0fff0;
  326 + cursor: pointer;
  327 + -webkit-box-sizing: content-box;
  328 + -moz-box-sizing: content-box;
  329 + box-sizing: content-box;
  330 + border: 1px solid #ddd;
  331 +}
  332 +
  333 +.verify-img-panel {
  334 + margin: 0;
  335 + -webkit-box-sizing: content-box;
  336 + -moz-box-sizing: content-box;
  337 + box-sizing: content-box;
  338 + border-top: 1px solid #ddd;
  339 + border-bottom: 1px solid #ddd;
  340 + border-radius: 3px;
  341 + position: relative;
  342 +}
  343 +
  344 +.verify-img-panel .verify-refresh {
  345 + width: 25px;
  346 + height: 25px;
  347 + text-align: center;
  348 + padding: 5px;
  349 + cursor: pointer;
  350 + position: absolute;
  351 + top: 0;
  352 + right: 0;
  353 + z-index: 2;
  354 +}
  355 +
  356 +.verify-img-panel .icon-refresh {
  357 + font-size: 20px;
  358 + color: #fff;
  359 +}
  360 +
  361 +.verify-img-panel .verify-gap {
  362 + background-color: #fff;
  363 + position: relative;
  364 + z-index: 2;
  365 + border: 1px solid #fff;
  366 +}
  367 +
  368 +.verify-bar-area .verify-move-block .verify-sub-block {
  369 + position: absolute;
  370 + text-align: center;
  371 + z-index: 3;
  372 + /* border: 1px solid #fff; */
  373 +}
  374 +
  375 +.verify-bar-area .verify-move-block .verify-icon {
  376 + font-size: 18px;
  377 +}
  378 +
  379 +.verify-bar-area .verify-msg {
  380 + z-index: 3;
  381 +}
  382 +
  383 +/*字体图标的css*/
  384 +/*@font-face {font-family: "iconfont";*/
  385 +/*src: url('../fonts/iconfont.eot?t=1508229193188'); !* IE9*!*/
  386 +/*src: url('../fonts/iconfont.eot?t=1508229193188#iefix') format('embedded-opentype'), !* IE6-IE8 *!*/
  387 +/*url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),*/
  388 +/*url('../fonts/iconfont.ttf?t=1508229193188') format('truetype'), !* chrome, firefox, opera, Safari, Android, iOS 4.2+*!*/
  389 +/*url('../fonts/iconfont.svg?t=1508229193188#iconfont') format('svg'); !* iOS 4.1- *!*/
  390 +/*}*/
  391 +
  392 +.iconfont {
  393 + font-family: "iconfont" !important;
  394 + font-size: 16px;
  395 + font-style: normal;
  396 + -webkit-font-smoothing: antialiased;
  397 + -moz-osx-font-smoothing: grayscale;
  398 +}
  399 +
  400 +.icon-check:before {
  401 + content: " ";
  402 + display: block;
  403 + width: 16px;
  404 + height: 16px;
  405 + position: absolute;
  406 + margin: auto;
  407 + left: 0;
  408 + right: 0;
  409 + top: 0;
  410 + bottom: 0;
  411 + z-index: 9999;
  412 + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAIlFJREFUeNrt3X1cVNW6B/BnbcS3xJd7fLmSeo+op/Qmyp4BFcQEwpd8Nyc9iZppgUfE49u1tCwlNcMySCM1S81jCoaioiJvKoYgswfUo5wSJ69SZFKCKSAws+4f2/GetFFRYG3g9/2Hz2xj+O2J4Zm19trrIQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgjmOgAAADwOBhz83TzdPNs397qanW1ujJ2s8fNHjd7FBTkhuSG5IbculVdP1kSfeoAAPBwdFzHdXzgQN0S3RLdkpgY2SJbZMvNm9It6ZZ064cfGmQ2yGyQmZfX3KO5R3OPwkJdsi5Zl5yYKIfL4XL4mDHqs7AqGzhgBAIAoFFdI7pGdI1o1KjFlhZbWmxZv149OmXK4z3r4cPEiROfOFExKSbFVFDwqM+EEQgAgMY8y5/lz/LGjZu3bt66eev9+9Wjj1s4bAYNIkaMWHKyx3mP8x7nmzd/1GdyEP1CAQCASifrZJ3s6FjmWuZa5rprF3uLvcXeGjq0en5au3a8nJfz8k6d8lPyU/JTYmIq+wwYgQAAaIIk0WgaTaO/+IJm0SyaNWJEtf/IPMqjvJde0g/QD9APcHOrdGIhrxMAANzGmJwr58q569ZRLMVS7MSJNfajFVJIYYy/wF/gL7z0UmW/vUGNvk4AAHCHTqfT6XQrVtB4Gk/jg4KEBfmBfqAf+vSp7LdhBAIAUMPUwvH66+oj21eBSqmUStu3r+y3oYAAANQQtXDMmKE+WrlSdB4bvpwv58t/+62y34cCAgBQzeSt8lZ568SJFEiBFLh2reg8d2MD2UA28PTpyn4fCggAQDXRh+pD9aEjR1IABVDA5s20ntbTeklzf3eZF/NiXvv2Vfb7NHciAAC1nRwsB8vBvr5Wf6u/1X/nTubO3Jl7A+0tWvImb/LOyemc3zm/c/6ePZX9dmxlAgBQRfTd9N303Tw8rFusW6xbEhPZLDaLzXJyEp3rHjNoBs24dYt/wj/hn3h5mUwmk8mkKJV9GoxAAAAekz5AH6APeOYZ6znrOeu5Awc0WzgCKZACrVZ2hB1hR15++VELhw1GIAAAj0hdVdWli/ooNVX9WvnlsNUflHSk45wbuZEbg4LUwrFhw+M+LUYgAACV1CuoV1CvoCef5Kv4Kr4qIUE9qsHCcRsv4AW8YOHCqiocNtq7qAMAoFHqZoetW9MgGkSDDh+mhbSQFnbuLDrX/YWGmmJMMaaYsLCqfmZMYQEAPIBt23PLp5ZPLZ8mJ9MROkJHdDrRueyKpViKXbdO6aB0UDoEB1fXj8EUFgCAHX0v973c93KTJpbvLd9bvt+3T+uFg0/mk/nkL79UC0dISHX/PIxAAADuYuvLwQ/xQ/zQnj1sKBvKhj7/vOhc9vA4HsfjYmOd2jm1c2o3btxRdpQdZRUV1f1zMQIBALjNYDAYDAYHB9pEm2jTl19qvXBQGIVRWFKSWjgmTKipwmGDi+gAAERExJhZZ9aZdZGRNJ2m0/Tx40UnssuHfMgnPb2koKSgpGD0aIUpTGGlpTUdAwUEAOo9XbguXBf+/vu0lbbS1ldfFZ3HrgE0gAacPu0423G24+xhw5SOSkel440bouKggABAvaXjOq7j77xDetKTfv580Xns8iIv8srNlfKkPClv8OD0jukd0zv++qvoWLiIDgD1jrpnVXAwb86b8+Yffyw6jz18NV/NV+flWQZaBloGenufYqfYKXbxouhcNriIDgD1hi5Zl6xLnjyZL+AL+ILwcNF57OpLfanv1atsPpvP5vv7a61w2GAEAgB1nrpn1ejRPJNn8szoaM1ur05EREVF6ldfX0VRFEUxmUQnskejLyAAwOPT79fv1+9/7jn+E/+J/7Rjh7YLR3ExceLEhw9XTIpJMWm3cNho9IUEAHh08hB5iDykb1/+M/+Z/7x7N0VSJEU2aiQ61z30pCd9WZl1inWKdcoLL2R5ZnlmeR4/LjrWw8I1EACoM+S2clu5rasr+yv7K/vrgQO0jtbRumbNROe6G4/kkTzSYqFMyqTMgAC1cBw6JDpXZaGAAECt1zukd0jvkG7daBftol2HD1MERVBEq1aic93jdl8O9gv7hf0SGKhOVUVHi471qFBAAKDW0hfri/XFHTs6cAfuwBMS2Bw2h81p1050LruepWfp2fnzlaHKUGXopk2i4zwuFBAAqHVcw1zDXMPatrWSlayUkEBplEZp//VfonPZw86ys+zsm28qE5WJysQPPxSdp6qggABAraHuktuiRYOgBkENgg4dYt7Mm3k/9ZToXHZNpIk0MTzcWGosNZYuXy46TlXDfSAAoHnqfRxNm6qP4uPVr/37i85l11gaS2M3b1YWK4uVxa+8oh7kXHSsqoYRCABoVo+oHlE9oho2pME0mAbHxKhHNVw4IimSImNiXLJdsl2yp09XD9a9wmGDAgIAmmPry9G4f+P+jfv/4x8UT/EUP3iw6Fz3d/hwUXpRelH6Sy9FR0dHR0dbLKITVTfcSAgAGsPYhT4X+lzos2EDG8FGsBHjxolOZA9fxBfxRWlpFeYKc4V57NjckNyQ3JBbt0Tnqim4BgIAmiEvkhfJiz78kMWzeBY/Z47oPPbwpXwpX5qdbRlmGWYZ5uOjbnZYWCg6V03DFBYACKdbq1urW7tiheYLRypP5anffluRU5FTkTN4cH0tHDYYgQCAMOqeVX//O7vKrrKra9aIzmMPP86P8+NmM/fjftzP2zsrLSstK+3HH0XnEg0jEACocXJXuavcdepU1ol1Yp00fGNdP+pH/X78UUqSkqQkf38Ujt9DAQGAGqMP0YfoQ154gbbTdtq+cSMppJDCtDcTwokTLyiwvGh50fKiv79xuHG4cbjZLDqW1mjvfxwA1DluZjezm3nECMkgGSTD11+rRx0dRee6G8/gGTzj+nU+gA/gA/z81BGH0Sg6l1ZhBAIA1Ua9g9zHh/3MfmY/R0WpRzVYOE7yk/xkSYmUI+VIOSNHonA8HIxAAKDK6bvpu+m7eXhYt1i3WLckJrJZbBab5eQkOtcfKy9Xv44Zo7aQjYsTnai2cBAdAADqDn2APkAf8Mwz1gRrgjUhIYG9wF5gL7RsKTrXPQIpkAKtVlbMilnxpElKvBKvxO/eLTpWbYMRCAA8NnWqqksXddXSsWN0gk7QCWdn0bnuDao2dOJGbuTGoCCTyWQymTZsEB2rtsI1EAB4ZL2CegX1CnrySb6Kr+KrEhI0Wzhu4wW8gBcsXIjCUTWwFxYAVJral6N1axpEg2jQ4cO0kBbSws6dRee6v9BQU4wpxhQTFiY6SV2BKSwAeGge5z3Oe5xv3tzyreVby7dJSfQ2vU1v6/Wic9kVS7EUu26d0kHpoHQIDhYdp67BFBYAPFDfy30v973cpElFVkVWRdbevZovHJtpM23etk0tHCEhouPUVRiBAIBd6lSVoyMxYsRsq5SGDROdyx4ex+N4XGysUzundk7txo07yo6yo6yiQnSuugojEACwQ5L4dD6dT9+6VX2s3cJBYRRGYUlJauGYMAGFo2bUWAHps73P9j7b27Xr2bNnz549W7USfeIAYA9jslk2y+YNG9gmtoltmjBBdCJ7bA2dypVypVwZNUotHKWlonPVF1U+hfX7PW8CA9UtAnx9mQfzYB5Nmtz5Dz3IgzwKC+k1eo1ei4+naTSNpq1Zo5gUk2LKyBD9wgDUR/I5+Zx87oMP2CQ2iU2aO1d0HnvQ0EkbHruA9OK9eC/esmWD1AapDVK/+orm0ByaM2TIIz9hNEVT9IYNRfuL9hftDwmpby0iAUSQT8on5ZNLlrAZbAabsXSp6Dz28JV8JV/53XcVpypOVZzy9j694PSC0wt+/ll0rvrqkQuI15+8/uT1Jyen0smlk0snHz9Ox+gYHXN1rdp4KSnlE8onlE8YMUL9Rbl5U/QLBlCXqBfJQ0LUi+Th4aLz3N+lS+o2697e6kzFpUuiE9V3j3wNpHR26ezS2ZGR1VM4bHx8HHs59nLsdeBAj6geUT2imjUT9UIB1CVylBwlR738MulJT/qPPhKdxx6+hq/ha65ckWKlWCnW3x+FQ1sqPQJxN7gb3A29e1tbWVtZW5lMNdUQhifxJJ70zTdNujTp0qTL0KHf/PLNL9/88ttvYl42gNrJ7Te339x+GzuW5bAclhMVpU5ZOWhvU9UQCqGQa9es063TrdN9fLLKs8qzyk+dEh0Lfq/SIxBrf2t/a/+JE2u6kxjzY37Mz8ur9OXSl0tfTklRb2z6j/+o2ZcLoHZyi3aLdov285N2Sjulndu3a7ZwEBFRcTFP4Ak8YdQoFA5tq/wU1l/oL/QXLy9hiY/QETqi05U1L2te1vzgQdtFfGF5ADRMX6wv1hd7eqo9vWNjKZIiKbJRI9G57jGDZtCMW7fYUraULR01yrTNtM20LTVVdCy4v0qPINSLbrm56kW3Ll1EnwAtpaW01Ggse6PsjbI3Bg06c+bMmTNnrl0THQtApDtTza2tra2tU1LoJJ2kk9r7oMUzeSbPrKhg7syduRsMakOnPXtE54KHU+kRCF/Gl/FlGrr2cHtPHseVjisdVyYn39klFKAe6h3SO6R3SLduln9Y/mH5x8GDWi0ctr4cLJ7Fs/igIBSO2qnyU1i9qTf1zskRHfxu7G32Nnu7d2+1oCQmopBAfaL+vnfqJIVJYVJYUhLrx/qxfv/5n6Jz2cNSWApLCQlRhipDlaGbNonOA4+m8gWkM3WmzrGxooPbtYyW0bJevdQptuRk1zDXMNewtm1FxwKoDrYtgugNeoPeSExknsyTeXbsKDqXPewsO8vOvvmm8bzxvPH82rWi88DjqXQB6TK6y+guo3ftosW0mBafOyf6BO6vZ0/Hrxy/cvzq6FE3TzdPN0/tdkoDqAx1xNGiRfmI8hHlIw4epPfoPXqvWzfRueyaSBNpYni4sdRYaixdvlx0HKgaj7wMV5ZlWZZ1OsYYY+zYMfVo06aiT8genspTeeq331rmWuZa5vr5nfr01KenPv3hB9G5ACpD7T1ue5/Fx6tf+/cXncuusTSWxm7erCxWFiuLX3lFPci56FhQNR75TnS1p7Ci8Ml8Mp8cEKAeLS8XfUL2MG/mzbyfesphrMNYh7HJybZezqJzATyMrhFdI7pGNGrE5/F5fJ5tClm7hYNP49P4tB071MIxbdrtoygcdUyV3Qioy9Pl6fKef57n8Tye9/XXbCabyWY2biz6BO1aQAtowcWLFeMrxleMt+3mefGi6FgA/85gMBgMBgcH8wXzBfOFr75Sr+0ZDKJz3d/hw0VTiqYUTRk5Epuh1m1Vfie5foN+g37D0KFWV6ur1TUmRvOFxJM8yfN//9fhosNFh4s+Pif3ndx3ct/334uOBfD/fTk2bmQGZmAG2yd57bH15agwV5grzIMGYfPT+qHatiKRF8mL5EWDB1MohVLo7t339APRJNsmbb6+6rr0CxdEJ4L6SX3/fPihep/EnDmi89iDvhz1W7V1JDStMK0wrYiPV+8wHT1abSxVUiL6hO+vUyeextN4WkqKW5pbmlta166iE0H9oivVlepKly/XfOG4vSilIqcipyJn8GAUjvqp2lvaqtsvHz6sbss8ZAjNpJk088YN0Sduj20dPbvFbrFbKSm2O3tF54K6TU6UE+XE2bPJi7zIa9Ei0Xns4cf5cX7cbObP8ef4c76+aOhUv9XYbro2coAcIAd4e9Pf6G/0t7g4NovNYrOcnES/EPbwE/wEP/HTT9Z0a7o13c8ve0D2gOwBWr//BWoLW18OlsgSWeLnn9f0LtcPrR/1o34//siGsCFsiLe3cbhxuHG42Sw6FohV7SOQu9l22WTBLJgFP/88/5h/zD/W0N5ad7FtCSGRRBIlJ7uvdV/rvva//1t0LqjdbH056M/0Z/rzZ59ptnBw4sQLCqSnpaelpwcNQuGAf1fjBcRGndo6flzqLfWWeg8ZwjN4Bs+4fl30C2IPm8PmsDnt2llbWFtYW9g2bezZU3QuqF3U35tBg7Tel8P2frQ2tja2Nh46NDM4Mzgz+OxZ0blAW4QVEBtjU2NTY9O0NPIgD/Lw9eXhPJyH//qr6Fx2fUQf0Udt26pD+qQkua3cVm5bXS19oa6w9eVQf89jYrTal8O22IU5MAfmMGpUVlpWWlaa0Sg6F2iT5obM6lYNsqwWkoQENpvNZrM13HnQ1npzvXW9df2gQXjDwb+rLX05VLadJMaMUZexx8WJTgTaJnwEcjf1F9dkkhZJi6RFzz3H03k6T//lF9G57IqgCIpo1UrqJfWSeiUkuHd27+ze2d1ddCwQSx+qD9WHPvWUdaR1pHVkfLxmC0cgBVKg1cq6s+6s++TJKBxQGZobgdztzie4C9YL1gsJCepWDhru8+FBHuRRWEgZlEEZQ4ao13oyMkTHgpqh36/fr9/v4sIP8UP8UGoqnaATdEKDu0DfbujEjdzIjUFB6t52GzaIjgW1i+YLiI26aqV7d9aINWKNkpO13jBHVVTE2/A2vM2QIaZDpkOmQ+npohNB9bC1C2BJLIklpaay/qw/6+/iIjqXPczMzMy8cKHxmvGa8dr774vOA7WT5qaw7MlyynLKcsrJUQuHj496ND9fdK77a9GCXWVX2dVDh9wC3QLdAvv1E50Iqpat86U0X5ovzU9I0HrhUIWGonBAVag1BcRGnaP917/UR76+thucROe6vxYtJCYxiSUk6LiO6/jAgaITwePxOO9x3uN88+ZqB8yDB2k5LaflPXqIzmVXLMVS7Lp16vtnyRLRcaBuqDVTWPbYLlZyF+7CXZKS6EP6kD7UcJ8Pd3In95s3eQPegDcYOdK01rTWtDY5WXQseDh9L/e93PdykyZlT5Q9UfbEgQPMn/kzfw1/INhMm2nztm1KT6Wn0nPKFPWg1So6FtQNtb6A2Nj2rJLGSGOkMcnJbD6bz+Z36CA61/0VF1tft75ufX3kyCxDliHLkJQkOhH8MXWqytFRXcSxe7d6dNgw0bns4XE8jsfFxjq1c2rn1G7cuKPsKDvKKipE54K6pdZNYdmTHZEdkR1x/rxloGWgZaC3N1/FV/FVWu/r0bSp9J70nvTe3r26Ql2hrtDfX3Qi+COSxKfz6Xz61q3qY+0WDgqjMApLSlILx4QJKBxQnepMAbGxdRbk2TybZ/v42HYPFZ3r/po2pV20i3bt2yevkFfIK4YPF50IiIgY05l1Zp05MpJtYpvYpgkTRCeyy4d8yCc9vaSgpKCkYPRotXCUloqOBXVbnZnCskedeujUSX2UnKxOQXTpIjqXXXrSk76sjHVgHVgHg8H4lvEt41t794qOVd/I8+R58rxVq9gRdoQd+Z//EZ3n/s6ccdzjuMdxz8CB6R3TO6Z31PBWQFCn1LkRyN3UG/kuXWLH2XF23MdH7beQmys6l11GMpKxYUO1t3x0tO5fun/p/jVqlOhY9YW6lc5bb2m+cNz+PZZcJBfJZdAgFA4Qoc4XEBt108bLl6V8KV/K9/amxbSYFmu4r8ftQkJraA2tiYqSw+VwOXzMGNGx6ir5oHxQPvi3v6mPli0Tnccevpqv5qvz8irCK8Irwv39M6MzozOjf/pJdC6on+pNAbGxveEalDYobVDq68vf5e/ydzW8TfXtQsK2sq1s686dd/pIQJVQd1MOCGCX2WV2+eOPReexqy/1pb5Xr6qrC/39bdf6RMeC+q3eFRCbjJcyXsp46coVx2uO1xyv+fnxo/woP/rPf4rOdX+OjiyH5bCcqCh5q7xV3jpxouhEtdWdqcGf6Cf66YsvaD2tp/WSRt8PRUWUTumUPmTI72+kBRBLo2+YmmMrJBWRFZEVkX5+6tEzZ0TnsudOA6Kn6Wl6essW2ydo0blqC7dot2i3aD8/XsgLeeGOHcyduTP3Bg1E5/pjxcW8O+/Ou48YYdulWnQigH9X51dhVVbvY72P9T7Wpo3DbofdDrsTE+kYHaNj2m0YxSN5JI+0WNgNdoPdeOUVxVfxVXxt9yuAjboar08fCqZgCk5MpHW0jtY1ayY61z1ur8KzTrFOsU4ZNSrLM8szy/PQIdGxAP5IvR+B3C17QPaA7AFXr5YlliWWJQ4cSEtpKS3VboMo24iEN+PNeLPPP5ej5Cg56uWXRefSClvrYR7BI3jEgQNaLRy2DwKUSZmUGRCAwgG1AUYgD9CL9+K9eMuWDtcdrjtcj49nvsyX+Xp4iM5l1+0+D6SQQsrMmerUR2Sk6Fg1zS3NLc0trWtXpmd6pk9N1ez2/7b/X2NoDI159VVlqDJUGbppk+hYAA8DI5AHUFe7FBZamluaW5oPHkycOHENN4hSSCGFMfUP07p18gB5gDxg5kzRsWqKuktuhw7SJemSdCkhQbOFw+ZZepaenT8fhQNqI4xAKkmdEmnRgnzJl3wPHaIUSqGUvn1F57If+PYnXH/yJ//ZsxWDYlAMGl6u+ojuXLuKcYhxiDl6lFIplVK7dxedyx52lp1lZ99801hqLDWWLl8uOg/Ao3AQHaC2yc/Pz8/Pv3WrzZg2Y9qM2bFDWiOtkdZ4erIv2Zfsyz//WXS+ewNTPuUzRiVUQiVDhjhzZ+7Mr11Tz0PDI6mHZCvoUrwUL8UnJNAlukSXtLvoQRURoVxWLiuXFy0SnQTgcaCAPKIrCVcSriSUl7dp3aZ1m9a7djn80+GfDv+0dRzs3Fl0vnvYCome9KQfMqR9m/Zt2rcpKsrPzc/Nz619rXbVLUeaNqXn6Dl67sAB+p6+p+81PBIcS2Np7ObNyjZlm7JtxgzRcQCqAq6BPKbTC04vOL3g5k310fDh6lSRhhtE3b5GorbaXbNGDpAD5IDa80m4R1SPqB5RDRvy2Xw2n71rFyVREiV5e4vOZVckRVJkTIxLtku2S/b06epBzkXHAqgKGIFUEXVKqLzcucS5xLlk1y4+j8/j8/r0YSfYCXZCuz2yWQErYAV+fs6hzqHOoRZL/t78vfl7jx0TnetuBoPBYDA4ONzYd2PfjX3bt7MMlsEytL7J5OHDRa2LWhe1Hjfu+AfHPzj+QXm56EQAVQkX0avJndanTcqalDWJjWWD2WA2WPsNo9T7Ed5+2+Rh8jB5aGVTQcZks2yWzRs3MgMzMMO0aaIT2cMX8UV8UVpahbnCXGEeNOj3I1SAugUFpJp1jega0TWiUaMW+hb6FvroaJpFs2jWiBGicz0I/4J/wb9YtcrkanI1ub7+uqgc8jn5nHzugw/YJDaJTZo7V/TrYg9fypfypdnZlmGWYZZhPj625d+icwFUJ1wDqWa5IbkhuSG3bpXkleSV5I0bx2fymXym9htEsalsKpu6cKF8Wj4tn37vvZr++bJJNsmm0FDNF46VfCVf+d13FTkVORU5gwejcEB9ghFIDbNdBG6yqsmqJqt27lSPjh4tOtcDJVESJYWFKS2VlkrL6mu0pC7LDQlRO0eGh4s+7fu7dEm9sdTb29a4THQigJqEEUgNO/fiuRfPvVhWpv7hefFF2yod0bkeyI/8yG/BAvUP/OrVVf306rLcKVPUZcYffST6dO3qR/2o348/sqVsKVvq44PCAfUZVmEJoq7aslr7F/Yv7F/49dfXrl27du1a167qv/bsKTqfXYwYMU/P9lPbT20/tUWL/NT81PzUw4cf9enuNMjqQ32oz7ZtbCPbyDZqsC8HJ068oEDyl/wlfz8/Y4AxwBjw3XeiYwGIpL03aj0THR0dHR1tsbi4uLi4uEyeTJtpM23etk10rgdh8Syexc+ZI+fKuXLuJ5/cPvrQU6K6Ql2hrtDfX9op7ZR2bt9+p8+JxvAMnsEzrl+3NrY2tjYeOjQzODM4M1jDHSwBahCugWiM7X6HC/0v9L/Q/4sv1Fa2kyaJzvVA0RRN0Rs2KC6Ki+Jiu9Paar37P9MX64v1xZ6efC6fy+cePqxuX/7EE6Lj342f5Cf5yZISJjGJSc8/rzCFKezIEdG5ALQEBUSjbIXEbDabzWbbLq1TpojO9UCcOPHPPlOvDQQGqgetVneDu8Hd0Lu3tbW1tbV1SgqdpJN0smVL0XH/mO2GvzFj1O3w4+JEJwLQIs1NGYDq3Llz586d41y9VrJ3r3OKc4pzSqdOFEMxFOPmJjqfXYwYMVluP6/9vPbzOnZ0/sX5F+dfvvvOusS6xLokMZF9zj5nn7duLTrmPQIpkAKtVlbMilnxpElKvBKvxO/eLToWgJZhBFKrSJK6Cmr9evUPtW1vJQ273aKVjGQkY8OGouPc4/Z293wYH8aHBQaaRplGmUZt3Cg6FkBtgAJSKzEmvyO/I78TEcH2sX1sX3Cw6ES1FTMzMzMvXGi8ZrxmvPb++6LzANQmmMKqpfKP5B/JP3LokLOzs7Ozc6tW6tE+fUTnql1CQxWzYlbM774rOglAbYRlvLUa5+pF3r//nQ7SQTqo4RvwtGI8jafxn3yivm5LloiOA1CbYQqrjtGV6kp1pcuXkxd5kVft6fNR7W7fX6P0VHoqPW2r2e5dZgwADw8jkDpGaaw0VhovXsw38o18I6ZmeByP43Gxsc2eafZMs2emTlWPonAAVAUUkDrKJJtkk/zWW/QqvUqvaqWvRw0KozAKS0pyaufUzqndhAlH2VF2lFVUiI4FUJeggNRxSpASpAS9/ba6jHbpUtF5qh0nTjwjo6SgpKCkYPRotXCUloqOBVAXoYDUE+pWHO+8QyEUQiHiGkRVrzNnHGMdYx1jn39e3fX4xg3RiQDqMizjrWfy9+Tvyd/zzTdPlj5Z+mRpSQm1olbUSvutdu3yIi/yys2VHCVHydHX9+T0k9NPTr96VXQsgPoAq7DqOfmYfEw+Nn8+m8PmsDlhYaLzPCy+mq/mq/PyLAMtAy0Dvb3VToAXL4rOBVCfYAqrnjMNMA0wDVi9mubSXJo7b57oPA/Ul/pS36tX2Xw2n83390fhABAHIxD4HV2sLlYXGxREcRRHcZ98QgoppDx8n4/qVVSkfvX1VW8ENJlEJwKoz3ANBH4nf0f+jvwdRmN73p635/n5LIgFsaBhw8QWkuJi3p13592HDTPFm+JN8RkZol8nAMAIBB5AjpVj5dhXX2VX2BV25dNPaT2tp/U10HL29i6+TMd0TDd6tPE142vG1w4eFP16AMD/QwGBh6I7qDuoOzhtGl2my3R5w4bqKiQ8kkfySItFHfn89a9qY6roaNHnDwD3QgGBSpG7yl3lrlOn0nbaTts3bqyqXua2wiEtk5ZJy6ZONe437jfu//JL0ecLAPbhGghUSv6v+b/m/5qd3b5N+zbt22RksLFsLBvbvz+lURqlVb5FLU/lqTz122+l36TfpN8MBuMc4xzjnL17RZ8nADwYlvHCIzGtMK0wrYiPbza+2fhm47t3V48uWcJX8pV85Xff2fu+3//7kiXXP7v+2fXPevUy9jT2NPY8elT0eQHAw8MUFlQL1zDXMNewJ55o2L1h94bd27UryynLKcu5cuX0gtMLTi+4eVN0PgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAO/4PSBxbMqgmA24AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDCiEb4vAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAw00wGkwAAAE10RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fY2sxYnphMHpqOWpqZGN4ci9jaGVjay5zdmfbTpDYAAAAAElFTkSuQmCC");
  413 + background-size: contain;
  414 +}
  415 +
  416 +.icon-close:before {
  417 + content: " ";
  418 + display: block;
  419 + width: 16px;
  420 + height: 16px;
  421 + position: absolute;
  422 + margin: auto;
  423 + left: 0;
  424 + right: 0;
  425 + top: 0;
  426 + bottom: 0;
  427 + z-index: 9999;
  428 + background-image: url("data:image/png;base64,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");
  429 + background-size: contain;
  430 +}
  431 +
  432 +.icon-right:before {
  433 + content: " ";
  434 + display: block;
  435 + width: 16px;
  436 + height: 16px;
  437 + position: absolute;
  438 + margin: auto;
  439 + left: 0;
  440 + right: 0;
  441 + top: 0;
  442 + bottom: 0;
  443 + background-size: cover;
  444 + z-index: 9999;
  445 + background-image: url("data:image/png;base64,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");
  446 + background-size: contain;
  447 +}
  448 +
  449 +.icon-refresh:before {
  450 + content: " ";
  451 + display: block;
  452 + width: 16px;
  453 + height: 16px;
  454 + position: absolute;
  455 + margin: auto;
  456 + left: 0;
  457 + right: 0;
  458 + top: 0;
  459 + bottom: 0;
  460 + z-index: 9999;
  461 + background-image: url("data:image/png;base64,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");
  462 + background-size: contain;
  463 +}
  464 +</style>
yudao-ui-admin/src/components/Verifition/Verify/VerifyPoints.vue 0 → 100644
  1 +<template>
  2 + <div style="position: relative" >
  3 + <div class="verify-img-out">
  4 + <div
  5 + class="verify-img-panel"
  6 + :style="{'width': setSize.imgWidth,
  7 + 'height': setSize.imgHeight,
  8 + 'background-size' : setSize.imgWidth + ' '+ setSize.imgHeight,
  9 + 'margin-bottom': vSpace + 'px'}"
  10 + >
  11 + <div v-show="showRefresh" class="verify-refresh" style="z-index:3" @click="refresh">
  12 + <i class="iconfont icon-refresh" />
  13 + </div>
  14 + <img
  15 + ref="canvas"
  16 + :src="pointBackImgBase?('data:image/png;base64,'+pointBackImgBase):defaultImg"
  17 + alt=""
  18 + style="width:100%;height:100%;display:block"
  19 + @click="bindingClick?canvasClick($event):undefined"
  20 + >
  21 +
  22 + <div
  23 + v-for="(tempPoint, index) in tempPoints"
  24 + :key="index"
  25 + class="point-area"
  26 + :style="{
  27 + 'background-color':'#1abd6c',
  28 + color:'#fff',
  29 + 'z-index':9999,
  30 + width:'20px',
  31 + height:'20px',
  32 + 'text-align':'center',
  33 + 'line-height':'20px',
  34 + 'border-radius': '50%',
  35 + position:'absolute',
  36 + top:parseInt(tempPoint.y-10) + 'px',
  37 + left:parseInt(tempPoint.x-10) + 'px'
  38 + }"
  39 + >
  40 + {{ index + 1 }}
  41 + </div>
  42 + </div>
  43 + </div>
  44 + <!-- 'height': this.barSize.height, -->
  45 + <div
  46 + class="verify-bar-area"
  47 + :style="{'width': setSize.imgWidth,
  48 + 'color': this.barAreaColor,
  49 + 'border-color': this.barAreaBorderColor,
  50 + 'line-height':this.barSize.height}"
  51 + >
  52 + <span class="verify-msg">{{ text }}</span>
  53 + </div>
  54 + </div>
  55 +</template>
  56 +<script type="text/babel">
  57 +/**
  58 + * VerifyPoints
  59 + * @description 点选
  60 + * */
  61 +import { resetSize, _code_chars, _code_color1, _code_color2 } from './../utils/util'
  62 +import { aesEncrypt } from '@/utils/ase'
  63 +import { reqGet, reqCheck } from './../api/index'
  64 +
  65 +export default {
  66 + name: 'VerifyPoints',
  67 + props: {
  68 + // 弹出式pop,固定fixed
  69 + mode: {
  70 + type: String,
  71 + default: 'fixed'
  72 + },
  73 + captchaType: {
  74 + type: String,
  75 + },
  76 + // 间隔
  77 + vSpace: {
  78 + type: Number,
  79 + default: 5
  80 + },
  81 + imgSize: {
  82 + type: Object,
  83 + default() {
  84 + return {
  85 + width: '310px',
  86 + height: '155px'
  87 + }
  88 + }
  89 + },
  90 + barSize: {
  91 + type: Object,
  92 + default() {
  93 + return {
  94 + width: '310px',
  95 + height: '40px'
  96 + }
  97 + }
  98 + },
  99 + defaultImg: {
  100 + type: String,
  101 + default: ''
  102 + }
  103 + },
  104 + data() {
  105 + return {
  106 + secretKey: '', // 后端返回的ase加密秘钥
  107 + checkNum: 3, // 默认需要点击的字数
  108 + fontPos: [], // 选中的坐标信息
  109 + checkPosArr: [], // 用户点击的坐标
  110 + num: 1, // 点击的记数
  111 + pointBackImgBase: '', // 后端获取到的背景图片
  112 + poinTextList: [], // 后端返回的点击字体顺序
  113 + backToken: '', // 后端返回的token值
  114 + setSize: {
  115 + imgHeight: 0,
  116 + imgWidth: 0,
  117 + barHeight: 0,
  118 + barWidth: 0
  119 + },
  120 + tempPoints: [],
  121 + text: '',
  122 + barAreaColor: undefined,
  123 + barAreaBorderColor: undefined,
  124 + showRefresh: true,
  125 + bindingClick: true
  126 + }
  127 + },
  128 + computed: {
  129 + resetSize() {
  130 + return resetSize
  131 + }
  132 + },
  133 + watch: {
  134 + // type变化则全面刷新
  135 + type: {
  136 + immediate: true,
  137 + handler() {
  138 + this.init()
  139 + }
  140 + }
  141 + },
  142 + mounted() {
  143 + // 禁止拖拽
  144 + this.$el.onselectstart = function() {
  145 + return false
  146 + }
  147 + },
  148 + methods: {
  149 + init() {
  150 + // 加载页面
  151 + this.fontPos.splice(0, this.fontPos.length)
  152 + this.checkPosArr.splice(0, this.checkPosArr.length)
  153 + this.num = 1
  154 + this.getPictrue()
  155 + this.$nextTick(() => {
  156 + this.setSize = this.resetSize(this) // 重新设置宽度高度
  157 + this.$parent.$emit('ready', this)
  158 + })
  159 + },
  160 + canvasClick(e) {
  161 + this.checkPosArr.push(this.getMousePos(this.$refs.canvas, e))
  162 + if (this.num === this.checkNum) {
  163 + this.num = this.createPoint(this.getMousePos(this.$refs.canvas, e))
  164 + // 按比例转换坐标值
  165 + this.checkPosArr = this.pointTransfrom(this.checkPosArr, this.setSize)
  166 + // 等创建坐标执行完
  167 + setTimeout(() => {
  168 + // var flag = this.comparePos(this.fontPos, this.checkPosArr);
  169 + // 发送后端请求
  170 + var captchaVerification = this.secretKey ? aesEncrypt(this.backToken + '---' + JSON.stringify(this.checkPosArr), this.secretKey) : this.backToken + '---' + JSON.stringify(this.checkPosArr)
  171 + const data = {
  172 + captchaType: this.captchaType,
  173 + 'pointJson': this.secretKey ? aesEncrypt(JSON.stringify(this.checkPosArr), this.secretKey) : JSON.stringify(this.checkPosArr),
  174 + 'token': this.backToken
  175 + }
  176 + reqCheck(data).then(res => {
  177 + if (res.repCode === '0000') {
  178 + this.barAreaColor = '#4cae4c'
  179 + this.barAreaBorderColor = '#5cb85c'
  180 + this.text = '验证成功'
  181 + this.bindingClick = false
  182 + if (this.mode === 'pop') {
  183 + setTimeout(() => {
  184 + this.$parent.clickShow = false
  185 + this.refresh()
  186 + }, 1500)
  187 + }
  188 + this.$parent.$emit('success', { captchaVerification })
  189 + } else {
  190 + this.$parent.$emit('error', this)
  191 + this.barAreaColor = '#d9534f'
  192 + this.barAreaBorderColor = '#d9534f'
  193 + this.text = '验证失败'
  194 + setTimeout(() => {
  195 + this.refresh()
  196 + }, 700)
  197 + }
  198 + })
  199 + }, 400)
  200 + }
  201 + if (this.num < this.checkNum) {
  202 + this.num = this.createPoint(this.getMousePos(this.$refs.canvas, e))
  203 + }
  204 + },
  205 +
  206 + // 获取坐标
  207 + getMousePos: function(obj, e) {
  208 + var x = e.offsetX
  209 + var y = e.offsetY
  210 + return { x, y }
  211 + },
  212 + // 创建坐标点
  213 + createPoint: function(pos) {
  214 + this.tempPoints.push(Object.assign({}, pos))
  215 + return ++this.num
  216 + },
  217 + refresh: function() {
  218 + this.tempPoints.splice(0, this.tempPoints.length)
  219 + this.barAreaColor = '#000'
  220 + this.barAreaBorderColor = '#ddd'
  221 + this.bindingClick = true
  222 + this.fontPos.splice(0, this.fontPos.length)
  223 + this.checkPosArr.splice(0, this.checkPosArr.length)
  224 + this.num = 1
  225 + this.getPictrue()
  226 + this.text = '验证失败'
  227 + this.showRefresh = true
  228 + },
  229 +
  230 + // 请求背景图片和验证图片
  231 + getPictrue() {
  232 + const data = {
  233 + captchaType: this.captchaType,
  234 + clientUid: localStorage.getItem('point'),
  235 + ts: Date.now(), // 现在的时间戳
  236 + }
  237 + reqGet(data).then(res => {
  238 + if (res.repCode === '0000') {
  239 + this.pointBackImgBase = res.repData.originalImageBase64
  240 + this.backToken = res.repData.token
  241 + this.secretKey = res.repData.secretKey
  242 + this.poinTextList = res.repData.wordList
  243 + this.text = '请依次点击【' + this.poinTextList.join(',') + '】'
  244 + } else {
  245 + this.text = res.repMsg
  246 + }
  247 +
  248 + // 判断接口请求次数是否失效
  249 + if (res.repCode === '6201') {
  250 + this.pointBackImgBase = null
  251 + }
  252 + })
  253 + },
  254 + // 坐标转换函数
  255 + pointTransfrom(pointArr, imgSize) {
  256 + var newPointArr = pointArr.map(p => {
  257 + const x = Math.round(310 * p.x / parseInt(imgSize.imgWidth))
  258 + const y = Math.round(155 * p.y / parseInt(imgSize.imgHeight))
  259 + return { x, y }
  260 + })
  261 + // console.log(newPointArr,"newPointArr");
  262 + return newPointArr
  263 + }
  264 + },
  265 +}
  266 +</script>
yudao-ui-admin/src/components/Verifition/Verify/VerifySlide.vue 0 → 100644
  1 +<template>
  2 + <div style="position: relative;">
  3 + <div
  4 + v-if="type === '2'"
  5 + class="verify-img-out"
  6 + :style="{height: (parseInt(setSize.imgHeight) + vSpace) + 'px'}"
  7 + >
  8 + <div
  9 + class="verify-img-panel"
  10 + :style="{width: setSize.imgWidth,
  11 + height: setSize.imgHeight,}"
  12 + >
  13 + <img :src="backImgBase?('data:image/png;base64,'+backImgBase):defaultImg" alt="" style="width:100%;height:100%;display:block">
  14 + <div v-show="showRefresh" class="verify-refresh" @click="refresh"><i class="iconfont icon-refresh" />
  15 + </div>
  16 + <transition name="tips">
  17 + <span v-if="tipWords" class="verify-tips" :class="passFlag ?'suc-bg':'err-bg'">{{ tipWords }}</span>
  18 + </transition>
  19 + </div>
  20 + </div>
  21 + <!-- 公共部分 -->
  22 + <div
  23 + class="verify-bar-area"
  24 + :style="{width: setSize.imgWidth,
  25 + height: barSize.height,
  26 + 'line-height':barSize.height}"
  27 + >
  28 + <span class="verify-msg" v-text="text" />
  29 + <div
  30 + class="verify-left-bar"
  31 + :style="{width: (leftBarWidth!==undefined)?leftBarWidth: barSize.height, height: barSize.height, 'border-color': leftBarBorderColor, transaction: transitionWidth}"
  32 + >
  33 + <span class="verify-msg" v-text="finishText" />
  34 + <div
  35 + class="verify-move-block"
  36 + :style="{width: barSize.height, height: barSize.height, 'background-color': moveBlockBackgroundColor, left: moveBlockLeft, transition: transitionLeft}"
  37 + @touchstart="start"
  38 + @mousedown="start"
  39 + >
  40 + <i
  41 + :class="['verify-icon iconfont', iconClass]"
  42 + :style="{color: iconColor}"
  43 + />
  44 + <div
  45 + v-if="type === '2'"
  46 + class="verify-sub-block"
  47 + :style="{'width':Math.floor(parseInt(setSize.imgWidth)*47/310)+ 'px',
  48 + 'height': setSize.imgHeight,
  49 + 'top':'-' + (parseInt(setSize.imgHeight) + vSpace) + 'px',
  50 + 'background-size': setSize.imgWidth + ' ' + setSize.imgHeight,
  51 + }"
  52 + >
  53 + <img :src="'data:image/png;base64,'+blockBackImgBase" alt="" style="width:100%;height:100%;display:block">
  54 + </div>
  55 + </div>
  56 + </div>
  57 + </div>
  58 + </div>
  59 +</template>
  60 +<script type="text/babel">
  61 +/**
  62 + * VerifySlide
  63 + * @description 滑块
  64 + * */
  65 +import { aesEncrypt } from '@/utils/ase'
  66 +import { resetSize } from './../utils/util'
  67 +import { reqGet, reqCheck } from './../api/index'
  68 +
  69 +// "captchaType":"blockPuzzle",
  70 +export default {
  71 + name: 'VerifySlide',
  72 + props: {
  73 + captchaType: {
  74 + type: String,
  75 + },
  76 + type: {
  77 + type: String,
  78 + default: '1'
  79 + },
  80 + // 弹出式pop,固定fixed
  81 + mode: {
  82 + type: String,
  83 + default: 'fixed'
  84 + },
  85 + vSpace: {
  86 + type: Number,
  87 + default: 5
  88 + },
  89 + explain: {
  90 + type: String,
  91 + default: '向右滑动完成验证'
  92 + },
  93 + imgSize: {
  94 + type: Object,
  95 + default() {
  96 + return {
  97 + width: '310px',
  98 + height: '155px'
  99 + }
  100 + }
  101 + },
  102 + blockSize: {
  103 + type: Object,
  104 + default() {
  105 + return {
  106 + width: '50px',
  107 + height: '50px'
  108 + }
  109 + }
  110 + },
  111 + barSize: {
  112 + type: Object,
  113 + default() {
  114 + return {
  115 + width: '310px',
  116 + height: '40px'
  117 + }
  118 + }
  119 + },
  120 + defaultImg: {
  121 + type: String,
  122 + default: ''
  123 + }
  124 + },
  125 + data() {
  126 + return {
  127 + secretKey: '', // 后端返回的加密秘钥 字段
  128 + passFlag: '', // 是否通过的标识
  129 + backImgBase: '', // 验证码背景图片
  130 + blockBackImgBase: '', // 验证滑块的背景图片
  131 + backToken: '', // 后端返回的唯一token值
  132 + startMoveTime: '', // 移动开始的时间
  133 + endMovetime: '', // 移动结束的时间
  134 + tipsBackColor: '', // 提示词的背景颜色
  135 + tipWords: '',
  136 + text: '',
  137 + finishText: '',
  138 + setSize: {
  139 + imgHeight: 0,
  140 + imgWidth: 0,
  141 + barHeight: 0,
  142 + barWidth: 0
  143 + },
  144 + top: 0,
  145 + left: 0,
  146 + moveBlockLeft: undefined,
  147 + leftBarWidth: undefined,
  148 + // 移动中样式
  149 + moveBlockBackgroundColor: undefined,
  150 + leftBarBorderColor: '#ddd',
  151 + iconColor: undefined,
  152 + iconClass: 'icon-right',
  153 + status: false, // 鼠标状态
  154 + isEnd: false, // 是够验证完成
  155 + showRefresh: true,
  156 + transitionLeft: '',
  157 + transitionWidth: ''
  158 + }
  159 + },
  160 + computed: {
  161 + barArea() {
  162 + return this.$el.querySelector('.verify-bar-area')
  163 + },
  164 + resetSize() {
  165 + return resetSize
  166 + }
  167 + },
  168 + watch: {
  169 + // type变化则全面刷新
  170 + type: {
  171 + immediate: true,
  172 + handler() {
  173 + this.init()
  174 + }
  175 + }
  176 + },
  177 + mounted() {
  178 + // 禁止拖拽
  179 + this.$el.onselectstart = function() {
  180 + return false
  181 + }
  182 + console.log(this.defaultImg)
  183 + },
  184 + methods: {
  185 + init() {
  186 + this.text = this.explain
  187 + this.getPictrue()
  188 + this.$nextTick(() => {
  189 + const setSize = this.resetSize(this) // 重新设置宽度高度
  190 + for (const key in setSize) {
  191 + this.$set(this.setSize, key, setSize[key])
  192 + }
  193 + this.$parent.$emit('ready', this)
  194 + })
  195 +
  196 + var _this = this
  197 +
  198 + window.removeEventListener('touchmove', function(e) {
  199 + _this.move(e)
  200 + })
  201 + window.removeEventListener('mousemove', function(e) {
  202 + _this.move(e)
  203 + })
  204 +
  205 + // 鼠标松开
  206 + window.removeEventListener('touchend', function() {
  207 + _this.end()
  208 + })
  209 + window.removeEventListener('mouseup', function() {
  210 + _this.end()
  211 + })
  212 +
  213 + window.addEventListener('touchmove', function(e) {
  214 + _this.move(e)
  215 + })
  216 + window.addEventListener('mousemove', function(e) {
  217 + _this.move(e)
  218 + })
  219 +
  220 + // 鼠标松开
  221 + window.addEventListener('touchend', function() {
  222 + _this.end()
  223 + })
  224 + window.addEventListener('mouseup', function() {
  225 + _this.end()
  226 + })
  227 + },
  228 +
  229 + // 鼠标按下
  230 + start: function(e) {
  231 + e = e || window.event
  232 + if (!e.touches) { // 兼容PC端
  233 + var x = e.clientX
  234 + } else { // 兼容移动端
  235 + var x = e.touches[0].pageX
  236 + }
  237 + this.startLeft = Math.floor(x - this.barArea.getBoundingClientRect().left)
  238 + this.startMoveTime = +new Date() // 开始滑动的时间
  239 + if (this.isEnd === false) {
  240 + this.text = ''
  241 + this.moveBlockBackgroundColor = '#337ab7'
  242 + this.leftBarBorderColor = '#337AB7'
  243 + this.iconColor = '#fff'
  244 + e.stopPropagation()
  245 + this.status = true
  246 + }
  247 + },
  248 + // 鼠标移动
  249 + move: function(e) {
  250 + e = e || window.event
  251 + if (this.status && this.isEnd === false) {
  252 + if (!e.touches) { // 兼容PC端
  253 + var x = e.clientX
  254 + } else { // 兼容移动端
  255 + var x = e.touches[0].pageX
  256 + }
  257 + var bar_area_left = this.barArea.getBoundingClientRect().left
  258 + var move_block_left = x - bar_area_left // 小方块相对于父元素的left值
  259 + if (move_block_left >= this.barArea.offsetWidth - parseInt(parseInt(this.blockSize.width) / 2) - 2) {
  260 + move_block_left = this.barArea.offsetWidth - parseInt(parseInt(this.blockSize.width) / 2) - 2
  261 + }
  262 + if (move_block_left <= 0) {
  263 + move_block_left = parseInt(parseInt(this.blockSize.width) / 2)
  264 + }
  265 + // 拖动后小方块的left值
  266 + this.moveBlockLeft = (move_block_left - this.startLeft) + 'px'
  267 + this.leftBarWidth = (move_block_left - this.startLeft) + 'px'
  268 + }
  269 + },
  270 +
  271 + // 鼠标松开
  272 + end: function() {
  273 + this.endMovetime = +new Date()
  274 + var _this = this
  275 + // 判断是否重合
  276 + if (this.status && this.isEnd === false) {
  277 + var moveLeftDistance = parseInt((this.moveBlockLeft || '').replace('px', ''))
  278 + moveLeftDistance = moveLeftDistance * 310 / parseInt(this.setSize.imgWidth)
  279 + const data = {
  280 + captchaType: this.captchaType,
  281 + 'pointJson': this.secretKey ? aesEncrypt(JSON.stringify({ x: moveLeftDistance, y: 5.0 }), this.secretKey) : JSON.stringify({ x: moveLeftDistance, y: 5.0 }),
  282 + 'token': this.backToken
  283 + }
  284 + reqCheck(data).then(res => {
  285 + if (res.repCode === '0000') {
  286 + this.moveBlockBackgroundColor = '#5cb85c'
  287 + this.leftBarBorderColor = '#5cb85c'
  288 + this.iconColor = '#fff'
  289 + this.iconClass = 'icon-check'
  290 + this.showRefresh = false
  291 + this.isEnd = true
  292 + if (this.mode === 'pop') {
  293 + setTimeout(() => {
  294 + this.$parent.clickShow = false
  295 + this.refresh()
  296 + }, 1500)
  297 + }
  298 + this.passFlag = true
  299 + this.tipWords = `${((this.endMovetime - this.startMoveTime) / 1000).toFixed(2)}s验证成功`
  300 + var captchaVerification = this.secretKey ? aesEncrypt(this.backToken + '---' + JSON.stringify({ x: moveLeftDistance, y: 5.0 }), this.secretKey) : this.backToken + '---' + JSON.stringify({ x: moveLeftDistance, y: 5.0 })
  301 + setTimeout(() => {
  302 + this.tipWords = ''
  303 + this.$parent.closeBox()
  304 + this.$parent.$emit('success', { captchaVerification })
  305 + }, 1000)
  306 + } else {
  307 + this.moveBlockBackgroundColor = '#d9534f'
  308 + this.leftBarBorderColor = '#d9534f'
  309 + this.iconColor = '#fff'
  310 + this.iconClass = 'icon-close'
  311 + this.passFlag = false
  312 + setTimeout(function() {
  313 + _this.refresh()
  314 + }, 1000)
  315 + this.$parent.$emit('error', this)
  316 + this.tipWords = '验证失败'
  317 + setTimeout(() => {
  318 + this.tipWords = ''
  319 + }, 1000)
  320 + }
  321 + })
  322 + this.status = false
  323 + }
  324 + },
  325 +
  326 + refresh: function() {
  327 + this.showRefresh = true
  328 + this.finishText = ''
  329 +
  330 + this.transitionLeft = 'left .3s'
  331 + this.moveBlockLeft = 0
  332 +
  333 + this.leftBarWidth = undefined
  334 + this.transitionWidth = 'width .3s'
  335 +
  336 + this.leftBarBorderColor = '#ddd'
  337 + this.moveBlockBackgroundColor = '#fff'
  338 + this.iconColor = '#000'
  339 + this.iconClass = 'icon-right'
  340 + this.isEnd = false
  341 +
  342 + this.getPictrue()
  343 + setTimeout(() => {
  344 + this.transitionWidth = ''
  345 + this.transitionLeft = ''
  346 + this.text = this.explain
  347 + }, 300)
  348 + },
  349 +
  350 + // 请求背景图片和验证图片
  351 + getPictrue() {
  352 + const data = {
  353 + captchaType: this.captchaType,
  354 + clientUid: localStorage.getItem('slider'),
  355 + ts: Date.now(), // 现在的时间戳
  356 + }
  357 + reqGet(data).then(res => {
  358 + if (res.repCode === '0000') {
  359 + this.backImgBase = res.repData.originalImageBase64
  360 + this.blockBackImgBase = res.repData.jigsawImageBase64
  361 + this.backToken = res.repData.token
  362 + this.secretKey = res.repData.secretKey
  363 + } else {
  364 + this.tipWords = res.repMsg
  365 + }
  366 +
  367 + // 判断接口请求次数是否失效
  368 + if (res.repCode === '6201') {
  369 + this.backImgBase = null
  370 + this.blockBackImgBase = null
  371 + }
  372 + })
  373 + },
  374 + },
  375 +}
  376 +</script>
  377 +
yudao-ui-admin/src/components/Verifition/api/index.js 0 → 100644
  1 +/**
  2 + * 此处可直接引用自己项目封装好的 axios 配合后端联调
  3 + */
  4 +
  5 +import request from './../utils/axios' // 组件内部封装的axios
  6 +// import request from "@/api/axios.js" //调用项目封装的axios
  7 +
  8 +// 获取验证图片 以及token
  9 +export function reqGet(data) {
  10 + return request({
  11 + url: '/captcha/get',
  12 + method: 'post',
  13 + data
  14 + })
  15 +}
  16 +
  17 +// 滑动或者点选验证
  18 +export function reqCheck(data) {
  19 + return request({
  20 + url: '/captcha/check',
  21 + method: 'post',
  22 + data
  23 + })
  24 +}
  25 +
yudao-ui-admin/src/components/Verifition/utils/axios.js 0 → 100644
  1 +import axios from 'axios'
  2 +
  3 +axios.defaults.baseURL = process.env.VUE_APP_BASE_API
  4 +
  5 +const service = axios.create({
  6 + timeout: 40000,
  7 + headers: {
  8 + 'X-Requested-With': 'XMLHttpRequest',
  9 + 'Content-Type': 'application/json; charset=UTF-8'
  10 + },
  11 +})
  12 +service.interceptors.request.use(
  13 + config => {
  14 + return config
  15 + },
  16 + error => {
  17 + Promise.reject(error)
  18 + }
  19 +)
  20 +
  21 +// response interceptor
  22 +service.interceptors.response.use(
  23 + response => {
  24 + const res = response.data
  25 + return res
  26 + },
  27 + error => {
  28 + }
  29 +)
  30 +export default service
yudao-ui-admin/src/components/Verifition/utils/util.js 0 → 100644
  1 +export function resetSize(vm) {
  2 + let img_width, img_height, bar_width, bar_height // 图片的宽度、高度,移动条的宽度、高度
  3 +
  4 + let parentWidth = vm.$el.parentNode.offsetWidth || window.offsetWidth
  5 + let parentHeight = vm.$el.parentNode.offsetHeight || window.offsetHeight
  6 +
  7 + if (vm.imgSize.width.indexOf('%') !== -1) {
  8 + img_width = parseInt(this.imgSize.width) / 100 * parentWidth + 'px'
  9 + } else {
  10 + img_width = this.imgSize.width
  11 + }
  12 +
  13 + if (vm.imgSize.height.indexOf('%') !== -1) {
  14 + img_height = parseInt(this.imgSize.height) / 100 * parentHeight + 'px'
  15 + } else {
  16 + img_height = this.imgSize.height
  17 + }
  18 +
  19 + if (vm.barSize.width.indexOf('%') !== -1) {
  20 + bar_width = parseInt(this.barSize.width) / 100 * parentWidth + 'px'
  21 + } else {
  22 + bar_width = this.barSize.width
  23 + }
  24 +
  25 + if (vm.barSize.height.indexOf('%') !== -1) {
  26 + bar_height = parseInt(this.barSize.height) / 100 * parentHeight + 'px'
  27 + } else {
  28 + bar_height = this.barSize.height
  29 + }
  30 +
  31 + return { imgWidth: img_width, imgHeight: img_height, barWidth: bar_width, barHeight: bar_height }
  32 +}
  33 +
  34 +export const _code_chars = [1, 2, 3, 4, 5, 6, 7, 8, 9, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
  35 +export const _code_color1 = ['#fffff0', '#f0ffff', '#f0fff0', '#fff0f0']
  36 +export const _code_color2 = ['#FF0033', '#006699', '#993366', '#FF9900', '#66CC66', '#FF33CC']
yudao-ui-admin/src/store/modules/user.js
@@ -36,14 +36,11 @@ const user = { @@ -36,14 +36,11 @@ const user = {
36 Login({ commit }, userInfo) { 36 Login({ commit }, userInfo) {
37 const username = userInfo.username.trim() 37 const username = userInfo.username.trim()
38 const password = userInfo.password 38 const password = userInfo.password
39 - const code = userInfo.code  
40 - const uuid = userInfo.uuid  
41 const socialCode = userInfo.socialCode 39 const socialCode = userInfo.socialCode
42 const socialState = userInfo.socialState 40 const socialState = userInfo.socialState
43 const socialType = userInfo.socialType 41 const socialType = userInfo.socialType
44 return new Promise((resolve, reject) => { 42 return new Promise((resolve, reject) => {
45 - login(username, password, code, uuid,  
46 - socialType, socialCode, socialState).then(res => { 43 + login(username, password, socialType, socialCode, socialState).then(res => {
47 res = res.data; 44 res = res.data;
48 // 设置 token 45 // 设置 token
49 setToken(res) 46 setToken(res)
yudao-ui-admin/src/utils/ase.js 0 → 100644
  1 +import CryptoJS from 'crypto-js'
  2 +/**
  3 + * @word 要加密的内容
  4 + * @keyWord String 服务器随机返回的关键字
  5 + */
  6 +export function aesEncrypt(word, keyWord = 'XwKsGlMcdPMEhR1B') {
  7 + const key = CryptoJS.enc.Utf8.parse(keyWord)
  8 + const secs = CryptoJS.enc.Utf8.parse(word)
  9 + const encrypted = CryptoJS.AES.encrypt(secs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
  10 + return encrypted.toString()
  11 +}
  12 +
  13 +/**
  14 + * @word 要解密的内容
  15 + * @keyWord String 服务器随机返回的关键字
  16 + */
  17 +export function aesDecrypt(word, keyWord = 'XwKsGlMcdPMEhR1B') {
  18 + const key = CryptoJS.enc.Utf8.parse(keyWord)
  19 + const decrypt = CryptoJS.AES.decrypt(word, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
  20 + return CryptoJS.enc.Utf8.stringify(decrypt).toString()
  21 +}
yudao-ui-admin/src/views/login.vue
@@ -36,19 +36,10 @@ @@ -36,19 +36,10 @@
36 </el-form-item> 36 </el-form-item>
37 <el-form-item prop="password"> 37 <el-form-item prop="password">
38 <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" 38 <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码"
39 - @keyup.enter.native="handleLogin"> 39 + @keyup.enter.native="getCode">
40 <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/> 40 <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
41 </el-input> 41 </el-input>
42 </el-form-item> 42 </el-form-item>
43 - <el-form-item prop="code" v-if="captchaEnable">  
44 - <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"  
45 - @keyup.enter.native="handleLogin">  
46 - <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>  
47 - </el-input>  
48 - <div class="login-code">  
49 - <img :src="codeUrl" @click="getCode" class="login-code-img"/>  
50 - </div>  
51 - </el-form-item>  
52 <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">记住密码</el-checkbox> 43 <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">记住密码</el-checkbox>
53 </div> 44 </div>
54 45
@@ -76,7 +67,7 @@ @@ -76,7 +67,7 @@
76 <!-- 下方的登录按钮 --> 67 <!-- 下方的登录按钮 -->
77 <el-form-item style="width:100%;"> 68 <el-form-item style="width:100%;">
78 <el-button :loading="loading" size="medium" type="primary" style="width:100%;" 69 <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
79 - @click.native.prevent="handleLogin"> 70 + @click.native.prevent="getCode">
80 <span v-if="!loading">登 录</span> 71 <span v-if="!loading">登 录</span>
81 <span v-else>登 录 中...</span> 72 <span v-else>登 录 中...</span>
82 </el-button> 73 </el-button>
@@ -96,6 +87,12 @@ @@ -96,6 +87,12 @@
96 </div> 87 </div>
97 </div> 88 </div>
98 </div> 89 </div>
  90 + <Verify
  91 + ref="verify"
  92 + :captcha-type="'blockPuzzle'"
  93 + :img-size="{width:'400px',height:'200px'}"
  94 + @success="handleLogin"
  95 + />
99 <!-- footer --> 96 <!-- footer -->
100 <div class="footer"> 97 <div class="footer">
101 Copyright © 2020-2022 iocoder.cn All Rights Reserved. 98 Copyright © 2020-2022 iocoder.cn All Rights Reserved.
@@ -104,7 +101,7 @@ @@ -104,7 +101,7 @@
104 </template> 101 </template>
105 102
106 <script> 103 <script>
107 -import {getCodeImg, sendSmsCode, socialAuthRedirect} from "@/api/login"; 104 +import {sendSmsCode, socialAuthRedirect} from "@/api/login";
108 import {getTenantIdByName} from "@/api/system/tenant"; 105 import {getTenantIdByName} from "@/api/system/tenant";
109 import {SystemUserSocialTypeEnum} from "@/utils/constants"; 106 import {SystemUserSocialTypeEnum} from "@/utils/constants";
110 import {getTenantEnable} from "@/utils/ruoyi"; 107 import {getTenantEnable} from "@/utils/ruoyi";
@@ -118,8 +115,13 @@ import { @@ -118,8 +115,13 @@ import {
118 setUsername 115 setUsername
119 } from "@/utils/auth"; 116 } from "@/utils/auth";
120 117
  118 +import Verify from '@/components/Verifition/Verify';
  119 +
121 export default { 120 export default {
122 name: "Login", 121 name: "Login",
  122 + components: {
  123 + Verify
  124 + },
123 data() { 125 data() {
124 return { 126 return {
125 codeUrl: "", 127 codeUrl: "",
@@ -133,8 +135,6 @@ export default { @@ -133,8 +135,6 @@ export default {
133 mobile: "", 135 mobile: "",
134 mobileCode: "", 136 mobileCode: "",
135 rememberMe: false, 137 rememberMe: false,
136 - code: "",  
137 - uuid: "",  
138 tenantName: "芋道源码", 138 tenantName: "芋道源码",
139 }, 139 },
140 scene: 21, 140 scene: 21,
@@ -146,7 +146,6 @@ export default { @@ -146,7 +146,6 @@ export default {
146 password: [ 146 password: [
147 {required: true, trigger: "blur", message: "密码不能为空"} 147 {required: true, trigger: "blur", message: "密码不能为空"}
148 ], 148 ],
149 - code: [{required: true, trigger: "change", message: "验证码不能为空"}],  
150 mobile: [ 149 mobile: [
151 {required: true, trigger: "blur", message: "手机号不能为空"}, 150 {required: true, trigger: "blur", message: "手机号不能为空"},
152 { 151 {
@@ -185,20 +184,11 @@ export default { @@ -185,20 +184,11 @@ export default {
185 SysUserSocialTypeEnum: SystemUserSocialTypeEnum, 184 SysUserSocialTypeEnum: SystemUserSocialTypeEnum,
186 }; 185 };
187 }, 186 },
188 - // watch: {  
189 - // $route: {  
190 - // handler: function(route) {  
191 - // this.redirect = route.query && route.query.redirect;  
192 - // },  
193 - // immediate: true  
194 - // }  
195 - // },  
196 created() { 187 created() {
197 // 租户开关 188 // 租户开关
198 this.tenantEnable = getTenantEnable(); 189 this.tenantEnable = getTenantEnable();
199 // 重定向地址 190 // 重定向地址
200 this.redirect = this.$route.query.redirect; 191 this.redirect = this.$route.query.redirect;
201 - this.getCode();  
202 this.getCookie(); 192 this.getCookie();
203 }, 193 },
204 methods: { 194 methods: {
@@ -207,15 +197,8 @@ export default { @@ -207,15 +197,8 @@ export default {
207 if (!this.captchaEnable) { 197 if (!this.captchaEnable) {
208 return; 198 return;
209 } 199 }
210 - // 请求远程,获得验证码  
211 - getCodeImg().then(res => {  
212 - res = res.data;  
213 - this.captchaEnable = res.enable;  
214 - if (this.captchaEnable) {  
215 - this.codeUrl = "data:image/gif;base64," + res.img;  
216 - this.loginForm.uuid = res.uuid;  
217 - }  
218 - }); 200 + // 弹出验证码
  201 + this.$refs.verify.show()
219 }, 202 },
220 getCookie() { 203 getCookie() {
221 const username = getUsername(); 204 const username = getUsername();
@@ -253,7 +236,6 @@ export default { @@ -253,7 +236,6 @@ export default {
253 }); 236 });
254 }).catch(() => { 237 }).catch(() => {
255 this.loading = false; 238 this.loading = false;
256 - this.getCode();  
257 }); 239 });
258 } 240 }
259 }); 241 });
yudao-ui-admin/vue.config.js
@@ -10,7 +10,7 @@ const CompressionPlugin = require(&#39;compression-webpack-plugin&#39;) @@ -10,7 +10,7 @@ const CompressionPlugin = require(&#39;compression-webpack-plugin&#39;)
10 10
11 const name = process.env.VUE_APP_TITLE || '芋道管理系统' // 网页标题 11 const name = process.env.VUE_APP_TITLE || '芋道管理系统' // 网页标题
12 12
13 -const port = process.env.port || process.env.npm_config_port || 80 // 端口 13 +const port = process.env.port || process.env.npm_config_port || 8081 // 端口
14 14
15 // vue.config.js 配置说明 15 // vue.config.js 配置说明
16 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions 16 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
yudao-ui-admin/yarn.lock
@@ -3197,6 +3197,11 @@ crypto-browserify@^3.11.0: @@ -3197,6 +3197,11 @@ crypto-browserify@^3.11.0:
3197 randombytes "^2.0.0" 3197 randombytes "^2.0.0"
3198 randomfill "^1.0.3" 3198 randomfill "^1.0.3"
3199 3199
  3200 +crypto-js@^4.0.0:
  3201 + version "4.1.1"
  3202 + resolved "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
  3203 + integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
  3204 +
3200 css-color-names@0.0.4, css-color-names@^0.0.4: 3205 css-color-names@0.0.4, css-color-names@^0.0.4:
3201 version "0.0.4" 3206 version "0.0.4"
3202 resolved "https://registry.npmmirror.com/css-color-names/-/css-color-names-0.0.4.tgz" 3207 resolved "https://registry.npmmirror.com/css-color-names/-/css-color-names-0.0.4.tgz"
@@ -5773,11 +5778,6 @@ js-beautify@1.13.0: @@ -5773,11 +5778,6 @@ js-beautify@1.13.0:
5773 mkdirp "^1.0.4" 5778 mkdirp "^1.0.4"
5774 nopt "^5.0.0" 5779 nopt "^5.0.0"
5775 5780
5776 -js-cookie@3.0.1:  
5777 - version "3.0.1"  
5778 - resolved "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.1.tgz"  
5779 - integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==  
5780 -  
5781 js-message@1.0.7: 5781 js-message@1.0.7:
5782 version "1.0.7" 5782 version "1.0.7"
5783 resolved "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz" 5783 resolved "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz"