UserIGOTravel/guns-admin/pom.xml
@@ -169,11 +169,9 @@ <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt</artifactId> </dependency> <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId> <version>2.9.0</version> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId> </dependency> <dependency> UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/config/RedisConfig.java
File was deleted UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1262,6 +1262,8 @@ if(null == uid){ return ResultUtil.tokenErr(); } System.err.println("支付接口请求参数：payType=" + payType + "&bankCardId=" + bankCardId + "&orderId=" + orderId + "&orderType=" + orderType + "&couponId=" + couponId + "&redDeduction=" + redDeduction + "&type=" + type + "&language=" + language); String format = String.format("uid=%s&payType=%s&orderId=%s&orderType=%s", uid, payType, orderId, orderType); String key = MD5Util.encrypt(format); String value = redisUtil.getValue(key); @@ -1778,9 +1780,11 @@ return ResultUtil.tokenErr(); } Double payMoney = 0D; Integer companyId = 1; switch (orderType){ case 1: OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId); companyId = orderPrivateCar.getCompanyId(); Double orderMoney = orderPrivateCar.getOrderMoney(); if(null == orderMoney){ orderMoney = 0D; @@ -1799,6 +1803,7 @@ break; case 4: OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId); companyId = orderLogistics.getCompanyId(); Double orderMoney1 = orderLogistics.getOrderMoney(); if(null == orderMoney1){ orderMoney1 = 0D; @@ -1816,9 +1821,10 @@ } break; } Double aDouble = userRedPacketRecordService.queryRemainingAmount(uid); List<UserRedPacketRecord> userRedPacketRecords = userRedPacketRecordService.selectList(new EntityWrapper<UserRedPacketRecord>().eq("userId", uid) .eq("state", 1).eq("companyId", companyId).gt("remainingAmount", 0).orderBy("insertTime", false)); Map<String, Object> map = new HashMap<>(); map.put("redTotal", aDouble); map.put("redTotal", userRedPacketRecords.stream().mapToDouble(UserRedPacketRecord::getRemainingAmount).sum()); RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings(); if(null == redEnvelopePaymentSettings){ map.put("deductionAmount", 0D); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1038,6 +1038,7 @@ new Thread(new Runnable() { @Override public void run() { System.err.println("直推司机后推送司机订单状态"); pushUtil.pushOrderState(1, uid, orderLogistics.getId(), 4, 2, 0, ""); pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, 2, 0, finalAudioUrl); } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -1,5 +1,6 @@ package com.stylefeng.guns.modular.specialTrain.server.impl; import cn.hutool.db.nosql.redis.RedisDS; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -59,6 +60,7 @@ import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors;
@@ -68,15 +68,15 @@ String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.equals(chineseName)){ if(s.contains(chineseName)){ collect.add(city1.getId()); break; } if(s.equals(englishName)){ if(s.contains(englishName)){ collect.add(city1.getId()); break; } if(s.equals(frenchName)){ if(s.contains(frenchName)){ collect.add(city1.getId()); break; } @@ -99,15 +99,15 @@ String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.equals(chineseName)){ if(s.contains(chineseName)){ collect.add(city1.getId()); break; } if(s.equals(englishName)){ if(s.contains(englishName)){ collect.add(city1.getId()); break; } if(s.equals(frenchName)){ if(s.contains(frenchName)){ collect.add(city1.getId()); break; } @@ -137,15 +137,15 @@ String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.equals(chineseName)){ if(s.contains(chineseName)){ collect.add(city1.getId()); break; } if(s.equals(englishName)){ if(s.contains(englishName)){ collect.add(city1.getId()); break; } if(s.equals(frenchName)){ if(s.contains(frenchName)){ collect.add(city1.getId()); break; } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
@@ -81,6 +81,7 @@ String tripId = redisUtil.getValue("trip" + uid); //查找与起点匹配的企业（经营范围） System.err.println("经纬度：" + startLonLat); ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(startLonLat.split(",")[1]), Double.valueOf(startLonLat.split(",")[0]), tripId); if(null == language){ language = 2; UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
@@ -1,18 +1,11 @@ package com.stylefeng.guns.modular.system.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.stylefeng.guns.core.util.ToolUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import java.util.concurrent.TimeUnit; /** @@ -22,7 +15,8 @@ public class RedisUtil { @Autowired private RestTemplate internalRestTemplate; private RedisTemplate redisTemplate; /** @@ -31,23 +25,9 @@ * @param value */ public void setStrValue(String key, String value){ if(ToolUtil.isNotEmpty(key)){ //发送验证码短信 HttpHeaders headers = new HttpHeaders(); // 以表单的方式提交 headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); //将请求头部和参数合成一个请求 MultiValueMap<String, Object> params = new LinkedMultiValueMap<>(); params.add("key", key); params.add("value", value); HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers); String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/setValue_", requestEntity, String.class); JSONObject jsonObject = JSON.parseObject(s, JSONObject.class); if(jsonObject.getIntValue("code") != 200){ System.err.println("调用redis出错了"); if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){ redisTemplate.opsForValue().set(key, value); } } } @@ -58,22 +38,8 @@ * @param time 秒 */ public void setStrValue(String key, String value, int time){ if(ToolUtil.isNotEmpty(key)){ //发送验证码短信 HttpHeaders headers = new HttpHeaders(); // 以表单的方式提交 headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); //将请求头部和参数合成一个请求 MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); params.add("key", key); params.add("value", value); params.add("time", String.valueOf(time)); HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(params, headers); String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/setValue", requestEntity, String.class); JSONObject jsonObject = JSON.parseObject(s, JSONObject.class); if(jsonObject.getIntValue("code") != 200){ System.err.println("调用redis出错了"); } if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){ redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); } } @@ -85,44 +51,22 @@ */ public String getValue(String key){ if(ToolUtil.isNotEmpty(key)){ HttpHeaders headers = new HttpHeaders(); // 以表单的方式提交 headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); //将请求头部和参数合成一个请求 MultiValueMap<String, Object> params = new LinkedMultiValueMap<>(); params.add("key", key); HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers); String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/getValue",requestEntity , String.class); JSONObject jsonObject = JSON.parseObject(s, JSONObject.class); if(jsonObject.getIntValue("code") != 200){ System.err.println("调用redis出错了"); } return jsonObject.getString("data"); String data = (String) redisTemplate.opsForValue().get(key); return data; } return null; } /** * 删除key * @param key */ public String remove(String key){ public void remove(String key){ if(ToolUtil.isNotEmpty(key)){ HttpHeaders headers = new HttpHeaders(); // 以表单的方式提交 headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); //将请求头部和参数合成一个请求 MultiValueMap<String, Object> params = new LinkedMultiValueMap<>(); params.add("key", key); HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers); String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/remove",requestEntity , String.class); JSONObject jsonObject = JSON.parseObject(s, JSONObject.class); if(jsonObject.getIntValue("code") != 200){ System.err.println("调用redis出错了"); redisTemplate.delete(key); } return jsonObject.getString("data"); } return null; } } UserIGOTravel/guns-admin/src/main/resources/application-dev.yml
@@ -25,6 +25,11 @@ multipart: max-request-size: 100MB max-file-size: 100MB redis: database: 0 host: 127.0.0.1 port: 6379 password: 123456 mybatis-plus: typeAliasesPackage: com.stylefeng.guns.modular @@ -47,20 +52,12 @@ base-package: com.stylefeng.guns.modular #spring: # datasource: # url: jdbc:mysql://127.0.0.1:3306/igotravel2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 # username: root # password: 123456 # db-name: guns #用来搜集数据库的所有表 # filters: wall,mergeStat spring: datasource: url: jdbc:mysql://182.160.16.251:3306/igotravel2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 username: root password: HjKbXilb9zajmXbl db-name: guns #用来搜集数据库的所有表 password: 123456 db-name: igotravel #用来搜集数据库的所有表 filters: wall,mergeStat
@@ -23,10 +23,13 @@ enabled: false additional-paths: src/main/java exclude: static/**,WEB-INF/view/** servlet: multipart: max-request-size: 100MB max-file-size: 100MB redis: database: 0 host: 127.0.0.1 port: 16379 password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5 mybatis-plus: typeAliasesPackage: com.stylefeng.guns.modular UserIGOTravel/guns-admin/src/main/resources/redis.properties
File was deleted
