diff --git a/capability/src/main/resources/application-prod.yml b/capability/src/main/resources/application-dev-100.yml similarity index 72% rename from capability/src/main/resources/application-prod.yml rename to capability/src/main/resources/application-dev-100.yml index de580149..56549284 100644 --- a/capability/src/main/resources/application-prod.yml +++ b/capability/src/main/resources/application-dev-100.yml @@ -7,42 +7,42 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306 /spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: - maximum-pool-size: 450 # 连接池最大连接数（关键！） - minimum-idle: 50 # 最小空闲连接数（与最大一致，避免频繁创建销毁） - idle-timeout: 300000 # 空闲连接超时时间（5分钟） - max-lifetime: 600000 # 连接最大存活时间（10分钟） + maximum-pool-size: 20 # 连接池最大连接数（关键！） + minimum-idle: 5 # 最小空闲连接数（与最大一致，避免频繁创建销毁） + idle-timeout: 60000 # 空闲连接超时时间（5分钟） + max-lifetime: 1800000 # 连接最大存活时间（30分钟） connection-timeout: 30000 # 获取连接超时时间（30秒，避免线程阻塞） master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306 /spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver slave: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306 /spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver enable: true cloud: nacos: discovery: - server-addr: 192.168.30.146:8848 - group: PROD_GROUP - # server-addr: 127.0.0.1:8848 + server-addr: 192.168.190.100:7848 + group: DEV_GROUP +# server-addr: 127.0.0.1:8848 enabled: true - # username: nacos - # password: ENC(+QKYnI6gAYu1SbLaZQTkZA==) +# username: nacos +# password: ENC(+QKYnI6gAYu1SbLaZQTkZA==) data: redis: # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0 database: 0 # redis服务器地址（填写自己的服务器地址） - host: 192.168.2.166 + host: 192.168.190.100 # redis端口（默认6379） - port: 6379 + port: 5379 #redis连接超时等待,10秒 timeout: PT10S # redis访问密码（默认为空） @@ -57,10 +57,10 @@ spring: min-idle: 1 # 连接池最大阻塞等待时间(使用负值表示没有限制) 默认 -1，这里配置10s max-wait: PT10S - # password: - # sentinel: - # master: mymaster - # nodes: 10.18.109.50:26379,10.18.109.51:26379,10.18.109.52:26379 +# password: +# sentinel: +# master: mymaster +# nodes: 10.18.109.50:26379,10.18.109.51:26379,10.18.109.52:26379 servlet: multipart: # 单个文件的最大值 @@ -81,7 +81,7 @@ mybatis-plus: configuration: map-underscore-to-camel-case: true auto-mapping-behavior: full - # cache-enabled: true +# cache-enabled: true # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: classpath*:mapper/**/*.xml global-config: diff --git a/capability/src/main/resources/application-dev-190.yml b/capability/src/main/resources/application-dev-190.yml index 45f714ca..b3112c05 100644 --- a/capability/src/main/resources/application-dev-190.yml +++ b/capability/src/main/resources/application-dev-190.yml @@ -10,10 +10,10 @@ spring: jdbc-url: jdbc:mysql://192.168.190.161:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: - maximum-pool-size: 450 # 连接池最大连接数（关键！） - minimum-idle: 50 # 最小空闲连接数（与最大一致，避免频繁创建销毁） - idle-timeout: 300000 # 空闲连接超时时间（5分钟） - max-lifetime: 600000 # 连接最大存活时间（10分钟） + maximum-pool-size: 20 # 连接池最大连接数（关键！） + minimum-idle: 5 # 最小空闲连接数（与最大一致，避免频繁创建销毁） + idle-timeout: 60000 # 空闲连接超时时间（5分钟） + max-lifetime: 1800000 # 连接最大存活时间（30分钟） connection-timeout: 30000 # 获取连接超时时间（30秒，避免线程阻塞） master: username: root diff --git a/capability/src/main/resources/application-dev-65.yml b/capability/src/main/resources/application-dev-65.yml index d9bf351e..78625441 100644 --- a/capability/src/main/resources/application-dev-65.yml +++ b/capability/src/main/resources/application-dev-65.yml @@ -10,10 +10,10 @@ spring: jdbc-url: jdbc:mysql://192.168.65.161:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: - maximum-pool-size: 450 # 连接池最大连接数（关键！） - minimum-idle: 50 # 最小空闲连接数（与最大一致，避免频繁创建销毁） - idle-timeout: 300000 # 空闲连接超时时间（5分钟） - max-lifetime: 600000 # 连接最大存活时间（10分钟） + maximum-pool-size: 20 # 连接池最大连接数（关键！） + minimum-idle: 5 # 最小空闲连接数（与最大一致，避免频繁创建销毁） + idle-timeout: 60000 # 空闲连接超时时间（5分钟） + max-lifetime: 1800000 # 连接最大存活时间（30分钟） connection-timeout: 30000 # 获取连接超时时间（30秒，避免线程阻塞） master: username: root diff --git a/capability/src/main/resources/application-local.yml b/capability/src/main/resources/application-local.yml index 5f8e4f4b..f83af2e5 100644 --- a/capability/src/main/resources/application-local.yml +++ b/capability/src/main/resources/application-local.yml @@ -10,10 +10,10 @@ spring: jdbc-url: jdbc:mysql://192.168.65.161:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: - maximum-pool-size: 450 # 连接池最大连接数（关键！） - minimum-idle: 50 # 最小空闲连接数（与最大一致，避免频繁创建销毁） - idle-timeout: 300000 # 空闲连接超时时间（5分钟） - max-lifetime: 600000 # 连接最大存活时间（10分钟） + maximum-pool-size: 20 # 连接池最大连接数（关键！） + minimum-idle: 5 # 最小空闲连接数（与最大一致，避免频繁创建销毁） + idle-timeout: 60000 # 空闲连接超时时间（5分钟） + max-lifetime: 1800000 # 连接最大存活时间（30分钟） connection-timeout: 30000 # 获取连接超时时间（30秒，避免线程阻塞） master: username: root diff --git a/data/src/main/resources/application-prod.yml b/data/src/main/resources/application-dev-100.yml similarity index 67% rename from data/src/main/resources/application-prod.yml rename to data/src/main/resources/application-dev-100.yml index 98b4b98c..cec8d896 100644 --- a/data/src/main/resources/application-prod.yml +++ b/data/src/main/resources/application-dev-100.yml @@ -7,7 +7,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。 @@ -23,19 +23,19 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver slave: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver enable: true cloud: nacos: discovery: - server-addr: 192.168.30.146:8848 - group: PROD_GROUP + server-addr: 192.168.190.100:7848 + group: DEV_GROUP # server-addr: 127.0.0.1:8848 enabled: true servlet: @@ -108,8 +108,8 @@ fileSystem: # spdmadmin/spdmadmin 作为普通用户只能看到spdm桶的数据 minio: - endpoint: 192.168.30.146 - port: 9000 + endpoint: 192.168.190.100 + port: 8000 access-key: minioadmin secret-key: minioadmin secure: false @@ -127,9 +127,44 @@ security: - /data/flowableUpFileToLocal - /data/flowableUpFileToLocalMerge - /data/getFileBaseInfo + - /data/uploadFiles - /data/initNewTenant - /data/getMinioPresignedUrl + - /data/getPublicDownloadUrl + - /data/updatePermission + - /data/createDir data: storage-monitor: - cron: 0 0 0/1 * * ? \ No newline at end of file + cron: 0 0 0/1 * * ? + + +# xxljob 配置开始 +# xxl-job admin address list, such as "http://address" or "http://address01,http://address02" +xxl: + job: + admin: + # 调度中心地址列表 + addresses: http://192.168.190.100:7110/xxl-job-admin + # 调度中心访问令牌 + accessToken: default_token + # xxl-job 超时时间（秒），默认3秒 + timeout: 3 + executor: + # 执行器是否启用，默认true + enabled: true + # 执行器应用名称 服务名-job-executor + appname: data-job-executor + # 执行器注册地址：默认使用address注册，若为null则使用ip:port注册 + address: + # 执行器IP + ip: ${XXL_JOB_EXECUTOR_IP:} + # 执行器端口,为了好记，web服务端口+1000 + port: 8104 + # 执行器日志路径 + logpath: /home/app/data/xxljob + # 执行器日志保留天数 + logretentiondays: 14 + # 执行器排除扫描的包，多个用逗号分隔，如 "org.package01" 或 "org.package01,org.package02" + excludedpackage: +# xxljob 配置结束 \ No newline at end of file diff --git a/flowable/src/main/resources/application-dev-100.yml b/flowable/src/main/resources/application-dev-100.yml new file mode 100644 index 00000000..c73e5cc9 --- /dev/null +++ b/flowable/src/main/resources/application-dev-100.yml @@ -0,0 +1,40 @@ +server: + port: 7106 +spring: + application: + name: flowable + datasource: + url: jdbc:mysql://192.168.190.100:3306/flowable?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + username: root + password: mysql + driver-class-name: com.mysql.cj.jdbc.Driver + flowable: + # ????????? + database-schema-update: true + # ??????JOB + async-executor-activate: true + cloud: + nacos: + discovery: + server-addr: 192.168.190.100:7848 + group: DEV_GROUP + enabled: true + +logging: + level: + org: + flowable: INFO + +mybatis-plus: + mapper-locations: classpath*:/mapper/**/*.xml + type-aliases-package: com.sdm.flowable.model.entity + configuration: + map-underscore-to-camel-case: true + global-config: + db-config: + id-type: auto +security: + whitelist: + paths: + - /process/testHpc + - /process/asyncCallback diff --git a/gateway2/src/main/resources/application-prod.yml b/gateway2/src/main/resources/application-dev-100.yml similarity index 85% rename from gateway2/src/main/resources/application-prod.yml rename to gateway2/src/main/resources/application-dev-100.yml index b98bdb2e..ca25e1d6 100644 --- a/gateway2/src/main/resources/application-prod.yml +++ b/gateway2/src/main/resources/application-dev-100.yml @@ -7,13 +7,13 @@ spring: cloud: nacos: config: - server-addr: 192.168.30.146:8848 + server-addr: 192.168.190.100:7848 file-extension: yaml import-check: enabled: false discovery: - server-addr: 192.168.30.146:8848 - group: PROD_GROUP + server-addr: 192.168.190.100:7848 + group: DEV_GROUP enabled: true gateway: httpclient: @@ -39,7 +39,7 @@ spring: filters: - StripPrefix=2 metadata: - group: PROD_GROUP # 指定目标服务的分组 + group: DEV_GROUP # 指定目标服务的分组 - id: pbs-service uri: lb://pbs predicates: @@ -59,7 +59,7 @@ spring: filters: - StripPrefix=2 metadata: - group: PROD_GROUP # 指定目标服务的分组 + group: DEV_GROUP # 指定目标服务的分组 - id: system-service uri: lb://system predicates: @@ -67,7 +67,7 @@ spring: filters: - StripPrefix=2 metadata: - group: PROD_GROUP # 指定目标服务的分组 + group: DEV_GROUP # 指定目标服务的分组 - id: task-service uri: lb://task predicates: @@ -75,7 +75,7 @@ spring: filters: - StripPrefix=2 metadata: - group: PROD_GROUP # 指定目标服务的分组 + group: DEV_GROUP # 指定目标服务的分组 - id: flowable-service uri: lb://flowable predicates: @@ -83,7 +83,7 @@ spring: filters: - StripPrefix=2 metadata: - group: PROD_GROUP # 指定目标服务的分组 + group: LOCAL_GROUP # 指定目标服务的分组 discovery: locator: enabled: true @@ -114,7 +114,7 @@ logging: # 0单机处理，1负载均衡轮询 serverType: 0 -serverIp: 192.168.30.146 +serverIp: 192.168.190.100 #serverIp: 192.168.65.73 security: diff --git a/outbridge/src/main/resources/common-dev-100.yml b/outbridge/src/main/resources/common-dev-100.yml new file mode 100644 index 00000000..ab5cecdd --- /dev/null +++ b/outbridge/src/main/resources/common-dev-100.yml @@ -0,0 +1,54 @@ +spring: + datasource: + second: + username: root + password: mysql +# todo 生产地址 + jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver + third: + username: root + password: mysql + # todo 生产地址 + jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver +# 测试开发环境 +#appKey : 380ad3deb578424c9ca5178383f732c1 +#appSecret : 805c316f35024b8b9566ca67b4991c42 +#appKey : d39820947556421aa329b070e669dfa2 +#corpKey : e906d13947944947921bb32c8fcffc6e +#appSecret : 13cff5f8fb1c479297370a7d41853158 +appKey : 123 +appSecret : 123 +# 海葵云url +HK_CLOUD_URL : https://v15.lyh.haikuicloud.com +# 1. 海葵云获取用户token url后缀 +HK_USER_TOKEN_URL_SUFFIX: /merchant/openapi/user/login/jobNo +# 2. 海葵云获取单个用户信息url后缀 +HK_SIMPLE_USER_URL_SUFFIX: /merchant/api/user/getSimpleUserInfo +# 3. 海葵云上传文件url后缀 +HK_UPLOAD_FILE_URL_SUFFIX: /haikui-oa/autoCreateFlow/uploadFile +# 获取项目工位实例号 +HK_GET_PROCESS_DATA_SUFFIX: /haikui-oa/autoCreateFlow/getProcessData/oa_three_d_review + +# EP系统URL +#EP_URL : https://ep-url.dev.haikuicloud.com +# 开发环境 +EP_URL: https://ep-url-test.lyh.haikuicloud.com +# 推送代办状态url后缀 +QUERY_TODO_STATUS_SUFFIX: /todoApi/todo/emulation/dm/status +# 查询待办结果url后缀 +QUERY_TODO_RESULT_SUFFIX: /todoApi/todo/emulation/dm/result +# 6. 查询待办附加url后缀 +QUERY_TOD_ATTACHMENT_SUFFIX: /todoApi/todo/emulation/dm/attachments + +# 即时通url +FREELINK_URL: http://freelink.haikui.com +FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform + +USER_URL: https://url.lyh.haikuicloud.com +USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType +user: + workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控工种）,激光光学工种,激光工艺工种,激光程序工种,激光装调工种 + account: lyric + password: Lyric#$12389..@ \ No newline at end of file diff --git a/pbs/src/main/resources/application-prod.yml b/pbs/src/main/resources/application-dev-100.yml similarity index 62% rename from pbs/src/main/resources/application-prod.yml rename to pbs/src/main/resources/application-dev-100.yml index 4c1bb36a..5a645bb9 100644 --- a/pbs/src/main/resources/application-prod.yml +++ b/pbs/src/main/resources/application-dev-100.yml @@ -7,7 +7,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。 @@ -23,31 +23,31 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver slave: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver enable: true cloud: nacos: discovery: - server-addr: 192.168.30.146:8848 - group: PROD_GROUP + server-addr: 192.168.190.190:7848 + group: DEV_GROUP enabled: true - # namespace: 3 - # username: nacos - # password: ENC(+QKYnI6gAYu1SbLaZQTkZA==) +# namespace: 3 +# username: nacos +# password: ENC(+QKYnI6gAYu1SbLaZQTkZA==) data: redis: # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0 database: 0 # redis服务器地址（填写自己的服务器地址） - host: 192.168.2.166 + host: 192.168.190.100 # redis端口（默认6379） - port: 6379 + port: 5379 #redis连接超时等待,10秒 timeout: PT10S # redis访问密码（默认为空） @@ -62,10 +62,10 @@ spring: min-idle: 1 # 连接池最大阻塞等待时间(使用负值表示没有限制) 默认 -1，这里配置10s max-wait: PT10S - # password: - # sentinel: - # master: mymaster - # nodes: 10.18.109.50:26379,10.18.109.51:26379,10.18.109.52:26379 +# password: +# sentinel: +# master: mymaster +# nodes: 10.18.109.50:26379,10.18.109.51:26379,10.18.109.52:26379 servlet: multipart: # 单个文件的最大值 @@ -86,7 +86,7 @@ mybatis-plus: configuration: map-underscore-to-camel-case: true auto-mapping-behavior: full - # cache-enabled: true +# cache-enabled: true # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: classpath*:mapper/**/*.xml global-config: @@ -112,16 +112,25 @@ file: hpc: url: http://172.27.3.135/JSONAPI/JSONAPI.ashx # 这个是spdm mock执行cmd命令 - # remoteCmdUrl: http://127.0.0.1:9097/doProcess +# remoteCmdUrl: http://127.0.0.1:9097/doProcess # remote： hpc借助工具http远程调用，local:该服务和hpc部署在同一机器 excuteWay: remote remoteCmdUrl: http://192.168.65.55:9097/doProcess remoteCreateDirUrl: http://192.168.65.55:9097/createDir remoteScanDirUrl: http://192.168.65.55:9097/scanDir remoteDownLoadFileUrl: http://192.168.65.55:9097/hpcDownload - # remoteDownLoadFileUrl: http://127.0.0.1:9097/hpcDownload +# remoteDownLoadFileUrl: http://127.0.0.1:9097/hpcDownload remoteUploadFileUrl: http://192.168.65.55:9097/uploadHpcFile callHpcUpload: http://192.168.65.55:9097/addJobQueue + delHpcJobsUrl: http://192.168.65.55:9098/delHpcJobs + # 上传头节点文件相关的配置 + fileToHpc: + http: + scheme: http # 协议（http/https） + host: 192.168.190.164 # 目标主机 + port: 9098 # 目标端口 + path: /upFileToHpcBatch # 接口路径 + mergePath: /upFileToHpcMerge # 合并的接口路径 #logging: @@ -138,4 +147,33 @@ security: paths: - /pbs/jobFileCallback - /pbs/netTest - - /pbs/adapterSubmitHpcJob \ No newline at end of file + - /pbs/adapterSubmitHpcJob + +# xxljob 配置开始 +xxl: + job: + admin: + # 调度中心地址列表 + addresses: http://192.168.190.100:7110/xxl-job-admin + # 调度中心访问令牌 + accessToken: default_token + # xxl-job 超时时间（秒），默认3秒 + timeout: 3 + executor: + # 执行器是否启用，默认true + enabled: true + # 执行器应用名称 + appname: pbs-job-executor + # 执行器注册地址：默认使用address注册，若为null则使用ip:port注册 + address: + # 执行器IP + ip: ${XXL_JOB_EXECUTOR_IP:} + # 执行器端口,为了好记，web服务端口+1000 + port: 8105 + # 执行器日志路径 + logpath: /home/app/pbs/xxljob + # 执行器日志保留天数 + logretentiondays: 14 + # 执行器排除扫描的包，多个用逗号分隔，如 "org.package01" 或 "org.package01,org.package02" + excludedpackage: +# xxljob 配置结束 \ No newline at end of file diff --git a/project/src/main/resources/application-dev-100.yml b/project/src/main/resources/application-dev-100.yml new file mode 100644 index 00000000..ba4e6285 --- /dev/null +++ b/project/src/main/resources/application-dev-100.yml @@ -0,0 +1,188 @@ +server: + port: 7101 + +spring: + application: + name: project + datasource: + username: root + password: mysql + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。 + maximum-pool-size: 20 + # 连接池在空闲时保持的最小连接数。 + minimum-idle: 5 + # 一个连接在被标记为空闲之前可以保持空闲状态的最长时间（毫秒）。当连接的空闲时间超过此值后，它可能会被连接池 evict（驱逐）。 + idle-timeout: 60000 # 1 min + # 一个连接从被创建开始，其生命周期的最大时长（毫秒）。HikariCP的默认值就是30分钟，这是一个非常合理的设置。 + max-lifetime: 1800000 # 30 min（Hikari 默认） + # 应用程序尝试从连接池获取一个连接时，等待的最长时间（毫秒）。建议值：30-60秒。 + connection-timeout: 30000 # 30s + master: + username: root + password: mysql + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver + slave: + username: root + password: mysql + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver + enable: true + cloud: + nacos: + discovery: + server-addr: 192.168.190.100:7848 + enabled: true + group: DEV_GROUP +# username: nacos +# password: ENC(+QKYnI6gAYu1SbLaZQTkZA==) + data: + redis: + # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0 + database: 0 + # redis服务器地址（填写自己的服务器地址） + host: 192.168.190.100 + # redis端口（默认6379） + port: 5379 + #redis连接超时等待,10秒 + timeout: PT10S + # redis访问密码（默认为空） + password: + lettuce: + pool: + # 连接池最大连接数（使用负值表示没有限制） 默认 8 + max-active: 50 + # 连接池中的最大空闲连接 默认 8 + max-idle: 20 + # 连接池中的最小空闲连接 默认 0 + min-idle: 1 + # 连接池最大阻塞等待时间(使用负值表示没有限制) 默认 -1，这里配置10s + max-wait: PT10S +# password: +# sentinel: +# master: mymaster +# nodes: 10.18.109.50:26379,10.18.109.51:26379,10.18.109.52:26379 + servlet: + multipart: + # 单个文件的最大值 + max-file-size: 500MB + # 上传文件总的最大值 + max-request-size: 10240MB + +management: + endpoints: + web: + exposure: + include: health,info + endpoint: + health: + show-details: always + group: + readiness: + include: discoveryComposite,ping,refreshScope + health: + redis: + enabled: false + db: + enabled: false + +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + auto-mapping-behavior: full + cache-enabled: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + mapper-locations: classpath*:mapper/**/*.xml + global-config: + # 逻辑删除配置 + db-config: + # 删除前 + logic-not-delete-value: 1 + # 删除后 + logic-delete-value: 0 + +#showSql +logging: + level: + com.sdm.dao: debug + +lombok: + anyConstructor: + addConstructorProperties: true + +file: + rootPath: /data/home/sdm + scriptPath : /opt/script + +security: + whitelist: + paths: + - /run/deliverableApproveCallback + - /run/getSimulationKeyResultFileIds + - /run/generateReportInternal + - /dataManager/tree/node/listUserByIds + - /demand/queryTodoList +#logging: +# config: ./config/logback.xml + +YA: + backend: + backendPublicKey : MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo4hmt4m5CpMIE5DL8G60cg63X6nEiNPt1yWB+kXDXQA0RaiqXhT4O78HT9BldrQVpyj6g4Z2mwPMfLBP6LjR8QyLlwfMBJ2uUV5B4PlEWiF9pUK9tU0lPlByS+p0oIxX8XlvzbbGbkyWQaOQ6SflFxB7eHu3r/hDOYtsMDcNe4hsuz1BnrAuRY6Yj+Hq2d4zPDetDgXeXs066z3qO6bLN9r/2UkHZc4tdkpMJgxucwTuvAvmgRgdDfnd6sAVDHYPaIVuJHqWnEnEcQzq6zWb1YPItc2FgDbXWpi8noz7wSjXDfBiTHU11nU5vv//xLVF83h5mbhk8dWHKq7bLUGp9QIDAQAB + + frontend: + #publicKeyUrl : http://s279983e.natappfree.cc/api-auth/clients/getPublicKey + publicKeyUrl : http://pisxwh.8866.org:8015/gateway/api-auth/clients/getPublicKey + frontendPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCjz2pItCtM2Itf3knLhA1ZWzTVtKKY692Eptk3ZUy4qjlv+2e6u78/cBYZsVa/1nOyHPtb2j9xZAsHYGKZGoh64UWSewUhRdUO15xBRr5DyGEdTWHjwc1GHf7c99rKCjKDO2Xdp7cpqYABOAxgkSA2vP5zqhSCq0FCqwleEPLG1aAa/kh/oUzCZLUoSjZIdqQOgHJTZojqNeQCOC6U8Q+kUcHdKbptewu1A6XK8DHV0WqiJJEG3kyaoAZ1kGtr6ETtGy++aRvJT9gZN4M4bIgucKtAu2dcqQHj9jZ1i2xwhY3nmLjqaz3y313/IEYpMTG8pnPb8eP5usHDaDmH8RqJAgMBAAECggEAAzz05WYGWxkGvEjpHYhJOUR3yWeuNSaodNhVf+ZVO2tGAmQuWz8d2zOshCqAw/8Jv3IaN+kbCvNG0okBufQP0ZoFZY1f/xXhzc7OTG4JEc7yuIEQl897btDl+lk97nOAJx7z9ws7MCwlFyEUAY6s29glkYTBrgmTmy1FXKIqImsLfVV3LgfL2Mkixn0YSSsbUh2b+dki1zxjct3hTGZVh29bKOpbflOaG0LqEO0UwSX92Y/ir+fKmC8zEFbi5HZANYODivm8DiwF7khpraayf78kG3liccOTMMLVxIHwNiS9wcLG8WPuVEphlXMT4Ev4lq5VFM3mVxtd9g21ESbuvwKBgQDmsgE8u66qKVBsndp2K9FV9VWYDA4fYfRswDAWnZDCzIdanT0NFPp8s3nZCVU4FfX4m958yOrJ/MVp6d58z6fgkYQh2qL2Wy6zRPaIxCc6JG3FheFSxfWyULU/mBBK02ntUZCXEs8XKjAfDvmxaVVeonv0nCSgVwxJ4ypB5BZ+owKBgQC1x0GDnWtMbNGUMx6tYtFGWQIgop4hVQe6ZNgkKaQX7gtMa5egEda6ga6wCTV3+ZvQ9tBa1DxUFb5N/TrtQdFm39gOSXyhWSrntUKqaSFo03GvXXvvze2D3+uXpk7S8yzWuuD3OYyYj9S3nFVZffymabfukuY7oY3AN0E0PALw4wKBgQDQiyGrMU6X7HkTdy9BnCLEvd7+cAdkPzyiAqp2B0IRlqrVM0c5SDmX+PaxSEqNROzyLJVX4Ji+t44OTKgf0+hCjckQgYDHi24QCMuEny2G1d+Vq40hMmsFIwh10JUJz0v2iMFYkFw86JpPuU3nHv1ZazD60xwZBhfJw10z62iaWQKBgH+EVgsUJS8pryO9cKnFBnXI/tsR+Mf9NDynfZBwvbIjxT1IxMb/fJi9XGQVMbMGIS5H1gXBmMiLsEJZgDrrzw/Ru2jaWFl/ib+dwjR1J4C3w6p3c/fXh+TY8hYiDm2hNTU1R5dmgaCMVXawbpcm8FN1Ghh8aJIwVJYgrNcNuiptAoGAO14DHGqUXZZ//erIYWVfL0CAMXqy38dqNmfbzSAXYyLDl6cn49CCHF0GXOfCOesQN9ToQbqpLrntFgcFe0hil5dIWYafk9fHjjR8N8g74ijErQmCEAQy22b06V0q7rLzEsU/HDVL+RZg2aY4hDN+ODHRdpdFkOxsCYV73gevVeo= + default: + tenantId: 1999362907622948866 + userId: 1999363561237610497 + +scheduler: + todo: 10.10.00 + project: 10.11.00 + +project: + active-customer: basic + customers: + basic: + enabled: true + lyric: + enabled: false + +# xxljob 配置开始 +xxl: + job: + admin: + # 调度中心地址列表 + addresses: http://192.168.190.100:7110/xxl-job-admin + # 调度中心访问令牌 + accessToken: default_token + # xxl-job 超时时间（秒），默认3秒 + timeout: 3 + executor: + # 执行器是否启用，默认true + enabled: true + # 执行器应用名称 服务名-job-executor + appname: project-job-executor + # 执行器注册地址：默认使用address注册，若为null则使用ip:port注册 + address: + # 执行器IP + ip: ${XXL_JOB_EXECUTOR_IP:} + # 执行器端口,为了好记，web服务端口+1000 + port: 8101 + # 执行器日志路径 + logpath: /home/app/project/xxljob + # 执行器日志保留天数 + logretentiondays: 14 + # 执行器排除扫描的包，多个用逗号分隔，如 "org.package01" 或 "org.package01,org.package02" + excludedpackage: +# xxljob 配置结束 + +# 通过标识判断是否走查询现场视图逻辑（0不查询，1查询） +lyricFlag : 0 + +# 同步待办时，查询待办的最大时间间隔，单位：天 +lyricTodoInterval : 7 \ No newline at end of file diff --git a/system/src/main/resources/application-prod.yml b/system/src/main/resources/application-dev-100.yml similarity index 86% rename from system/src/main/resources/application-prod.yml rename to system/src/main/resources/application-dev-100.yml index 5f17f5bc..30428829 100644 --- a/system/src/main/resources/application-prod.yml +++ b/system/src/main/resources/application-dev-100.yml @@ -7,7 +7,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。 @@ -23,29 +23,29 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver slave: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver enable: true cloud: nacos: discovery: - server-addr: 192.168.30.146:8848 - group: PROD_GROUP - # server-addr: 127.0.0.1:8848 + server-addr: 192.168.190.100:7848 + group: DEV_GROUP +# server-addr: 127.0.0.1:8848 enabled: true data: redis: # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0 database: 0 # redis服务器地址（填写自己的服务器地址） - host: 192.168.2.166 + host: 192.168.190.100 # redis端口（默认6379） - port: 6379 + port: 5379 #redis连接超时等待,10秒 timeout: PT10S # redis访问密码（默认为空） @@ -139,7 +139,7 @@ tenantSystem: localTenant: local cid: - url: http://192.168.65.162:8989/honeycom-spdm # 请根据实际CID服务地址修改 + url: http://192.168.190.100:8989/honeycom-spdm # 请根据实际CID服务地址修改 #url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址 user: listUser: /spdm-user/listUser @@ -164,6 +164,8 @@ cid: launchApprove: /spdm-flow/startFlow queryFlowTemplate: /spdm-flow/listProcessByGroup queryApproveDetail: /spdm-flow/queryFlowNodeDetail + queryNewApproveDetail: /spdm-flow/queryNewFlowNodeDetail + getTaskIdByNodeId: /spdm-flow/getTaskIdByNodeId stopApproveFlow: /spdm-flow/stopFlow group: SPDM # 单次批量查询cid审批流详情的条数 @@ -198,4 +200,5 @@ security: - /tenant/list - /tenant/initNewTenant - /user/getUserByRoleCode - - /lyricUser/queryUserList \ No newline at end of file + - /lyricUser/queryUserList + - /user/listUser \ No newline at end of file diff --git a/task/src/main/resources/application-prod.yml b/task/src/main/resources/application-dev-100.yml similarity index 85% rename from task/src/main/resources/application-prod.yml rename to task/src/main/resources/application-dev-100.yml index 6bb935b5..452475dc 100644 --- a/task/src/main/resources/application-prod.yml +++ b/task/src/main/resources/application-dev-100.yml @@ -8,7 +8,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。 @@ -24,19 +24,19 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver slave: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.190.100:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver enable: true cloud: nacos: discovery: - server-addr: 192.168.30.146:8848 - group: PROD_GROUP + server-addr: 192.168.190.100:7848 + group: DEV_GROUP # server-addr: 127.0.0.1:8848 enabled: true # username: nacos @@ -46,9 +46,9 @@ spring: # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0 database: 0 # redis服务器地址（填写自己的服务器地址） - host: 192.168.2.166 + host: 192.168.190.100 # redis端口（默认6379） - port: 6379 + port: 5379 #redis连接超时等待,10秒 timeout: PT10S # redis访问密码（默认为空） @@ -119,7 +119,7 @@ file: rootPath: /data/home/sdm scriptPath : /opt/script approve: - replyUrl: http:192.168.30.146:7102/simulation/task/taskpool/approveHandleNotice + replyUrl: http:192.168.190.100:7102/simulation/task/taskpool/approveHandleNotice #logging: # config: ./config/logback.xml