From c02e013361997835b6bde8bd47f7fa107cafd74b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Fri, 1 Nov 2024 13:47:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=BC=95=E6=93=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../calc/functions/FunctionSaveCalcData.java  |   2 +-
 das/src/main/resources/application-dev.yml    | 100 ++++++++++++++++++
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 das/src/main/resources/application-dev.yml

diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java b/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java
index 4601a90f..9e9ad09a 100644
--- a/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java
@@ -79,7 +79,7 @@ public class FunctionSaveCalcData extends AbstractVariadicFunction {
             dataList.add(dt);
         }
 
-//        dataService.updateCalFieldData(dataList);
+        dataService.updateCalFieldData(dataList);
         return AviatorRuntimeJavaType.valueOf(0);
     }
 }
diff --git a/das/src/main/resources/application-dev.yml b/das/src/main/resources/application-dev.yml
new file mode 100644
index 00000000..d33a2bc2
--- /dev/null
+++ b/das/src/main/resources/application-dev.yml
@@ -0,0 +1,100 @@
+server:
+  port: 8080
+  # SpringBoot中我们既可以使用Tomcat作为Http服务，也可以用Undertow来代替。Undertow在高并发业务场景中，性能优于Tomcat
+  undertow:
+    threads:
+      # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
+      io: 16
+      # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
+      worker: 400
+    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
+    # 每块buffer的空间大小,越小的空间被利用越充分
+    buffer-size: 1024
+    # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的
+    max-http-post-size: -1
+    # 是否分配的直接内存
+    direct-buffers: true
+
+sa-token:
+  # token有效期，单位秒
+  expireTime: 7200
+  refreshExpireTime: 604800
+  # 是否允许同一账号多终端登录，默认为true
+  is-concurrent: true
+
+
+spring:
+  application:
+    name: das
+  #json格式化全局配置,相当于@JsonFormat
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+    # 指定默认包含的熟悉，NON_NULL表示只序列化非空属性
+    default-property-inclusion: non_null
+  # 配置文件上传大小限制
+  servlet:
+    multipart:
+      # 单个文件最大大小
+      max-file-size: 1024MB
+      # 多个文件总大小
+      max-request-size: 2048MB
+  datasource:
+    url: jdbc:postgresql://192.168.109.102:5432/das
+    username: das
+    password: qwaszx12
+      #  # redis相关配置
+  data:
+    redis:
+      host: 192.168.109.195
+      database: 0
+      port: 6379
+      password:
+      client-type: lettuce
+
+
+# 配置 xml 文件所在位置    配置全局的 主键策略，默认为 ASSIGN_ID 默认为 【雪花算法】 , auto 自增
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/**/*.xml
+  # 搜索指定包别名
+  typeAliasesPackage: com.das.**.entity
+  global-config:
+    # 关闭MP3.0自带的banner
+    banner: false
+    db-config:
+      id-type: ASSIGN_ID
+      # 逻辑删除
+      logic-not-delete-value: 0
+      logic-delete-value: 1
+      #字段策略
+      insert-strategy: not_null
+      update-strategy: not_null
+      where-strategy: not_empty
+      #驼峰下划线转换
+      table-underline: true
+  # 开启驼峰命名 默认开启驼峰命名
+  # mybatis-plus配置控制台打印完整带参数SQL语句
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+# 验证码相关
+captcha:
+  enabled: true
+  verify-type: calculate
+  expire: 120
+
+das:
+  aes:
+    key: b6967ee87b86d85a
+
+logging:
+  level:
+    com:
+      das: DEBUG
+
+tdengine:
+  password: taosdata
+  url: jdbc:TAOS-RS://192.168.109.160:6041/das
+  username: root
\ No newline at end of file