root/alikeSCRM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改注册逻辑

Browse Source
This commit is contained in:
慕下 2024-03-29 16:17:52 +08:00
parent 5830c6a0ff
commit 246b72c50a
3 changed files with 1194 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1485
ruoyi-admin/src/main/resources/init-sql-script/rycrm-tenant-sample.sql
View File

File diff suppressed because it is too large Load Diff

6
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TenantRegisterService.java
View File

@ -99,8 +99,10 @@ public class TenantRegisterService {
tenantDatabaseDTO = new TenantDatabaseDTO();
tenantDatabaseDTO.setTenantDatabase(tenantDatabase);
tenantDatabaseDTO.setTenantName(form.tenantName);
tenantDatabaseDTO.setDbUser(tenantDatabaseUsername);
tenantDatabaseDTO.setDbPass(tenantDatabasePassword);
// tenantDatabaseDTO.setDbUser(tenantDatabaseUsername);
// tenantDatabaseDTO.setDbPass(tenantDatabasePassword);
tenantDatabaseDTO.setDbUser(username);
tenantDatabaseDTO.setDbPass(password);
tenantDatabaseDTO.setAdminName(form.adminName);
tenantDatabaseDTO.setAdminPass(form.adminPass);
String tenantUrl = getUrl() + tenantDatabaseDTO.tenantDatabase + "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";

2
ruoyi-ui/src/utils/request.js
View File

@ -17,7 +17,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
// 超时
timeout: 10000
timeout: 30000
})
// request拦截器