diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml
index e6fcbcf..a59849c 100644
--- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml
+++ b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml
@@ -10,7 +10,9 @@
-
+
+
+
diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml
index 1b52415..890cb15 100644
--- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml
+++ b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml
@@ -10,7 +10,9 @@
-
+
+
+
diff --git a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml
index f1c7418..1ddf35a 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml
+++ b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml
@@ -10,7 +10,9 @@
-
+
+
+
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shopUser/controller/ShopUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shopUser/controller/ShopUserController.java
index 06741db..8a3aa4d 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shopUser/controller/ShopUserController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shopUser/controller/ShopUserController.java
@@ -216,7 +216,7 @@ public class ShopUserController extends JeecgController delete(@RequestParam(name="id",required=true) String id) {
ShopUser byId = shopUserService.getById(id);
byId.setEncourageNum(0);
- byId.setIsOpen("N");
+// byId.setIsOpen("N");
shopUserService.updateById(byId);
return Result.OK("归零成功!");
}
diff --git a/jeecg-boot-module-system/jeecg-boot-module-system.iml b/jeecg-boot-module-system/jeecg-boot-module-system.iml
index c4db102..9caccca 100644
--- a/jeecg-boot-module-system/jeecg-boot-module-system.iml
+++ b/jeecg-boot-module-system/jeecg-boot-module-system.iml
@@ -14,7 +14,9 @@
-
+
+
+
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/IndexController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/IndexController.java
index 3a9c724..924ea5d 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/IndexController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/IndexController.java
@@ -134,6 +134,13 @@ public class IndexController {
}
+ //获取乌克兰时间测试
+ @ApiOperation(value="获取乌克兰时间测试", notes="获取乌克兰时间测试")
+ @GetMapping(value = "/getUTCTime")
+ public Result getUTCTime()
+ {
+ return indexApiService.getUTCTime();
+ }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/IIndexApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/IIndexApiService.java
index 1b55708..e888492 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/IIndexApiService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/IIndexApiService.java
@@ -39,4 +39,8 @@ public interface IIndexApiService {
//获取首页提现滚动
Result getIndexTixian();
+
+
+ //获取乌克兰时间测试
+ Result getUTCTime();
}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ILoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ILoginApiServiceImpl.java
index 7b2520c..0c2b44a 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ILoginApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ILoginApiServiceImpl.java
@@ -12,6 +12,7 @@ import org.jeecg.modules.api.bean.LoginBean;
import org.jeecg.modules.api.bean.RegisterBean;
import org.jeecg.modules.api.service.ILoginApiService;
import org.jeecg.modules.api.utils.PromptUtils;
+import org.jeecg.modules.api.utils.UTCTime;
import org.jeecg.modules.shopCustomer.entity.ShopCustomer;
import org.jeecg.modules.shopCustomer.service.IShopCustomerService;
import org.jeecg.modules.shopIpLog.entity.ShopIpLog;
@@ -93,13 +94,13 @@ public class ILoginApiServiceImpl implements ILoginApiService {
if(!bean.getAccount().equals("999999")){
member.setLoginIp(bean.getLoginIp());
- member.setLoginTime(new Date());
+ member.setLoginTime(UTCTime.getUTCTime());
//增加登录日志
shopIpLogService.save(new ShopIpLog()
.setLoginIp(bean.getLoginIp())
.setUserId(member.getId()+"")
- .setCreateTime(new Date())
+ .setCreateTime(UTCTime.getUTCTime())
);
@@ -149,6 +150,8 @@ public class ILoginApiServiceImpl implements ILoginApiService {
// return Result.error(500,PromptUtils.payPass_error_ok);
// }
+ //把bean.getAccount()的空的去掉
+ bean.setAccount(bean.getAccount().trim());
//账户是否存在
ShopUser member = shopUserService.lambdaQuery().eq(ShopUser::getAccount, bean.getAccount()).one();
if(member!=null){
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/IndexApiServiceImpl.java
index 3d11191..7c0a696 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/IndexApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/IndexApiServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.api.service.impl;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.api.service.IIndexApiService;
import org.jeecg.modules.api.utils.PromptUtils;
+import org.jeecg.modules.api.utils.UTCTime;
import org.jeecg.modules.shopConf.entity.ShopConf;
import org.jeecg.modules.shopConf.service.IShopConfService;
import org.jeecg.modules.shopGiveMoney.service.IShopGiveMoneyService;
@@ -129,4 +130,13 @@ public class IndexApiServiceImpl implements IIndexApiService {
public Result getIndexTixian(){
return Result.OK(PromptUtils.query_success,giveMoneyService.list());
}
+
+
+
+
+ //获取乌克兰时间测试
+ @Override
+ public Result getUTCTime(){
+ return Result.OK(UTCTime.getUTCTime());
+ }
}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShopApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShopApiServiceImpl.java
index 196107c..48982df 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShopApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShopApiServiceImpl.java
@@ -10,6 +10,7 @@ import org.jeecg.config.shiro.ShiroRealm;
import org.jeecg.modules.api.bean.ShopOrderBean;
import org.jeecg.modules.api.service.IShopApiService;
import org.jeecg.modules.api.utils.PromptUtils;
+import org.jeecg.modules.api.utils.UTCTime;
import org.jeecg.modules.bean.ShopListPageBean;
import org.jeecg.modules.shopApp.entity.ShopApp;
import org.jeecg.modules.shopApp.service.IShopAppService;
@@ -324,7 +325,7 @@ public class ShopApiServiceImpl implements IShopApiService {
//增加卡单记录
ShopKaLog kaLog = new ShopKaLog();
kaLog.setKaId(ka.getId());
- kaLog.setCreateTime(new Date());
+ kaLog.setCreateTime(UTCTime.getUTCTime());
kaLog.setUserId(user.getId());
kaLog.setOrderMoney(orderPrice);
kaLog.setNum(ka.getNum());
@@ -398,7 +399,7 @@ public class ShopApiServiceImpl implements IShopApiService {
order.setImage(image);
order.setGiveMoney(orderMoney);
order.setState("0");
- order.setCreateTime(new Date());
+ order.setCreateTime(UTCTime.getUTCTime());
orderService.save(order);
return Result.OK(PromptUtils.create_order_success,order);
@@ -428,7 +429,7 @@ public class ShopApiServiceImpl implements IShopApiService {
if(order.getState().equals("0")){
//支付成功
order.setState("1");
- order.setPayTime(new Date());
+ order.setPayTime(UTCTime.getUTCTime());
orderService.updateById(order);
@@ -436,7 +437,7 @@ public class ShopApiServiceImpl implements IShopApiService {
ShopOrderLog logOrder = new ShopOrderLog();
logOrder.setUserId(user.getId()+"");
logOrder.setOrderId(order.getId());
- logOrder.setCreateTime(new Date());
+ logOrder.setCreateTime(UTCTime.getUTCTime());
logOrder.setShopId(order.getShopId());
logService.save(logOrder);
@@ -486,7 +487,7 @@ public class ShopApiServiceImpl implements IShopApiService {
ShopWater water = new ShopWater();
water.setUid(user.getId());
water.setMoney(money);
- water.setCreateTime(new Date());
+ water.setCreateTime(UTCTime.getUTCTime());
water.setType("2");
water.setState("1");
waterService.save(water);
@@ -521,7 +522,7 @@ public class ShopApiServiceImpl implements IShopApiService {
ShopWater water = new ShopWater();
water.setUid(oneUser.getId());
water.setMoney(oneMoney);
- water.setCreateTime(new Date());
+ water.setCreateTime(UTCTime.getUTCTime());
water.setType("0"); //当做是充值
water.setState("1");
waterService.save(water);
@@ -540,7 +541,7 @@ public class ShopApiServiceImpl implements IShopApiService {
ShopWater waterTwo = new ShopWater();
waterTwo.setUid(twoUser.getId());
waterTwo.setMoney(twoMoney);
- waterTwo.setCreateTime(new Date());
+ waterTwo.setCreateTime(UTCTime.getUTCTime());
waterTwo.setType("0"); //当作是充值
waterTwo.setState("1");
waterService.save(waterTwo);
@@ -760,8 +761,8 @@ public class ShopApiServiceImpl implements IShopApiService {
return Result.error(PromptUtils.sign_is_null);
}else{
ShopSign sign = new ShopSign();
- sign.setCreateTime(new Date());
- sign.setSignTime(new Date());
+ sign.setCreateTime(UTCTime.getUTCTime());
+ sign.setSignTime(UTCTime.getUTCTime());
sign.setUserId(user.getId()+"");
signService.save(sign);
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/utils/UTCTime.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/utils/UTCTime.java
new file mode 100644
index 0000000..47a58ba
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/utils/UTCTime.java
@@ -0,0 +1,40 @@
+package org.jeecg.modules.api.utils;
+
+import org.jeecg.common.util.DateUtils;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+
+@Component
+public class UTCTime {
+
+ public static Date getUTCTime(){
+
+ // 获取中国标准时间（北京时间）
+ ZonedDateTime beijingTime = ZonedDateTime.now(ZoneId.of("Asia/Shanghai"));
+ // 转换为乌克兰时间，即UTC+2
+ ZonedDateTime ukraineTime = beijingTime.withZoneSameInstant(ZoneId.of("Europe/Kiev"));
+
+ System.out.println("北京时间: " + beijingTime.toLocalDateTime());
+ System.out.println("乌克兰时间: " + ukraineTime.toLocalDateTime());
+ //转化成年月日十分秒格式
+ System.out.println(ukraineTime.toLocalDateTime().toLocalDate().toString()+" "+ukraineTime.toLocalDateTime().toLocalTime().toString().substring(0,8));
+ //去除毫秒
+ String time = ukraineTime.toLocalDateTime().toLocalDate().toString()+" "+ukraineTime.toLocalDateTime().toLocalTime().toString().substring(0,8);
+ //time转化为时间格式
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = DateUtils.str2Date(time, sdf);
+
+ return date;
+ }
+
+
+
+
+}
diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml
index 8326c20..ad25b84 100644
--- a/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8086
+ port: 8093
tomcat:
max-swallow-size: -1
error:
@@ -7,7 +7,7 @@ server:
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
- context-path: /uav-api
+ context-path: /uav-oxl-api
compression:
enabled: true
min-response-size: 1024
@@ -134,9 +134,9 @@ spring:
# connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:mysql://175.178.51.79:3306/uav-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+ url: jdbc:mysql://8.215.29.137:3306/uav-oxl-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
username: root
- password: fe2niQbG
+ password: z-v1z*xW
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#multi-datasource1:
@@ -147,7 +147,7 @@ spring:
#redis 配置
redis:
database: 5
- host: 175.178.51.79
+ host: 8.215.29.137
lettuce:
pool:
max-active: -1 #最大连接数据库连接数,设 -1 为没有限制
@@ -155,7 +155,7 @@ spring:
max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
shutdown-timeout: 1000ms
- password: 'lzx.123456'
+ password: 'ty.888888'
port: 6379
#mybatis plus 设置
mybatis-plus:
@@ -192,11 +192,11 @@ jeecg :
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#阿里云oss存储和大鱼短信秘钥配置
oss:
- accessKey: LTAI5tMan18fjJPUtr3Aim2W
- secretKey: lhALqqgYijc115wY8c1KfTYkbSnq5I
- endpoint: oss-cn-shenzhen.aliyuncs.com
- bucketName: mangoimageapplet
- staticDomain: https://dianpin-img.xzaiyp.top
+ accessKey: LTAI5tHmEEmaoEArocKKpccd
+ secretKey: GeVPNHZnnEwQyvtIbHrZgEKtWzaCxx
+ endpoint: oss-ap-southeast-5.aliyuncs.com
+ bucketName: shop996image
+ staticDomain: https://shop996image.oss-ap-southeast-5.aliyuncs.com
# ElasticSearch 6设置
elasticsearch:
cluster-name: jeecg-ES