Merge branch 'add-findByCondition' into 'master'

更改Test的profile







See merge request !6

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

@@ -120,7 +120,10 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         List<User> userList = userService.findByCondition(condition);
         List<UserDTO> userDTOList = new ArrayList<>();
         for (User user : userList) {
-            userDTOList.add(Converter.convert(UserDTO.class,user));
+            UserDTO userDTO = Converter.convert(UserDTO.class,user);
+            userDTO.setCreateTime(user.getCreateTime().getTime());
+            userDTOList.add(userDTO);
+
         }
         return userDTOList;
     }

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

@@ -29,6 +29,7 @@ spring:
         url: jdbc:mysql://127.0.0.1:3306/mooctest_user?useUnicode=yes&characterEncoding=UTF-8
         username: root
         password: cxz6518
+
     dubbo:
         application.name: user-service-provider
         registry.address: zookeeper://127.0.0.1:2181
@@ -50,15 +51,15 @@ logging.config: classpath:log4j2.yaml
 spring:
     profiles: test
     datasource:
-        url: jdbc:mysql://127.0.0.1:3306/mooctest_user # please modify manually
-        username: test-username # please modify manually
-        password: test-password # please modify manually
+        url: jdbc:mysql://101.37.175.111:3306/mooctest_user # please modify manually
+        username: mooctest # please modify manually
+        password: secr3t! # please modify manually
 
     dubbo:
         application.name: user-service-provider
-        registry.address: zookeeper://127.0.0.1:2181
+        registry.address: zookeeper://118.178.131.206:2181
         protocol.name: dubbo
-        protocol.port: 20878
+        protocol.port: 20900
         protocol.host: 127.0.0.1
         scan: cn.iselab.mooctest.user.rpc
         monitor.protocal: registry