Skip to content

Commit

Permalink
修复单元测试
Browse files Browse the repository at this point in the history
  • Loading branch information
@entropy-cloud
entropy-cloud committed Nov 2, 2023
1 parent 9f8c133 commit 88aa20b
Show file tree
Hide file tree
Showing 74 changed files with 10,006 additions and 9,316 deletions.
4 changes: 1 addition & 3 deletions ...ice/cases/io/nop/auth/service/TestGraphQLMissing/testFetch/input/tables/nop_auth_user.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
3a756228b1c94379a137a5a1e639fdf6,sss,$2a$10$q4jjMGiq50NMXT2pf8M00.Ia9gi6xNn/59xk8xvXFz.VGmbk9pHEy,4a7902dbf21a4ed89103ed4f30d8fae1,vvv,,733e3a990d8641faa77199b3b4abb270,1,,,,,0,,1,1,,,,,,,,a9a3707f91734fcc93d57c981db5d623,,,0,0,sys,2022-11-13 20:26:20.812,sys,2022-11-13 20:26:20.812,
c5be2b19d1bf4675a189f54fa5ce1c80,nop,$2a$10$xaSjysAcBGpLD0d.sjhmmur7vx83y1qtagCsnksk1uVCot5E6pIDe,5339798b19e848a681ea9383c8e19211,Nopper,,0,1,,,,,0,,1,1,,,,,,,,33,,,0,1,sys,2022-11-13 14:14:31.579,sys,2022-11-13 14:19:53.88,
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,REL_DEPT_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,MANAGER_ID,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
53 changes: 2 additions & 51 deletions ...auth-service/cases/io/nop/auth/service/TestGraphQLMissing/testFetch/output/response.json5
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,9 @@
{
"data": {
"NopAuthUser__findPage": {
"total": 2,
"total": 0,
"page": 1,
"items": [
{
"id": "3a756228b1c94379a137a5a1e639fdf6",
"userId": "3a756228b1c94379a137a5a1e639fdf6",
"userName": "sss",
"nickName": "vvv",
"dept": null,
"deptId": null,
"gender": 1,
"gender_label": "1-男",
"phone": null,
"birthday": null,
"userType": 1,
"userType_label": "1-普通用户",
"status": 1,
"status_label": "1-正常",
"expireAt": null,
"changePwdAtLogin": null,
"realName": null,
"workNo": null,
"positionId": "a9a3707f91734fcc93d57c981db5d623",
"telephone": null,
"position": {
"name": "abc"
}
},
{
"id": "c5be2b19d1bf4675a189f54fa5ce1c80",
"userId": "c5be2b19d1bf4675a189f54fa5ce1c80",
"userName": "nop",
"nickName": "Nopper",
"dept": null,
"deptId": null,
"gender": 1,
"gender_label": "1-男",
"phone": null,
"birthday": null,
"userType": 1,
"userType_label": "1-普通用户",
"status": 1,
"status_label": "1-正常",
"expireAt": null,
"changePwdAtLogin": null,
"realName": null,
"workNo": null,
"positionId": "33",
"telephone": null,
"position": null
}
]
"items": []
}
}
}
1 change: 1 addition & 0 deletions ...ce/cases/io/nop/auth/service/TestLoginApi/testCreateUser/input/tables/nop_auth_tenant.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TENANT_ID,NAME,BEGIN_TIME,END_TIME,STATUS,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
2 changes: 1 addition & 1 deletion ...vice/cases/io/nop/auth/service/TestLoginApi/testCreateUser/input/tables/nop_auth_user.csv
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,GENDER,AVATAR,EMAIL,PHONE,USER_TYPE,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,STATUS,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,REL_DEPT_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,MANAGER_ID,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
27 changes: 20 additions & 7 deletions ...-auth-service/cases/io/nop/auth/service/TestLoginApi/testCreateUser/output/response.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,40 @@
"nickName": "autoTestNick",
"openId": "@var:NopAuthUser@openId",
"gender": 1,
"gender_label": "1-男",
"phoneVerified": 0,
"userType": 1,
"userType_label": "1-普通用户",
"status": 1,
"status_label": "1-正常",
"delFlag": 0,
"version": 0,
"tenantId": "0",
"tenantId_label": null,
"createdBy": "autotest-ref",
"createTime": "@var:NopAuthUser@createTime",
"createTime": "@var:NopAuthUser@updateTime",
"updatedBy": "autotest-ref",
"updateTime": "@var:NopAuthUser@createTime",
"gender_label": "1-男",
"userType_label": "1-普通用户",
"status_label": "1-正常",
"updateTime": "@var:NopAuthUser@updateTime",
"id": "@var:NopAuthUser@userId",
"deptId": null,
"relDeptId": null,
"avatar": null,
"email": null,
"emailVerified": null,
"phone": null,
"birthday": null,
"idType": null,
"idNbr": null,
"expireAt": null,
"pwdUpdateTime": null,
"changePwdAtLogin": null,
"remark": null,
"*" : "*"
"realName": null,
"managerId": null,
"workNo": null,
"positionId": null,
"telephone": null,
"clientId": null,
"remark": null
},
"status": 0
}
4 changes: 2 additions & 2 deletions ...ice/cases/io/nop/auth/service/TestLoginApi/testCreateUser/output/tables/nop_auth_user.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
_chgType,USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,GENDER,AVATAR,EMAIL,PHONE,USER_TYPE,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,STATUS,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
A,@var:NopAuthUser@userId,auto_test1,@var:NopAuthUser@password,@var:NopAuthUser@salt,autoTestNick,,@var:NopAuthUser@openId,1,,,,1,,,,,,1,0,0,autotest-ref,*,autotest-ref,*,
_chgType,USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,REL_DEPT_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,MANAGER_ID,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
A,@var:NopAuthUser@userId,auto_test1,@var:NopAuthUser@password,@var:NopAuthUser@salt,autoTestNick,,@var:NopAuthUser@openId,,1,,,,,0,,1,1,,,,,,,,,,,,0,0,0,autotest-ref,*,autotest-ref,*,
11 changes: 11 additions & 0 deletions ...h-service/cases/io/nop/auth/service/TestLoginApi/testLogin/input/request-createUser.json5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
data: {
data: {
userName: "auto_test1",
password: "auto_test1",
nickName: "autoTestNick",
gender: "1",
userType: "1"
}
}
}
2 changes: 1 addition & 1 deletion ...ervice/cases/io/nop/auth/service/TestLoginApi/testLogin/input/tables/nop_auth_session.csv
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SESSION_ID,USER_ID,LOGIN_ADDR,LOGIN_DEVICE,LOGIN_APP,LOGIN_OS,LOGIN_TIME,LOGIN_TYPE,LOGOUT_TIME,LOGOUT_TYPE,LAST_ACCESS_TIME,VERSION,CREATED_BY,CREATE_TIME,REMARK
SESSION_ID,USER_ID,USER_NAME,LOGIN_ADDR,LOGIN_DEVICE,LOGIN_APP,LOGIN_OS,LOGIN_TIME,LOGIN_TYPE,LOGOUT_TIME,LOGOUT_TYPE,LOGOUT_BY,LAST_ACCESS_TIME,VERSION,CREATED_BY,CREATE_TIME,REMARK
1 change: 1 addition & 0 deletions ...service/cases/io/nop/auth/service/TestLoginApi/testLogin/input/tables/nop_auth_tenant.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TENANT_ID,NAME,BEGIN_TIME,END_TIME,STATUS,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
3 changes: 1 addition & 2 deletions ...h-service/cases/io/nop/auth/service/TestLoginApi/testLogin/input/tables/nop_auth_user.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,GENDER,AVATAR,EMAIL,PHONE,USER_TYPE,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,STATUS,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
067e0f1a03cf4ae28f71b606de700716,auto_test1,$2a$10$39JNzjZLqGTSrfRJ1m1KY.gU31UV5lML7oKzG0Mmrns7HjL2tdudm,353cc0a89fb9400ca6968e3322df5fea,autoTestNick,,ee50d2a24a164afaa4abb57534ddbdcc,1,,,,1,,,,,,1,0,0,autotest-ref,2022-09-08 19:57:55.0,autotest-ref,2022-09-08 19:57:55.0,
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,REL_DEPT_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,MANAGER_ID,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
8 changes: 4 additions & 4 deletions ...h/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin/output/response.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"tokenType": "bearer",
"userInfo": {
"locale": "zh-CN",
"nickName": "autoTestNick",
"openId": "@var:NopAuthUser@openId",
"roles": [],
"tenantId": null,
"tenantId": "0",
"timeZone": null,
"openId": "*",
"userName": "auto_test1",
"nickName": "autoTestNick"
"userName": "auto_test1"
}
},
"status": 0
Expand Down
4 changes: 2 additions & 2 deletions ...rvice/cases/io/nop/auth/service/TestLoginApi/testLogin/output/tables/nop_auth_session.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
_chgType,SESSION_ID,USER_ID,LOGIN_ADDR,LOGIN_DEVICE,LOGIN_APP,LOGIN_OS,LOGIN_TIME,LOGIN_TYPE,LOGOUT_TIME,LOGOUT_TYPE,LAST_ACCESS_TIME,VERSION,CREATED_BY,CREATE_TIME,REMARK
A,@var:NopAuthSession@sessionId,067e0f1a03cf4ae28f71b606de700716,,,,,@var:NopAuthSession@loginTime,1,,0,,0,autotest-ref,*,
_chgType,SESSION_ID,USER_ID,USER_NAME,LOGIN_ADDR,LOGIN_DEVICE,LOGIN_APP,LOGIN_OS,LOGIN_TIME,LOGIN_TYPE,LOGOUT_TIME,LOGOUT_TYPE,LOGOUT_BY,LAST_ACCESS_TIME,VERSION,CREATED_BY,CREATE_TIME,REMARK
A,@var:NopAuthSession@sessionId,@var:NopAuthUser@userId,auto_test1,,,,,@var:NopAuthSession@loginTime,1,,0,,,0,autotest-ref,*,
2 changes: 2 additions & 0 deletions ...-service/cases/io/nop/auth/service/TestLoginApi/testLogin/output/tables/nop_auth_user.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
_chgType,USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,REL_DEPT_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,MANAGER_ID,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
A,@var:NopAuthUser@userId,auto_test1,@var:NopAuthUser@password,@var:NopAuthUser@salt,autoTestNick,,@var:NopAuthUser@openId,,1,,,,,0,,1,1,,,,,,,,,,,,0,0,0,autotest-ref,*,autotest-ref,*,
11 changes: 11 additions & 0 deletions ...ice/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/input/request-createUser.json5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
data: {
data: {
userName: "auto_test1",
password: "auto_test1",
nickName: "autoTestNick",
gender: "1",
userType: "1"
}
}
}
1 change: 0 additions & 1 deletion ...e/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/input/tables/nop_auth_op_log.csv
View file

This file was deleted.

1 change: 1 addition & 0 deletions .../cases/io/nop/auth/service/TestLoginApi/testLoginLogout/input/tables/nop_auth_session.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SESSION_ID,USER_ID,USER_NAME,LOGIN_ADDR,LOGIN_DEVICE,LOGIN_APP,LOGIN_OS,LOGIN_TIME,LOGIN_TYPE,LOGOUT_TIME,LOGOUT_TYPE,LOGOUT_BY,LAST_ACCESS_TIME,VERSION,CREATED_BY,CREATE_TIME,REMARK
1 change: 1 addition & 0 deletions ...e/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/input/tables/nop_auth_tenant.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TENANT_ID,NAME,BEGIN_TIME,END_TIME,STATUS,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
3 changes: 1 addition & 2 deletions ...ice/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/input/tables/nop_auth_user.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,GENDER,AVATAR,EMAIL,PHONE,USER_TYPE,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,STATUS,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
067e0f1a03cf4ae28f71b606de700716,auto_test1,$2a$10$llF.pPENCpFBE/xYT4wHW.EIejeUEMctQ39o1MCw44ftLDUyR5Z9m,b8c5c8e5b88f4986b5259dbddfba94f9,autoTestNick,,ee50d2a24a164afaa4abb57534ddbdcc,1,,,,1,,,,,,1,0,0,autotest-ref,2022-09-08 19:57:55.0,autotest-ref,2022-09-08 19:57:55.0,
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,REL_DEPT_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,MANAGER_ID,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
8 changes: 4 additions & 4 deletions ...th-service/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/output/1_response.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"tokenType": "bearer",
"userInfo": {
"locale": "zh-CN",
"nickName": "autoTestNick",
"openId": "@var:NopAuthUser@openId",
"roles": [],
"tenantId": null,
"openId": "*",
"tenantId": "0",
"timeZone": null,
"userName": "auto_test1",
"nickName": "autoTestNick"
"userName": "auto_test1"
}
},
"status": 0
Expand Down
8 changes: 4 additions & 4 deletions ...ervice/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/output/2_userResponse.json5
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"data": {
"locale": "zh-CN",
"nickName": "autoTestNick",
"openId": "@var:NopAuthUser@openId",
"roles": [],
"tenantId": null,
"tenantId": "0",
"timeZone": null,
"openId": "*",
"userName": "auto_test1",
"nickName": "autoTestNick"
"userName": "auto_test1"
},
"status": 0
}
10 changes: 5 additions & 5 deletions ...ases/io/nop/auth/service/TestLoginApi/testLoginLogout/output/3_refreshTokenResponse.json5
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"data": {
"accessToken": "@var:accessToken_1",
"accessToken": "@var:accessToken",
"attrs": null,
"expiresIn": 1800,
"refreshExpiresIn": 0,
Expand All @@ -9,12 +9,12 @@
"tokenType": "bearer",
"userInfo": {
"locale": "zh-CN",
"nickName": "autoTestNick",
"openId": "@var:NopAuthUser@openId",
"roles": [],
"tenantId": null,
"tenantId": "0",
"timeZone": null,
"openId": "*",
"userName": "auto_test1",
"nickName": "autoTestNick"
"userName": "auto_test1"
}
},
"status": 0
Expand Down
4 changes: 2 additions & 2 deletions ...cases/io/nop/auth/service/TestLoginApi/testLoginLogout/output/tables/nop_auth_session.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
_chgType,SESSION_ID,USER_ID,LOGIN_ADDR,LOGIN_DEVICE,LOGIN_APP,LOGIN_OS,LOGIN_TIME,LOGIN_TYPE,LOGOUT_TIME,LOGOUT_TYPE,LAST_ACCESS_TIME,VERSION,CREATED_BY,CREATE_TIME,REMARK
A,@var:NopAuthSession@sessionId,067e0f1a03cf4ae28f71b606de700716,,,,,@var:NopAuthSession@loginTime,1,@var:NopAuthSession@logoutTime,1,,1,autotest-ref,*,
_chgType,SESSION_ID,USER_ID,USER_NAME,LOGIN_ADDR,LOGIN_DEVICE,LOGIN_APP,LOGIN_OS,LOGIN_TIME,LOGIN_TYPE,LOGOUT_TIME,LOGOUT_TYPE,LOGOUT_BY,LAST_ACCESS_TIME,VERSION,CREATED_BY,CREATE_TIME,REMARK
A,@var:NopAuthSession@sessionId,@var:NopAuthUser@userId,auto_test1,,,,,@var:NopAuthSession@loginTime,1,@var:NopAuthSession@logoutTime,1,autotest-ref,,1,autotest-ref,*,
2 changes: 2 additions & 0 deletions ...ce/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/output/tables/nop_auth_user.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
_chgType,USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,REL_DEPT_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,MANAGER_ID,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
A,@var:NopAuthUser@userId,auto_test1,@var:NopAuthUser@password,@var:NopAuthUser@salt,autoTestNick,,@var:NopAuthUser@openId,,1,,,,,0,,1,1,,,,,,,,,,,,0,0,0,autotest-ref,*,autotest-ref,*,
4 changes: 2 additions & 2 deletions ...vice/cases/io/nop/auth/service/TestManyToManyProp/testSave/input/tables/nop_auth_user.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
33a6b82bec45465aba4df5c5150ad0e9,nop,$2a$10$BTUbGXUr/VpAAj2O.3lRNuOia9BCr6xMEKR5DfiSqo3NsVoyqKXMW,3b23734165a44e0b86aba07067d462d2,Nopper,,0,1,,,,,0,,1,1,,,,,,,,,,,0,0,sys,2023-04-03 08:37:44.296,sys,2023-04-03 08:37:44.296,
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,REL_DEPT_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,MANAGER_ID,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
8cb7a9d6c3104026b33107f986829911,nop,$2a$10$Dy02Ld/NJez4TjYduJz2.Oy8o38E2xHNWlzUw4JGiWHtK2BwVc.oS,83f9f2356ed642468579eac2d898d61a,Nopper,,0,,1,,,,,0,,1,1,,,,,,,,,,,,0,0,0,sys,2023-11-02 23:07:55.958,sys,2023-11-02 23:07:55.958,
2 changes: 1 addition & 1 deletion ...ases/io/nop/auth/service/TestManyToManyProp/testSave/output/tables/nop_auth_user_role.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
_chgType,USER_ID,ROLE_ID,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
A,33a6b82bec45465aba4df5c5150ad0e9,test,0,autotest-ref,*,autotest-ref,*,
A,8cb7a9d6c3104026b33107f986829911,test,0,autotest-ref,*,autotest-ref,*,
4 changes: 2 additions & 2 deletions ...op/auth/service/TestNopAuthUserBizModel/testChangeSelfPass/input/tables/nop_auth_user.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
c782030fe35f43a0ac6486b0d33ec0e8,nop,$2a$10$Xztt83XXFJyBPFnO1wtz9.tUaVwDCFjEqVSrVIk2h0IxNrDC9gHze,3e8f91984e0e462abc1cbafea35bceb8,Nopper,2febf1a1948e44a1b027cce8a1d44066,0,1,,,,,0,,1,1,,,,,,,,,,,0,1,sys,2022-12-04 18:56:15.373,sys,2022-12-04 18:57:29.114,
USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
c782030fe35f43a0ac6486b0d33ec0e8,nop,$2a$10$Xztt83XXFJyBPFnO1wtz9.tUaVwDCFjEqVSrVIk2h0IxNrDC9gHze,3e8f91984e0e462abc1cbafea35bceb8,Nopper,2febf1a1948e44a1b027cce8a1d44066,0,1,,,,,0,,1,1,,,,,,,,,,,0,1,0,sys,2022-12-04 18:56:15.373,sys,2022-12-04 18:57:29.114,
13 changes: 12 additions & 1 deletion nop-auth/nop-auth-service/src/test/java/io/nop/auth/service/TestLoginApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import io.nop.api.core.annotations.autotest.EnableSnapshot;
import io.nop.api.core.annotations.autotest.NopTestConfig;
import io.nop.api.core.annotations.autotest.NopTestProperty;
import io.nop.api.core.beans.ApiRequest;
import io.nop.api.core.beans.ApiResponse;
import io.nop.api.core.util.FutureHelper;
Expand All @@ -35,7 +36,7 @@

import static org.junit.jupiter.api.Assertions.assertTrue;

@NopTestConfig
@NopTestConfig(initDatabaseSchema = true,localDb = true, disableSnapshot = false)
public class TestLoginApi extends JunitAutoTestCase {

@Inject
Expand Down Expand Up @@ -64,6 +65,9 @@ public void testCreateUser() {
@Test
public void testLogin() {
LoginApi loginApi = buildLoginApi();

createTestUser();

ApiRequest<LoginRequest> request = input("request.json5", new TypeReference<ApiRequest<LoginRequest>>() {
}.getType());
ApiResponse<LoginResult> result = loginApi.login(request);
Expand All @@ -72,11 +76,18 @@ public void testLogin() {
assertTrue(FutureHelper.waitUntil(() -> auditService.isAllProcessed(), 1000));
}

void createTestUser(){
IGraphQLExecutionContext context = graphQLEngine.newRpcContext(GraphQLOperationType.mutation, "NopAuthUser__save",
input("request-createUser.json5",ApiRequest.class));
FutureHelper.syncGet(graphQLEngine.executeRpcAsync(context));
}

@EnableSnapshot
@Test
public void testLoginLogout() {
LoginApi loginApi = buildLoginApi();

createTestUser();
ApiRequest<LoginRequest> request = request("1_request.json5", LoginRequest.class);

ApiResponse<LoginResult> result = loginApi.login(request);
Expand Down
6 changes: 4 additions & 2 deletions nop-auth/nop-auth-service/src/test/java/io/nop/auth/service/TestManyToManyProp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@

import io.nop.api.core.annotations.autotest.EnableSnapshot;
import io.nop.api.core.annotations.autotest.NopTestConfig;
import io.nop.api.core.annotations.autotest.NopTestProperty;
import io.nop.auth.dao.entity.NopAuthRole;
import io.nop.auth.dao.entity.NopAuthUser;
import io.nop.autotest.junit.JunitAutoTestCase;
import io.nop.core.lang.sql.SQL;
import io.nop.orm.IOrmTemplate;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;

import jakarta.inject.Inject;
import java.util.Arrays;

@NopTestConfig()
@NopTestConfig(initDatabaseSchema = true, disableSnapshot = false)
//@NopTestProperty(name = "nop.auth.login.allow-create-default-user", value = "true")
public class TestManyToManyProp extends JunitAutoTestCase {
@Inject
IOrmTemplate ormTemplate;
Expand Down
6 changes: 6 additions & 0 deletions .../resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12934,6 +12934,12 @@
"java.lang.String"
]
},
{
"name": "getExpandField",
"parameterTypes": [
"java.lang.String"
]
},
{
"name": "getExpandIndex",
"parameterTypes": []
Expand Down
2 changes: 2 additions & 0 deletions nop-cli-core/src/main/resources/nop-vfs-index.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@
/nop/templates/orm/deploy/sql/{dialect}/_create_{appName}.sql.xgen
/nop/templates/orm/deploy/sql/{dialect}/_drop_{appName}.sql.xgen
/nop/templates/orm/pom.xml.xgen
/nop/templates/orm/{!!useCoreModule}{appName}-core/src/main/java/{basePackagePath}/core/_{moduleClassPrefix}CoreConstants.java.xgen
/nop/templates/orm/{!!useCoreModule}{appName}-core/src/main/java/{basePackagePath}/core/{moduleClassPrefix}CoreConstants.java.xgen
/nop/templates/orm/{appName}-api/pom.xml.xgen
/nop/templates/orm/{appName}-app/pom.xml.xgen
/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.jvm
Expand Down
2 changes: 1 addition & 1 deletion nop-core/src/main/java/io/nop/core/resource/record/csv/CsvRecordInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public T next() {
return (T) map;
return (T) BeanTool.instance().buildBean(map, beanType, null);
} catch (Exception e) {
throw new NopException(ERR_RESOURCE_READ_CSV_ROW_FAIL).param(ARG_RESOURCE, resource)
throw new NopException(ERR_RESOURCE_READ_CSV_ROW_FAIL,e).param(ARG_RESOURCE, resource)
.param(ARG_RESOURCE_PATH, resource.getPath()).param(ARG_READ_COUNT, readCount);
}
}
Expand Down
5 changes: 5 additions & 0 deletions nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/_delta/default/nop/spring/beans/spring-demo.beans.xml
/_delta/default/nop/spring/mapper/SysUser.mapper.xml
/dict/auth/gender.dict.yaml
/dict/auth/login-status.dict.yaml
/dict/auth/login-type.dict.yaml
Expand Down Expand Up @@ -351,6 +353,9 @@
/nop/schema/xui/xview.xdef
/nop/spring/_module
/nop/spring/beans/spring-base.beans.xml
/nop/spring/beans/spring-demo.beans.xml
/nop/spring/mapper/SysUser.mapper.xml
/nop/spring/mapper/_gen/_SysUser.mapper.xml
/nop/spring/schema/mapper.xdef
/nop/sys/_module
/nop/sys/auth/_nop-sys.action-auth.xml
Expand Down
Loading

0 comments on commit 88aa20b

Please sign in to comment.