0612

cloudutil/src/main/resources/application-util-test.yml

@@ -20,8 +20,8 @@ eureka:
     service-url:
       # 指定eureka server通信地址，注意/eureka/小尾巴不能少
       #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
-#      defaultZone: http://admin:admin@192.168.0.99:7010/eureka/
-      defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
+      defaultZone: http://admin:admin@192.168.0.99:7010/eureka/
+#      defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
   instance:
     # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
     prefer-ip-address: true

tall/src/main/java/com/ccsens/tall/service/ProMemberService.java

@@ -68,7 +68,7 @@ public class ProMemberService implements IProMemberService {
         List<ProRole> roleList = proRoleDao.selectByExample(roleExample);
         if(CollectionUtil.isNotEmpty(roleList)){
             for(ProRole role :roleList){
-                if(!role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)&&!role.getName().equals("MVP")) {
+                if(!role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)&&!role.getName().equals(WebConstant.ROLE_NAME.MVP.phase)) {
                     //查找角色下所有成员
                     ProMemberRoleExample memberRoleExample = new ProMemberRoleExample();
                     memberRoleExample.createCriteria().andRoleIdEqualTo(role.getId());
@@ -77,7 +77,7 @@ public class ProMemberService implements IProMemberService {
                         for (ProMemberRole memberRole:memberRoleList){
                             ProMember proMember = proMemberDao.selectByPrimaryKey(memberRole.getMemberId());
                             if(ObjectUtil.isNotNull(proMember)){
-                                Boolean flag = false;
+                                boolean flag = false;
                                 if (CollectionUtil.isNotEmpty(members)) {
                                     for (ProjectVo.MembersByProject membersByProject : members) {
                                         if (membersByProject.getPhone().equals(proMember.getPhone())) {

tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java

@@ -320,6 +320,8 @@ public class TaskDeliverService implements ITaskDeliverService {
                         subTimeId = taskAndSubTime.getSubTimeId();
                     }
                 }
+            }else {
+                throw new BaseException(CodeEnum.NOT_TASK);
             }
             if(ObjectUtil.isNull(subTimeId)){
                 ProTaskSubTimeExample taskSubTimeExample = new ProTaskSubTimeExample();

tall/src/main/resources/application-test.yml

@@ -32,7 +32,7 @@ swagger:
   enable: true
 eureka:
   instance:
-#    ip-address: 192.168.0.99
-    ip-address: 49.233.89.188
+    ip-address: 192.168.0.99
+#    ip-address: 49.233.89.188
 gatewayUrl: http://192.168.0.99/gateway/
 notGatewayUrl: http://192.168.0.99/

tall/src/main/resources/druid-test.yml

@@ -15,8 +15,8 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-      password:
-#      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
+#      password:
+      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -28,8 +28,8 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8
-#      url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8
+#      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

tall/src/main/resources/mapper_dao/SysOperationDao.xml

@@ -38,7 +38,7 @@
             AND s.receiver_id = #{userId}
             AND s.send_type = #{sendType}
             AND s.init_read =0
-            AND s.rec_status = 0
+            AND s.rec_status = 0e
             AND o.rec_status = 0
     </select>
     <select id="queryMsg" resultMap="MessageQuery">