[update] 合并代码

2025-07-02 09:22:21 +08:00
parent 66912c4eb9
commit bb9d654d57
8 changed files with 48 additions and 92 deletions
--- a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
@ -272,12 +272,12 @@ weather:
 # dxf转 geojson 执行文件名
 dxf2GeoJson:
  file-name: main.exe
-#ys7:
-#  app-key: 3acf9f1a43dc4209841e0893003db0a2
-#  app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36
 ys7:
-  app-key: 081b0d6d5f7f4de8bc5c7fa350fb26ec
-  app-secret: caa37b9f60ef02deb57e563bc190e6db
+  app-key: 3acf9f1a43dc4209841e0893003db0a2
+  app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36
+#ys7:
+#  app-key: 081b0d6d5f7f4de8bc5c7fa350fb26ec
+#  app-secret: caa37b9f60ef02deb57e563bc190e6db
 # 斯巴达算法
 sparta:
  url: http://119.3.204.120:8040
--- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml
+++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml
@ -296,7 +296,7 @@ websocket:
 --- # warm-flow工作流配置
 warm-flow:
  # 是否开启工作流，默认true
-  enabled: false
+  enabled: true
  # 是否开启设计器ui
  ui: true
  # 默认Authorization，如果有多个token，用逗号分隔