diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..6eed9ad --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/bonus/boot/manager/basic/controller/PersonnelLibraryController.java b/src/main/java/com/bonus/boot/manager/basic/controller/PersonnelLibraryController.java index 271bd69..13f805c 100644 --- a/src/main/java/com/bonus/boot/manager/basic/controller/PersonnelLibraryController.java +++ b/src/main/java/com/bonus/boot/manager/basic/controller/PersonnelLibraryController.java @@ -9,6 +9,7 @@ import com.bonus.boot.manager.basic.entity.ZNode; import com.bonus.boot.manager.basic.service.PersonnelLibraryService; import com.bonus.boot.manager.manager.annotation.LogAnnotation; import com.bonus.boot.manager.manager.controller.HttpClientUtils; +import com.bonus.boot.manager.manager.entity.AddressConfiguration; import com.bonus.boot.manager.manager.entity.R; import com.bonus.boot.manager.manager.entity.UnifyBean; import com.bonus.boot.manager.manager.model.SysUser; @@ -264,8 +265,7 @@ public class PersonnelLibraryController { String encrypt = AESCBCUtils.encrypt(s, AESCBCUtils.sKey); String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); -// String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token); - String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token); + String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/putUser", object, token); JSONObject jsonObject = JSONObject.parseObject(result); String code = jsonObject.getString("code"); System.err.println("新增code="+code); @@ -297,7 +297,7 @@ public class PersonnelLibraryController { String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); // String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/delUser", object, token); - String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/delUser", object, token); + String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/delUser", object, token); JSONObject jsonObject = JSONObject.parseObject(result); String code = jsonObject.getString("code"); System.err.println("删除code="+code); diff --git a/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java b/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java index 0d7c425..9093aa1 100644 --- a/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java +++ b/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.bonus.boot.manager.basic.controller.AESCBCUtils; import com.bonus.boot.manager.manager.annotation.LogAnnotation; import com.bonus.boot.manager.manager.dao.UserDao; +import com.bonus.boot.manager.manager.entity.AddressConfiguration; import com.bonus.boot.manager.manager.entity.R; import com.bonus.boot.manager.manager.entity.UnifyBean; import com.bonus.boot.manager.manager.entity.UserDto; @@ -347,7 +348,7 @@ public class UserController { String user = "{'phone':'" + phones + "','pd':'" + passwords + "'}"; JSONObject object = JSON.parseObject(user); // String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/userLogin", object, null); - String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/userLogin", object, null); + String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/userLogin", object, null); JSONObject jsonObject = JSONObject.parseObject(result); String string = JSONObject.parseObject(jsonObject.getString("data")).getString("token"); return string; @@ -371,7 +372,7 @@ public class UserController { String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); // String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token); - String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token); + String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/putUser", object, token); JSONObject jsonObject = JSONObject.parseObject(result); String code = jsonObject.getString("code"); System.err.println("新增code="+code); @@ -405,7 +406,7 @@ public class UserController { String encrypt = AESCBCUtils.encrypt(s, AESCBCUtils.sKey); String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); - String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/updateUser", object, token); + String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/updateUser", object, token); JSONObject jsonObject = JSONObject.parseObject(result); String code = jsonObject.getString("code"); System.err.println("修改code="+code); @@ -436,7 +437,7 @@ public class UserController { String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); // String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/delUser", object, token); - String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/delUser", object, token); + String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/delUser", object, token); JSONObject jsonObject = JSONObject.parseObject(result); String code = jsonObject.getString("code"); System.err.println("删除code="+code); diff --git a/src/main/java/com/bonus/boot/manager/manager/entity/AddressConfiguration.java b/src/main/java/com/bonus/boot/manager/manager/entity/AddressConfiguration.java new file mode 100644 index 0000000..e2a3317 --- /dev/null +++ b/src/main/java/com/bonus/boot/manager/manager/entity/AddressConfiguration.java @@ -0,0 +1,16 @@ +package com.bonus.boot.manager.manager.entity; + +/** + * @author 19814 + */ +public class AddressConfiguration { + /** + * 生产环境 + */ + public static final String UNIFICATION_URL = "http://112.29.103.165:1616"; + + /** + * 测试环境 + */ +// public static final String UNIFICATION_URL = "http://192.168.0.14:27018"; +} diff --git a/src/main/java/com/bonus/boot/manager/task/UnifyTask.java b/src/main/java/com/bonus/boot/manager/task/UnifyTask.java index ddb434f..5f01449 100644 --- a/src/main/java/com/bonus/boot/manager/task/UnifyTask.java +++ b/src/main/java/com/bonus/boot/manager/task/UnifyTask.java @@ -7,6 +7,7 @@ import com.bonus.boot.manager.basic.controller.AESCBCUtils; import com.bonus.boot.manager.manager.controller.HttpClientUtils; import com.bonus.boot.manager.manager.controller.UserController; import com.bonus.boot.manager.manager.dao.UserDao; +import com.bonus.boot.manager.manager.entity.AddressConfiguration; import com.bonus.boot.manager.manager.entity.UnifyBean; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Configuration; @@ -72,7 +73,7 @@ public class UnifyTask { String encrypt = AESCBCUtils.encrypt(s, AESCBCUtils.sKey); String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); - String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putLoginLog", object, token); + String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/putLoginLog", object, token); log.info("登录日志数据="+result); } @@ -114,7 +115,7 @@ public class UnifyTask { String encrypt = AESCBCUtils.encrypt(s, AESCBCUtils.sKey); String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); - String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putOperaLog", object, token); + String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/putOperaLog", object, token); log.info("操作日志数据="+result); } @@ -183,10 +184,12 @@ public class UnifyTask { String encrypt = AESCBCUtils.encrypt(s, AESCBCUtils.sKey); String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); - String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token); + String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/putUser", object, token); +// String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token); // String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/putUser", object, token); //推送成功改推送状态 JSONObject jsonObject = JSONObject.parseObject(result); + String code = jsonObject.getString("code"); System.err.println("新增code="+code); if(code.equals("200")){ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a87316d..2b1b8a5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -40,7 +40,6 @@ spring.redis.password=Bonus@yntj123! #spring.redis.port=2001 #spring.redis.password=Dszbns@Redis123! #\u672C\u5730 - #spring.redis.host=127.0.0.1 #spring.redis.port=6379 #spring.redis.password=