Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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

@@ -40,7 +40,7 @@ public interface IProRoleService {
 
     void deleteRoleByProjectId(Long projectId) throws Exception;
 
-    RoleVo.RoleByProjectId saveRole(Long currentUserId, RoleDto.SaveRole saveRole) throws Exception;
+    ProjectVo.RoleInfo saveRole(Long currentUserId, RoleDto.SaveRole saveRole) throws Exception;
 
     ProjectVo.RoleInfo updateRole(Long currentUserId, RoleDto.UpdateRole updateRole) throws Exception;
 

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

@@ -599,7 +599,7 @@ public class ProRoleService implements IProRoleService {
 
 
     @Override
-    public RoleVo.RoleByProjectId saveRole(Long currentUserId, RoleDto.SaveRole saveRole) throws Exception {
+    public ProjectVo.RoleInfo saveRole(Long currentUserId, RoleDto.SaveRole saveRole) throws Exception {
         //检查操作者的权限
         int power = selectPowerByRoleName(currentUserId, saveRole.getProjectId());
         if (power < 2) {
@@ -626,7 +626,8 @@ public class ProRoleService implements IProRoleService {
 
         //发送系统消息
          robotService.addRoleRobotSend(currentUserId,saveRole.getProjectId(),saveRole.getRoleName(),roleInfo.getRoleId());
-        return roleInfo;
+//        getRoleInfoByRoleId(role.getId());
+        return getRoleInfoByRoleId(role.getId());
     }
 
     @Override

tall/src/main/java/com/ccsens/tall/web/RoleController.java

@@ -53,10 +53,10 @@ public class RoleController {
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<RoleVo.RoleByProjectId> saveRole(HttpServletRequest request,
+    public JsonResponse<ProjectVo.RoleInfo> saveRole(HttpServletRequest request,
                                  @ApiParam @Validated @RequestBody RoleDto.SaveRole saveRole) throws Exception {
         Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
-        RoleVo.RoleByProjectId roleInfo = proRoleService.saveRole(currentUserId,saveRole);
+        ProjectVo.RoleInfo roleInfo = proRoleService.saveRole(currentUserId,saveRole);
         return JsonResponse.newInstance().ok(roleInfo);
     }
 

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common