diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 0b466a1..768ffb3 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -38,9 +38,13 @@ + + + + - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java index ae1c3ec..adc205f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -113,7 +113,7 @@ public class SwaggerConfig // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题：若依管理系统_接口文档") + .title("标题：优势管理系统_接口文档") // 描述 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 355ad5d..88f5274 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,13 +1,13 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi + name: youshi # 版本 version: 3.8.7 # 版权年份 copyrightYear: 2024 # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: D:/youshi/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 511842b..d00d4a0 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -111,7 +111,7 @@ public class SecurityConfig .authorizeHttpRequests((requests) -> { permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - requests.antMatchers("/login", "/register", "/captchaImage").permitAll() + requests.antMatchers("/login", "/register", "/captchaImage","/sms").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISmsService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISmsService.java index 653b740..892f3c2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISmsService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISmsService.java @@ -25,5 +25,10 @@ public interface ISmsService { */ Boolean validationCode(String phone, String code); + /** + * 验证验证码 + * @param phone + * @return + */ void sendSmsOne(String phone); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsServiceImpl.java index 37f121d..b98ce25 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service.impl; import com.ruoyi.common.config.TencentCloudProperties; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.system.service.ISmsService; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest; @@ -66,6 +67,10 @@ public class SmsServiceImpl implements ISmsService { @Override public void sendSmsOne(String phone) { try { + /*验证手机号是否存在*/ + if(false){ + throw new ServiceException("手机号不存在，请联系管理员注册！"); + } String code = generateCode(); String[] phoneNumber = new String[]{phone}; String[] params = new String[]{code}; @@ -75,7 +80,7 @@ public class SmsServiceImpl implements ISmsService { redisTemplate.opsForValue().set(phone, code); } } catch (TencentCloudSDKException e) { - e.printStackTrace(); + throw new ServiceException(e.getMessage()); } } diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index e6fa101..b31b06d 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,8 +1,8 @@ { "name": "ruoyi", "version": "3.8.7", - "description": "若依管理系统", - "author": "若依", + "description": "优势管理系统", + "author": "优势", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", diff --git a/ruoyi-ui/src/views/market/brand/index.vue b/ruoyi-ui/src/views/market/brand/index.vue index b54c56d..2a0f81c 100644 --- a/ruoyi-ui/src/views/market/brand/index.vue +++ b/ruoyi-ui/src/views/market/brand/index.vue @@ -1,28 +1,43 @@