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; @@ -147,7 +149,7 @@ @Resource private IUserActivityRedenvelopeService userActivityRedenvelopeService; @Resource private RedisUtil redisUtil; @@ -1301,7 +1303,7 @@ ResultUtil resultUtil = ResultUtil.success(""); orderPrivateCar.setCouponMoney(0D);//初始化历史数据 orderPrivateCar.setCouponId(null); //计算折扣 UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId()); if(null != query2){ @@ -1320,7 +1322,7 @@ } } } //计算优惠券 UserCouponRecord userCouponRecord = null; if(null != couponId){ @@ -1347,7 +1349,7 @@ orderPrivateCar.setCouponMoney(userCouponRecord.getMoney()); orderPrivateCar.setCouponId(couponId); } //计算红包 if(null != redDeduction && 1 == redDeduction && null == orderPrivateCar.getRedPacketId()){ RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings(); @@ -1360,14 +1362,14 @@ if(total > 0 && multiply1.doubleValue() > 0 && total.compareTo(multiply1.doubleValue()) >= 0){ orderPrivateCar.setRedPacketMoney(multiply1.doubleValue()); orderMoney = orderMoney.subtract(multiply1).setScale(2, RoundingMode.HALF_EVEN); //获取红包id JSONArray jsonArray = new JSONArray(); for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", userRedPacketRecord.getId()); BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount()); if(multiply1.compareTo(remainingAmount) >= 0){ userRedPacketRecord.setRemainingAmount(0D); userRedPacketRecord.setEndTime(new Date()); @@ -1397,7 +1399,7 @@ jsonObject.put("id", userRedPacketRecord.getId()); jsonObject.put("money", userRedPacketRecord.getRemainingAmount()); jsonArray.add(jsonObject); userRedPacketRecord.setRemainingAmount(0D); userRedPacketRecord.setEndTime(new Date()); userRedPacketRecord.setState(2); @@ -1409,8 +1411,8 @@ } } } if(payType == 1){//手机支付 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS"); String merchantTransactionId = sdf.format(new Date()) + "1" + language + orderId; @@ -1428,14 +1430,14 @@ checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html"); checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html"); resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest); if(resultUtil.getCode()==200){ paymentRecordService.saveData(1, null, null, orderId, 1, 1, orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), null, 1);//添加预支付数据 }else{ resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", ""); } } if(payType == 2){//银行卡支付 BankCard bankCard = bankCardService.selectById(bankCardId); @@ -1455,7 +1457,7 @@ checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html"); checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html"); resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest); if(resultUtil.getCode()==200){ paymentRecordService.saveData(1, null, null, orderId, 1, 2, orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), null, 1);//添加预支付数据 @@ -1467,28 +1469,28 @@ if(userInfo.getBalance() == null || new BigDecimal(userInfo.getBalance()).compareTo(orderMoney) < 0){ return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant", ""); } userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId()); userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分 //添加交易明细 transactionDetailsService.saveData(uid, "完成订单", orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), 2, 1, 1, 1, orderId); userInfoService.updateById(userInfo); orderPrivateCar.setState(8); orderPrivateCar.setPayType(3); orderPrivateCar.setPayMoney(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue()); //处理优惠券和红包 if(null != userCouponRecord){ userCouponRecord.setState(2); userCouponRecord.setEndTime(new Date()); userCouponRecordService.updateById(userCouponRecord); } //添加已收入明细 Company company = companyService.selectById(orderPrivateCar.getCompanyId()); Double speMoney = company.getSpeMoney(); @@ -1510,7 +1512,7 @@ driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driverService.updateById(driver); if(ToolUtil.isNotEmpty(userInfo.getEmail())){ new Thread(new Runnable() { @Override @@ -1850,7 +1852,7 @@ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course", document.html()); //开始生成pdf收据和html收据 File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ @@ -1864,7 +1866,7 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); File file1 = new File("/home/igotechgh/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); @@ -1880,7 +1882,7 @@ e.printStackTrace(); System.out.println("html转pdf异常"); } String link ="https://igo.i-go.group/files/html/ride_receipt_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); @@ -1898,18 +1900,18 @@ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); }catch (Exception e){ e.printStackTrace(); } } }).start(); } // TODO: 2020/5/24 这里需要给司机和用户推送订单状态 new Thread(new Runnable() { @Override @@ -1918,7 +1920,7 @@ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, ""); } }).start(); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2 ? "You've paid for the ride order successfully, thank you for using I-GO" : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1); @@ -1926,19 +1928,19 @@ if(payType == 4){//现金支付 SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId()); userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分 //添加交易明细 transactionDetailsService.saveData(uid, "完成订单", orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), 2, 1, 1, 1, orderId); userInfoService.updateById(userInfo); orderPrivateCar.setState(8); orderPrivateCar.setPayType(4); orderPrivateCar.setDriverPay(2); orderPrivateCar.setPayMoney(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue()); Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); //处理优惠券和红包 if(null != userCouponRecord){ userCouponRecord.setState(2); @@ -1952,7 +1954,7 @@ driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driverService.updateById(driver); } if(null != orderPrivateCar.getRedPacketId()){ Double money = orderPrivateCar.getRedPacketMoney(); incomeService.saveData(2, orderPrivateCar.getDriverId(), 7, orderPrivateCar.getId(), 1, money); @@ -1961,7 +1963,7 @@ driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driverService.updateById(driver); } if(null != orderPrivateCar.getDiscountMoney() && 0 < orderPrivateCar.getDiscountMoney()){ Double money = orderPrivateCar.getDiscountMoney(); incomeService.saveData(2, orderPrivateCar.getDriverId(), 6, orderPrivateCar.getId(), 1, money); @@ -1970,8 +1972,8 @@ driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driverService.updateById(driver); } //添加已收入明细 Company company = companyService.selectById(orderPrivateCar.getCompanyId()); Double speMoney = company.getSpeMoney(); @@ -1993,8 +1995,8 @@ // driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); // driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); // driverService.updateById(driver); //记录司机待结算金额 if(d.compareTo(new BigDecimal(0)) > 0){ SettlementDetail settlementDetail = new SettlementDetail(); @@ -2005,7 +2007,7 @@ settlementDetail.setPrice(d.doubleValue()); settlementDetail.setCreateTime(new Date()); settlementDetailService.insert(settlementDetail); SettlementAllocation settlementAllocation = settlementAllocationService.selectOne(null); if(null != settlementAllocation){ JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent()); @@ -2053,7 +2055,7 @@ car.setVehicleId(UUIDUtil.getRandomCode()); carService.updateById(car); } //司机下班，修改谷歌上的车辆信息 new Thread(()->{ try { @@ -2101,7 +2103,7 @@ } } } if(ToolUtil.isNotEmpty(userInfo.getEmail())){ new Thread(new Runnable() { @Override @@ -2440,9 +2442,9 @@ Element server_tel_french = document.getElementById("server_tel_french"); server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course", document.html()); //开始生成pdf收据和html收据 File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ @@ -2456,7 +2458,7 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); File file1 = new File("/home/igotechgh/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); @@ -2489,17 +2491,17 @@ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); }catch (Exception e){ e.printStackTrace(); } } }).start(); } // TODO: 2020/5/24 这里需要给司机和用户推送订单状态 new Thread(new Runnable() { @Override @@ -2518,7 +2520,7 @@ case 3: text = "Le client a choisi de payer en espèces, vous devez donc encaisser le paiement.Confirmez si vous avez reçu les frais pour cette commande : Espèces GHS " + orderPrivateCar.getPayMoney(); break; } String audioUrl = ""; String fileName = "offlinePayment" + orderPrivateCar.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3"; @@ -2552,12 +2554,12 @@ pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getPayMoney(), audioUrl); } }).start(); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2 ? "You've paid for the ride order successfully, thank you for using I-GO" : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1); } this.updateAllColumnById(orderPrivateCar); return resultUtil; } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -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; /** @@ -20,37 +13,24 @@ */ @Component public class RedisUtil { @Autowired private RestTemplate internalRestTemplate; private RedisTemplate redisTemplate; /** * 向redis中存储字符串没有过期时间 * @param key * @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); } } /** * 以分钟为单位设置存储值（设置过期时间） * @param key @@ -58,26 +38,12 @@ * @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); } } /** * 从redis中获取值 * @param key @@ -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出错了"); } return jsonObject.getString("data"); redisTemplate.delete(key); } 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,11 +23,14 @@ 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
File was deleted
