Merge branch '84-wb' into '71-integrate'

84 wb







See merge request !51

smsb-customer-manager-adapter/src/main/java/com/inspur/customer/web/controller/keyclaok/KeycloakUserController.java

@@ -107,7 +107,7 @@ public class KeycloakUserController {
         }
     }
 
-    @SmsbMethodLog(description = "密码重置" ,business = "用户：${credential.userLabel}密码重置")
+    @SmsbMethodLog(description = "密码重置" ,business = "用户【${credential.userLabel}】密码重置")
     @PutMapping("/admin/users/{userId}/resetPassword")
     public Response resetPassword(@PathVariable("userId") String userId , @RequestBody CredentialRepresentation credential){
         if(StringUtils.isEmpty(credential.getType()) || !credential.getType().equals(Constant.type)){
@@ -157,7 +157,7 @@ public class KeycloakUserController {
         return keycloakService.queryUserCredentials(userId);
     }
 
-    @SmsbMethodLog(description = "OTP重置" ,business = "用户:${userName}重置OTP")
+    @SmsbMethodLog(description = "OTP重置" ,business = "重置用户【${userName}】OTP")
     @DeleteMapping("/admin/users/{userId}/credentials/{credentialId}")
     public Response removeUserCredentials(@PathVariable("userId")String userId,
                                           @PathVariable("credentialId")String credentialId,
@@ -192,7 +192,7 @@ public class KeycloakUserController {
     }
 
     @SmsbMethodLog(description = "新增账号",
-        business = "添加账号：${smsbUserAdd.username}到部门：${smsbUserAdd.departmentName}")
+        business = "新增账号【${smsbUserAdd.username}】到部门【${smsbUserAdd.departmentName}】")
     @PostMapping("/admin/users")
     public Response addKeyClaokUser(@RequestHeader String userId ,@Valid @RequestBody SmsbUserAdd smsbUserAdd){
         Response checkResponse = departmentService.checkOperationAuthority(userId, smsbUserAdd.getTenant());
@@ -201,7 +201,7 @@ public class KeycloakUserController {
     }
 
     @SmsbMethodLog(description = "账号分组",
-        business = "将账号：${smsbRegrouping.userName}添加到部门：${smsbRegrouping.departmentName}")
+        business = "将账号【${smsbRegrouping.userName}】添加到部门【${smsbRegrouping.departmentName}】")
     @PutMapping("/admin/users/regrouping")
     public Response regrouping(@RequestHeader String userId,
                                @Valid @RequestBody SmsbRegrouping smsbRegrouping){
@@ -211,7 +211,7 @@ public class KeycloakUserController {
         return departmentService.regrouping(smsbRegrouping);
     }
 
-    @SmsbMethodLog(description = "账号注销", business = "账号：${userName}注销")
+    @SmsbMethodLog(description = "账号注销", business = "注销账号【${userName}】")
     @DeleteMapping("/admin/users/{uId}")
     public Response enableSwitch(@RequestHeader String userId,
                                  @PathVariable("uId") String uId,
@@ -241,7 +241,7 @@ public class KeycloakUserController {
         return userService.migration(userMigration);
     }
 
-    @SmsbMethodLog(description = "账号启用/禁用", business = "账号：${switchDTO.userName}启用：${switchDTO.enabled}")
+    @SmsbMethodLog(description = "账号启用/禁用", business = "账号【${switchDTO.userName}】启用【${switchDTO.enabled}】")
     @PutMapping("/admin/users/enabled")
     public Response enableSwitch(@RequestHeader String userId,
                                  @RequestBody SwitchDTO switchDTO){
@@ -255,7 +255,7 @@ public class KeycloakUserController {
         return Response.buildFailure("500","账号启用/禁用失败！");
     }
 
-    @SmsbMethodLog(description = "账号名称修改", business = "用户：${userUpdate.userId}将名称修改为：${userUpdate.name}")
+    @SmsbMethodLog(description = "账号名称修改", business = "用户【${userUpdate.userId}】将名称修改为【${userUpdate.name}】")
     @PutMapping("/admin/users/update")
     public Response updateUserFirstName(@RequestHeader String userId ,
                                         @RequestBody SmsbUserUpdate userUpdate) {
@@ -270,7 +270,7 @@ public class KeycloakUserController {
         return Response.buildFailure("500", "用户名修改失败！");
     }
 
-    @SmsbMethodLog(description = "消息推送预警级别", business = "将用户账号：${levelUpdate.userName}消息推送预警级别改为:${levelUpdate.informName}")
+    @SmsbMethodLog(description = "消息推送预警级别", business = "将用户账号【${levelUpdate.userName}】消息推送预警级别改为【${levelUpdate.informName}】")
     @PutMapping("/admin/users/update/deviceExceptionLevel")
     public Response updateUserFirstName(@RequestHeader String userId,
                                         @RequestBody SmsbUserExceptionLevelUpdate levelUpdate) {