From b0a4d23b83b9cdbdee15263acdd4e7353a8286a1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 07 八月 2024 18:19:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java    |    4 +
 server/service/src/main/resources/application-pro.yml                                         |    6 +-
 server/admin/src/main/java/com/doumee/api/business/PushController.java                        |    9 +++
 server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTUserInfoUpdateRequest.java  |   14 ++++
 server/admin/src/main/resources/application.yml                                               |    2 
 server/web/src/main/java/com/doumee/api/ScheduleTool.java                                     |    6 -
 server/service/src/main/java/com/doumee/dao/web/response/ZTBaseInfoResponse.java              |    3 +
 server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java |   36 ++++++-----
 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java          |   55 ++++++++++++------
 9 files changed, 93 insertions(+), 42 deletions(-)

diff --git a/server/admin/src/main/java/com/doumee/api/business/PushController.java b/server/admin/src/main/java/com/doumee/api/business/PushController.java
index 4ff9a10..8aff700 100644
--- a/server/admin/src/main/java/com/doumee/api/business/PushController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/PushController.java
@@ -18,6 +18,7 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,7 @@
  */
 @Api(tags = "瀵瑰銆怚AM銆丳AD绔�戞帹閫佹彁渚涙帴鍙�")
 @RestController
+@Slf4j
 @RequestMapping("/push")
 public class PushController extends BaseController {
     @Autowired
@@ -56,9 +58,11 @@
             zbomIAMService.updateShopInfo(token,uuid,timestamp,shopList);
             r  = ApiResponse.successIam("鎿嶄綔鎴愬姛");
         }catch (BusinessException e){
+            log.error("銆怚AM銆戠粍缁囦俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
             success = Constants.ONE;
             r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
         }catch (Exception e){
+            log.error("銆怚AM銆戠粍缁囦俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
             e.printStackTrace();
             success = Constants.ONE;
             r = ApiResponse.failed("鎿嶄綔澶辫触");
@@ -80,9 +84,11 @@
             zbomIAMService.updateUserInfo(token,uuid,timestamp,upateUserModel);
             r  = ApiResponse.successIam("鎿嶄綔鎴愬姛");
         }catch (BusinessException e){
+            log.error("銆怚AM銆戜汉鍛樿处鍙蜂俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
               success = Constants.ONE;
             r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
         }catch (Exception e){
+            log.error("銆怚AM銆戜汉鍛樿处鍙蜂俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
             success = Constants.ONE;
             e.getMessage();
             r = ApiResponse.failed("鎿嶄綔澶辫触");
@@ -104,9 +110,11 @@
             zbomIAMService.updateRoleInfo(token,uuid,timestamp,upateModel);
             r  = ApiResponse.successIam("鎿嶄綔鎴愬姛");
         }catch (BusinessException e){
+            log.error("銆怚AM銆戣鑹蹭俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
               success = Constants.ONE;
             r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
         }catch (Exception e){
+            log.error("銆怚AM銆戣鑹蹭俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
             success = Constants.ONE;
             e.getMessage();
             r = ApiResponse.failed("鎿嶄綔澶辫触");
@@ -144,6 +152,7 @@
             InputStream inputStream = usersService.getQrCode(generateQRCodeRequest);
             ImageIO.write(ImageIO.read(inputStream),"png",response.getOutputStream());
         }catch (Exception e){
+            log.error("鐢熸垚娑堣垂鑰匔绔皬绋嬪簭鐮�===澶辫触锛�"+e.getMessage());
             e.printStackTrace();
         }
     }
diff --git a/server/admin/src/main/resources/application.yml b/server/admin/src/main/resources/application.yml
index b1555f6..d1e194d 100644
--- a/server/admin/src/main/resources/application.yml
+++ b/server/admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@
   #  application:
   #    name: doumee
   profiles:
-    active: dev
+    active: pro
 
   # JSON杩斿洖閰嶇疆
   jackson:
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTUserInfoUpdateRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTUserInfoUpdateRequest.java
index 8630ead..0ed0f78 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTUserInfoUpdateRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTUserInfoUpdateRequest.java
@@ -129,4 +129,18 @@
      * 寰俊鍙�
      */
     private String weixin;
+
+
+    /**
+     * 鐪佷唤缂栫爜
+     */
+    private String province;
+    /**
+     * 甯傜紪鐮�
+     */
+    private String city;
+    /**
+     * 鍖哄煙缂栫爜
+     */
+    private String county;
 }
diff --git a/server/service/src/main/java/com/doumee/dao/web/response/ZTBaseInfoResponse.java b/server/service/src/main/java/com/doumee/dao/web/response/ZTBaseInfoResponse.java
index 858aaba..6e352f9 100644
--- a/server/service/src/main/java/com/doumee/dao/web/response/ZTBaseInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/dao/web/response/ZTBaseInfoResponse.java
@@ -17,6 +17,9 @@
 
     private String userType;
 
+    private String ztUserId;
+
+
 
 
 }
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
index 1a3b88f..640ec0d 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 瀹㈡埛瀵艰喘鍏宠仈琛⊿ervice瀹炵幇
@@ -250,6 +251,9 @@
             if(member == null){
                 continue;
             }
+            if(Objects.isNull(user)){
+                continue;
+            }
             memberIds.add(member.getId());
             phoneList.add(data.getCustomerPhone());
 
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 38d963a..7e2137b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -290,10 +290,6 @@
             if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
                 Users users = usersMapper.selectById(salesId);
                 Member member = memberMapper.selectById(userId);
-                if(StringUtils.isNotBlank(member.getImgurl())){
-                    member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
-                            systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
-                }
                 if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
                     //鏇存柊瀵艰喘缁戝畾淇℃伅
                     MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
@@ -303,6 +299,11 @@
                         users.setImgurlFull(prefix + users.getImgurl());
                     }
                     response.setUsers(users);
+                    memberMapper.updateById(member);
+                }
+                if(StringUtils.isNotBlank(member.getImgurl())){
+                    member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+                            systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
                 }
             }
             List<String> stringList = new ArrayList<String>();
@@ -348,10 +349,6 @@
             if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
                 Users users = usersMapper.selectById(salesId);
                 Member member = memberMapper.selectById(userId);
-                if(StringUtils.isNotBlank(member.getImgurl())){
-                    member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
-                            systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
-                }
                 if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
                     MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
                     String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
@@ -360,6 +357,11 @@
                         users.setImgurlFull(prefix + users.getImgurl());
                     }
                     response.setUsers(users);
+                    memberMapper.updateById(member);
+                }
+                if(StringUtils.isNotBlank(member.getImgurl())){
+                    member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+                            systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
                 }
             }
             List<String> stringList = new ArrayList<String>();
@@ -399,10 +401,6 @@
             if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
                 Users users = usersMapper.selectById(salesId);
                 Member member = memberMapper.selectById(userId);
-                if(StringUtils.isNotBlank(member.getImgurl())){
-                    member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
-                            systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
-                }
                 if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
                     MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
                     String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
@@ -411,6 +409,11 @@
                         users.setImgurlFull(prefix + users.getImgurl());
                     }
                     response.setUsers(users);
+                    memberMapper.updateById(member);
+                }
+                if(StringUtils.isNotBlank(member.getImgurl())){
+                    member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+                            systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
                 }
             }
             List<String> stringList = new ArrayList<String>();
@@ -456,10 +459,6 @@
                 Users users = usersMapper.selectById(salesId);
                 Member member = memberMapper.selectById(userId);
                 if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
-                    if(StringUtils.isNotBlank(member.getImgurl())){
-                        member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
-                                systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
-                    }
                     MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
                     String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
                             StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
@@ -467,6 +466,11 @@
                         users.setImgurlFull(prefix + users.getImgurl());
                     }
                     response.setUsers(users);
+                    memberMapper.updateById(member);
+                }
+                if(StringUtils.isNotBlank(member.getImgurl())){
+                    member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+                            systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
                 }
             }
             List<String> stringList = new ArrayList<String>();
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 0ed0e1a..9c643d6 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -291,12 +291,8 @@
                 member.setOpenid(openId);
                 member.setType(Constants.ZERO);
                 member.setAuthStatus(Constants.ZERO);
+                member.setStatus(Constants.ZERO);
                 //濡傛灉缁戝畾浜嗗璐� 鍒欑洿鎺ヤ娇鐢ㄥ凡缁戝畾瀵艰喘淇℃伅 璺宠繃鎵嬫満鍙风粦瀹氱殑鐘舵��
-//                if(Objects.nonNull(users)){
-//                    member.setAuthStatus(Constants.TWO);
-//                }else{
-//                    member.setAuthStatus(Constants.ZERO);
-//                }
                 ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
                 if(!Objects.isNull(ztUserGetTokenResponse)){
                     member.setToken(ztUserGetTokenResponse.getToken());
@@ -305,12 +301,14 @@
                 }
                 memberMapper.insert(member);
             }else{
-                ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
-                if(!Objects.isNull(ztUserGetTokenResponse)){
-                    member.setToken(ztUserGetTokenResponse.getToken());
-                    member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
+                ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+                        member.getId(),ZTConstants.CUSTOMER);
+                if(!Objects.isNull(ztBaseInfoResponse)){
+                    member.setToken(ztBaseInfoResponse.getToken());
+                    member.setZtUserId(StringUtils.defaultString(ztBaseInfoResponse.getZtUserId(),ztBaseInfoResponse.getToken()));
                     Member update = new Member();
-                    update.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
+                    update.setZtUserId(StringUtils.defaultString(ztBaseInfoResponse.getZtUserId(),ztBaseInfoResponse.getToken()));
+                    update.setToken(member.getToken());
                     update.setToken(member.getToken());
                     update.setId(member.getId());
                     update.setAuthStatus(member.getAuthStatus());
@@ -336,7 +334,6 @@
     public AccountResponse testLogin(String openid){
             String openId = openid;
             Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
-
             if (member == null) {
                 member = new Member();
                 member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
@@ -455,7 +452,9 @@
             //鏈粦瀹氳繃
             if (Objects.isNull(customerUser.getId())) {
                 customerUserMapper.insert(customerUser);
+                member.setAuthStatus(Constants.TWO);
             } else if(ztBaseResponse !=null) {
+                member.setAuthStatus(Constants.TWO);
                 customerUserMapper.updateById(customerUser);
             }
         }
@@ -543,7 +542,9 @@
             if(!Constants.equalsInteger(member.getPhone().length(),11)){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎵嬫満鍙烽敊璇�!");
             }
-            member.setAuthStatus(Constants.ONE);
+            if(Constants.equalsInteger(member.getAuthStatus(),Constants.ZERO)){
+                member.setAuthStatus(Constants.ONE);
+            }
         }
         memberMapper.updateById(member);
         return this.getMemberInfo(member.getId());
@@ -569,15 +570,17 @@
         ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
         if(!Objects.isNull(ztUserGetTokenResponse)){
             member.setToken(ztUserGetTokenResponse.getToken());
-            member.setToken(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
+            member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
         }
-        memberDto.setAuthStatus(Constants.ONE);
+        if(Constants.equalsInteger(member.getAuthStatus(),Constants.ZERO)){
+            memberDto.setAuthStatus(Constants.ONE);
+        }
         memberMapper.updateById(memberDto);
         return this.getMemberInfo(member.getId());
     }
 
 
-    public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
+    public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){
         ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new  ZTUserInfoUpdateRequest();
         ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
         String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
@@ -586,7 +589,14 @@
         ztUserInfoUpdateRequest.setPhone(member.getPhone());
         ztUserInfoUpdateRequest.setName(member.getName());
         ztUserInfoUpdateRequest.setNickName(member.getNickname());
-//        ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+        if(StringUtils.isNotBlank(member.getProvinceName())
+         && StringUtils.isNotBlank(member.getCityName())
+         && StringUtils.isNotBlank(member.getAreaName())){
+            ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+        }
+        ztUserInfoUpdateRequest.setProvince(member.getProvinceCode());
+        ztUserInfoUpdateRequest.setCity(member.getCityCode());
+        ztUserInfoUpdateRequest.setCounty(member.getAreaCode());
         ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
         String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
                 systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
@@ -605,7 +615,7 @@
         ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData();
         return ztUserGetTokenResponse;
     }
-    public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){
+    public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
         ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new  ZTUserInfoUpdateRequest();
         ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
         String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
@@ -614,7 +624,16 @@
         ztUserInfoUpdateRequest.setPhone(member.getPhone());
         ztUserInfoUpdateRequest.setName(member.getName());
         ztUserInfoUpdateRequest.setNickName(member.getNickname());
-//        ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+
+        if(StringUtils.isNotBlank(member.getProvinceName())
+                && StringUtils.isNotBlank(member.getCityName())
+                && StringUtils.isNotBlank(member.getAreaName())){
+            ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+        }
+        ztUserInfoUpdateRequest.setProvince(member.getProvinceCode());
+        ztUserInfoUpdateRequest.setCity(member.getCityCode());
+        ztUserInfoUpdateRequest.setCounty(member.getAreaCode());
+
         ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
         String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
                 systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
diff --git a/server/service/src/main/resources/application-pro.yml b/server/service/src/main/resources/application-pro.yml
index 7002d45..1e1f4a5 100644
--- a/server/service/src/main/resources/application-pro.yml
+++ b/server/service/src/main/resources/application-pro.yml
@@ -1,9 +1,9 @@
 spring:
   # 鏁版嵁婧愰厤缃�
   datasource:
-    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/zbom_youjia?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-    username: doumee
-    password: rtjgfEr@&0c0m
+    url: jdbc:mysql://10.200.200.16:3306/zbom_youjia?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    username: root
+    password: Zbom2020@rds
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
   redis:
diff --git a/server/web/src/main/java/com/doumee/api/ScheduleTool.java b/server/web/src/main/java/com/doumee/api/ScheduleTool.java
index 7923406..8fbf500 100644
--- a/server/web/src/main/java/com/doumee/api/ScheduleTool.java
+++ b/server/web/src/main/java/com/doumee/api/ScheduleTool.java
@@ -34,11 +34,10 @@
  * @date 2021-10-10 14:40:35
  * https://www.bejson.com/othertools/cron/  cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
  */
-//@Component
-//@EnableScheduling
+@Component
+@EnableScheduling
 @Slf4j
 public class ScheduleTool {
-
     @Autowired
     private SystemDictDataBiz systemDictDataBiz;
 
@@ -49,7 +48,6 @@
      */
     @Value("${debug_model}")
     private Boolean timing;
-
 
 
 

--
Gitblit v1.9.3