Browse Source

1. 修复滑块验证码,存在失败的情况
2. 重新构建 demo 预览项目

YunaiV 2 years ago
parent
commit
93b8a2b6c1
81 changed files with 417 additions and 320 deletions
  1. 42 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
  2. BIN
      yudao-server/src/main/resources/admin-ui/static/img/401.fea349c2.gif
  3. BIN
      yudao-server/src/main/resources/admin-ui/static/img/404.fa349ddc.png
  4. BIN
      yudao-server/src/main/resources/admin-ui/static/img/bg.c05ff27e.png
  5. 1 0
      yudao-server/src/main/resources/admin-ui/static/img/dark.16937467.svg
  6. BIN
      yudao-server/src/main/resources/admin-ui/static/img/default.6b914f9c.jpg
  7. 1 0
      yudao-server/src/main/resources/admin-ui/static/img/light.c2aad012.svg
  8. BIN
      yudao-server/src/main/resources/admin-ui/static/img/profile.b87e3d56.jpg
  9. 0 20
      yudao-server/src/main/resources/admin-ui/static/js/0.js
  10. BIN
      yudao-server/src/main/resources/admin-ui/static/js/0.js.gz
  11. 0 7
      yudao-server/src/main/resources/admin-ui/static/js/1.js
  12. BIN
      yudao-server/src/main/resources/admin-ui/static/js/1.js.gz
  13. 4 4
      yudao-server/src/main/resources/admin-ui/static/js/10.js
  14. BIN
      yudao-server/src/main/resources/admin-ui/static/js/10.js.gz
  15. 4 5
      yudao-server/src/main/resources/admin-ui/static/js/11.js
  16. BIN
      yudao-server/src/main/resources/admin-ui/static/js/11.js.gz
  17. 4 4
      yudao-server/src/main/resources/admin-ui/static/js/12.js
  18. BIN
      yudao-server/src/main/resources/admin-ui/static/js/12.js.gz
  19. 4 4
      yudao-server/src/main/resources/admin-ui/static/js/13.js
  20. BIN
      yudao-server/src/main/resources/admin-ui/static/js/13.js.gz
  21. 4 4
      yudao-server/src/main/resources/admin-ui/static/js/14.js
  22. BIN
      yudao-server/src/main/resources/admin-ui/static/js/14.js.gz
  23. 4 4
      yudao-server/src/main/resources/admin-ui/static/js/15.js
  24. BIN
      yudao-server/src/main/resources/admin-ui/static/js/15.js.gz
  25. 4 4
      yudao-server/src/main/resources/admin-ui/static/js/16.js
  26. BIN
      yudao-server/src/main/resources/admin-ui/static/js/16.js.gz
  27. 0 8
      yudao-server/src/main/resources/admin-ui/static/js/17.js
  28. BIN
      yudao-server/src/main/resources/admin-ui/static/js/17.js.gz
  29. 4 5
      yudao-server/src/main/resources/admin-ui/static/js/18.js
  30. BIN
      yudao-server/src/main/resources/admin-ui/static/js/18.js.gz
  31. 8 1
      yudao-server/src/main/resources/admin-ui/static/js/19.js
  32. BIN
      yudao-server/src/main/resources/admin-ui/static/js/19.js.gz
  33. 4 4
      yudao-server/src/main/resources/admin-ui/static/js/2.js
  34. BIN
      yudao-server/src/main/resources/admin-ui/static/js/2.js.gz
  35. 4 4
      yudao-server/src/main/resources/admin-ui/static/js/20.js
  36. BIN
      yudao-server/src/main/resources/admin-ui/static/js/20.js.gz
  37. 2 3
      yudao-server/src/main/resources/admin-ui/static/js/21.js
  38. BIN
      yudao-server/src/main/resources/admin-ui/static/js/21.js.gz
  39. 23 20
      yudao-server/src/main/resources/admin-ui/static/js/22.js
  40. BIN
      yudao-server/src/main/resources/admin-ui/static/js/22.js.gz
  41. 37 5
      yudao-server/src/main/resources/admin-ui/static/js/23.js
  42. BIN
      yudao-server/src/main/resources/admin-ui/static/js/23.js.gz
  43. 37 5
      yudao-server/src/main/resources/admin-ui/static/js/24.js
  44. BIN
      yudao-server/src/main/resources/admin-ui/static/js/24.js.gz
  45. 9 11
      yudao-server/src/main/resources/admin-ui/static/js/25.js
  46. BIN
      yudao-server/src/main/resources/admin-ui/static/js/25.js.gz
  47. 20 8
      yudao-server/src/main/resources/admin-ui/static/js/26.js
  48. BIN
      yudao-server/src/main/resources/admin-ui/static/js/26.js.gz
  49. 4 4
      yudao-server/src/main/resources/admin-ui/static/js/27.js
  50. BIN
      yudao-server/src/main/resources/admin-ui/static/js/27.js.gz
  51. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/28.js
  52. BIN
      yudao-server/src/main/resources/admin-ui/static/js/28.js.gz
  53. 10 0
      yudao-server/src/main/resources/admin-ui/static/js/29.js
  54. BIN
      yudao-server/src/main/resources/admin-ui/static/js/29.js.gz
  55. 7 5
      yudao-server/src/main/resources/admin-ui/static/js/3.js
  56. BIN
      yudao-server/src/main/resources/admin-ui/static/js/3.js.gz
  57. 10 0
      yudao-server/src/main/resources/admin-ui/static/js/30.js
  58. BIN
      yudao-server/src/main/resources/admin-ui/static/js/30.js.gz
  59. 0 8
      yudao-server/src/main/resources/admin-ui/static/js/4.js
  60. BIN
      yudao-server/src/main/resources/admin-ui/static/js/4.js.gz
  61. 8 1
      yudao-server/src/main/resources/admin-ui/static/js/5.js
  62. BIN
      yudao-server/src/main/resources/admin-ui/static/js/5.js.gz
  63. 8 1
      yudao-server/src/main/resources/admin-ui/static/js/6.js
  64. BIN
      yudao-server/src/main/resources/admin-ui/static/js/6.js.gz
  65. 9 9
      yudao-server/src/main/resources/admin-ui/static/js/7.js
  66. BIN
      yudao-server/src/main/resources/admin-ui/static/js/7.js.gz
  67. 9 9
      yudao-server/src/main/resources/admin-ui/static/js/8.js
  68. BIN
      yudao-server/src/main/resources/admin-ui/static/js/8.js.gz
  69. 4 4
      yudao-server/src/main/resources/admin-ui/static/js/9.js
  70. BIN
      yudao-server/src/main/resources/admin-ui/static/js/9.js.gz
  71. 3 3
      yudao-server/src/main/resources/admin-ui/static/js/app.js
  72. BIN
      yudao-server/src/main/resources/admin-ui/static/js/app.js.gz
  73. 6 6
      yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js
  74. BIN
      yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js.gz
  75. 4 4
      yudao-server/src/main/resources/application.yaml
  76. 0 26
      yudao-ui-admin-uniapp/api/login.js
  77. 8 6
      yudao-ui-admin-uniapp/components/verifition/verifyPoint/verifyPoint.vue
  78. 5 3
      yudao-ui-admin-uniapp/components/verifition/verifySlider/verifySlider.vue
  79. 92 95
      yudao-ui-admin-vue3/pnpm-lock.yaml
  80. 4 2
      yudao-ui-admin-vue3/src/components/Verifition/src/api/index.ts
  81. 4 2
      yudao-ui-admin/src/components/Verifition/api/index.js

+ 42 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java

@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.system.controller.admin.captcha;
+
+import com.anji.captcha.model.common.ResponseModel;
+import com.anji.captcha.model.vo.CaptchaVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.security.PermitAll;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 验证码
+ *
+ * 问题:为什么不直接使用 anji 提供的 CaptchaController,而要另外继承?
+ * 回答:管理使用 /admin-api/* 作为前缀,所以需要继承!
+ *
+ * @author 芋道源码
+ */
+@Api(tags = "管理后台 - 验证码")
+@RestController("adminCaptchaController")
+@RequestMapping("/captcha")
+public class CaptchaController extends com.anji.captcha.controller.CaptchaController {
+
+    @PostMapping({"/get"})
+    @ApiOperation("获得验证码")
+    @PermitAll
+    public ResponseModel get(@RequestBody CaptchaVO data, HttpServletRequest request) {
+        return super.get(data, request);
+    }
+
+    @PostMapping({"/check"})
+    @ApiOperation("校验验证码")
+    @PermitAll
+    public ResponseModel check(@RequestBody CaptchaVO data, HttpServletRequest request) {
+        return super.check(data, request);
+    }
+
+}

BIN
yudao-server/src/main/resources/admin-ui/static/img/401.fea349c2.gif


BIN
yudao-server/src/main/resources/admin-ui/static/img/404.fa349ddc.png


BIN
yudao-server/src/main/resources/admin-ui/static/img/bg.c05ff27e.png


+ 1 - 0
yudao-server/src/main/resources/admin-ui/static/img/dark.16937467.svg

@@ -0,0 +1 @@
+<svg width="52" height="45" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="a"><feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0" in="shadowBlurOuter1" result="shadowMatrixOuter1"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="SourceGraphic"/></feMerge></filter><filter x="-4.2%" y="-2.5%" width="108.3%" height="110%" filterUnits="objectBoundingBox" id="c"><feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation=".5" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" in="shadowBlurOuter1"/></filter><rect id="b" x="0" y="0" width="48" height="40" rx="4"/></defs><g filter="url(#a)" transform="translate(2 1)" fill="none" fill-rule="evenodd"><mask id="d" fill="#fff"><use xlink:href="#b"/></mask><use fill="#000" filter="url(#c)" xlink:href="#b"/><use fill="#F0F2F5" xlink:href="#b"/><path fill="#FFF" mask="url(#d)" d="M0 0H48V10H0z"/><path fill="#303648" mask="url(#d)" d="M0 0H16V40H0z"/></g></svg>

BIN
yudao-server/src/main/resources/admin-ui/static/img/default.6b914f9c.jpg


+ 1 - 0
yudao-server/src/main/resources/admin-ui/static/img/light.c2aad012.svg

@@ -0,0 +1 @@
+<svg width="52" height="45" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="a"><feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0" in="shadowBlurOuter1" result="shadowMatrixOuter1"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="SourceGraphic"/></feMerge></filter><filter x="-4.2%" y="-2.5%" width="108.3%" height="110%" filterUnits="objectBoundingBox" id="c"><feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation=".5" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" in="shadowBlurOuter1"/></filter><rect id="b" x="0" y="0" width="48" height="40" rx="4"/></defs><g filter="url(#a)" transform="translate(2 1)" fill="none" fill-rule="evenodd"><mask id="d" fill="#fff"><use xlink:href="#b"/></mask><use fill="#000" filter="url(#c)" xlink:href="#b"/><use fill="#F0F2F5" xlink:href="#b"/><path fill="#FFF" mask="url(#d)" d="M0 0H16V40H0z"/><path fill="#FFF" mask="url(#d)" d="M0 0H48V10H0z"/></g></svg>

BIN
yudao-server/src/main/resources/admin-ui/static/img/profile.b87e3d56.jpg


File diff suppressed because it is too large
+ 0 - 20
yudao-server/src/main/resources/admin-ui/static/js/0.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/0.js.gz


File diff suppressed because it is too large
+ 0 - 7
yudao-server/src/main/resources/admin-ui/static/js/1.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/1.js.gz


File diff suppressed because it is too large
+ 4 - 4
yudao-server/src/main/resources/admin-ui/static/js/10.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/10.js.gz


File diff suppressed because it is too large
+ 4 - 5
yudao-server/src/main/resources/admin-ui/static/js/11.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/11.js.gz


File diff suppressed because it is too large
+ 4 - 4
yudao-server/src/main/resources/admin-ui/static/js/12.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/12.js.gz


File diff suppressed because it is too large
+ 4 - 4
yudao-server/src/main/resources/admin-ui/static/js/13.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/13.js.gz


File diff suppressed because it is too large
+ 4 - 4
yudao-server/src/main/resources/admin-ui/static/js/14.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/14.js.gz


File diff suppressed because it is too large
+ 4 - 4
yudao-server/src/main/resources/admin-ui/static/js/15.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/15.js.gz


File diff suppressed because it is too large
+ 4 - 4
yudao-server/src/main/resources/admin-ui/static/js/16.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/16.js.gz


File diff suppressed because it is too large
+ 0 - 8
yudao-server/src/main/resources/admin-ui/static/js/17.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/17.js.gz


File diff suppressed because it is too large
+ 4 - 5
yudao-server/src/main/resources/admin-ui/static/js/18.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/18.js.gz


File diff suppressed because it is too large
+ 8 - 1
yudao-server/src/main/resources/admin-ui/static/js/19.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/19.js.gz


File diff suppressed because it is too large
+ 4 - 4
yudao-server/src/main/resources/admin-ui/static/js/2.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/2.js.gz


File diff suppressed because it is too large
+ 4 - 4
yudao-server/src/main/resources/admin-ui/static/js/20.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/20.js.gz


File diff suppressed because it is too large
+ 2 - 3
yudao-server/src/main/resources/admin-ui/static/js/21.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/21.js.gz


File diff suppressed because it is too large
+ 23 - 20
yudao-server/src/main/resources/admin-ui/static/js/22.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/22.js.gz


File diff suppressed because it is too large
+ 37 - 5
yudao-server/src/main/resources/admin-ui/static/js/23.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/23.js.gz


File diff suppressed because it is too large
+ 37 - 5
yudao-server/src/main/resources/admin-ui/static/js/24.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/24.js.gz


File diff suppressed because it is too large
+ 9 - 11
yudao-server/src/main/resources/admin-ui/static/js/25.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/25.js.gz


File diff suppressed because it is too large
+ 20 - 8
yudao-server/src/main/resources/admin-ui/static/js/26.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/26.js.gz


File diff suppressed because it is too large
+ 4 - 4
yudao-server/src/main/resources/admin-ui/static/js/27.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/27.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/28.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/28.js.gz


File diff suppressed because it is too large
+ 10 - 0
yudao-server/src/main/resources/admin-ui/static/js/29.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/29.js.gz


File diff suppressed because it is too large
+ 7 - 5
yudao-server/src/main/resources/admin-ui/static/js/3.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/3.js.gz


File diff suppressed because it is too large
+ 10 - 0
yudao-server/src/main/resources/admin-ui/static/js/30.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/30.js.gz


File diff suppressed because it is too large
+ 0 - 8
yudao-server/src/main/resources/admin-ui/static/js/4.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/4.js.gz


File diff suppressed because it is too large
+ 8 - 1
yudao-server/src/main/resources/admin-ui/static/js/5.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/5.js.gz


File diff suppressed because it is too large
+ 8 - 1
yudao-server/src/main/resources/admin-ui/static/js/6.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/6.js.gz


File diff suppressed because it is too large
+ 9 - 9
yudao-server/src/main/resources/admin-ui/static/js/7.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/7.js.gz


File diff suppressed because it is too large
+ 9 - 9
yudao-server/src/main/resources/admin-ui/static/js/8.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/8.js.gz


File diff suppressed because it is too large
+ 4 - 4
yudao-server/src/main/resources/admin-ui/static/js/9.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/9.js.gz


File diff suppressed because it is too large
+ 3 - 3
yudao-server/src/main/resources/admin-ui/static/js/app.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/app.js.gz


File diff suppressed because it is too large
+ 6 - 6
yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js.gz


+ 4 - 4
yudao-server/src/main/resources/application.yaml

@@ -68,9 +68,9 @@ aj:
     timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行
     type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选
     water-mark: 芋道源码 # 右下角水印文字(我的水印),可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode,Linux 可能需要转 unicode
-    interference-options: 2 # 滑动干扰项(0/1/2)
+    interference-options: 0 # 滑动干扰项(0/1/2)
     req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false
-    req-get-lock-limit: 5 # 验证失败5次,get接口锁定
+    req-get-lock-limit: 5 # 验证失败 5 次,get接口锁定
     req-get-lock-seconds: 10 # 验证失败后,锁定时间间隔
     req-get-minute-limit: 30 # get 接口一分钟内请求数限制
     req-check-minute-limit: 60 # check 接口一分钟内请求数限制
@@ -109,8 +109,8 @@ yudao:
     enable: true
     ignore-urls:
       - /admin-api/system/tenant/get-id-by-name # 基于名字获取租户,不许带租户编号
-      - /captcha/get # 获取图片验证码,和租户无关
-      - /captcha/check # 校验图片验证码,和租户无关
+      - /admin-api/captcha/get # 获取图片验证码,和租户无关
+      - /admin-api/captcha/check # 校验图片验证码,和租户无关
       - /admin-api/infra/file/*/get/** # 获取图片,和租户无关
       - /admin-api/system/sms/callback/* # 短信回调接口,无法带上租户编号
       - /app-api/pay/order/notify/* # 支付回调通知,不携带租户编号

+ 0 - 26
yudao-ui-admin-uniapp/api/login.js

@@ -32,29 +32,3 @@ export function logout() {
 		'method': 'POST'
 	})
 }
-
-// 获取验证码
-export function getCaptcha(data) {
-	return request({
-		url: '/captcha/get',
-		headers: {
-			isToken: false,
-			isTenant: false
-		},
-		method: 'POST',
-		'data': data
-	})
-}
-
-// 验证验证码
-export function checkCaptcha(data) {
-	return request({
-		url: '/captcha/check',
-		headers: {
-			isToken: false,
-			isTenant: false
-		},
-		method: 'POST',
-		'data': data
-	})
-}

+ 8 - 6
yudao-ui-admin-uniapp/components/verifition/verifyPoint/verifyPoint.vue

@@ -125,7 +125,7 @@
                 const query = uni.createSelectorQuery().in(this);
                 query.select('#image').boundingClientRect(data => {
                     this.imgLeft =Math.ceil(data.left)
-                    this.imgTop =Math.ceil(data.top) 
+                    this.imgTop =Math.ceil(data.top)
                     this.checkPosArr.push(this.getMousePos(this.$refs.canvas, e));
                     if (this.num == this.checkNum) {
                         this.num = this.createPoint(this.getMousePos(this.$refs.canvas, e));
@@ -141,7 +141,8 @@
                                 "token":this.backToken
                             }
                             myRequest({
-                                url: `/captcha/check`, 
+                                // url: `/captcha/check`,
+                                url: '/admin-api/captcha/check', // 使用项目自定义的 /admin-api/ 前缀
                                 data,
                                 method:"POST",
                             }).then(result => {
@@ -167,7 +168,7 @@
                                             this.refresh();
                                         }, 700);
                                     }
-                                })    
+                                })
                         }, 400);
                     }
                     if (this.num < this.checkNum) {
@@ -211,7 +212,8 @@
 					ts: Date.now(), // 现在的时间戳
                 }
                 myRequest({
-                    url: "/captcha/get", //仅为示例,并非真实接口地址。
+                    // url: "/captcha/get", //仅为示例,并非真实接口地址。
+                    url: '/admin-api/captcha/get', // 使用项目自定义的 /admin-api/ 前缀
                     data,
                     method:"POST",
                 }).then((result) => {
@@ -232,8 +234,8 @@
             //坐标转换函数
             pointTransfrom(pointArr,imgSize){
                 var newPointArr = pointArr.map(p=>{
-                    let x = Math.round(310 * p.x/parseInt(imgSize.width)) 
-                    let y =Math.round(155 * p.y/parseInt(imgSize.height)) 
+                    let x = Math.round(310 * p.x/parseInt(imgSize.width))
+                    let y =Math.round(155 * p.y/parseInt(imgSize.height))
                     return {x,y}
                 })
                 // console.log(newPointArr,"newPointArr");

+ 5 - 3
yudao-ui-admin-uniapp/components/verifition/verifySlider/verifySlider.vue

@@ -230,8 +230,9 @@
 							"token": this.backToken
 						}
 						myRequest({
-							url: `/captcha/check`,
-							data,
+							// url: `/captcha/check`,
+              url: '/admin-api/captcha/check', // 使用项目自定义的 /admin-api/ 前缀
+              data,
 							method: "POST",
 						}).then((result) => {
 							let res = result.data
@@ -317,7 +318,8 @@
 					ts: Date.now(), // 现在的时间戳
 				}
 				myRequest({
-					url: '/captcha/get', //仅为示例,并非真实接口地址。
+					// url: '/captcha/get', //仅为示例,并非真实接口地址。
+					url: '/admin-api/captcha/get', // 使用项目自定义的 /admin-api/ 前缀
 					data,
 					method: "POST",
 				}).then((result) => {

+ 92 - 95
yudao-ui-admin-vue3/pnpm-lock.yaml

@@ -1,4 +1,4 @@
-lockfileVersion: 5.4
+lockfileVersion: 5.3
 
 specifiers:
   '@commitlint/cli': ^17.2.0
@@ -84,7 +84,7 @@ dependencies:
   '@iconify/iconify': 3.0.0
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@wangeditor/editor': 5.1.22
-  '@wangeditor/editor-for-vue': 5.1.12_su3dw7bmszfjg67suaojchptby
+  '@wangeditor/editor-for-vue': 5.1.12_95363b7c2c964a937bf2a01c911df30e
   '@zxcvbn-ts/core': 2.1.0
   animate.css: 4.1.1
   axios: 1.1.3
@@ -99,7 +99,7 @@ dependencies:
   lodash-es: 4.17.21
   mitt: 3.0.0
   nprogress: 0.2.0
-  pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm
+  pinia: 2.0.23_typescript@4.8.4+vue@3.2.44
   qrcode: 1.5.1
   qs: 6.11.0
   url: 0.11.0
@@ -124,15 +124,15 @@ devDependencies:
   '@types/nprogress': 0.2.0
   '@types/qrcode': 1.5.0
   '@types/qs': 6.9.7
-  '@typescript-eslint/eslint-plugin': 5.42.1_2udltptbznfmezdozpdoa2aemq
-  '@typescript-eslint/parser': 5.42.1_rmayb2veg2btbq6mbmnyivgasy
+  '@typescript-eslint/eslint-plugin': 5.42.1_d506b9be61cb4ac2646ecbc6e0680464
+  '@typescript-eslint/parser': 5.42.1_eslint@8.27.0+typescript@4.8.4
   '@vitejs/plugin-vue': 3.2.0_vite@3.2.3+vue@3.2.44
   '@vitejs/plugin-vue-jsx': 2.1.1_vite@3.2.3+vue@3.2.44
   autoprefixer: 10.4.13_postcss@8.4.18
   eslint: 8.27.0
   eslint-config-prettier: 8.5.0_eslint@8.27.0
   eslint-define-config: 1.12.0
-  eslint-plugin-prettier: 4.2.1_v7o5sx5x3wbs57ifz6wc4f76we
+  eslint-plugin-prettier: 4.2.1_afddd95fb7dd832efd05cfac2e17feb1
   eslint-plugin-vue: 9.7.0_eslint@8.27.0
   less: 4.1.3
   lint-staged: 13.0.3
@@ -144,14 +144,14 @@ devDependencies:
   rimraf: 3.0.2
   rollup: 3.2.5
   stylelint: 14.14.1
-  stylelint-config-html: 1.1.0_a4i6jbpfaxelx4fvjhtlgvxx6i
+  stylelint-config-html: 1.1.0_0711e485e505c8bbf0b549e6b356f7f2
   stylelint-config-prettier: 9.0.4_stylelint@14.14.1
   stylelint-config-recommended: 9.0.0_stylelint@14.14.1
   stylelint-config-standard: 29.0.0_stylelint@14.14.1
   stylelint-order: 5.0.0_stylelint@14.14.1
   typescript: 4.8.4
-  unplugin-vue-macros: 0.16.2_nch4vsbos5hmj7k4a4oy3znhuu
-  vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+  unplugin-vue-macros: 0.16.2_688fcac82e974ec4fd5c071d8de5a7a5
+  vite: 3.2.3_@types+node@18.11.9+less@4.1.3
   vite-plugin-compression: 0.5.1_vite@3.2.3
   vite-plugin-eslint: 1.8.1_eslint@8.27.0+vite@3.2.3
   vite-plugin-html: 3.2.0_vite@3.2.3
@@ -574,10 +574,10 @@ packages:
       '@types/node': 14.18.31
       chalk: 4.1.2
       cosmiconfig: 7.0.1
-      cosmiconfig-typescript-loader: 4.1.1_gpl3msxjb2n3qdkii2jvdrcxxe
+      cosmiconfig-typescript-loader: 4.1.1_33d7b64ae90e9bb80d48469351c457b9
       lodash: 4.17.21
       resolve-from: 5.0.0
-      ts-node: 10.9.1_fk6arlf3j7tudlucddpzvj2plq
+      ts-node: 10.9.1_2abc08acbb4fe741ae8218df9aa74f5c
       typescript: 4.8.4
     transitivePeerDependencies:
       - '@swc/core'
@@ -658,7 +658,7 @@ packages:
       '@jridgewell/trace-mapping': 0.3.9
     dev: true
 
-  /@csstools/selector-specificity/2.0.2_dvkg4kkb622mvceygg47xxdz3a:
+  /@csstools/selector-specificity/2.0.2_1d546e2941f6b4ca889831b9fbdc79d8:
     resolution: {integrity: sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==}
     engines: {node: ^12 || ^14 || >=16}
     peerDependencies:
@@ -798,12 +798,14 @@ packages:
       '@intlify/message-compiler': 9.2.2
       '@intlify/shared': 9.2.2
       '@intlify/vue-devtools': 9.2.2
+    dev: false
 
   /@intlify/devtools-if/9.2.2:
     resolution: {integrity: sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==}
     engines: {node: '>= 14'}
     dependencies:
       '@intlify/shared': 9.2.2
+    dev: false
 
   /@intlify/message-compiler/9.2.2:
     resolution: {integrity: sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==}
@@ -811,6 +813,7 @@ packages:
     dependencies:
       '@intlify/shared': 9.2.2
       source-map: 0.6.1
+    dev: false
 
   /@intlify/message-compiler/9.3.0-beta.6:
     resolution: {integrity: sha512-3PJqRJoqvFHExA9DCkf7fZYKbvYne1tYQ0fptJAhUOZsELarh8wr4aPLKWCkQSRuutdrtZ/n5CcPgJgUmVthDw==}
@@ -823,6 +826,7 @@ packages:
   /@intlify/shared/9.2.2:
     resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==}
     engines: {node: '>= 14'}
+    dev: false
 
   /@intlify/shared/9.3.0-beta.6:
     resolution: {integrity: sha512-ITA1R4tvJYwZXT5x6QCSwxcwQ4dU52zrzVm/EUbgsp8oWzYS1xexBrxyNM80PSQudYvL2rvcZJKQ7yBh7b0LkQ==}
@@ -850,7 +854,7 @@ packages:
       debug: 4.3.4
       fast-glob: 3.2.12
       source-map: 0.6.1
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
       vue-i18n: 9.2.2_vue@3.2.44
     transitivePeerDependencies:
       - supports-color
@@ -862,6 +866,7 @@ packages:
     dependencies:
       '@intlify/core-base': 9.2.2
       '@intlify/shared': 9.2.2
+    dev: false
 
   /@jridgewell/gen-mapping/0.1.1:
     resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
@@ -1092,8 +1097,9 @@ packages:
 
   /@types/web-bluetooth/0.0.16:
     resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
+    dev: false
 
-  /@typescript-eslint/eslint-plugin/5.42.1_2udltptbznfmezdozpdoa2aemq:
+  /@typescript-eslint/eslint-plugin/5.42.1_d506b9be61cb4ac2646ecbc6e0680464:
     resolution: {integrity: sha512-LyR6x784JCiJ1j6sH5Y0K6cdExqCCm8DJUTcwG5ThNXJj/G8o5E56u5EdG4SLy+bZAwZBswC+GYn3eGdttBVCg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1104,10 +1110,10 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.42.1_rmayb2veg2btbq6mbmnyivgasy
+      '@typescript-eslint/parser': 5.42.1_eslint@8.27.0+typescript@4.8.4
       '@typescript-eslint/scope-manager': 5.42.1
-      '@typescript-eslint/type-utils': 5.42.1_rmayb2veg2btbq6mbmnyivgasy
-      '@typescript-eslint/utils': 5.42.1_rmayb2veg2btbq6mbmnyivgasy
+      '@typescript-eslint/type-utils': 5.42.1_eslint@8.27.0+typescript@4.8.4
+      '@typescript-eslint/utils': 5.42.1_eslint@8.27.0+typescript@4.8.4
       debug: 4.3.4
       eslint: 8.27.0
       ignore: 5.2.0
@@ -1120,7 +1126,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.42.1_rmayb2veg2btbq6mbmnyivgasy:
+  /@typescript-eslint/parser/5.42.1_eslint@8.27.0+typescript@4.8.4:
     resolution: {integrity: sha512-kAV+NiNBWVQDY9gDJDToTE/NO8BHi4f6b7zTsVAJoTkmB/zlfOpiEVBzHOKtlgTndCKe8vj9F/PuolemZSh50Q==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1148,7 +1154,7 @@ packages:
       '@typescript-eslint/visitor-keys': 5.42.1
     dev: true
 
-  /@typescript-eslint/type-utils/5.42.1_rmayb2veg2btbq6mbmnyivgasy:
+  /@typescript-eslint/type-utils/5.42.1_eslint@8.27.0+typescript@4.8.4:
     resolution: {integrity: sha512-WWiMChneex5w4xPIX56SSnQQo0tEOy5ZV2dqmj8Z371LJ0E+aymWD25JQ/l4FOuuX+Q49A7pzh/CGIQflxMVXg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1159,7 +1165,7 @@ packages:
         optional: true
     dependencies:
       '@typescript-eslint/typescript-estree': 5.42.1_typescript@4.8.4
-      '@typescript-eslint/utils': 5.42.1_rmayb2veg2btbq6mbmnyivgasy
+      '@typescript-eslint/utils': 5.42.1_eslint@8.27.0+typescript@4.8.4
       debug: 4.3.4
       eslint: 8.27.0
       tsutils: 3.21.0_typescript@4.8.4
@@ -1194,7 +1200,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.42.1_rmayb2veg2btbq6mbmnyivgasy:
+  /@typescript-eslint/utils/5.42.1_eslint@8.27.0+typescript@4.8.4:
     resolution: {integrity: sha512-Gxvf12xSp3iYZd/fLqiQRD4uKZjDNR01bQ+j8zvhPjpsZ4HmvEFL/tC4amGNyxN9Rq+iqvpHLhlqx6KTxz9ZyQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1273,7 +1279,7 @@ packages:
       '@babel/core': 7.19.6
       '@babel/plugin-transform-typescript': 7.20.2_@babel+core@7.19.6
       '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.19.6
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
       vue: 3.2.44
     transitivePeerDependencies:
       - supports-color
@@ -1286,7 +1292,7 @@ packages:
       vite: ^3.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
       vue: 3.2.44
     dev: true
 
@@ -1418,7 +1424,7 @@ packages:
       unplugin: 0.10.2
     dev: true
 
-  /@vue-macros/named-template/0.0.5_vkxhlib7tgibcivdhj2bfsgnbi:
+  /@vue-macros/named-template/0.0.5_aaae75a03f99901122a33a7412c8cd0a:
     resolution: {integrity: sha512-bZRUljNyvOOqeE9dyqXvKPQCLUCcPt1EkThmXqSbxagV29ohyviF8+CCs/8OdmNygLTBIChjP8DexQ3nUIFzUg==}
     engines: {node: '>=14.19.0'}
     dependencies:
@@ -1515,6 +1521,7 @@ packages:
       '@vue/shared': 3.2.44
       estree-walker: 2.0.2
       source-map: 0.6.1
+    dev: false
 
   /@vue/compiler-dom/3.2.41:
     resolution: {integrity: sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==}
@@ -1535,6 +1542,7 @@ packages:
     dependencies:
       '@vue/compiler-core': 3.2.44
       '@vue/shared': 3.2.44
+    dev: false
 
   /@vue/compiler-sfc/3.2.41:
     resolution: {integrity: sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==}
@@ -1579,6 +1587,7 @@ packages:
       magic-string: 0.25.9
       postcss: 8.4.18
       source-map: 0.6.1
+    dev: false
 
   /@vue/compiler-ssr/3.2.41:
     resolution: {integrity: sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==}
@@ -1599,9 +1608,11 @@ packages:
     dependencies:
       '@vue/compiler-dom': 3.2.44
       '@vue/shared': 3.2.44
+    dev: false
 
   /@vue/devtools-api/6.4.3:
     resolution: {integrity: sha512-9WCRwdROJvWcHAdyrR7SZMM/qUvllDZnpndHXokThkUsjnJ2xe4/pvsH9FZrxFe22L+JmDKczL79HjLJ7DK9rg==}
+    dev: false
 
   /@vue/devtools-api/6.4.4:
     resolution: {integrity: sha512-Ku31WzpOV/8cruFaXaEZKF81WkNnvCSlBY4eOGtz5WMSdJvX1v1WWlSMGZeqUwPtQ27ZZz7B62erEMq8JDjcXw==}
@@ -1639,6 +1650,7 @@ packages:
       '@vue/shared': 3.2.44
       estree-walker: 2.0.2
       magic-string: 0.25.9
+    dev: false
 
   /@vue/reactivity/3.2.41:
     resolution: {integrity: sha512-9JvCnlj8uc5xRiQGZ28MKGjuCoPhhTwcoAdv3o31+cfGgonwdPNuvqAXLhlzu4zwqavFEG5tvaoINQEfxz+l6g==}
@@ -1650,12 +1662,14 @@ packages:
     resolution: {integrity: sha512-Fe0s52fTsPl+RSdvoqUZ3HRKlaVsKhIh1mea5EWOedFvZCjnymzlj3YC1wZMxi89qXRFSdEASVA/BWUGypk0Ig==}
     dependencies:
       '@vue/shared': 3.2.44
+    dev: false
 
   /@vue/runtime-core/3.2.44:
     resolution: {integrity: sha512-uwEV1cttL33k2dC+CNGYhKEYqGejT9KmgQ+4n/LmYUfZ1Gorl8F32DlIX+1pANyGHL1tBAisqHDxKyQBp2oBNA==}
     dependencies:
       '@vue/reactivity': 3.2.44
       '@vue/shared': 3.2.44
+    dev: false
 
   /@vue/runtime-dom/3.2.44:
     resolution: {integrity: sha512-LDzNwXpU/nSpxrLk5jS0bfStgt88msgsgFzj6vHrl7es3QktIrCGybQS5CB/p/TO0q98iAiYtEVmi+Lej7Vgjg==}
@@ -1663,6 +1677,7 @@ packages:
       '@vue/runtime-core': 3.2.44
       '@vue/shared': 3.2.44
       csstype: 2.6.21
+    dev: false
 
   /@vue/server-renderer/3.2.44_vue@3.2.44:
     resolution: {integrity: sha512-3+ArN07UgOAdbGKIp3uVqeC3bnR3J324QNjPR6vxHbLrTlkibFv8QNled/ux3fVq0KDCkVVKGOKB2V4sCIYOgg==}
@@ -1672,6 +1687,7 @@ packages:
       '@vue/compiler-ssr': 3.2.44
       '@vue/shared': 3.2.44
       vue: 3.2.44
+    dev: false
 
   /@vue/shared/3.2.41:
     resolution: {integrity: sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==}
@@ -1683,6 +1699,7 @@ packages:
 
   /@vue/shared/3.2.44:
     resolution: {integrity: sha512-mGZ44bnn0zpZ36nXtxbrBPno43yr96wjQE1dBEKS1Sieugt27HS4OGZVBRIgsdGzosB7vqZAvu0ttu1FDVdolA==}
+    dev: false
 
   /@vueuse/core/9.5.0_vue@3.2.44:
     resolution: {integrity: sha512-6GsWBsJHEb3sYw15mbLrcbslAVY45pkzjJYTKYKCXv88z7srAF0VEW0q+oXKsl58tCbqooplInahXFg8Yo1m4w==}
@@ -1694,9 +1711,11 @@ packages:
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
+    dev: false
 
   /@vueuse/metadata/9.5.0:
     resolution: {integrity: sha512-4M1AyPZmIv41pym+K5+4wup3bKuYebbH8w8BROY1hmT7rIwcyS4tEL+UsGz0Hiu1FCOxcoBrwtAizc0YmBJjyQ==}
+    dev: false
 
   /@vueuse/shared/9.5.0_vue@3.2.44:
     resolution: {integrity: sha512-HnnCWU1Vg9CVWRCcI8ohDKDRB2Sc4bTgT1XAIaoLSfVHHn+TKbrox6pd3klCSw4UDxkhDfOk8cAdcK+Z5KleCA==}
@@ -1705,8 +1724,9 @@ packages:
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
+    dev: false
 
-  /@wangeditor/basic-modules/1.1.6_o6rq7lyzv5eg7j3353bh3hudbm:
+  /@wangeditor/basic-modules/1.1.6_77a30faf19af486fa77beec27d9e830b:
     resolution: {integrity: sha512-wckcFm/kEAHpTn7dTmN0+7POFoygqt9bZdNHJUkdKObXtAerml8RdjrkHRcwJFCkSELbrNK63fvkwS0+FsabfA==}
     peerDependencies:
       '@wangeditor/core': 1.x
@@ -1716,7 +1736,7 @@ packages:
       slate: ^0.72.0
       snabbdom: ^3.1.0
     dependencies:
-      '@wangeditor/core': 1.1.18_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/core': 1.1.18_83942e33b1d7a7a6aab922626cc5c0f9
       dom7: 3.0.0
       is-url: 1.2.4
       lodash.throttle: 4.1.1
@@ -1725,7 +1745,7 @@ packages:
       snabbdom: 3.5.1
     dev: false
 
-  /@wangeditor/code-highlight/1.0.3_l7btiqc6jwjbtk5j6zx52mrhj4:
+  /@wangeditor/code-highlight/1.0.3_5fc334405e4d9219aba9f66fdd32274f:
     resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
     peerDependencies:
       '@wangeditor/core': 1.x
@@ -1733,14 +1753,14 @@ packages:
       slate: ^0.72.0
       snabbdom: ^3.1.0
     dependencies:
-      '@wangeditor/core': 1.1.18_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/core': 1.1.18_83942e33b1d7a7a6aab922626cc5c0f9
       dom7: 3.0.0
       prismjs: 1.29.0
       slate: 0.72.8
       snabbdom: 3.5.1
     dev: false
 
-  /@wangeditor/core/1.1.18_qokc4m5r26t2nkvzejrgzroa7e:
+  /@wangeditor/core/1.1.18_83942e33b1d7a7a6aab922626cc5c0f9:
     resolution: {integrity: sha512-GZsW/8tm2Hc2hZKX8BZP9PO7vTZll9YXsOt+jKck3D2bj9nk4T0FZymuE5fq9ZHdo+MwLiXBHXS/D1SIGlVnGQ==}
     peerDependencies:
       '@uppy/core': ^2.1.1
@@ -1780,7 +1800,7 @@ packages:
       snabbdom: 3.5.1
     dev: false
 
-  /@wangeditor/editor-for-vue/5.1.12_su3dw7bmszfjg67suaojchptby:
+  /@wangeditor/editor-for-vue/5.1.12_95363b7c2c964a937bf2a01c911df30e:
     resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
     peerDependencies:
       '@wangeditor/editor': '>=5.1.0'
@@ -1795,13 +1815,13 @@ packages:
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
-      '@wangeditor/basic-modules': 1.1.6_o6rq7lyzv5eg7j3353bh3hudbm
-      '@wangeditor/code-highlight': 1.0.3_l7btiqc6jwjbtk5j6zx52mrhj4
-      '@wangeditor/core': 1.1.18_qokc4m5r26t2nkvzejrgzroa7e
-      '@wangeditor/list-module': 1.0.5_l7btiqc6jwjbtk5j6zx52mrhj4
-      '@wangeditor/table-module': 1.1.4_lwgnfhttvljctbijfdv636yew4
-      '@wangeditor/upload-image-module': 1.0.2_pknk2k7txbsal4ptocd5fojeuq
-      '@wangeditor/video-module': 1.1.4_i7nsf6mii7znnnswtj7jlro46u
+      '@wangeditor/basic-modules': 1.1.6_77a30faf19af486fa77beec27d9e830b
+      '@wangeditor/code-highlight': 1.0.3_5fc334405e4d9219aba9f66fdd32274f
+      '@wangeditor/core': 1.1.18_83942e33b1d7a7a6aab922626cc5c0f9
+      '@wangeditor/list-module': 1.0.5_5fc334405e4d9219aba9f66fdd32274f
+      '@wangeditor/table-module': 1.1.4_5d8cd29e73aad229850928ebedfb04b7
+      '@wangeditor/upload-image-module': 1.0.2_7a9aad2bf3b86405f1f37087d2b924a4
+      '@wangeditor/video-module': 1.1.4_47db22f98847f2d6b6569a7e95c5dcf5
       dom7: 3.0.0
       is-hotkey: 0.2.0
       lodash.camelcase: 4.3.0
@@ -1816,7 +1836,7 @@ packages:
       snabbdom: 3.5.1
     dev: false
 
-  /@wangeditor/list-module/1.0.5_l7btiqc6jwjbtk5j6zx52mrhj4:
+  /@wangeditor/list-module/1.0.5_5fc334405e4d9219aba9f66fdd32274f:
     resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
     peerDependencies:
       '@wangeditor/core': 1.x
@@ -1824,13 +1844,13 @@ packages:
       slate: ^0.72.0
       snabbdom: ^3.1.0
     dependencies:
-      '@wangeditor/core': 1.1.18_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/core': 1.1.18_83942e33b1d7a7a6aab922626cc5c0f9
       dom7: 3.0.0
       slate: 0.72.8
       snabbdom: 3.5.1
     dev: false
 
-  /@wangeditor/table-module/1.1.4_lwgnfhttvljctbijfdv636yew4:
+  /@wangeditor/table-module/1.1.4_5d8cd29e73aad229850928ebedfb04b7:
     resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
     peerDependencies:
       '@wangeditor/core': 1.x
@@ -1841,7 +1861,7 @@ packages:
       slate: ^0.72.0
       snabbdom: ^3.1.0
     dependencies:
-      '@wangeditor/core': 1.1.18_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/core': 1.1.18_83942e33b1d7a7a6aab922626cc5c0f9
       dom7: 3.0.0
       lodash.isequal: 4.5.0
       lodash.throttle: 4.1.1
@@ -1850,7 +1870,7 @@ packages:
       snabbdom: 3.5.1
     dev: false
 
-  /@wangeditor/upload-image-module/1.0.2_pknk2k7txbsal4ptocd5fojeuq:
+  /@wangeditor/upload-image-module/1.0.2_7a9aad2bf3b86405f1f37087d2b924a4:
     resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
     peerDependencies:
       '@uppy/core': ^2.0.3
@@ -1864,15 +1884,15 @@ packages:
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
-      '@wangeditor/basic-modules': 1.1.6_o6rq7lyzv5eg7j3353bh3hudbm
-      '@wangeditor/core': 1.1.18_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/basic-modules': 1.1.6_77a30faf19af486fa77beec27d9e830b
+      '@wangeditor/core': 1.1.18_83942e33b1d7a7a6aab922626cc5c0f9
       dom7: 3.0.0
       lodash.foreach: 4.5.0
       slate: 0.72.8
       snabbdom: 3.5.1
     dev: false
 
-  /@wangeditor/video-module/1.1.4_i7nsf6mii7znnnswtj7jlro46u:
+  /@wangeditor/video-module/1.1.4_47db22f98847f2d6b6569a7e95c5dcf5:
     resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
     peerDependencies:
       '@uppy/core': ^2.1.4
@@ -1885,7 +1905,7 @@ packages:
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
-      '@wangeditor/core': 1.1.18_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/core': 1.1.18_83942e33b1d7a7a6aab922626cc5c0f9
       dom7: 3.0.0
       nanoid: 3.3.4
       slate: 0.72.8
@@ -2250,8 +2270,6 @@ packages:
       snapdragon-node: 2.1.1
       split-string: 3.1.0
       to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
   /braces/3.0.2:
@@ -2635,8 +2653,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
-      JSONStream: 1.3.5
       is-text-path: 1.0.1
+      JSONStream: 1.3.5
       lodash: 4.17.21
       meow: 8.1.2
       split2: 3.2.2
@@ -2668,7 +2686,7 @@ packages:
       vary: 1.1.2
     dev: true
 
-  /cosmiconfig-typescript-loader/4.1.1_gpl3msxjb2n3qdkii2jvdrcxxe:
+  /cosmiconfig-typescript-loader/4.1.1_33d7b64ae90e9bb80d48469351c457b9:
     resolution: {integrity: sha512-9DHpa379Gp0o0Zefii35fcmuuin6q92FnLDffzdZ0l9tVd3nEobG3O+MZ06+kuBvFTSVScvNb/oHA13Nd4iipg==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
@@ -2679,7 +2697,7 @@ packages:
     dependencies:
       '@types/node': 14.18.31
       cosmiconfig: 7.0.1
-      ts-node: 10.9.1_fk6arlf3j7tudlucddpzvj2plq
+      ts-node: 10.9.1_2abc08acbb4fe741ae8218df9aa74f5c
       typescript: 4.8.4
     dev: true
 
@@ -2762,6 +2780,7 @@ packages:
 
   /csstype/2.6.21:
     resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
+    dev: false
 
   /d/1.0.1:
     resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
@@ -2785,22 +2804,12 @@ packages:
 
   /debug/2.6.9:
     resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
     dependencies:
       ms: 2.0.0
     dev: true
 
   /debug/3.2.7:
     resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
     dependencies:
       ms: 2.1.3
     dev: true
@@ -3066,7 +3075,7 @@ packages:
       escape-html: 1.0.3
       lodash: 4.17.21
       lodash-es: 4.17.21
-      lodash-unified: 1.0.2_3ib2ivapxullxkx3xftsimdk7u
+      lodash-unified: 1.0.2_da03a4540fbd16bbaafbb96724306afd
       memoize-one: 6.0.0
       normalize-wheel-es: 1.2.0
       vue: 3.2.44
@@ -3390,7 +3399,7 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13', pnpm: '>= 7.0.0'}
     dev: true
 
-  /eslint-plugin-prettier/4.2.1_v7o5sx5x3wbs57ifz6wc4f76we:
+  /eslint-plugin-prettier/4.2.1_afddd95fb7dd832efd05cfac2e17feb1:
     resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -3624,8 +3633,6 @@ packages:
       regex-not: 1.0.2
       snapdragon: 0.8.2
       to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
   /expand-tilde/2.0.2:
@@ -3681,8 +3688,6 @@ packages:
       regex-not: 1.0.2
       snapdragon: 0.8.2
       to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
   /fast-deep-equal/3.1.3:
@@ -4704,8 +4709,6 @@ packages:
       mime: 1.6.0
       needle: 3.1.0
       source-map: 0.6.1
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
   /levn/0.4.1:
@@ -4812,7 +4815,7 @@ packages:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
-  /lodash-unified/1.0.2_3ib2ivapxullxkx3xftsimdk7u:
+  /lodash-unified/1.0.2_da03a4540fbd16bbaafbb96724306afd:
     resolution: {integrity: sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g==}
     peerDependencies:
       '@types/lodash-es': '*'
@@ -5041,8 +5044,6 @@ packages:
       regex-not: 1.0.2
       snapdragon: 0.8.2
       to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
   /micromatch/4.0.5:
@@ -5183,8 +5184,6 @@ packages:
       regex-not: 1.0.2
       snapdragon: 0.8.2
       to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
   /natural-compare-lite/1.4.0:
@@ -5204,8 +5203,6 @@ packages:
       debug: 3.2.7
       iconv-lite: 0.6.3
       sax: 1.2.4
-    transitivePeerDependencies:
-      - supports-color
     dev: true
     optional: true
 
@@ -5606,7 +5603,7 @@ packages:
     dev: true
     optional: true
 
-  /pinia/2.0.23_d45o5shxrtvj6wh4y524t7cqnm:
+  /pinia/2.0.23_typescript@4.8.4+vue@3.2.44:
     resolution: {integrity: sha512-N15hFf4o5STrxpNrib1IEb1GOArvPYf1zPvQVRGOO1G1d74Ak0J0lVyalX/SmrzdT4Q0nlEFjbURsmBmIGUR5Q==}
     peerDependencies:
       '@vue/composition-api': ^1.4.0
@@ -6266,8 +6263,6 @@ packages:
       source-map: 0.5.7
       source-map-resolve: 0.5.3
       use: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
   /source-map-js/1.0.2:
@@ -6440,7 +6435,7 @@ packages:
     resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==}
     dev: true
 
-  /stylelint-config-html/1.1.0_a4i6jbpfaxelx4fvjhtlgvxx6i:
+  /stylelint-config-html/1.1.0_0711e485e505c8bbf0b549e6b356f7f2:
     resolution: {integrity: sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==}
     engines: {node: ^12 || >=14}
     peerDependencies:
@@ -6493,7 +6488,7 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@csstools/selector-specificity': 2.0.2_dvkg4kkb622mvceygg47xxdz3a
+      '@csstools/selector-specificity': 2.0.2_1d546e2941f6b4ca889831b9fbdc79d8
       balanced-match: 2.0.0
       colord: 2.9.3
       cosmiconfig: 7.0.1
@@ -6590,8 +6585,6 @@ packages:
       posthtml-svg-mode: 1.0.3
       query-string: 4.3.4
       traverse: 0.6.6
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
   /svg-tags/1.0.0:
@@ -6719,7 +6712,7 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /ts-node/10.9.1_fk6arlf3j7tudlucddpzvj2plq:
+  /ts-node/10.9.1_2abc08acbb4fe741ae8218df9aa74f5c:
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
@@ -6816,6 +6809,7 @@ packages:
     resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==}
     engines: {node: '>=4.2.0'}
     hasBin: true
+    dev: true
 
   /uglify-js/3.17.3:
     resolution: {integrity: sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==}
@@ -6866,7 +6860,7 @@ packages:
       '@antfu/utils': 0.6.0
       rollup: 3.2.5
       unplugin: 0.10.2
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
     dev: true
 
   /unplugin-vue-define-options/0.12.7:
@@ -6879,7 +6873,7 @@ packages:
       unplugin: 0.10.2
     dev: true
 
-  /unplugin-vue-macros/0.16.2_nch4vsbos5hmj7k4a4oy3znhuu:
+  /unplugin-vue-macros/0.16.2_688fcac82e974ec4fd5c071d8de5a7a5:
     resolution: {integrity: sha512-uNfjIXVUYBujbjJUcjXreE6zipZlPAIEMsx6bc/5qygwTfdvkJeHCAvvxrl0c8hdcT5/18OV2VDdwI60vCh56g==}
     engines: {node: '>=14.19.0'}
     peerDependencies:
@@ -6892,7 +6886,7 @@ packages:
       '@vue-macros/define-render': 0.13.8_vue@3.2.44
       '@vue-macros/define-slots': 0.0.5_vue@3.2.44
       '@vue-macros/hoist-static': 0.12.7
-      '@vue-macros/named-template': 0.0.5_vkxhlib7tgibcivdhj2bfsgnbi
+      '@vue-macros/named-template': 0.0.5_aaae75a03f99901122a33a7412c8cd0a
       '@vue-macros/setup-component': 0.12.7_rollup@3.2.5+vite@3.2.3
       '@vue-macros/setup-sfc': 0.12.7
       '@vue-macros/short-emits': 0.12.8
@@ -7008,7 +7002,7 @@ packages:
       chalk: 4.1.2
       debug: 4.3.4
       fs-extra: 10.1.0
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -7023,7 +7017,7 @@ packages:
       '@types/eslint': 8.4.6
       eslint: 8.27.0
       rollup: 2.79.1
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
     dev: true
 
   /vite-plugin-html/3.2.0_vite@3.2.3:
@@ -7043,7 +7037,7 @@ packages:
       html-minifier-terser: 6.1.0
       node-html-parser: 5.4.2
       pathe: 0.2.0
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
     dev: true
 
   /vite-plugin-purge-icons/0.9.1_vite@3.2.3:
@@ -7055,7 +7049,7 @@ packages:
       '@purge-icons/core': 0.9.1
       '@purge-icons/generated': 0.9.0
       rollup-plugin-purge-icons: 0.9.1
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -7073,7 +7067,7 @@ packages:
       fs-extra: 10.1.0
       magic-string: 0.25.9
       pathe: 0.2.0
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
     dev: true
 
   /vite-plugin-svg-icons/2.0.1_vite@3.2.3:
@@ -7089,7 +7083,7 @@ packages:
       pathe: 0.2.0
       svg-baker: 1.7.0
       svgo: 2.8.0
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -7102,13 +7096,13 @@ packages:
       '@windicss/plugin-utils': 1.8.8
       debug: 4.3.4
       kolorist: 1.6.0
-      vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi
+      vite: 3.2.3_@types+node@18.11.9+less@4.1.3
       windicss: 3.5.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite/3.2.3_mp5lu76ee5qtwstsyca37sdhqi:
+  /vite/3.2.3_@types+node@18.11.9+less@4.1.3:
     resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -7160,6 +7154,7 @@ packages:
         optional: true
     dependencies:
       vue: 3.2.44
+    dev: false
 
   /vue-eslint-parser/9.1.0_eslint@8.27.0:
     resolution: {integrity: sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==}
@@ -7190,6 +7185,7 @@ packages:
       '@intlify/vue-devtools': 9.2.2
       '@vue/devtools-api': 6.4.3
       vue: 3.2.44
+    dev: false
 
   /vue-router/4.1.6_vue@3.2.44:
     resolution: {integrity: sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==}
@@ -7236,6 +7232,7 @@ packages:
       '@vue/runtime-dom': 3.2.44
       '@vue/server-renderer': 3.2.44_vue@3.2.44
       '@vue/shared': 3.2.44
+    dev: false
 
   /vxe-table/4.3.5_vue@3.2.44+xe-utils@3.5.7:
     resolution: {integrity: sha512-JEvGAs7SBN1rWn5f2tkoRiXd/rAT7RfnDTTlFsHsTtASiUTKNTISI2WBsVeLkkNRTs0SXh6FgrYsIPO2soSBXA==}

+ 4 - 2
yudao-ui-admin-vue3/src/components/Verifition/src/api/index.ts

@@ -8,7 +8,8 @@ import request from './../utils/axios' //组件内部封装的axios
 //获取验证图片  以及token
 export function reqGet(data) {
   return request({
-    url: '/captcha/get',
+    // url: '/captcha/get',
+    url: '/admin-api/captcha/get', // 使用项目自定义的 /admin-api/ 前缀
     method: 'post',
     data
   })
@@ -17,7 +18,8 @@ export function reqGet(data) {
 //滑动或者点选验证
 export function reqCheck(data) {
   return request({
-    url: '/captcha/check',
+    // url: '/captcha/check',
+    url: '/admin-api/captcha/check', // 使用项目自定义的 /admin-api/ 前缀
     method: 'post',
     data
   })

+ 4 - 2
yudao-ui-admin/src/components/Verifition/api/index.js

@@ -8,7 +8,8 @@ import request from './../utils/axios' // 组件内部封装的axios
 // 获取验证图片  以及token
 export function reqGet(data) {
   return request({
-    url: '/captcha/get',
+    // url: '/captcha/get',
+    url: '/admin-api/captcha/get', // 使用项目自定义的 /admin-api/ 前缀
     method: 'post',
     data
   })
@@ -17,7 +18,8 @@ export function reqGet(data) {
 // 滑动或者点选验证
 export function reqCheck(data) {
   return request({
-    url: '/captcha/check',
+    // url: '/captcha/check',
+    url: '/admin-api/captcha/check', // 使用项目自定义的 /admin-api/ 前缀
     method: 'post',
     data
   })

Some files were not shown because too many files changed in this diff