diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/inspection/InspectionTaskLogController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/inspection/InspectionTaskLogController.java index 14c231c..b11675c 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/inspection/InspectionTaskLogController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/inspection/InspectionTaskLogController.java @@ -33,7 +33,6 @@ public class InspectionTaskLogController extends BaseController @ApiOperation("查询巡检任务执行日志列表") @GetMapping("/list") public TableDataInfo list(@ApiParam("任务实例ID") @RequestParam String taskInstanceId) { - startPage(); List list = inspectionTaskLogService.selectInspectionTaskLogList(taskInstanceId); return getDataTable(list); } diff --git a/cmvr-iot-admin/src/main/resources/application-prodbak.yml b/cmvr-iot-admin/src/main/resources/application-prodbak.yml new file mode 100644 index 0000000..0bc1cd7 --- /dev/null +++ b/cmvr-iot-admin/src/main/resources/application-prodbak.yml @@ -0,0 +1,134 @@ +server: + # 服务器的HTTP端口,默认为8080 + port: 13080 +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://mysql57:3306/cmvr-iot-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: cmvr-iot + password: cmvr-iot123456 + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间,单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间,单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单,不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: cmvr-iot + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true + # 服务模块 + devtools: + restart: + # 热部署开关 + enabled: true + # redis 配置 + redis: + # 地址 + host: redis + # 端口,默认为6379 + port: 6379 + # 数据库索引 + database: 0 + # 密码 + password: cmvr2468 + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池:中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间(使用负值表示没有限制) + max-wait: -1ms + +# Minio配置 +minio: + url: http://minio:9000 + accessKey: AKICMVR + secretKey: wJalrXUtnFEMI + bucketName: cmvr-iot + +# gRPC 客户端设置 +grpc: + client: + grpc-server: # 自定义服务名 + address: 'static://10.148.108.100:50051' # 调用 gRPC 的地址 + # address: 'static://10.148.108.100:50051' # 调用 gRPC 的地址 + enableKeepAlive: true + keepAliveWithoutCalls: true + negotiationType: plaintext # 明文传输 + +api: + app-id: d0epfibvo3em6c4iul40 + app-key: d0eqt1kqek3vg7g4ofi0 + work-flow-url: https://aiagentplatform.cmft.com/api/proxy/api/v1/run_app_workflow + query-result-url: https://aiagentplatform.cmft.com/api/proxy/api/v1/query_run_app_process + bge-vl: http://192.168.1.8:5000/search_similar + generate_advanced_audio: http://192.168.0.102:9003/generate_advanced_audio + # 智能体应用id和秘钥 + # ActionEnum 的枚举作为 key + agents: + INTENT_RECOGNITION: # 意图识别 + app-id: d5dn5ibp9adhq1b34lig + app-key: d6j5bcellh49on5tasvg + TI_TOUCH_COORDINATES: # 获取触控二维坐标 + app-id: d1ebtabnjkflk4gmhikg + app-key: d5thge2cktmipk78h82g + evaluation: http://192.168.0.8:8000/analyze + current-page: http://192.168.0.222:5000/search_similar + +flowise: + tts: 192.168.0.222:8080/tts/ + start: http://192.168.0.108:3000/api/v1/prediction/86f01c9d-aaf4-495e-9530-d02e3172c807 + abort: http://192.168.0.108:3000/api/v1/chatmessage/abort/86f01c9d-aaf4-495e-9530-d02e3172c807/ + query: http://192.168.0.108:3000/api/v1/executions/ + api-key: pg61JW6W_GXyqmqSoURJ4mlSRrCMRzGLBJli_w3BFkg