diff --git a/cmvr-iot-admin/src/main/resources/application-dev.yml b/cmvr-iot-admin/src/main/resources/application-dev.yml index fee51a8..c523d21 100644 --- a/cmvr-iot-admin/src/main/resources/application-dev.yml +++ b/cmvr-iot-admin/src/main/resources/application-dev.yml @@ -105,4 +105,18 @@ grpc: # address: 'static://10.148.108.100:50051' # 调用 gRPC 的地址 enableKeepAlive: true keepAliveWithoutCalls: true - negotiationType: plaintext # 明文传输 \ No newline at end of file + 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: d3c98sp0gdon0fcf6l00 + app-key: d3c98vp0gdon0fcf6n20 \ No newline at end of file diff --git a/cmvr-iot-admin/src/main/resources/application-prod.yml b/cmvr-iot-admin/src/main/resources/application-prod.yml index c850d0a..eb0f431 100644 --- a/cmvr-iot-admin/src/main/resources/application-prod.yml +++ b/cmvr-iot-admin/src/main/resources/application-prod.yml @@ -1,71 +1,122 @@ server: - # 服务器的HTTP端口，默认为8080 - port: 13082 + # 服务器的HTTP端口，默认为8080 + port: 13080 # 数据源配置 spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - druid: - # 主库数据源 - master: - url: jdbc:mysql://10.148.20.35: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 + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://192.168.0.222: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: 192.168.0.222 + # 端口，默认为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://localhost:9000 - accessKey: minioadmin - secretKey: minioadmin - bucketName: ruoyi \ No newline at end of file + url: http://192.168.0.222: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: d3c98sp0gdon0fcf6l00 + app-key: d3c98vp0gdon0fcf6n20 \ No newline at end of file diff --git a/cmvr-iot-admin/src/main/resources/application.yml b/cmvr-iot-admin/src/main/resources/application.yml index 503e51f..6a590bc 100644 --- a/cmvr-iot-admin/src/main/resources/application.yml +++ b/cmvr-iot-admin/src/main/resources/application.yml @@ -113,16 +113,4 @@ xss: # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/*,/device/*,/test/*,/api/* -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: d3c98sp0gdon0fcf6l00 - app-key: d3c98vp0gdon0fcf6n20 +