diff --git a/ruoyi-vue-pro-master-jdk17/pom.xml b/ruoyi-vue-pro-master-jdk17/pom.xml index e0750ab..07499db 100644 --- a/ruoyi-vue-pro-master-jdk17/pom.xml +++ b/ruoyi-vue-pro-master-jdk17/pom.xml @@ -8,7 +8,7 @@ ${revision} pom - yudao-dependencies + dependencies yudao-framework yudao-server @@ -21,7 +21,7 @@ ${project.artifactId} - 芋道项目基础脚手架 + 项目基础脚手架 https://github.com/YunaiV/ruoyi-vue-pro diff --git a/ruoyi-vue-pro-master-jdk17/yudao-dependencies/pom.xml b/ruoyi-vue-pro-master-jdk17/yudao-dependencies/pom.xml deleted file mode 100644 index a470f4c..0000000 --- a/ruoyi-vue-pro-master-jdk17/yudao-dependencies/pom.xml +++ /dev/null @@ -1,678 +0,0 @@ - - - 4.0.0 - - cn.iocoder.boot - yudao-dependencies - ${revision} - pom - - ${project.artifactId} - 基础 bom 文件，管理整个项目的依赖版本 - https://github.com/YunaiV/ruoyi-vue-pro - - - 2.6.1-SNAPSHOT - 1.6.0 - - 3.4.5 - - 2.8.3 - 4.6.0 - - 1.2.24 - 3.5.19 - 3.5.10.1 - 4.3.1 - 1.4.13 - 3.0.6 - 3.41.0 - 8.1.3.140 - 8.6.0 - 5.1.0 - 3.3.3 - - 2.3.2 - - 2.2.7 - - 9.0.0 - 3.4.5 - 0.33.0 - - 8.0.2.RELEASE - 1.1.8 - 5.2.0 - - 7.0.1 - - 1.4.0 - 1.18.3 - 1.18.38 - 1.6.3 - 5.8.35 - 6.0.0-M19 - 4.0.3 - 2.4.1 - 1.2.83 - 33.4.8-jre - 2.14.5 - 3.11.1 - 0.1.55 - 3.1.0 - 2.7.0 - 3.0.6 - 4.1.118.Final - 1.2.5 - 0.9.0 - 4.5.13 - - 2.17.0 - 1.27.1 - 2.30.14 - - 1.4.0 - 2.0.0 - 1.9.5 - - - - - - - - io.netty - netty-bom - ${netty.version} - pom - import - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - - io.github.mouzt - bizlog-sdk - ${bizlog-sdk.version} - - - org.springframework.boot - spring-boot-starter - - - - - cn.iocoder.boot - yudao-spring-boot-starter-biz-tenant - ${revision} - - - cn.iocoder.boot - yudao-spring-boot-starter-biz-data-permission - ${revision} - - - cn.iocoder.boot - yudao-spring-boot-starter-biz-ip - ${revision} - - - - - - org.springframework.boot - spring-boot-configuration-processor - ${spring.boot.version} - - - - - cn.iocoder.boot - yudao-spring-boot-starter-web - ${revision} - - - - cn.iocoder.boot - yudao-spring-boot-starter-security - ${revision} - - - - cn.iocoder.boot - yudao-spring-boot-starter-websocket - ${revision} - - - - com.github.xingfudeshi - knife4j-openapi3-jakarta-spring-boot-starter - ${knife4j.version} - - - org.springdoc - springdoc-openapi-starter-webmvc-api - ${springdoc.version} - - - - - cn.iocoder.boot - yudao-spring-boot-starter-mybatis - ${revision} - - - - com.alibaba - druid-spring-boot-3-starter - ${druid.version} - - - - org.mybatis - mybatis - ${mybatis.version} - - - com.baomidou - mybatis-plus-spring-boot3-starter - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-jsqlparser - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-generator - ${mybatis-plus.version} - - - com.baomidou - dynamic-datasource-spring-boot3-starter - ${dynamic-datasource.version} - - - com.github.yulichang - mybatis-plus-join-boot-starter - ${mybatis-plus-join.version} - - - - com.fhs-opensource - easy-trans-spring-boot-starter - ${easy-trans.version} - - - org.springframework - spring-context - - - org.springframework.cloud - spring-cloud-commons - - - - - com.fhs-opensource - easy-trans-mybatis-plus-extend - ${easy-trans.version} - - - com.fhs-opensource - easy-trans-anno - ${easy-trans.version} - - - - cn.iocoder.boot - yudao-spring-boot-starter-redis - ${revision} - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - org.springframework.boot - spring-boot-starter-actuator - - - - - - - - - - com.taosdata.jdbc - taos-jdbcdriver - ${taos.version} - - - - - cn.iocoder.boot - yudao-spring-boot-starter-job - ${revision} - - - - - cn.iocoder.boot - yudao-spring-boot-starter-mq - ${revision} - - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq-spring.version} - - - - - cn.iocoder.boot - yudao-spring-boot-starter-protection - ${revision} - - - - com.baomidou - lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - redisson-spring-boot-starter - org.redisson - - - - - - - cn.iocoder.boot - yudao-spring-boot-starter-monitor - ${revision} - - - - org.apache.skywalking - apm-toolkit-trace - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-logback-1.x - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-opentracing - ${skywalking.version} - - - - - - - - - - - - - io.opentracing - opentracing-api - ${opentracing.version} - - - io.opentracing - opentracing-util - ${opentracing.version} - - - io.opentracing - opentracing-noop - ${opentracing.version} - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - de.codecentric - spring-boot-admin-server-cloud - - - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - - - cn.iocoder.boot - yudao-spring-boot-starter-test - ${revision} - test - - - - org.mockito - mockito-inline - ${mockito-inline.version} - - - - org.springframework.boot - spring-boot-starter-test - ${spring.boot.version} - - - asm - org.ow2.asm - - - org.mockito - mockito-core - - - - - - - org.flowable - flowable-spring-boot-starter-process - ${flowable.version} - - - org.flowable - flowable-spring-boot-starter-actuator - ${flowable.version} - - - - - - cn.iocoder.boot - yudao-common - ${revision} - - - - cn.iocoder.boot - yudao-spring-boot-starter-excel - ${revision} - - - - org.projectlombok - lombok - ${lombok.version} - - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - - cn.hutool - hutool-all - ${hutool-5.version} - - - org.dromara.hutool - hutool-extra - ${hutool-6.version} - - - - com.alibaba - easyexcel - ${easyexcel.version} - - - commons-io - commons-io - ${commons-io.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - - - org.apache.tika - tika-core - ${tika-core.version} - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - com.alibaba - fastjson - ${fastjson.version} - - - - com.google.guava - guava - ${guava.version} - - - - com.alibaba - transmittable-thread-local - ${transmittable-thread-local.version} - - - - commons-net - commons-net - ${commons-net.version} - - - - com.jcraft - jsch - ${jsch.version} - - - - com.anji-plus - captcha-spring-boot-starter - ${anji-plus-captcha.version} - - - - org.lionsoul - ip2region - ${ip2region.version} - - - - org.jsoup - jsoup - ${jsoup.version} - - - - - software.amazon.awssdk - s3 - ${awssdk.version} - - - - - - - - - - org.jeecgframework.jimureport - jimureport-spring-boot3-starter-fastjson2 - ${jimureport.version} - - - org.jeecgframework.jimureport - jimubi-spring-boot3-starter - ${jimubi.version} - - - com.github.jsqlparser - jsqlparser - - - - - - - org.pf4j - pf4j-spring - ${pf4j-spring.version} - - - org.slf4j - slf4j-log4j12 - - - - - - - io.vertx - vertx-core - ${vertx.version} - - - io.vertx - vertx-web - ${vertx.version} - - - io.vertx - vertx-mqtt - ${vertx.version} - - - - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - ${mqtt.version} - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - ${flatten-maven-plugin.version} - - bom - true - - - - - flatten - - flatten - process-resources - - - - clean - - flatten.clean - clean - - - - - - - diff --git a/ruoyi-vue-pro-master-jdk17/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/ruoyi-vue-pro-master-jdk17/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java index a42a3ec..2097a49 100644 --- a/ruoyi-vue-pro-master-jdk17/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java +++ b/ruoyi-vue-pro-master-jdk17/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java @@ -915,14 +915,14 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService status); } - // 2. 发送对应的消息通知 - if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) { + // 2. 工作流发送短信 发送对应的消息通知 +/* if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) { messageService.sendMessageWhenProcessInstanceApprove( BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceApproveMessage(instance)); } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.REJECT.getStatus())) { messageService.sendMessageWhenProcessInstanceReject( BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceRejectMessage(instance, reason)); - } + }*/ // 3. 发送流程实例的状态事件 processInstanceEventPublisher.sendProcessInstanceResultEvent( diff --git a/ruoyi-vue-pro-master-jdk17/yudao-server/src/main/resources/application-local.yaml b/ruoyi-vue-pro-master-jdk17/yudao-server/src/main/resources/application-local.yaml index 1479089..c3ea35d 100644 --- a/ruoyi-vue-pro-master-jdk17/yudao-server/src/main/resources/application-local.yaml +++ b/ruoyi-vue-pro-master-jdk17/yudao-server/src/main/resources/application-local.yaml @@ -177,10 +177,6 @@ debug: false --- #################### 微信公众号、小程序相关配置 #################### wx: mp: # 公众号配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 -# app-id: wx041349c6f39b268b # 测试号（牛希尧提供的） -# secret: 5abee519483bc9f8cb37ce280e814bd0 -# app-id: wx5b23ba7a5589ecbb # 测试号（自己的） -# secret: 2a7b3b20c537e52e74afd395eb85f61f app-id: wxf56b1542b9e85f8a # 测试号（Kongdy 提供的） secret: 496379dcef1ba869e9234de8d598cfd3 # 存储配置，解决 AccessToken 的跨节点的共享 @@ -189,14 +185,8 @@ wx: key-prefix: wx # Redis Key 的前缀 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 - # appid: wx62056c0d5e8db250 # 测试号（牛希尧提供的） - # secret: 333ae72f41552af1e998fe1f54e1584a -# appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 -# secret: 6f270509224a7ae1296bbf1c8cb97aed appid: wxc4598c446f8a9cb3 # 测试号（Kongdy 提供的） secret: 4a1a04e07f6a4a0751b39c3064a92c8b -# appid: wx66186af0759f47c9 # 测试号（puhui 提供的） -# secret: 3218bcbd112cbc614c7264ceb20144ac config-storage: type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 key-prefix: wa # Redis Key 的前缀 @@ -210,10 +200,6 @@ yudao: enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试； security: mock-enable: true - pay: - order-notify-url: https://yutou.mynatapp.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 - refund-notify-url: https://yutou.mynatapp.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址 - transfer-notify-url: https://yutou.mynatapp.cc/admin-api/pay/notify/transfer # 支付渠道的【转账】回调地址 access-log: # 访问日志的配置项 enable: false demo: false # 关闭演示模式 @@ -223,28 +209,7 @@ yudao: miniprogram-state: developer # 跳转小程序类型：开发版为 “developer”；体验版为 “trial”为；正式版为 “formal” tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc -justauth: - enabled: true - type: - DINGTALK: # 钉钉 - client-id: dingvrnreaje3yqvzhxg - client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI - ignore-check-redirect-uri: true - WECHAT_ENTERPRISE: # 企业微信 - client-id: wwd411c69a39ad2e54 - client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw - agent-id: 1000004 - ignore-check-redirect-uri: true - # noinspection SpringBootApplicationYaml - WECHAT_MINI_PROGRAM: # 微信小程序 - client-id: ${wx.miniapp.appid} - client-secret: ${wx.miniapp.secret} - ignore-check-redirect-uri: true - ignore-check-state: true # 微信小程序，不会使用到 state，所以不进行校验 - WECHAT_MP: # 微信公众号 - client-id: ${wx.mp.app-id} - client-secret: ${wx.mp.secret} - ignore-check-redirect-uri: true + cache: type: REDIS prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: @@ -253,4 +218,5 @@ justauth: --- #################### iot相关配置 TODO 芋艿【IOT】：再瞅瞅 #################### pf4j: # pluginsDir: /tmp/ - pluginsDir: ../plugins \ No newline at end of file + pluginsDir: ../plugins + diff --git a/ruoyi-vue-pro-master-jdk17/yudao-server/src/main/resources/application.yaml b/ruoyi-vue-pro-master-jdk17/yudao-server/src/main/resources/application.yaml index 12a4abf..f73ed5a 100644 --- a/ruoyi-vue-pro-master-jdk17/yudao-server/src/main/resources/application.yaml +++ b/ruoyi-vue-pro-master-jdk17/yudao-server/src/main/resources/application.yaml @@ -142,92 +142,6 @@ spring: # Kafka Consumer Listener 监听器配置 listener: missing-topics-fatal: false # 消费监听接口监听的主题不存在时，默认会报错。所以通过设置为 false ，解决报错 - ---- #################### AI 相关配置 #################### - -spring: - ai: - vectorstore: # 向量存储 - redis: - initialize-schema: true - index-name: knowledge_index # Redis 中向量索引的名称：用于存储和检索向量数据的索引标识符，所有相关的向量搜索操作都会基于这个索引进行 - prefix: "knowledge_segment:" # Redis 中存储向量数据的键名前缀：这个前缀会添加到每个存储在 Redis 中的向量数据键名前，每个 document 都是一个 hash 结构 - qdrant: - initialize-schema: true - collection-name: knowledge_segment # Qdrant 中向量集合的名称：用于存储向量数据的集合标识符，所有相关的向量操作都会在这个集合中进行 - host: 127.0.0.1 - port: 6334 - milvus: - initialize-schema: true - database-name: default # Milvus 中数据库的名称 - collection-name: knowledge_segment # Milvus 中集合的名称：用于存储向量数据的集合标识符，所有相关的向量操作都会在这个集合中进行 - client: - host: 127.0.0.1 - port: 19530 - qianfan: # 文心一言 - api-key: x0cuLZ7XsaTCU08vuJWO87Lg - secret-key: R9mYF9dl9KASgi5RUq0FQt3wRisSnOcK - zhipuai: # 智谱 AI - api-key: 32f84543e54eee31f8d56b2bd6020573.3vh9idLJZ2ZhxDEs - openai: # OpenAI 官方 - api-key: sk-aN6nWn3fILjrgLFT0fC4Aa60B72e4253826c77B29dC94f17 - base-url: https://api.gptsapi.net - azure: # OpenAI 微软 - openai: - endpoint: https://eastusprejade.openai.azure.com - api-key: xxx - ollama: - base-url: http://127.0.0.1:11434 - chat: - model: llama3 - stabilityai: - api-key: sk-e53UqbboF8QJCscYvzJscJxJXoFcFg4iJjl1oqgE7baJETmx - dashscope: # 通义千问 - api-key: sk-71800982914041848008480000000000 - minimax: # Minimax：https://www.minimaxi.com/ - api-key: xxxx - moonshot: # 月之暗灭（KIMI） - api-key: sk-abc - deepseek: # DeepSeek - api-key: sk-e94db327cc7d457d99a8de8810fc6b12 - chat: - options: - model: deepseek-chat - -yudao: - ai: - doubao: # 字节豆包 - enable: true - api-key: 5c1b5747-26d2-4ebd-a4e0-dd0e8d8b4272 - model: doubao-1-5-lite-32k-250115 - hunyuan: # 腾讯混元 - enable: true - api-key: sk-abc - model: hunyuan-turbo - siliconflow: # 硅基流动 - enable: true - api-key: sk-epsakfenqnyzoxhmbucsxlhkdqlcbnimslqoivkshalvdozz - model: deepseek-ai/DeepSeek-R1-Distill-Qwen-7B - xinghuo: # 讯飞星火 - enable: true - appKey: 75b161ed2aef4719b275d6e7f2a4d4cd - secretKey: YWYxYWI2MTA4ODI2NGZlYTQyNjAzZTcz - model: generalv3.5 - baichuan: # 百川智能 - enable: true - api-key: sk-abc - model: Baichuan4-Turbo - midjourney: - enable: true - # base-url: https://api.holdai.top/mj-relax/mj - base-url: https://api.holdai.top/mj - api-key: sk-dZEPiVaNcT3FHhef51996bAa0bC74806BeAb620dA5Da10Bf - notify-url: http://java.nat300.top/admin-api/ai/image/midjourney/notify - suno: - enable: true - # base-url: https://suno-55ishh05u-status2xxs-projects.vercel.app - base-url: http://127.0.0.1:3001 - --- #################### 芋道相关配置 #################### yudao: