martin 3 vuotta sitten
vanhempi
commit
fce1d8fe26

+ 2 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/TaskService.java

@@ -62,6 +62,7 @@ public class TaskService {
     String linuxTempPath;
 
     public void taskTick(String taskId) {
+        log.info("------- 接收到任务 " + taskId + "的心跳!");
         // 刷新 redis 心跳时间
         ProjectPO projectPO = projectMapper.selectById(taskId);
         String projectId = projectPO.getId();
@@ -73,6 +74,7 @@ public class TaskService {
 
     @Transactional
     public void taskState(String taskId, String state) {
+        log.info("------- 接收到任务 " + taskId + "的状态:" + state);
         //1 根据 taskId 修改任务状态 taskState。
         taskMapper.updateState(taskId, state);
         //2 如果 taskState 为完成状态,校验一下项目的已完成数量。

+ 10 - 0
simulation-resource-scheduler/src/main/resources/bootstrap-aliyun.yaml

@@ -0,0 +1,10 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 47.94.105.148:8848
+        namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
+      config:
+        server-addr: 47.94.105.148:8848
+        namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
+        file-extension: yaml

+ 10 - 0
simulation-resource-scheduler/src/main/resources/bootstrap-dev.yaml

@@ -0,0 +1,10 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.15.12.70:8848
+        namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
+      config:
+        server-addr: 10.15.12.70:8848
+        namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
+        file-extension: yaml

+ 0 - 11
simulation-resource-scheduler/src/main/resources/bootstrap.yml

@@ -1,16 +1,5 @@
 spring:
   application:
     name: simulation-resource-scheduler
-  #* -------------------------------- 环境配置 --------------------------------
   profiles:
     active: dev
-  #* -------------------------------- 微服务配置 --------------------------------
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 10.15.12.70:8848
-        namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
-      config:
-        server-addr: 10.15.12.70:8848
-        namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
-        file-extension: yaml

+ 2 - 2
simulation-resource-scheduler/src/main/resources/logback-spring.xml

@@ -4,8 +4,8 @@
     <property name="PROJECT_NAME" value="changjingyun"/>
 
     <!--定义不同环境的日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <springProfile name="dev">
-        <property name="LOG_HOME" value="D:\\idea-log\\simulation-cloud\\simulation-resource-scheduler"/>
+    <springProfile name="aliyun">
+        <property name="LOG_HOME" value="/opt/simulation-cloud/simulation-resource-scheduler/log"/>
     </springProfile>
 
     <!--输出到控制台-->