Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
计算机应用开发
后
后端
J
Java
后台管理
Ruoyi Vue Pro
提交
61a00b84
R
Ruoyi Vue Pro
项目概览
计算机应用开发
/
后端
/
Java
/
后台管理
/
Ruoyi Vue Pro
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Ruoyi Vue Pro
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
61a00b84
编写于
3月 10, 2022
作者:
公众号-芋道源码
提交者:
Gitee
3月 10, 2022
浏览文件
操作
浏览文件
下载
差异文件
!93 增加 ProjectReactor 脚本,实现一键修改包名
Merge pull request !93 from 芋道源码/feature/1.6.1
上级
c9780d59
716bbb98
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
105 addition
and
25 deletion
+105
-25
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/util/TenantUtils.java
...iocoder/yudao/framework/tenant/core/util/TenantUtils.java
+0
-1
yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceTest.java
...oder/yudao/module/infra/service/file/FileServiceTest.java
+4
-4
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
...o/module/system/controller/admin/user/UserController.java
+1
-1
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
...module/system/service/errorcode/ErrorCodeServiceTest.java
+7
-7
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceTest.java
...dao/module/system/service/sms/SmsTemplateServiceTest.java
+4
-4
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java
...o/module/system/service/tenant/TenantServiceImplTest.java
+2
-2
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/user/UserServiceImplTest.java
...yudao/module/system/service/user/UserServiceImplTest.java
+6
-6
yudao-server/src/test/java/cn/iocoder/yudao/ProjectReactor.java
...server/src/test/java/cn/iocoder/yudao/ProjectReactor.java
+81
-0
未找到文件。
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/util/TenantUtils.java
浏览文件 @
61a00b84
...
@@ -32,5 +32,4 @@ public class TenantUtils {
...
@@ -32,5 +32,4 @@ public class TenantUtils {
}
}
}
}
}
}
yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceTest.java
浏览文件 @
61a00b84
...
@@ -38,7 +38,7 @@ public class FileServiceTest extends BaseDbUnitTest {
...
@@ -38,7 +38,7 @@ public class FileServiceTest extends BaseDbUnitTest {
public
void
testGetFilePage
()
{
public
void
testGetFilePage
()
{
// mock 数据
// mock 数据
FileDO
dbFile
=
randomPojo
(
FileDO
.
class
,
o
->
{
// 等会查询到
FileDO
dbFile
=
randomPojo
(
FileDO
.
class
,
o
->
{
// 等会查询到
o
.
setId
(
"yu
dao
"
);
o
.
setId
(
"yu
nai
"
);
o
.
setType
(
"jpg"
);
o
.
setType
(
"jpg"
);
o
.
setCreateTime
(
buildTime
(
2021
,
1
,
15
));
o
.
setCreateTime
(
buildTime
(
2021
,
1
,
15
));
});
});
...
@@ -47,17 +47,17 @@ public class FileServiceTest extends BaseDbUnitTest {
...
@@ -47,17 +47,17 @@ public class FileServiceTest extends BaseDbUnitTest {
fileMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbFile
,
o
->
o
.
setId
(
"tudou"
)));
fileMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbFile
,
o
->
o
.
setId
(
"tudou"
)));
// 测试 type 不匹配
// 测试 type 不匹配
fileMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbFile
,
o
->
{
fileMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbFile
,
o
->
{
o
.
setId
(
"yu
dao
02"
);
o
.
setId
(
"yu
nai
02"
);
o
.
setType
(
"png"
);
o
.
setType
(
"png"
);
}));
}));
// 测试 createTime 不匹配
// 测试 createTime 不匹配
fileMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbFile
,
o
->
{
fileMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbFile
,
o
->
{
o
.
setId
(
"yu
dao
03"
);
o
.
setId
(
"yu
nai
03"
);
o
.
setCreateTime
(
buildTime
(
2020
,
1
,
15
));
o
.
setCreateTime
(
buildTime
(
2020
,
1
,
15
));
}));
}));
// 准备参数
// 准备参数
FilePageReqVO
reqVO
=
new
FilePageReqVO
();
FilePageReqVO
reqVO
=
new
FilePageReqVO
();
reqVO
.
setId
(
"yu
dao
"
);
reqVO
.
setId
(
"yu
nai
"
);
reqVO
.
setType
(
"jp"
);
reqVO
.
setType
(
"jp"
);
reqVO
.
setBeginCreateTime
(
buildTime
(
2021
,
1
,
10
));
reqVO
.
setBeginCreateTime
(
buildTime
(
2021
,
1
,
10
));
reqVO
.
setEndCreateTime
(
buildTime
(
2021
,
1
,
20
));
reqVO
.
setEndCreateTime
(
buildTime
(
2021
,
1
,
20
));
...
...
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
浏览文件 @
61a00b84
...
@@ -163,7 +163,7 @@ public class UserController {
...
@@ -163,7 +163,7 @@ public class UserController {
public
void
importTemplate
(
HttpServletResponse
response
)
throws
IOException
{
public
void
importTemplate
(
HttpServletResponse
response
)
throws
IOException
{
// 手动创建导出 demo
// 手动创建导出 demo
List
<
UserImportExcelVO
>
list
=
Arrays
.
asList
(
List
<
UserImportExcelVO
>
list
=
Arrays
.
asList
(
UserImportExcelVO
.
builder
().
username
(
"yu
dao"
).
deptId
(
1L
).
email
(
"yudao
@iocoder.cn"
).
mobile
(
"15601691300"
)
UserImportExcelVO
.
builder
().
username
(
"yu
nai"
).
deptId
(
1L
).
email
(
"yunai
@iocoder.cn"
).
mobile
(
"15601691300"
)
.
nickname
(
"芋道"
).
status
(
CommonStatusEnum
.
ENABLE
.
getStatus
()).
sex
(
SexEnum
.
MALE
.
getSex
()).
build
(),
.
nickname
(
"芋道"
).
status
(
CommonStatusEnum
.
ENABLE
.
getStatus
()).
sex
(
SexEnum
.
MALE
.
getSex
()).
build
(),
UserImportExcelVO
.
builder
().
username
(
"yuanma"
).
deptId
(
2L
).
email
(
"yuanma@iocoder.cn"
).
mobile
(
"15601701300"
)
UserImportExcelVO
.
builder
().
username
(
"yuanma"
).
deptId
(
2L
).
email
(
"yuanma@iocoder.cn"
).
mobile
(
"15601701300"
)
.
nickname
(
"源码"
).
status
(
CommonStatusEnum
.
DISABLE
.
getStatus
()).
sex
(
SexEnum
.
FEMALE
.
getSex
()).
build
()
.
nickname
(
"源码"
).
status
(
CommonStatusEnum
.
DISABLE
.
getStatus
()).
sex
(
SexEnum
.
FEMALE
.
getSex
()).
build
()
...
...
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
浏览文件 @
61a00b84
...
@@ -92,9 +92,9 @@ public class ErrorCodeServiceTest extends BaseDbUnitTest {
...
@@ -92,9 +92,9 @@ public class ErrorCodeServiceTest extends BaseDbUnitTest {
// 准备参数
// 准备参数
ErrorCodePageReqVO
reqVO
=
new
ErrorCodePageReqVO
();
ErrorCodePageReqVO
reqVO
=
new
ErrorCodePageReqVO
();
reqVO
.
setType
(
ErrorCodeTypeEnum
.
AUTO_GENERATION
.
getType
());
reqVO
.
setType
(
ErrorCodeTypeEnum
.
AUTO_GENERATION
.
getType
());
reqVO
.
setApplicationName
(
"
yudao
"
);
reqVO
.
setApplicationName
(
"
tu
"
);
reqVO
.
setCode
(
1
);
reqVO
.
setCode
(
1
);
reqVO
.
setMessage
(
"
yu
"
);
reqVO
.
setMessage
(
"
ma
"
);
reqVO
.
setBeginCreateTime
(
buildTime
(
2020
,
11
,
1
));
reqVO
.
setBeginCreateTime
(
buildTime
(
2020
,
11
,
1
));
reqVO
.
setEndCreateTime
(
buildTime
(
2020
,
11
,
30
));
reqVO
.
setEndCreateTime
(
buildTime
(
2020
,
11
,
30
));
...
@@ -112,16 +112,16 @@ public class ErrorCodeServiceTest extends BaseDbUnitTest {
...
@@ -112,16 +112,16 @@ public class ErrorCodeServiceTest extends BaseDbUnitTest {
private
ErrorCodeDO
initGetErrorCodePage
()
{
private
ErrorCodeDO
initGetErrorCodePage
()
{
ErrorCodeDO
dbErrorCode
=
randomInfErrorCodeDO
(
o
->
{
// 等会查询到
ErrorCodeDO
dbErrorCode
=
randomInfErrorCodeDO
(
o
->
{
// 等会查询到
o
.
setType
(
ErrorCodeTypeEnum
.
AUTO_GENERATION
.
getType
());
o
.
setType
(
ErrorCodeTypeEnum
.
AUTO_GENERATION
.
getType
());
o
.
setApplicationName
(
"
yudaoyuanma
"
);
o
.
setApplicationName
(
"
tudou
"
);
o
.
setCode
(
1
);
o
.
setCode
(
1
);
o
.
setMessage
(
"yu
dao
"
);
o
.
setMessage
(
"yu
anma
"
);
o
.
setCreateTime
(
buildTime
(
2020
,
11
,
11
));
o
.
setCreateTime
(
buildTime
(
2020
,
11
,
11
));
});
});
errorCodeMapper
.
insert
(
dbErrorCode
);
errorCodeMapper
.
insert
(
dbErrorCode
);
// 测试 type 不匹配
// 测试 type 不匹配
errorCodeMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbErrorCode
,
o
->
o
.
setType
(
ErrorCodeTypeEnum
.
MANUAL_OPERATION
.
getType
())));
errorCodeMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbErrorCode
,
o
->
o
.
setType
(
ErrorCodeTypeEnum
.
MANUAL_OPERATION
.
getType
())));
// 测试 applicationName 不匹配
// 测试 applicationName 不匹配
errorCodeMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbErrorCode
,
o
->
o
.
setApplicationName
(
"yu
nai
"
)));
errorCodeMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbErrorCode
,
o
->
o
.
setApplicationName
(
"yu
an
"
)));
// 测试 code 不匹配
// 测试 code 不匹配
errorCodeMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbErrorCode
,
o
->
o
.
setCode
(
2
)));
errorCodeMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbErrorCode
,
o
->
o
.
setCode
(
2
)));
// 测试 message 不匹配
// 测试 message 不匹配
...
@@ -138,9 +138,9 @@ public class ErrorCodeServiceTest extends BaseDbUnitTest {
...
@@ -138,9 +138,9 @@ public class ErrorCodeServiceTest extends BaseDbUnitTest {
// 准备参数
// 准备参数
ErrorCodeExportReqVO
reqVO
=
new
ErrorCodeExportReqVO
();
ErrorCodeExportReqVO
reqVO
=
new
ErrorCodeExportReqVO
();
reqVO
.
setType
(
ErrorCodeTypeEnum
.
AUTO_GENERATION
.
getType
());
reqVO
.
setType
(
ErrorCodeTypeEnum
.
AUTO_GENERATION
.
getType
());
reqVO
.
setApplicationName
(
"
yudao
"
);
reqVO
.
setApplicationName
(
"
tu
"
);
reqVO
.
setCode
(
1
);
reqVO
.
setCode
(
1
);
reqVO
.
setMessage
(
"
yu
"
);
reqVO
.
setMessage
(
"
ma
"
);
reqVO
.
setBeginCreateTime
(
buildTime
(
2020
,
11
,
1
));
reqVO
.
setBeginCreateTime
(
buildTime
(
2020
,
11
,
1
));
reqVO
.
setEndCreateTime
(
buildTime
(
2020
,
11
,
30
));
reqVO
.
setEndCreateTime
(
buildTime
(
2020
,
11
,
30
));
...
...
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceTest.java
浏览文件 @
61a00b84
...
@@ -201,7 +201,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
...
@@ -201,7 +201,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
SmsTemplateDO
dbSmsTemplate
=
randomPojo
(
SmsTemplateDO
.
class
,
o
->
{
// 等会查询到
SmsTemplateDO
dbSmsTemplate
=
randomPojo
(
SmsTemplateDO
.
class
,
o
->
{
// 等会查询到
o
.
setType
(
SmsTemplateTypeEnum
.
PROMOTION
.
getType
());
o
.
setType
(
SmsTemplateTypeEnum
.
PROMOTION
.
getType
());
o
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
o
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
o
.
setCode
(
"
yudaoyuanma
"
);
o
.
setCode
(
"
tudou
"
);
o
.
setContent
(
"芋道源码"
);
o
.
setContent
(
"芋道源码"
);
o
.
setApiTemplateId
(
"yunai"
);
o
.
setApiTemplateId
(
"yunai"
);
o
.
setChannelId
(
1L
);
o
.
setChannelId
(
1L
);
...
@@ -226,7 +226,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
...
@@ -226,7 +226,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
SmsTemplatePageReqVO
reqVO
=
new
SmsTemplatePageReqVO
();
SmsTemplatePageReqVO
reqVO
=
new
SmsTemplatePageReqVO
();
reqVO
.
setType
(
SmsTemplateTypeEnum
.
PROMOTION
.
getType
());
reqVO
.
setType
(
SmsTemplateTypeEnum
.
PROMOTION
.
getType
());
reqVO
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
reqVO
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
reqVO
.
setCode
(
"
yudao
"
);
reqVO
.
setCode
(
"
tu
"
);
reqVO
.
setContent
(
"芋道"
);
reqVO
.
setContent
(
"芋道"
);
reqVO
.
setApiTemplateId
(
"yu"
);
reqVO
.
setApiTemplateId
(
"yu"
);
reqVO
.
setChannelId
(
1L
);
reqVO
.
setChannelId
(
1L
);
...
@@ -247,7 +247,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
...
@@ -247,7 +247,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
SmsTemplateDO
dbSmsTemplate
=
randomPojo
(
SmsTemplateDO
.
class
,
o
->
{
// 等会查询到
SmsTemplateDO
dbSmsTemplate
=
randomPojo
(
SmsTemplateDO
.
class
,
o
->
{
// 等会查询到
o
.
setType
(
SmsTemplateTypeEnum
.
PROMOTION
.
getType
());
o
.
setType
(
SmsTemplateTypeEnum
.
PROMOTION
.
getType
());
o
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
o
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
o
.
setCode
(
"
yudaoyuanma
"
);
o
.
setCode
(
"
tudou
"
);
o
.
setContent
(
"芋道源码"
);
o
.
setContent
(
"芋道源码"
);
o
.
setApiTemplateId
(
"yunai"
);
o
.
setApiTemplateId
(
"yunai"
);
o
.
setChannelId
(
1L
);
o
.
setChannelId
(
1L
);
...
@@ -272,7 +272,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
...
@@ -272,7 +272,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
SmsTemplateExportReqVO
reqVO
=
new
SmsTemplateExportReqVO
();
SmsTemplateExportReqVO
reqVO
=
new
SmsTemplateExportReqVO
();
reqVO
.
setType
(
SmsTemplateTypeEnum
.
PROMOTION
.
getType
());
reqVO
.
setType
(
SmsTemplateTypeEnum
.
PROMOTION
.
getType
());
reqVO
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
reqVO
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
reqVO
.
setCode
(
"
yudao
"
);
reqVO
.
setCode
(
"
tu
"
);
reqVO
.
setContent
(
"芋道"
);
reqVO
.
setContent
(
"芋道"
);
reqVO
.
setApiTemplateId
(
"yu"
);
reqVO
.
setApiTemplateId
(
"yu"
);
reqVO
.
setChannelId
(
1L
);
reqVO
.
setChannelId
(
1L
);
...
...
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java
浏览文件 @
61a00b84
...
@@ -176,7 +176,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
...
@@ -176,7 +176,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
}),
eq
(
RoleTypeEnum
.
SYSTEM
.
getType
()))).
thenReturn
(
200L
);
}),
eq
(
RoleTypeEnum
.
SYSTEM
.
getType
()))).
thenReturn
(
200L
);
// mock 用户 300L
// mock 用户 300L
when
(
userService
.
createUser
(
argThat
(
user
->
{
when
(
userService
.
createUser
(
argThat
(
user
->
{
assertEquals
(
"yu
dao
"
,
user
.
getUsername
());
assertEquals
(
"yu
nai
"
,
user
.
getUsername
());
assertEquals
(
"yuanma"
,
user
.
getPassword
());
assertEquals
(
"yuanma"
,
user
.
getPassword
());
assertEquals
(
"芋道"
,
user
.
getNickname
());
assertEquals
(
"芋道"
,
user
.
getNickname
());
assertEquals
(
"15601691300"
,
user
.
getMobile
());
assertEquals
(
"15601691300"
,
user
.
getMobile
());
...
@@ -190,7 +190,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
...
@@ -190,7 +190,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
o
.
setPackageId
(
100L
);
o
.
setPackageId
(
100L
);
o
.
setStatus
(
randomCommonStatus
());
o
.
setStatus
(
randomCommonStatus
());
o
.
setDomain
(
"https://www.iocoder.cn"
);
o
.
setDomain
(
"https://www.iocoder.cn"
);
o
.
setUsername
(
"yu
dao
"
);
o
.
setUsername
(
"yu
nai
"
);
o
.
setPassword
(
"yuanma"
);
o
.
setPassword
(
"yuanma"
);
});
});
...
...
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/user/UserServiceImplTest.java
浏览文件 @
61a00b84
...
@@ -175,12 +175,12 @@ public class UserServiceImplTest extends BaseDbUnitTest {
...
@@ -175,12 +175,12 @@ public class UserServiceImplTest extends BaseDbUnitTest {
@Test
@Test
public
void
testUpdateUserPassword_success
()
{
public
void
testUpdateUserPassword_success
()
{
// mock 数据
// mock 数据
AdminUserDO
dbUser
=
randomAdminUserDO
(
o
->
o
.
setPassword
(
"encode:
yudao
"
));
AdminUserDO
dbUser
=
randomAdminUserDO
(
o
->
o
.
setPassword
(
"encode:
tudou
"
));
userMapper
.
insert
(
dbUser
);
userMapper
.
insert
(
dbUser
);
// 准备参数
// 准备参数
Long
userId
=
dbUser
.
getId
();
Long
userId
=
dbUser
.
getId
();
UserProfileUpdatePasswordReqVO
reqVO
=
randomPojo
(
UserProfileUpdatePasswordReqVO
.
class
,
o
->
{
UserProfileUpdatePasswordReqVO
reqVO
=
randomPojo
(
UserProfileUpdatePasswordReqVO
.
class
,
o
->
{
o
.
setOldPassword
(
"
yudao
"
);
o
.
setOldPassword
(
"
tudou
"
);
o
.
setNewPassword
(
"yuanma"
);
o
.
setNewPassword
(
"yuanma"
);
});
});
// mock 方法
// mock 方法
...
@@ -272,7 +272,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
...
@@ -272,7 +272,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
AdminUserDO
dbUser
=
initGetUserPageData
();
AdminUserDO
dbUser
=
initGetUserPageData
();
// 准备参数
// 准备参数
UserPageReqVO
reqVO
=
new
UserPageReqVO
();
UserPageReqVO
reqVO
=
new
UserPageReqVO
();
reqVO
.
setUsername
(
"
yudao
"
);
reqVO
.
setUsername
(
"
tu
"
);
reqVO
.
setMobile
(
"1560"
);
reqVO
.
setMobile
(
"1560"
);
reqVO
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
reqVO
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
reqVO
.
setBeginTime
(
buildTime
(
2020
,
12
,
1
));
reqVO
.
setBeginTime
(
buildTime
(
2020
,
12
,
1
));
...
@@ -296,7 +296,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
...
@@ -296,7 +296,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
AdminUserDO
dbUser
=
initGetUserPageData
();
AdminUserDO
dbUser
=
initGetUserPageData
();
// 准备参数
// 准备参数
UserExportReqVO
reqVO
=
new
UserExportReqVO
();
UserExportReqVO
reqVO
=
new
UserExportReqVO
();
reqVO
.
setUsername
(
"
yudao
"
);
reqVO
.
setUsername
(
"
tu
"
);
reqVO
.
setMobile
(
"1560"
);
reqVO
.
setMobile
(
"1560"
);
reqVO
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
reqVO
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
reqVO
.
setBeginTime
(
buildTime
(
2020
,
12
,
1
));
reqVO
.
setBeginTime
(
buildTime
(
2020
,
12
,
1
));
...
@@ -319,7 +319,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
...
@@ -319,7 +319,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
private
AdminUserDO
initGetUserPageData
()
{
private
AdminUserDO
initGetUserPageData
()
{
// mock 数据
// mock 数据
AdminUserDO
dbUser
=
randomAdminUserDO
(
o
->
{
// 等会查询到
AdminUserDO
dbUser
=
randomAdminUserDO
(
o
->
{
// 等会查询到
o
.
setUsername
(
"
yudaoyuanma
"
);
o
.
setUsername
(
"
tudou
"
);
o
.
setMobile
(
"15601691300"
);
o
.
setMobile
(
"15601691300"
);
o
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
o
.
setStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
o
.
setCreateTime
(
buildTime
(
2020
,
12
,
12
));
o
.
setCreateTime
(
buildTime
(
2020
,
12
,
12
));
...
@@ -327,7 +327,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
...
@@ -327,7 +327,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
});
});
userMapper
.
insert
(
dbUser
);
userMapper
.
insert
(
dbUser
);
// 测试 username 不匹配
// 测试 username 不匹配
userMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbUser
,
o
->
o
.
setUsername
(
"
yuanma
"
)));
userMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbUser
,
o
->
o
.
setUsername
(
"
dou
"
)));
// 测试 mobile 不匹配
// 测试 mobile 不匹配
userMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbUser
,
o
->
o
.
setMobile
(
"18818260888"
)));
userMapper
.
insert
(
ObjectUtils
.
cloneIgnoreId
(
dbUser
,
o
->
o
.
setMobile
(
"18818260888"
)));
// 测试 status 不匹配
// 测试 status 不匹配
...
...
yudao-server/src/test/java/cn/iocoder/yudao/ProjectReactor.java
0 → 100644
浏览文件 @
61a00b84
package
cn.iocoder.yudao
;
import
cn.hutool.core.io.FileUtil
;
import
cn.hutool.core.util.StrUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.io.FileUtils
;
import
java.io.File
;
import
java.nio.charset.StandardCharsets
;
import
java.util.Collection
;
/**
* 项目修改器,一键替换 Maven 的 groupId、artifactId,项目的 package 等
*
* 通过修改 groupIdNew、artifactIdNew、projectBaseDirNew 三个变量
*
* @author 芋道源码
*/
@Slf4j
public
class
ProjectReactor
{
private
static
final
String
GROUP_ID
=
"cn.iocoder.boot"
;
private
static
final
String
ARTIFACT_ID
=
"yudao"
;
private
static
final
String
PACKAGE_NAME
=
"cn.iocoder.yudao"
;
public
static
void
main
(
String
[]
args
)
{
String
projectBaseDir
=
getProjectBaseDir
();
// ========== 配置,需要你手动修改 ==========
String
groupIdNew
=
"cn.star.gg"
;
String
artifactIdNew
=
"star"
;
String
packageNameNew
=
"cn.start.pp"
;
String
projectBaseDirNew
=
projectBaseDir
+
"-new"
;
// ========== ==========
// 获得需要复制的文件
log
.
info
(
"[main][开始获得需要重写的文件]"
);
Collection
<
File
>
files
=
listFiles
(
projectBaseDir
);
log
.
info
(
"[main][需要重写的文件数量:{},预计需要 5-10 秒]"
,
files
.
size
());
// 写入文件
files
.
forEach
(
file
->
{
String
content
=
replaceFileContent
(
file
,
groupIdNew
,
artifactIdNew
,
packageNameNew
);
writeFile
(
file
,
content
,
projectBaseDir
,
projectBaseDirNew
,
packageNameNew
,
artifactIdNew
);
});
log
.
info
(
"[main][重写完成]"
);
}
private
static
String
getProjectBaseDir
()
{
// noinspection ConstantConditions
return
StrUtil
.
subBefore
(
ProjectReactor
.
class
.
getClassLoader
().
getResource
(
""
).
getFile
(),
"/yudao-server"
,
false
);
}
private
static
Collection
<
File
>
listFiles
(
String
projectBaseDir
)
{
Collection
<
File
>
files
=
FileUtils
.
listFiles
(
new
File
(
projectBaseDir
),
null
,
true
);
files
.
removeIf
(
file
->
file
.
getPath
().
contains
(
"/target/"
));
files
.
removeIf
(
file
->
file
.
getPath
().
contains
(
"/node_modules/"
));
files
.
removeIf
(
file
->
file
.
getPath
().
contains
(
"/.idea/"
));
// 移除 IDEA 自身的文件
files
.
removeIf
(
file
->
file
.
getPath
().
contains
(
"/.git/"
));
// 移除 Git 自身的文件
files
.
removeIf
(
file
->
file
.
getPath
().
contains
(
"/dist/"
));
// 移除 Node 编译出来的
return
files
;
}
private
static
String
replaceFileContent
(
File
file
,
String
groupIdNew
,
String
artifactIdNew
,
String
packageNameNew
)
{
return
FileUtil
.
readString
(
file
,
StandardCharsets
.
UTF_8
)
.
replaceAll
(
GROUP_ID
,
groupIdNew
)
.
replaceAll
(
PACKAGE_NAME
,
packageNameNew
)
.
replaceAll
(
ARTIFACT_ID
,
artifactIdNew
)
// 必须放在最后替换,因为 ARTIFACT_ID 太短!
.
replaceAll
(
StrUtil
.
upperFirst
(
ARTIFACT_ID
),
StrUtil
.
upperFirst
(
artifactIdNew
));
}
private
static
void
writeFile
(
File
file
,
String
fileContent
,
String
projectBaseDir
,
String
projectBaseDirNew
,
String
packageNameNew
,
String
artifactIdNew
)
{
String
newPath
=
file
.
getPath
().
replace
(
projectBaseDir
,
projectBaseDirNew
)
// 新目录
.
replace
(
PACKAGE_NAME
.
replaceAll
(
"\\."
,
"/"
),
packageNameNew
.
replaceAll
(
"\\."
,
"/"
))
.
replace
(
ARTIFACT_ID
,
artifactIdNew
)
//
.
replaceAll
(
StrUtil
.
upperFirst
(
ARTIFACT_ID
),
StrUtil
.
upperFirst
(
artifactIdNew
));
FileUtil
.
writeUtf8String
(
fileContent
,
newPath
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录