diff --git a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java index 3309bee..f51cf68 100644 --- a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java +++ b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java @@ -37,10 +37,11 @@ public class DynamicRuleController implements DynamicRuleControllerApi { HttpSession session = request.getSession(); UserFull user = (UserFull) session.getAttribute("user"); if (user != null) { - dynamicRuleObject.setAuditUserName(user.name); - dynamicRuleObject.setAuditUserId(user.uid); - dynamicRuleObject.setAuditUserDepart(user.getOrgName()); + dynamicRuleObject.setDynamicRuleCreateUsername(user.name); + dynamicRuleObject.setDynamicRuleCreateUserId(Integer.valueOf(user.uid)); + dynamicRuleObject.setDynamicRuleCreateDepart(user.getOrgName()); } + //调用service新增 Integer dynamicRuleObjectId = dynamicRuleService.newDynamicRuleObject(dynamicRuleObject); return ResponseResult.ok(). diff --git a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java index be27d48..b22c34c 100644 --- a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java +++ b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java @@ -66,7 +66,7 @@ public class StaticRuleService { @Transactional public Integer newStaticRuleObject(StaticRuleObject object) { - object.setStaticRuleCreateTime(LocalDateTime.now()); +// object.setStaticRuleCreateTime(LocalDateTime.now()); object.setAuditStatus(0); if (!isIpMaskValid(object.getStaticRuleSip(),object.getStaticRuleMsip()) || diff --git a/src/main/java/com/realtime/protection/server/user/login/LoginService.java b/src/main/java/com/realtime/protection/server/user/login/LoginService.java index 8bb63fb..4b3083e 100644 --- a/src/main/java/com/realtime/protection/server/user/login/LoginService.java +++ b/src/main/java/com/realtime/protection/server/user/login/LoginService.java @@ -51,7 +51,8 @@ public class LoginService { String accessToken = ""; // 获取 ACCESS_TOKEN ObjectMapper objectMapper = new ObjectMapper(); -// OkHttpClient client = new OkHttpClient(); + + // OkHttpClient client = new OkHttpClient(); //不做证书验证的OkHttpClient OkHttpClient client = new OkHttpClient.Builder() @@ -61,14 +62,17 @@ public class LoginService { Request request = new Request.Builder() // .url("https://114.243.134.122:10217/passport/accessToken?grant_type=client_credentials") - .url("https://passport.iam.pub/passport/accessToken?grant_type=client_credentials") +// .url("https://passport.iam.pub/passport/accessToken?grant_type=client_credentials") + .url("http://10.60.15.14:8080/passport/accessToken?grant_type=client_credentials") // .header("Authorization", "Basic TlNBRERAWlguT1JHOk14a1hHZ1ltOUNROUE3TCRSOCNLRW02R1pSeEhwd1c2") - .header("Authorization", "Basic TlNBREQ6bkhRbE5zN3lLeVd5bzJOc2JmNk5oRmFhYmlWWUlBU1NsdWJRZ3pUaDhOU2xOUkE1V2xQUTF3PT0=") +// .header("Authorization", "Basic TlNBREQ6bkhRbE5zN3lLeVd5bzJOc2JmNk5oRmFhYmlWWUlBU1NsdWJRZ3pUaDhOU2xOUkE1V2xQUTF3PT0=") + .header("Authorization", "Basic TlNBRERAWlguT1JHOm5IUWxOczd5S3lXeW8yTnNiZjZOaEZhYWJpVllJQVNTbHViUWd6VGg4TlNsTlJBNVdsUFExdz09") .post(okhttp3.internal.Util.EMPTY_REQUEST) .build(); try { Response response = client.newCall(request).execute(); String rsp = response.body().string(); + System.out.println("rsp:" + rsp); try { AccessTokenResponse atr = objectMapper.readValue(rsp, AccessTokenResponse.class); accessToken = atr.getAccess_token(); @@ -87,8 +91,9 @@ public class LoginService { .addFormDataPart("sessionData", sessionData).build(); request = new Request.Builder() // .url("https://passport.zx.com:10217/passport/accessApplication") - .url("https://114.243.134.122:10217/passport/accessApplication") +// .url("https://114.243.134.122:10217/passport/accessApplication") // .url("https://passport.iam.pub/passport/accessApplication") + .url("http://10.60.15.14:8080/passport/accessApplication") .header("Authorization", "Bearer " + accessToken) .header("Content-Type", "application/x-www-form-urlencoded") .post(body) diff --git a/src/main/java/com/realtime/protection/server/whitelist/WhiteListController.java b/src/main/java/com/realtime/protection/server/whitelist/WhiteListController.java index 59902cf..1e0213b 100644 --- a/src/main/java/com/realtime/protection/server/whitelist/WhiteListController.java +++ b/src/main/java/com/realtime/protection/server/whitelist/WhiteListController.java @@ -39,7 +39,7 @@ public class WhiteListController implements WhiteListControllerApi { UserFull user = (UserFull) session.getAttribute("user"); if (user != null) { object.setCreateUserName(user.name); - object.setAuditUserId(user.uid); + object.setCreateUserId(user.uid); object.setCreateUserDepartment(user.getOrgName()); } @@ -184,7 +184,7 @@ public class WhiteListController implements WhiteListControllerApi { @PathVariable Integer auditStatus, @Autowired HttpServletRequest request) { if (id <= 0 || auditStatus < 0 || auditStatus > 2) { - return new ResponseResult(400, "id or status is invalid") + return new ResponseResult(400, "id或状态无效") .setData("whiteobj_id", id) .setData("success", false); } diff --git a/src/main/resources/mappers/ProtectObjectMapper.xml b/src/main/resources/mappers/ProtectObjectMapper.xml index f36f304..ef48291 100644 --- a/src/main/resources/mappers/ProtectObjectMapper.xml +++ b/src/main/resources/mappers/ProtectObjectMapper.xml @@ -143,10 +143,10 @@ - + - + @@ -157,10 +157,9 @@