This is an automated email from the ASF dual-hosted git repository.
liuxun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 29d5fc5 Failed to exec method getUserByName in SysUserService class
29d5fc5 is described below
commit 29d5fc593d7a36a7422020282d211e44c75aa02f
Author: lichaonw <[email protected]>
AuthorDate: Sat Aug 22 05:28:40 2020 -0700
Failed to exec method getUserByName in SysUserService class
### What is this PR for?
Fix an error in SysUserService class.
Also i give a test case to check Correctness.
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Task
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-605
### How should this be tested?
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? Yes/No
* Is there breaking changes for older versions? Yes/No
* Does this needs documentation? Yes/No
Author: lichaonw <[email protected]>
Closes #386 from lichaonw/SUBMARINE-605 and squashes the following commits:
ae50e20 [lichaonw] Failed to exec method getUserByName in SysUserService
class
---
.../workbench/database/service/SysUserService.java | 2 +-
.../submarine/database/mappers/SysUserMapper.xml | 2 +-
.../database/service/SysUserServiceTest.java | 25 ++++++++++++++++++++++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/service/SysUserService.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/service/SysUserService.java
index 0436b03..79f3919 100755
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/service/SysUserService.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/service/SysUserService.java
@@ -34,7 +34,7 @@ public class SysUserService {
private static final Logger LOG =
LoggerFactory.getLogger(SysUserService.class);
private static String GET_USER_BY_NAME_STATEMENT
- = "org.apache.submarine.database.mappers.SysUserMapper.getUserByName";
+ =
"org.apache.submarine.server.workbench.database.mappers.SysUserMapper.getUserByName";
public SysUser getUserByName(String name, String password) throws Exception {
SysUser sysUser = null;
diff --git
a/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/SysUserMapper.xml
b/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/SysUserMapper.xml
index 82d8eff..95fea58 100644
---
a/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/SysUserMapper.xml
+++
b/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/SysUserMapper.xml
@@ -46,7 +46,7 @@
<!-- get user info by user name -->
<select id="getUserByName" parameterType="java.util.Map"
resultMap="resultMap">
- SELECT id, name, username FROM sys_user WHERE name = #{mapParams.name} AND
password = #{mapParams.password}
+ SELECT id, user_name, real_name FROM sys_user WHERE user_name =
#{mapParams.name} AND password = #{mapParams.password}
</select>
<select id="login" parameterType="java.util.Map" resultMap="resultMap">
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/SysUserServiceTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/SysUserServiceTest.java
index daa6d9c..0d98c27 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/SysUserServiceTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/SysUserServiceTest.java
@@ -165,4 +165,29 @@ public class SysUserServiceTest {
assertTrue(DateUtils.isSameDay(updateUser.getCreateTime(),
user.getCreateTime()));
assertTrue(DateUtils.isSameDay(updateUser.getUpdateTime(),
user.getUpdateTime()));
}
+
+ @Test
+ public void getUserByNameTest() throws Exception {
+ SysUser sysUser = new SysUser();
+ sysUser.setUserName("user_name");
+ sysUser.setRealName("real_name");
+ sysUser.setPassword("password");
+ sysUser.setAvatar("avatar");
+ sysUser.setDeleted(1);
+ sysUser.setPhone("123456789");
+ sysUser.setRoleCode("roleCode");
+ sysUser.setEmail("[email protected]");
+ sysUser.setBirthday(new Date());
+ sysUser.setCreateTime(new Date());
+ sysUser.setUpdateTime(new Date());
+
+ Boolean ret = userService.add(sysUser);
+ assertTrue(ret);
+
+ SysUser user = userService.getUserByName("user_name", "password");
+ // assertNotNull(user.getDeptName());
+ assertEquals(sysUser.getRealName(), user.getRealName());
+ assertEquals(sysUser.getUserName(), user.getUserName());
+ assertEquals(sysUser.getId(), user.getId());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
