邮箱变更

pom.xml

@@ -17,7 +17,6 @@
     </properties>
     <dependencyManagement>
         <dependencies>
-            <!-- Microsoft Graph SDK -->
 
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
@@ -61,29 +60,6 @@
             <version>3.1</version>
         </dependency>
         <dependency>
-            <groupId>com.microsoft.graph</groupId>
-            <artifactId>microsoft-graph-auth</artifactId>
-            <version>0.3.0</version>
-        </dependency>
-        <dependency>
-            <!-- Include the sdk as a dependency -->
-            <groupId>com.microsoft.graph</groupId>
-            <artifactId>microsoft-graph-core</artifactId>
-            <version>2.0.14</version>
-        </dependency>
-
-        <dependency>
-            <!-- Include the sdk as a dependency -->
-            <groupId>com.microsoft.graph</groupId>
-            <artifactId>microsoft-graph</artifactId>
-            <version>5.42.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-identity</artifactId>
-            <version>1.3.3</version>
-        </dependency>
-        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <version>2.5.15</version>
@@ -154,19 +130,6 @@
             <artifactId>javax.mail</artifactId>
             <version>1.6.2</version>
         </dependency>
-        <!-- Microsoft Graph SDK -->
-
-        <dependency>
-            <groupId>com.microsoft.graph</groupId>
-            <artifactId>microsoft-graph-auth</artifactId>
-            <version>0.3.0</version>
-        </dependency>
-        <dependency>
-            <!-- Include the sdk as a dependency -->
-            <groupId>com.microsoft.graph</groupId>
-            <artifactId>microsoft-graph-core</artifactId>
-            <version>2.0.14</version>
-        </dependency>
         <!-- MSAL认证库 -->
 
 
@@ -218,18 +181,6 @@
             <version>4.9.3</version>  <!-- 使用最新版本 -->
         </dependency>
         <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-identity</artifactId>
-            <version>1.3.3</version>
-        </dependency>
-        <!-- 确保所有Azure库版本一致 -->
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-core</artifactId>
-            <version>1.34.0</version>
-        </dependency>
-
-        <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.49</version> <!-- 请使用适合您MySQL版本的驱动 -->
@@ -253,6 +204,11 @@
             <version>2.13.0</version>
         </dependency>
         <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>2.13.0</version>
+        </dependency>
+        <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-parameter-names</artifactId>
             <version>2.13.0</version>

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

@@ -3,10 +3,6 @@ package com.cmeeting.job;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
-import com.azure.core.credential.AccessToken;
-import com.azure.core.credential.TokenRequestContext;
-import com.azure.identity.ClientSecretCredential;
-import com.azure.identity.ClientSecretCredentialBuilder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cmeeting.config.StatisticsEmailPushProperties;
 import com.cmeeting.constant.DeptCollect;

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

@@ -367,25 +367,25 @@ public class FileProcessTask {
                     "text/plain; charset=utf-8",      // MIME类型
                     recordData.getBytes(StandardCharsets.UTF_8)          // 字节内容
             );
-            //将转录文件存到知识向量库
-            Map<String, String> otherParams = new HashMap<>();
-            otherParams.put("userId", toUserCode);
-            otherParams.put("tenantId", permTenantId);
-            otherParams.put("layout", "V1");
-            String responseData = HttpClientKnowledgePlatformUtil.sendPostByFormDataFiles(userAdminConfig.getDocDomain() + KnowledgePlatformRouteConstant.DOC.SIMPLE_DOC_UPLOAD_URL, Arrays.asList(multipartFile), otherParams, null);
-            if (StringUtils.isNotBlank(responseData)) {
-                R result = JSON.parseObject(responseData, R.class);
-                List<DocResultDto> docResultDtoList = JSON.parseObject(JSONObject.toJSONString(result.getData()), new TypeReference<List<DocResultDto>>() {
-                });
-                DocResultDto docResultDto = docResultDtoList.get(0);
-//                String previewPath = docResultDto.getPreviewPath();
-//                recordContentPath = previewPath.replaceAll(fileDownloadPath,"");
-                meetingInfo.setTransDocId(docResultDto.getId());
-            } else {
-                processLogService.log(meetingId, subMeetingId, "填充会议纪要失败，上传转录文件到向量知识库失败");
-//                throw new RuntimeException("填充会议纪要失败");
-                meetingInfo.setTransDocId("");
-            }
+//            //将转录文件存到知识向量库
+//            Map<String, String> otherParams = new HashMap<>();
+//            otherParams.put("userId", toUserCode);
+//            otherParams.put("tenantId", permTenantId);
+//            otherParams.put("layout", "V1");
+//            String responseData = HttpClientKnowledgePlatformUtil.sendPostByFormDataFiles(userAdminConfig.getDocDomain() + KnowledgePlatformRouteConstant.DOC.SIMPLE_DOC_UPLOAD_URL, Arrays.asList(multipartFile), otherParams, null);
+//            if (StringUtils.isNotBlank(responseData)) {
+//                R result = JSON.parseObject(responseData, R.class);
+//                List<DocResultDto> docResultDtoList = JSON.parseObject(JSONObject.toJSONString(result.getData()), new TypeReference<List<DocResultDto>>() {
+//                });
+//                DocResultDto docResultDto = docResultDtoList.get(0);
+////                String previewPath = docResultDto.getPreviewPath();
+////                recordContentPath = previewPath.replaceAll(fileDownloadPath,"");
+//                meetingInfo.setTransDocId(docResultDto.getId());
+//            } else {
+//                processLogService.log(meetingId, subMeetingId, "填充会议纪要失败，上传转录文件到向量知识库失败");
+////                throw new RuntimeException("填充会议纪要失败");
+//                meetingInfo.setTransDocId("");
+//            }
 
             // 将转录文件保存到MinIO
             String encryptedRecordData = AESUtils.encrypt(recordData, aesKey);

src/main/resources/application.yml

@@ -34,7 +34,9 @@ CORP_SECRET: 7YLePWG7rJqkQFnAB4FeylqAXpmu7q5qv_NOeSGNbm0
 
 ############################################################## email
 EMAIL_SENDER: cmeeting_assistant@cimc.com
-EMAIL_SMTP_HOST: smtp.office365.com
+EMAIL_SENDER_PWD: 4Zno69350R7Hwrj8
+EMAIL_SMTP_HOST: mail.ksomail.com
+EMAIL_SMTP_PORT: 465
 
 ############################################################## permission
 PERMISSION_APPLiCATION_ID: 1945681039926104064
@@ -106,14 +108,11 @@ tencent:
 
 email:
   sender: ${EMAIL_SENDER}
-#  sender-pwd: ${EMAIL_SENDER_PWD}
+  sender-pwd: ${EMAIL_SENDER_PWD}
   smtp-host: ${EMAIL_SMTP_HOST}
+  smtp-port: ${EMAIL_SMTP_PORT}
   push-switch: true  #邮件推送总开关，高优先级
   environment: prod  #test推给本公司人员，prod推给用户
-  microsoft:
-    clientId: 'rNvsNtIQTUAD7aYik9/1LDpfO+XbM4nuPkpf131H8vHfJg7Uj7HxJJcHFbtmO4uWagelhTsOTSx2PDqjeuqiYw=='
-    clientSecret: 'DERmPlHbjiN4rjIFHvpe+OypNRCuSwLe/MBy56EFtI7FkzHfOnVjMdCTRG/CmybBBfha6geFbijC6ymeMVSSeg=='
-    tenantId: 'dFSC/Jg4ibKnmKWCofo1KfR5IdsvHEHYiAE0iehpiyj0rzes8BRBzvQAu2rjG8SAm8VQetE+sLNvxObI8vq5iA=='
 
 llm:
   api-addr: ${LLM_API_ADDR}