syh 5 år sedan
förälder
incheckning
ad9dc76569

+ 0 - 6
module-common/src/main/java/cn/com/ctop/common/module/entity/BindAccountLogin.java

@@ -3,14 +3,12 @@ package cn.com.ctop.common.module.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -87,16 +85,12 @@ public class BindAccountLogin {
      * 创建时间
      */
     @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
     /**
      * 修改时间
      */
     @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 

+ 4 - 5
module-common/src/main/java/cn/com/ctop/common/module/service/impl/CtopOauthTokenServiceImpl.java

@@ -9,6 +9,7 @@ import cn.com.ctop.common.module.utils.PropertiesUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xxl.job.core.log.XxlJobLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,7 +52,7 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
      */
     @Override
     public Map<String, Object> getByteDanceAccessToken(String token, String refreshToken) {
-        log.info("刷新头条token入参,token:{},refreshToken:{}", token, refreshToken);
+        XxlJobLogger.log("刷新头条token入参,token:{},refreshToken:{}", token, refreshToken);
         Map<String, Object> resultMap = new HashMap<>();
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + "/oauth2/refresh_token";
         Map<String, Object> param = new HashMap<>();
@@ -61,7 +62,7 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
         param.put("refresh_token", refreshToken);
         String result = HttpUtils.httpPostRequest(url, param, new HashMap<>());
         JSONObject resultObject = JSONObject.parseObject(result);
-        log.info("头条刷新token入参,token:{},refreshToken:{},返回信息:{}", token, refreshToken, resultObject);
+        XxlJobLogger.log("头条刷新token入参,token:{},refreshToken:{},返回信息:{}", token, refreshToken, resultObject);
         Integer code = resultObject.getInteger("code");
         if (code == 0) {
             JSONObject data = resultObject.getJSONObject("data");
@@ -78,7 +79,7 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
             queryWrapper.eq("media_id", 1);
             int i = cTopOauthTokenMapper.update(updateRefreshToken, queryWrapper);
             if (i > 0) {
-                log.info("头条刷新token成功:token:{}", token);
+                XxlJobLogger.log("头条刷新token成功:token:{}", token);
             }
             resultMap.put("message", "token刷新成功");
             resultMap.put("code", 0);
@@ -87,8 +88,6 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
             resultMap.put("token", token);
             resultMap.put("code", 0);
         }
-
-
         return resultMap;
     }
 

+ 0 - 2
module-common/src/main/java/cn/com/ctop/common/module/service/impl/RefreshTokenServiceImpl.java

@@ -48,9 +48,7 @@ public class RefreshTokenServiceImpl implements IRefreshTokenService {
         if (!Check.isNull(byteDanceOauthTokens)) {
             for (CtopOauthToken oauthToken : byteDanceOauthTokens) {
                 oauthTokenService.getByteDanceAccessToken(oauthToken.getAccessToken(), oauthToken.getRefreshToken());
-
             }
         }
-
     }
 }

+ 23 - 0
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/ByteDanceRefreshTokenJob.java

@@ -0,0 +1,23 @@
+package cn.com.ctop.job.bytedance.handler;
+
+import cn.com.ctop.common.module.service.IRefreshTokenService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ByteDanceRefreshTokenJob {
+    @Autowired
+    private IRefreshTokenService refreshTokenService;
+
+    /**
+     * 刷新token
+     * @throws Exception
+     */
+    @XxlJob("byteDanceRefreshTokenJob")
+    public ReturnT<String> execute(String param) throws Exception {
+        refreshTokenService.byteDanceRefresh();
+        return ReturnT.SUCCESS;
+    }
+}

+ 10 - 10
module-job-bytedance/src/main/resources/application-prod.yml

@@ -120,16 +120,16 @@ jeecg:
     bin: ffmpeg
   path:
     #文件上传根目录 设置
-    upload: /mnt/upload
+    upload: /data/upload
     #webapp文件路径
-    webapp: /mnt/webapp
-    video-upload: /mnt/upload/video/
-    image-upload: /mnt/upload/image/
+    webapp: /data/webapp
+    video-upload: /data/upload/video/
+    image-upload: /data/upload/image/
     chrome-driver: /usr/bin/chromedriver
-    csv-upload: /mnt/upload/csv/
-    bak-database-file: /mnt/data/bak/
-    report-history: /mnt/upload/report/history/
-    report-daily: /mnt/upload/report/daily/
+    csv-upload: /data/upload/csv/
+    bak-database-file: /data/data/bak/
+    report-history: /data/upload/report/history/
+    report-daily: /data/upload/report/daily/
 kuaishou:
   group-control:
     path: http://39.106.184.70
@@ -140,10 +140,10 @@ logging:
   config: classpath:logback-prod.xml
 chrome:
   script:
-    clean: sh /mnt/webapp/cleanProcess.sh
+    clean: sh /data/webapp/cleanProcess.sh
 
 oss:
   replace:
     replace-value: oss-cn-beijing-internal
     replace-old-value: oss-cn-beijing
-    download: /mnt/file/video/
+    download: /data/file/video/

+ 25 - 0
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouRefreshTokenJob.java

@@ -0,0 +1,25 @@
+package cn.com.ctop.job.kuaishou.handler;
+
+import cn.com.ctop.common.module.service.IRefreshTokenService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class KuaiShouRefreshTokenJob {
+    @Autowired
+    private IRefreshTokenService refreshTokenService;
+
+    /**
+     * 刷新token
+     * @throws JobExecutionException
+     */
+    @XxlJob("kuaiShouRefreshTokenJob")
+    public ReturnT<String> execute(String param) throws Exception {
+        refreshTokenService.getKuaiShouRefresh();
+        return ReturnT.SUCCESS;
+    }
+}
+

+ 10 - 10
module-job-kuaishou/src/main/resources/application-prod.yml

@@ -125,16 +125,16 @@ jeecg:
     bin: ffmpeg
   path:
     #文件上传根目录 设置
-    upload: /mnt/upload
+    upload: /data/upload
     #webapp文件路径
-    webapp: /mnt/webapp
-    video-upload: /mnt/upload/video/
-    image-upload: /mnt/upload/image/
+    webapp: /data/webapp
+    video-upload: /data/upload/video/
+    image-upload: /data/upload/image/
     chrome-driver: /usr/bin/chromedriver
-    csv-upload: /mnt/upload/csv/
-    bak-database-file: /mnt/data/bak/
-    report-history: /mnt/upload/report/history/
-    report-daily: /mnt/upload/report/daily/
+    csv-upload: /data/upload/csv/
+    bak-database-file: /data/data/bak/
+    report-history: /data/upload/report/history/
+    report-daily: /data/upload/report/daily/
 kuaishou:
   group-control:
     path: http://39.106.184.70
@@ -145,10 +145,10 @@ logging:
   config: classpath:logback-prod.xml
 chrome:
   script:
-    clean: sh /mnt/webapp/cleanProcess.sh
+    clean: sh /data/webapp/cleanProcess.sh
 
 oss:
   replace:
     replace-value: oss-cn-beijing-internal
     replace-old-value: oss-cn-beijing
-    download: /mnt/file/video/
+    download: /data/file/video/

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/graphql/service/impl/KuaishouWebInterfaceServiceImpl.java

@@ -631,6 +631,7 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
 
     @Override
     public void getkuaishouWebLoginCookie(BindAccountLogin login){
+
         ChromeDriverService service = new ChromeDriverService.Builder().usingDriverExecutable(new File(chromeDriver)).usingAnyFreePort().build();
         try {
             service.start();