企微配置抽离

src/main/java/com/cmeeting/job/CmeetingJob.java

@@ -99,22 +99,6 @@ public class CmeetingJob {
     @Scheduled(fixedRate = 20 * 60 * 1000,initialDelay = 2 * 60 * 1000)
 //    @Scheduled(fixedRate = 20 * 60 * 1000)
     public void execute() {
-        // 定义时间格式化器
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-        // 获取当前时间
-        LocalDateTime now = LocalDateTime.now();
-        // 往之前推两天
-        LocalDateTime beforeDay = now.minusDays(2);
-
-        // 转换为 Unix 时间戳（秒）并转为字符串
-        Long nowTimestamp = now.atZone(ZoneId.systemDefault()).toEpochSecond();
-        Long beforeDayTimestamp = beforeDay.atZone(ZoneId.systemDefault()).toEpochSecond();
-        //日志记录
-        log.info("起始时间: " + beforeDay.format(formatter) + " | Unix 时间戳: " + beforeDayTimestamp);
-        log.info("结束时间: " + now.format(formatter) + " | Unix 时间戳: " + nowTimestamp);
-        log.info("----------------------------------");
-
         //查出企微id和腾会id的关联关系
         List<UserId> userIdRelations = userIdMapper.selectList(null);
         Map<String,String> widTidRelations = userIdRelations.stream().collect(Collectors.toMap(UserId::getWid,UserId::getTid));

src/main/java/com/cmeeting/service/impl/WeComServiceImpl.java

@@ -39,8 +39,10 @@ import java.util.stream.Collectors;
 @Slf4j
 public class WeComServiceImpl extends ServiceImpl<WeComUserMapper, WeComUser>  implements WeComService {
 
-    private static final String CORP_ID = "wx34544d057db97ffd";
-    private static final String CORP_SECRET = "7YLePWG7rJqkQFnAB4FeylqAXpmu7q5qv_NOeSGNbm0";
+    @Value(value = "${wechat.corp_id}")
+    private String CORP_ID;
+    @Value(value = "${wechat.corp_secret}")
+    private String CORP_SECRET;
     private static final String TOKEN_KEY = "ZHONGJI_WECOM_KEY";
 
     @Resource
@@ -67,8 +69,6 @@ public class WeComServiceImpl extends ServiceImpl<WeComUserMapper, WeComUser>  i
         JSONArray departmentList = getDepartmentList();
         Iterator<Object> iterator = departmentList.iterator();
         List<WeComUser> users = new ArrayList<>();
-//        List<UserDTO> userEmailList = sysUserSyncMapper.getUserEmail(permissionTenantId);
-//        CollectionUtils.isEmpty(userEmailList) ? new HashMap<>() : userEmailList.
         while (iterator.hasNext()){
             JSONObject department = (JSONObject) iterator.next();
             String departmentId = String.valueOf(department.get("id"));
@@ -98,7 +98,6 @@ public class WeComServiceImpl extends ServiceImpl<WeComUserMapper, WeComUser>  i
             return String.valueOf(redisUtils.get(TOKEN_KEY));
         }
         //获取token
-//        String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=ww1fd8778458e9f1e8&corpsecret=uFRq9Xi8-dVY90LydXYBhjc91JnnfkPUR6lHDdeJ_fo";
         String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=" + CORP_ID + "&corpsecret=" + CORP_SECRET;
         String accessToken;
         OkHttpClient client = new OkHttpClient();

src/main/resources/application.yml

@@ -32,6 +32,11 @@ TENCENT_SECRETID: 0ks7u8cgQ8DGVtlYZeRA9TxZCjvUT3oL
 TENCENT_SECRETKEY: gQU09rkJjiQfiGcUYdhiKq5Ol6LebXg4w7F7Ol0rwvvdv3Xy
 TENCENT_ADMIN_USERID: woaJARCQAAftcvU6GGoOn66rdSZ4IrOA
 
+############################################################## wechat
+# prod
+CORP_ID: wx34544d057db97ffd
+CORP_SECRET: 7YLePWG7rJqkQFnAB4FeylqAXpmu7q5qv_NOeSGNbm0
+
 ############################################################## email
 EMAIL_SENDER: cmeeting_assistant@cimc.com
 EMAIL_SENDER_PWD: scyou@xih45g6@xih4
@@ -96,6 +101,10 @@ minio.accessKey: ${MINIO_USERNAME}
 #访问的秘钥
 minio.secretKey: ${MINIO_PASSWORD}
 
+wechat:
+  corp_id: ${CORP_ID}
+  corp_secret: ${CORP_SECRET}
+
 tencent:
   appId: ${TENCENT_APPID}
   sdkId: ${TENCENT_SDKID}
@@ -105,7 +114,8 @@ tencent:
   meeting:
     token: QQZNb7xWQB47MpZF4C2DFAkv8
     aesKey: agy6ALUePp34lljWz1uIQWa7yQq3dgxxQNmfaN9GROm
-  base-save-path: E:/save/
+  base-save-path: E:/save/  #会议纪要临时文件存储路径
+  search-scope: 2   #腾会转录文件拉取时间范围，查询过去n天的记录
 
 email:
   sender: ${EMAIL_SENDER}