From 58853e68a607eabb110141bd03cbffd2cf3786be Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Thu, 9 Jun 2022 09:55:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=9D=E8=B4=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HighOpenApiController.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighOpenApiController.java b/hai-bweb/src/main/java/com/bweb/controller/HighOpenApiController.java index 6f884edc..3f9c50c1 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighOpenApiController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighOpenApiController.java @@ -95,18 +95,18 @@ public class HighOpenApiController { public ResponseData getGuizhouSinopecList(HttpServletRequest request) { try { -// String ip = ""; -// // 有的user可能使用代理，为处理用户使用代理的情况，使用x-forwarded-for -// if (request.getHeader("x-forwarded-for") == null) { -// ip = request.getRemoteAddr(); -// } else { -// ip = request.getHeader("x-forwarded-for"); -// } -// -// if (!secConfigService.isConfig("IP_WHITE" , ip)) { -// log.error("getGuizhouSinopec error!", "非法ip地址，请联系管理人员！"); -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "非法ip地址，请联系管理人员！"); -// } + String ip = ""; + // 有的user可能使用代理，为处理用户使用代理的情况，使用x-forwarded-for + if (request.getHeader("x-forwarded-for") == null) { + ip = request.getRemoteAddr(); + } else { + ip = request.getHeader("x-forwarded-for"); + } + + if (!secConfigService.isConfig("IP_WHITE" , ip)) { + log.error("getGuizhouSinopec error!", "非法ip地址，请联系管理人员！"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "非法ip地址，请联系管理人员！"); + } // 获取token String token = huiLianTongConfig.getToken(); @@ -140,16 +140,16 @@ public class HighOpenApiController { ip = request.getHeader("x-forwarded-for"); } -// if (!secConfigService.isConfig("IP_WHITE" , ip)) { -// log.error("getGuizhouSinopec error!", "非法ip地址，请联系管理人员！"); -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "非法ip地址，请联系管理人员！"); -// } + if (!secConfigService.isConfig("IP_WHITE" , ip)) { + log.error("getGuizhouSinopec error!", "非法ip地址，请联系管理人员！"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "非法ip地址，请联系管理人员！"); + } // 获取token String token = huiLianTongConfig.getToken(); // 查询电子卡券类型 - JSONObject data = HuiLianTongConfig.getCouState(token, object.getString("orderNo")); + JSONObject data = HuiLianTongConfig.getCouState(token, object.getString("couNo")); if (!data.getString("result").equals("success")) { log.error("HighOpenApiController -> insertCoupon() error!","查询电子券状态失败"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "查询电子券状态失败"); @@ -175,11 +175,11 @@ public class HighOpenApiController { } else { ip = request.getHeader("x-forwarded-for"); } -// -// if (!secConfigService.isConfig("IP_WHITE" , ip)) { -// log.error("couJointDist error!", "非法ip地址，请联系管理人员！"); -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "非法ip地址，请联系管理人员！"); -// } + + if (!secConfigService.isConfig("IP_WHITE" , ip)) { + log.error("couJointDist error!", "非法ip地址，请联系管理人员！"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "非法ip地址，请联系管理人员！"); + } // 获取token String token = huiLianTongConfig.getToken(); From 504f3b91fa2f4f9567fd2b0c2e8068228408a1e8 Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Thu, 9 Jun 2022 14:56:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=9D=E8=B4=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutRechargeOrderController.java | 5 +++- .../resources/dev/commonConfig.properties | 4 +-- v1/target/classes/application.yml | 28 ++++--------------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java index 1f708f70..6fbc5353 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java @@ -133,7 +133,10 @@ public class OutRechargeOrderController { Map map = new HashMap<>(); map.put("userId", userInfoModel.getHighUser().getId().toString()); - map.put("payStatus", status.toString()); + if (status != null) { + map.put("payStatus", status.toString()); + } + map.put("orderNo", orderNo); PageHelper.startPage(pageNum, pageSize); diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties index 01d060e7..3daf7fd6 100644 --- a/hai-service/src/main/resources/dev/commonConfig.properties +++ b/hai-service/src/main/resources/dev/commonConfig.properties @@ -35,8 +35,8 @@ unionPayChannelid=D01X00000801226 unionPayMerid=83169055983W000 unionPayTermid=XS000103 unionPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0 -unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify -unionPayTelNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notifyTel +unionPayNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/notify +unionPayTelNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/notifyTel unionStagingPayUrl=https://mtest.eycard.cn/ unionStagingPayOrgId=ORG000000000001 diff --git a/v1/target/classes/application.yml b/v1/target/classes/application.yml index 28b711c3..f0e71e2f 100644 --- a/v1/target/classes/application.yml +++ b/v1/target/classes/application.yml @@ -9,9 +9,9 @@ debug: false #datasource数据源设置 spring: datasource: - url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 - username: hsg - password: HUfukeji123456!@# + url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false + username: root + password: HF123456. type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver filters: stat @@ -29,38 +29,20 @@ spring: maxOpenPreparedStatements: 20 redis: database: 0 - host: 127.0.0.1 + host: 139.159.177.244 port: 36379 password: HF123456.Redis - timeout: 1000 + timeout: 36000000 jedis: pool: max-active: 20 max-wait: -1 max-idle: 10 min-idle: 0 - #thymelea模板配置 - thymeleaf: - prefix: classpath:/templates/ - suffix: .html - mode: HTML5 - encoding: UTF-8 - #热部署文件，页面不产生缓存，及时更新 - cache: false #配置日期返回至前台为时间戳 jackson: serialization: write-dates-as-timestamps: true - - - thymeleaf: - cache: false - prefix: classpath:/templates/ - suffix: .html - encoding: UTF-8 - content-type: text/html - mode: HTML5 - mybatis: mapperLocations: - classpath*:sqlmap*/*.xml From f472dda5fddf106b03aa939d445f120573a307ed Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Thu, 9 Jun 2022 16:04:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=9D=E8=B4=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutRechargeOrderController.java | 20 +++++++++++-- .../hai/dao/OutRechargeOrderMapperExt.java | 2 +- v1/target/classes/application.yml | 28 +++++++++++++++---- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java index 8f99b16a..3cb1fb81 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java @@ -51,6 +51,7 @@ import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; +import java.util.function.IntFunction; @Controller @RequestMapping(value = "/outRechargeOrder") @@ -134,6 +135,7 @@ public class OutRechargeOrderController { @RequestParam(name = "payStatus", required = false) Integer payStatus, @RequestParam(name = "rechargeStatus", required = false) String rechargeStatus, @RequestParam(name = "orderNo", required = false) String orderNo, + @RequestParam(name = "companyId", required = false) Long companyId, @RequestParam(name = "operatorType", required = false) String operatorType, @RequestParam(name = "laborUnionCard", required = false) String laborUnionCard, @RequestParam(name = "rechargeContent", required = false) String rechargeContent, @@ -154,7 +156,16 @@ public class OutRechargeOrderController { Map map = new HashMap<>(); - map.put("companyId", userInfoModel.getBsCompany().getId()); + if (companyId != null) { + map.put("companyId", companyId); + } else if (userInfoModel.getSecRole().getRoleType() != 1){ + if (userInfoModel.getSecRole().getRoleType() == 7) { + map.put("companyId", 23); + } else { + map.put("companyId", userInfoModel.getBsCompany().getId()); + } + } + map.put("rechargeStatus", rechargeStatus); map.put("payStatus", payStatus); map.put("orderNo", orderNo); @@ -189,6 +200,7 @@ public class OutRechargeOrderController { public ResponseData exportOrderList( @RequestParam(name = "payStatus", required = false) Integer payStatus, @RequestParam(name = "rechargeStatus", required = false) String rechargeStatus, + @RequestParam(name = "companyId", required = false) Long companyId, @RequestParam(name = "orderNo", required = false) String orderNo, @RequestParam(name = "operatorType", required = false) String operatorType, @RequestParam(name = "laborUnionCard", required = false) String laborUnionCard, @@ -209,7 +221,11 @@ public class OutRechargeOrderController { Map map = new HashMap<>(); - map.put("companyId", userInfoModel.getBsCompany().getId()); + if (companyId != null) { + map.put("companyId", companyId); + } else if (userInfoModel.getSecRole().getRoleType() != 1){ + map.put("companyId", userInfoModel.getBsCompany().getId()); + } map.put("rechargeStatus", rechargeStatus); map.put("payStatus", payStatus); map.put("orderNo", orderNo); diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java index cbd3f4de..a2e5329b 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java @@ -134,7 +134,7 @@ public interface OutRechargeOrderMapperExt { @Select(value = { "" }) @Results({ diff --git a/v1/target/classes/application.yml b/v1/target/classes/application.yml index f0e71e2f..28b711c3 100644 --- a/v1/target/classes/application.yml +++ b/v1/target/classes/application.yml @@ -9,9 +9,9 @@ debug: false #datasource数据源设置 spring: datasource: - url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false - username: root - password: HF123456. + url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 + username: hsg + password: HUfukeji123456!@# type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver filters: stat @@ -29,20 +29,38 @@ spring: maxOpenPreparedStatements: 20 redis: database: 0 - host: 139.159.177.244 + host: 127.0.0.1 port: 36379 password: HF123456.Redis - timeout: 36000000 + timeout: 1000 jedis: pool: max-active: 20 max-wait: -1 max-idle: 10 min-idle: 0 + #thymelea模板配置 + thymeleaf: + prefix: classpath:/templates/ + suffix: .html + mode: HTML5 + encoding: UTF-8 + #热部署文件，页面不产生缓存，及时更新 + cache: false #配置日期返回至前台为时间戳 jackson: serialization: write-dates-as-timestamps: true + + + thymeleaf: + cache: false + prefix: classpath:/templates/ + suffix: .html + encoding: UTF-8 + content-type: text/html + mode: HTML5 + mybatis: mapperLocations: - classpath*:sqlmap*/*.xml