diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml index 938a74214..683cb85f5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml @@ -338,15 +338,17 @@ jwt: aj: captcha: + i18n.enabled: true + i18n.prefx: aj.captcha. jigsaw: classpath:images/my-jigsaw # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径 pic-click: classpath:images/my-pic-click # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径 cache-type: redis # 缓存 local/redis... cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存 timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行 - type: clickWord # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选 + type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选 water-mark: 晨丰科技 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode interference-options: 0 # 滑动干扰项(0/1/2) - req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false + req-frequency-limit-enable: true # 接口请求次数一分钟限制是否开启 true|false req-get-lock-limit: 5 # 验证失败5次，get接口锁定 req-get-lock-seconds: 10 # 验证失败后，锁定时间间隔 req-get-minute-limit: 30 # get 接口一分钟内请求数限制 diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml index b371e7699..3cfec519c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml @@ -359,15 +359,17 @@ jwt: aj: captcha: + i18n.enabled: true + i18n.prefx: aj.captcha. jigsaw: classpath:images/my-jigsaw # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径 pic-click: classpath:images/my-pic-click # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径 cache-type: redis # 缓存 local/redis... cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存 timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行 - type: clickWord # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选 + type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选 water-mark: 晨丰科技 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode interference-options: 0 # 滑动干扰项(0/1/2) - req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false + req-frequency-limit-enable: true # 接口请求次数一分钟限制是否开启 true|false req-get-lock-limit: 5 # 验证失败5次，get接口锁定 req-get-lock-seconds: 10 # 验证失败后，锁定时间间隔 req-get-minute-limit: 30 # get 接口一分钟内请求数限制 diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/10.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/10.png new file mode 100644 index 000000000..69324725e Binary files /dev/null and b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/10.png differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11.png new file mode 100644 index 000000000..9c6862d9e Binary files /dev/null and b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11.png differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/10.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/10.png deleted file mode 100644 index 297e44cf4..000000000 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/10.png and /dev/null differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/11.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/11.png deleted file mode 100644 index d9b1da8d7..000000000 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/11.png and /dev/null differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/13.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/13.png deleted file mode 100644 index 82c3dd969..000000000 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/13.png and /dev/null differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/14.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/14.png deleted file mode 100644 index 0b9a86615..000000000 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/14.png and /dev/null differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/17.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/17.png deleted file mode 100644 index a82cbc7c4..000000000 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/17.png and /dev/null differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/18.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/18.png deleted file mode 100644 index d3f3cfd03..000000000 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/18.png and /dev/null differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/19.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/19.png deleted file mode 100644 index eb2855bd8..000000000 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/19.png and /dev/null differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/8.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/8.png deleted file mode 100644 index 3cb5ce1c8..000000000 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/8.png and /dev/null differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/9.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/9.png deleted file mode 100644 index 384d35415..000000000 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/9.png and /dev/null differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/12.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/12.png new file mode 100644 index 000000000..7c90bd772 Binary files /dev/null and b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/12.png differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/2.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/2.png index baf3f06d7..297e44cf4 100644 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/2.png and b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/2.png differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/3.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/3.png index ccaf61723..0b9a86615 100644 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/3.png and b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/3.png differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/4.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/4.png index 7dab16223..d3f3cfd03 100644 Binary files a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/4.png and b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/4.png differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/5.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/5.png new file mode 100644 index 000000000..7dab16223 Binary files /dev/null and b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/5.png differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/12.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/6.png similarity index 100% rename from cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/12.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/6.png diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/15.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/7.png similarity index 100% rename from cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/15.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/7.png diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/16.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/8.png similarity index 100% rename from cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/11/16.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/8.png diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/9.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/9.png new file mode 100644 index 000000000..369ed871e Binary files /dev/null and b/cf-module-system/cf-module-system-biz/src/main/resources/images/my-jigsaw/slidingBlock/9.png differ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/message.properties b/cf-module-system/cf-module-system-biz/src/main/resources/message.properties index 1da1417be..25640e7c5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/message.properties +++ b/cf-module-system/cf-module-system-biz/src/main/resources/message.properties @@ -103,4 +103,14 @@ global.error.no.permission.to.visit.org=您无权访问该组织的数据 global.error.request.organId.notExist=请求的组织标识未传递，请进行排查 global.org.product.not.exist=账号登录异常，套餐信息不存在，请重新登陆 global.org.product.expired=组织产品套餐已过期，请续费后继续使用 -global.not.login=账号未登录 \ No newline at end of file +global.not.login=账号未登录 + +aj.captcha.6110=验证码已失效，请重新获取。 +aj.captcha.6111=验证失败。 +aj.captcha.6112=获取验证码失败,请联系管理员。 +aj.captcha.6113=底图未初始化成功，请检查路径。 +aj.captcha.6201=get接口请求次数超限，请稍后再试! +aj.captcha.6206=无效请求，请重新获取验证码。 +aj.captcha.6202=接口验证失败数过多，请稍后再试。 +aj.captcha.6204=check接口请求次数超限，请稍后再试! +aj.captcha.6205=verify请求次数超限。 \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/message_cht.properties b/cf-module-system/cf-module-system-biz/src/main/resources/message_cht.properties index 5adc05349..2ed27694c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/message_cht.properties +++ b/cf-module-system/cf-module-system-biz/src/main/resources/message_cht.properties @@ -103,4 +103,14 @@ global.error.no.permission.to.visit.org=您無權訪問該組織的數據 global.error.request.organId.notExist=請求的組織標識未傳遞，請進行排查 global.org.product.not.exist=帳號登入異常，套餐資訊不存在，請重新登入 global.org.product.expired=組織產品套餐已過期，請續費後繼續使用 -global.not.login=賬號未登錄 \ No newline at end of file +global.not.login=賬號未登錄 + +aj.captcha.6110=驗證碼已失效，請重新獲取。 +aj.captcha.6111=驗證失敗。 +aj.captcha.6112=獲取驗證碼失敗，請聯繫管理員。 +aj.captcha.6113=底圖未初始化成功，請檢查路徑。 +aj.captcha.6201=get 接口請求次數超限，請稍後再試！ +aj.captcha.6206=無效請求，請重新獲取驗證碼。 +aj.captcha.6202=接口驗證失敗次數過多，請稍後再試。 +aj.captcha.6204=check 接口請求次數超限，請稍後再試！ +aj.captcha.6205=verify 請求次數超限。 \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/message_en.properties b/cf-module-system/cf-module-system-biz/src/main/resources/message_en.properties index 385c5203c..01f1c6f6e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/message_en.properties +++ b/cf-module-system/cf-module-system-biz/src/main/resources/message_en.properties @@ -103,4 +103,14 @@ global.error.no.permission.to.visit.org=You do not have permission to access thi global.error.request.organId.notExist=The requested organization ID was not provided, please check global.org.product.not.exist=Account login exception: product package does not exist, please log in again global.org.product.expired=The organization's product package has expired, please renew before continuing to use the service -global.not.login=The account is not logged in \ No newline at end of file +global.not.login=The account is not logged in + +aj.captcha.6110=Captcha expired, please try again +aj.captcha.6111=Verification failed +aj.captcha.6112=Failed to get captcha, please contact administrator +aj.captcha.6113=Base map not initialized successfully, please check the path +aj.captcha.6201=GET request limit exceeded, please try again later! +aj.captcha.6206=Invalid request, please try again +aj.captcha.6202=Too many verification failures, please try again later +aj.captcha.6204=CHECK request limit exceeded, please try again later! +aj.captcha.6205=VERIFY request limit exceeded! \ No newline at end of file