Merge branch 'master_cloud' of http://47.97.198.219:3000/wangyongsheng/kcim-cost into jiangyongmin

Dockerfile

@@ -0,0 +1,6 @@
+FROM openjdk:8-jdk-alpine
+LABEL authors="KCIM"
+RUN  ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+COPY ./target/kcim-cost-0.0.1-SNAPSHOT.jar ./data/app/kcim-cost-0.0.1-SNAPSHOT.jar
+EXPOSE 8083
+ENTRYPOINT ["java","-jar","./data/app/kcim-cost-0.0.1-SNAPSHOT.jar"]

pom.xml

@@ -20,6 +20,7 @@
         <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
         <fastjson2.version>2.0.23</fastjson2.version>
         <nacos.version>2.2.8.RELEASE</nacos.version>
+        <spring-cloud-alibaba.version>2.2.8.RELEASE</spring-cloud-alibaba.version>
         <openfeign.version>2.2.9.RELEASE</openfeign.version>
         <saToken.version>1.31.0</saToken.version>
         <easypoi.version>4.3.0</easypoi.version>
@@ -335,6 +336,15 @@
             <artifactId>metastore</artifactId>
             <version>8.3.0.0-371</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>${spring-cloud-alibaba.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/kcim/common/config/AsyncConfig.java

@@ -0,0 +1,28 @@
+package com.kcim.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+
+/**
+ * @program: CostAccount
+ * @description:
+ * @author: Wang.YS
+ * @create: 2025-07-04 19:15
+ **/
+
+@Configuration
+public class AsyncConfig {
+    @Bean("asyncTaskExecutor")
+    public Executor asyncTaskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(10);
+        executor.setMaxPoolSize(20);
+        executor.setQueueCapacity(50);
+        executor.setThreadNamePrefix("Async-");
+        executor.initialize();
+        return executor;
+    }
+}

src/main/java/com/kcim/vo/SessionUserVO.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @program: CostAccount
  * @description:
@@ -43,4 +45,7 @@ public class SessionUserVO {
     private Long orgnId;
 
     private String orgnName;
+
+    private List<Long> roleIds;
+
 }

src/main/resources/application-dev.yml

@@ -113,9 +113,6 @@ sa-token:
     password: xywl2021!
     # 连接超时时间
     timeout: 10s
-  #    host: 118.31.245.65
-  #    password: xywl2021#
-
   is-log: false
 minio:
   url: http://47.97.198.219:9000

src/main/resources/bootstrap.yml

@@ -0,0 +1,29 @@
+spring:
+  application:
+    name: kcim-cost
+  cloud:
+    nacos:
+      discovery:
+        namespace: 060cc0fe-193f-4a94-bbca-6d48a4f95ac2
+        server-addr: 120.27.235.181:8848
+        service: ${spring.application.name}
+        group: dev
+      config:
+        server-addr: 120.27.235.181:8848
+        namespace: 060cc0fe-193f-4a94-bbca-6d48a4f95ac2
+        file-extension: yaml
+        enabled: true
+        refresh-enabled: true
+#      discovery:
+#        server-addr: nacos-cs.iot-middleware:8848
+#        service: ${spring.application.name}
+#        #        namespace: 38b4fbe9-4a20-48c3-a8bf-ebf069fb26e8
+#        #        group: KCIM
+#        namespace: kcim-pre
+#        group: dev
+#      config:
+#        server-addr: nacos-cs.iot-middleware:8848
+#        namespace: kcim-pre
+#        file-extension: yaml
+#        enabled: true
+#        refresh-enabled: true