Merge branch 'master' of git.mooctest.net:summer/mooctest-user

mooctest-user-server/pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>cn.iselab.mooctest</groupId>
             <artifactId>user-dubbo-api</artifactId>
-            <version>1.0.16</version>
+            <version>1.0.17</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/mapper/UserMapper.java

@@ -51,4 +51,7 @@ public interface UserMapper {
 
     @Select("SELECT * FROM user WHERE email LIKE concat('%',#{username},'%')")
     List<User> findByFuzzyEmail(String email);
+
+    @Select("SELECT * FROM user WHERE name LIKE concat('%',#{keyword},'%') OR email LIKE CONCAT('%',#{keyword},'%')")
+    List<User> findByFuzzyNameOrEmail(String keyword);
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/rpc/UserRPC.java

@@ -59,4 +59,9 @@ public class UserRPC implements UserService {
     public List<UserDTO> getUserByFuzzyEmail(UserDTO userDTO) {
         return userLogic.getUserByFuzzyEmail(userDTO);
     }
+
+    @Override
+    public List<UserDTO> getUserByFuzzyNameOrEmail(UserDTO userDTO) {
+        return userLogic.getUserByFuzzyNameOrEmail(userDTO);
+    }
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/UserService.java

@@ -24,5 +24,7 @@ public interface UserService {
     List<User> findByFuzzyName(String name);
 
     List<User> findByFuzzyEmail(String email);
+
+    List<User> findByFuzzyNameOrEmail(String keyword);
 }
 

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/UserServiceImpl.java

@@ -62,4 +62,9 @@ public class UserServiceImpl implements UserService {
     public List<User> findByFuzzyEmail(String email) {
         return userMapper.findByFuzzyEmail(email);
     }
+
+    @Override
+    public List<User> findByFuzzyNameOrEmail(String keyword) {
+        return userMapper.findByFuzzyNameOrEmail(keyword);
+    }
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/UserLogic.java

@@ -25,4 +25,6 @@ public interface UserLogic {
     List<UserDTO> getUserByFuzzyName(UserDTO userDTO);
 
     List<UserDTO> getUserByFuzzyEmail(UserDTO userDTO);
+
+    List<UserDTO> getUserByFuzzyNameOrEmail(UserDTO userDTO);
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/UserLogicImpl.java

@@ -125,4 +125,16 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         List<User> users = userService.findByFuzzyEmail(userDTO.getEmail());
         return userWrapper.wrap(users);
     }
+
+    @Override
+    public List<UserDTO> getUserByFuzzyNameOrEmail(UserDTO userDTO) {
+        String keyword = null;
+        if(userDTO.getName() != null) {
+            keyword = userDTO.getName();
+        } else if (userDTO.getEmail() != null) {
+            keyword = userDTO.getEmail();
+        }
+        List<User> userList = userService.findByFuzzyNameOrEmail(keyword);
+        return userWrapper.wrap(userList);
+    }
 }

mooctest-user-server/src/main/resources/application.yaml

@@ -60,21 +60,24 @@ logging.config: classpath:log4j2.yaml
 spring:
     profiles: test
     datasource:
-        url: jdbc:mysql://101.37.175.111:3306/mooctest_user # please modify manually
+        url: jdbc:mysql://101.37.175.111:3306/mooctest_user?useUnicode=yes&characterEncoding=UTF-8 # please modify manually
         username: mooctest # please modify manually
         password: secr3t! # please modify manually
 
     dubbo:
         application.name: user-service-provider
-        registry.address: zookeeper://118.178.131.206:2181
+        registry.address: zookeeper://101.37.175.111:2181
         protocol.name: dubbo
         protocol.port: 20900
-        protocol.host: 127.0.0.1
+        protocol.host: 101.37.175.111
         scan: cn.iselab.mooctest.user.rpc
         monitor.protocal: registry
         provider.timeout: 120000
         provider.retries: 0
 
+server:
+    port: 8191
+
 logging.config: classpath:log4j2.test.yaml
 logging.access.directory: /home/share/log
 
@@ -101,7 +104,7 @@ spring:
         provider.retries: 0
 
 server:
-    port: 8088
+    port: 8191
 
 logging.config: classpath:log4j2.online.yaml
 logging.access.directory: /home/share/log