From 27a28c6817118d7119ab9ecff2d42d3a58d3a7b5 Mon Sep 17 00:00:00 2001 From: zhangjiahao <411398774@qq.com> Date: Mon, 24 Feb 2025 17:20:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20langchat=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacos/conf/application.properties | 4 +- pom.xml | 3 +- yudao-langchat-server/.flattened-pom.xml | 63 ------ yudao-langchat-server/pom.xml | 133 ----------- .../framework/security/core/package-info.java | 4 - .../src/main/resources/application-dev.yml | 47 ---- .../src/main/resources/application-prd.yml | 44 ---- .../src/main/resources/application.yml | 46 ---- .../src/main/resources/logback-spring.xml | 56 ----- .../src/main/resources/application-local.yaml | 14 +- yudao-module-langchat/.flattened-pom.xml | 144 ++++++++++++ yudao-module-langchat/pom.xml | 21 ++ .../.flattened-pom.xml | 144 ++++++++++++ .../yudao-module-langchat-biz/pom.xml | 167 ++++++++++++++ .../module/langchat/LangChatApplication.java | 10 +- .../langchat/server/annotation/ApiLog.java | 2 +- .../component/EmbeddingRefreshEvent.java | 2 +- .../server/component/ModelTypeEnum.java | 2 +- .../component/ProviderRefreshEvent.java | 2 +- .../server/component/SpringContextHolder.java | 2 +- .../controller/AigcEmbedStoreController.java | 18 +- .../controller/AigcKnowledgeController.java | 28 +-- .../controller/AigcMessageController.java | 14 +- .../controller/AigcModelController.java | 18 +- .../langchat/server/entity/AigcApp.java | 2 +- .../langchat/server/entity/AigcAppApi.java | 2 +- .../server/entity/AigcConversation.java | 2 +- .../langchat/server/entity/AigcDocs.java | 2 +- .../langchat/server/entity/AigcDocsSlice.java | 2 +- .../server/entity/AigcEmbedStore.java | 2 +- .../langchat/server/entity/AigcKnowledge.java | 2 +- .../langchat/server/entity/AigcMessage.java | 2 +- .../langchat/server/entity/AigcModel.java | 2 +- .../langchat/server/entity/SysDept.java | 2 +- .../langchat/server/entity/SysRole.java | 2 +- .../langchat/server/entity/SysUser.java | 2 +- .../langchat/server/entity/UserInfo.java | 2 +- .../server/framework/package-info.java | 2 +- .../framework/security/ApiConstants.java | 2 +- .../config/SecurityConfiguration.java | 4 +- .../framework/security/core/package-info.java | 4 + .../server/mapper/AigcConversationMapper.java | 4 +- .../server/mapper/AigcDocsMapper.java | 4 +- .../server/mapper/AigcDocsSliceMapper.java | 4 +- .../server/mapper/AigcEmbedStoreMapper.java | 4 +- .../server/mapper/AigcKnowledgeMapper.java | 4 +- .../server/mapper/AigcMessageMapper.java | 4 +- .../server/mapper/AigcModelMapper.java | 4 +- .../langchat/server/mapper/SysUserMapper.java | 6 +- .../provider/KnowledgeStoreFactory.java | 14 +- .../server/service/AigcEmbedStoreService.java | 4 +- .../server/service/AigcKnowledgeService.java | 8 +- .../server/service/AigcMessageService.java | 8 +- .../server/service/AigcModelService.java | 6 +- .../impl/AigcEmbedStoreServiceImpl.java | 10 +- .../impl/AigcKnowledgeServiceImpl.java | 19 +- .../service/impl/AigcMessageServiceImpl.java | 18 +- .../service/impl/AigcModelServiceImpl.java | 12 +- .../langchat/server/utils/MybatisUtil.java | 2 +- .../langchat/server/utils/QueryPage.java | 2 +- .../module}/langchat/server/utils/R.java | 2 +- .../src/main/resources/application-dev.yaml | 214 ++++++++++++++++++ .../src/main/resources/application-local.yaml | 213 +++++++++++++++++ .../src/main/resources/application-prd.yaml | 214 ++++++++++++++++++ .../src/main/resources/application.yaml | 125 ++++++++++ .../src/main/resources/banner.txt | 0 .../src/main/resources/logback-spring.xml | 76 +++++++ .../src/main/resources/static/favicon.ico | Bin .../src/main/resources/application-local.yaml | 14 +- 69 files changed, 1475 insertions(+), 546 deletions(-) delete mode 100644 yudao-langchat-server/.flattened-pom.xml delete mode 100644 yudao-langchat-server/pom.xml delete mode 100644 yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/security/core/package-info.java delete mode 100644 yudao-langchat-server/src/main/resources/application-dev.yml delete mode 100644 yudao-langchat-server/src/main/resources/application-prd.yml delete mode 100644 yudao-langchat-server/src/main/resources/application.yml delete mode 100644 yudao-langchat-server/src/main/resources/logback-spring.xml create mode 100644 yudao-module-langchat/.flattened-pom.xml create mode 100644 yudao-module-langchat/pom.xml create mode 100644 yudao-module-langchat/yudao-module-langchat-biz/.flattened-pom.xml create mode 100644 yudao-module-langchat/yudao-module-langchat-biz/pom.xml rename yudao-langchat-server/src/main/java/cn/tycoding/langchat/LangChatApp.java => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/LangChatApplication.java (78%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/annotation/ApiLog.java (94%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/component/EmbeddingRefreshEvent.java (94%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/component/ModelTypeEnum.java (93%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/component/ProviderRefreshEvent.java (94%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/component/SpringContextHolder.java (97%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/controller/AigcEmbedStoreController.java (85%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/controller/AigcKnowledgeController.java (84%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/controller/AigcMessageController.java (83%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/controller/AigcModelController.java (83%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/AigcApp.java (97%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/AigcAppApi.java (96%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/AigcConversation.java (97%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/AigcDocs.java (96%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/AigcDocsSlice.java (96%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/AigcEmbedStore.java (96%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/AigcKnowledge.java (97%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/AigcMessage.java (97%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/AigcModel.java (96%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/SysDept.java (96%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/SysRole.java (95%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/SysUser.java (97%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/entity/UserInfo.java (96%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/framework/package-info.java (57%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/framework/security/ApiConstants.java (86%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/framework/security/config/SecurityConfiguration.java (91%) create mode 100644 yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/security/core/package-info.java rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/mapper/AigcConversationMapper.java (87%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/mapper/AigcDocsMapper.java (87%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/mapper/AigcDocsSliceMapper.java (87%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/mapper/AigcEmbedStoreMapper.java (87%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/mapper/AigcKnowledgeMapper.java (87%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/mapper/AigcMessageMapper.java (96%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/mapper/AigcModelMapper.java (87%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/mapper/SysUserMapper.java (88%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/provider/KnowledgeStoreFactory.java (84%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/service/AigcEmbedStoreService.java (86%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/service/AigcKnowledgeService.java (82%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/service/AigcMessageService.java (86%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/service/AigcModelService.java (86%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/service/impl/AigcEmbedStoreServiceImpl.java (75%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/service/impl/AigcKnowledgeServiceImpl.java (84%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/service/impl/AigcMessageServiceImpl.java (90%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/service/impl/AigcModelServiceImpl.java (89%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/utils/MybatisUtil.java (96%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/utils/QueryPage.java (94%) rename {yudao-langchat-server/src/main/java/cn/tycoding => yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module}/langchat/server/utils/R.java (97%) create mode 100644 yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-dev.yaml create mode 100644 yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-local.yaml create mode 100644 yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-prd.yaml create mode 100644 yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application.yaml rename {yudao-langchat-server => yudao-module-langchat/yudao-module-langchat-biz}/src/main/resources/banner.txt (100%) create mode 100644 yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/logback-spring.xml rename {yudao-langchat-server => yudao-module-langchat/yudao-module-langchat-biz}/src/main/resources/static/favicon.ico (100%) diff --git a/nacos/conf/application.properties b/nacos/conf/application.properties index 47defbd..caa7da1 100644 --- a/nacos/conf/application.properties +++ b/nacos/conf/application.properties @@ -41,8 +41,8 @@ db.num=1 ### Connect URL of DB: db.url.0=jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC -db.user.0=dev -db.password.0=123456 +db.user.0=root +db.password.0=root ### Connection pool configuration: hikariCP db.pool.config.connectionTimeout=30000 diff --git a/pom.xml b/pom.xml index 72f6c76..7e12e91 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,7 @@ yudao-module-mall yudao-module-erp yudao-module-crm + yudao-module-langchat @@ -33,7 +34,7 @@ 2.3.0-jdk8-SNAPSHOT - 1.8 + 17 ${java.version} ${java.version} 3.0.0-M5 diff --git a/yudao-langchat-server/.flattened-pom.xml b/yudao-langchat-server/.flattened-pom.xml deleted file mode 100644 index 2b92692..0000000 --- a/yudao-langchat-server/.flattened-pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - 4.0.0 - cn.iocoder.cloud - yudao-langchat-server - 2.3.0-jdk8-SNAPSHOT - 芋道项目基础脚手架 - https://github.com/YunaiV/ruoyi-vue-pro/yudao-langchat-server - - - org.dromara.x-file-storage - x-file-storage-core - 2.2.1 - compile - - - cn.iocoder.cloud - yudao-spring-boot-starter-mybatis - 2.3.0-jdk8-SNAPSHOT - compile - - - cn.iocoder.cloud - yudao-spring-boot-starter-security - 2.3.0-jdk8-SNAPSHOT - compile - - - org.apache.groovy - groovy - 4.0.24 - compile - - - - - huaweicloud - huawei - https://mirrors.huaweicloud.com/repository/maven/ - - - aliyunmaven - aliyun - https://maven.aliyun.com/repository/public - - - diff --git a/yudao-langchat-server/pom.xml b/yudao-langchat-server/pom.xml deleted file mode 100644 index e36ed30..0000000 --- a/yudao-langchat-server/pom.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - 4.0.0 - - - - - - - - cn.iocoder.cloud - yudao - ${revision} - - - yudao-langchat-server - ${revision} - jar - - - - - org.dromara.x-file-storage - x-file-storage-core - 2.2.1 - - - - - cn.iocoder.cloud - yudao-spring-boot-starter-mybatis - - - - - cn.iocoder.cloud - yudao-spring-boot-starter-security - - - org.apache.groovy - groovy - 4.0.24 - compile - - - - - - ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - repackage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/security/core/package-info.java b/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/security/core/package-info.java deleted file mode 100644 index 95087e8..0000000 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/security/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.tycoding.langchat.server.framework.security.core; diff --git a/yudao-langchat-server/src/main/resources/application-dev.yml b/yudao-langchat-server/src/main/resources/application-dev.yml deleted file mode 100644 index ec5a80b..0000000 --- a/yudao-langchat-server/src/main/resources/application-dev.yml +++ /dev/null @@ -1,47 +0,0 @@ -server: - port: 8100 - -spring: - # 数据库配置 - datasource: - username: root - password: root -# url: jdbc:mysql://127.0.0.1:3306/langchat?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - url: jdbc:mysql://192.168.0.17:3306/langchat?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - druid: - keep-alive: true - - # Redis配置 - data: - redis: - port: 6379 - host: 192.168.0.21 - database: 1 - jedis: - pool: - max-wait: 2000 - time-between-eviction-runs: 1000 - -langchat: - oss: - default-platform: local - qiniu-kodo: - - platform: qiniu # 存储平台标识,七牛:qiniu、阿里OSS:aliyun-oss、腾讯OSS:tencent-cos - enable-storage: true # 启用存储 - access-key: - secret-key: - bucket-name: - domain: / # 访问域名,注意“/”结尾,例如:http://abc.hn-bkt.clouddn.com/ - base-path: langchat/ # 基础路径 - local-plus: - - platform: local # 存储平台标识 - enable-storage: true #启用存储 - enable-access: true #启用访问(线上请使用 Nginx 配置,效率更高) - domain: http://127.0.0.1:8100/ # 访问域名,例如:“http://127.0.0.1:8030/file/”,注意后面要和 path-patterns 保持一致,“/”结尾,本地存储建议使用相对路径,方便后期更换域名 - base-path: langchat/ # 基础路径 - path-patterns: /static/** # 访问路径(默认本地target目录),注意:如果使用本地nginx容器,此路径要修改为nginx存储路径 - storage-path: ./static/ # 存储路径(默认本地target目录),注意:如果使用本地nginx容器,此路径要修改为nginx存储路径 - - diff --git a/yudao-langchat-server/src/main/resources/application-prd.yml b/yudao-langchat-server/src/main/resources/application-prd.yml deleted file mode 100644 index e73258c..0000000 --- a/yudao-langchat-server/src/main/resources/application-prd.yml +++ /dev/null @@ -1,44 +0,0 @@ -server: - port: 8100 - -spring: - # 数据库配置 - datasource: - username: root - password: root - url: jdbc:mysql://127.0.0.1:3306/langchat?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - druid: - keep-alive: true - - # Redis配置 - data: - redis: - port: 6379 - host: 127.0.0.1 - database: 1 - jedis: - pool: - max-wait: 2000 - time-between-eviction-runs: 1000 - -langchat: - oss: - default-platform: local - qiniu-kodo: - - platform: qiniu # 存储平台标识 - enable-storage: true # 启用存储 - access-key: - secret-key: - bucket-name: - domain: / # 访问域名,注意“/”结尾,例如:http://abc.hn-bkt.clouddn.com/ - base-path: langchat/ # 基础路径 - local-plus: - - platform: local # 存储平台标识 - enable-storage: true #启用存储 - enable-access: true #启用访问(线上请使用 Nginx 配置,效率更高) - domain: http://127.0.0.1/ # 访问域名,例如:“http://127.0.0.1:8030/file/”,注意后面要和 path-patterns 保持一致,“/”结尾,本地存储建议使用相对路径,方便后期更换域名 - base-path: langchat/ # 基础路径 - path-patterns: /Users/tycoding/data/software/nginx/ # 访问路径 - storage-path: /Users/tycoding/data/software/nginx/ # 存储路径 diff --git a/yudao-langchat-server/src/main/resources/application.yml b/yudao-langchat-server/src/main/resources/application.yml deleted file mode 100644 index 88970ff..0000000 --- a/yudao-langchat-server/src/main/resources/application.yml +++ /dev/null @@ -1,46 +0,0 @@ -server: - tomcat: - uri-encoding: utf-8 - -spring: - # 应用名称 - application: - name: langChat-server - # 默认执行的配置文件 - profiles: - active: dev - main: - allow-bean-definition-overriding: true - - # Cache设置 - cache: - type: redis - - # 文件上传相关设置 - servlet: - multipart: - max-file-size: 200MB - max-request-size: 200MB - mvc: - async: - request-timeout: 3600000 - -# MybatisPlus配置 -mybatis-plus: - mapper-locations: classpath:mapper/**/*.xml - configuration: - jdbc-type-for-null: null -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - global-config: - banner: false - -sa-token: - is-print: false - token-name: Authorization - -logging: - level: - dev: - langchain4j: DEBUG - ai4j: - openai4j: DEBUG diff --git a/yudao-langchat-server/src/main/resources/logback-spring.xml b/yudao-langchat-server/src/main/resources/logback-spring.xml deleted file mode 100644 index 9c88036..0000000 --- a/yudao-langchat-server/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - ${CONSOLE_LOG_PATTERN} - - - - - - ${log.path}/debug.log - - ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz - 50MB - 30 - - - %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n - - - - - - ${log.path}/error.log - - ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz - 50MB - 30 - - - %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n - - - ERROR - - - - - - - - - - diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml index 450e875..896de43 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml @@ -3,7 +3,7 @@ spring: cloud: nacos: - server-addr: 10.31.0.128:8848 # Nacos 服务器地址 + server-addr: 192.168.0.17:8848 # Nacos 服务器地址 username: nacos # Nacos 账号 password: nacos # Nacos 密码 discovery: # 【配置中心】配置项 @@ -61,30 +61,30 @@ spring: primary: master datasource: master: - url: jdbc:mysql://10.31.0.128:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例 # url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例 username: root - password: chinasoft@123 + password: root # username: sa # SQL Server 连接的示例 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # SQL Server 连接的示例 # username: SYSDBA # DM 连接的示例 # password: SYSDBA # DM 连接的示例 slave: # 模拟从库,可根据自己需要修改 lazy: true # 开启懒加载,保证启动速度 - url: jdbc:mysql://10.31.0.128:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true + url: jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true username: root - password: chinasoft@123 + password: root # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 redis: - host: 10.31.0.128 # 地址 + host: 192.168.0.17 # 地址 port: 6379 # 端口 database: 0 # 数据库索引 -# password: 123456 # 密码,建议生产环境开启 + password: 123456 # 密码,建议生产环境开启 --- #################### MQ 消息队列相关配置 #################### diff --git a/yudao-module-langchat/.flattened-pom.xml b/yudao-module-langchat/.flattened-pom.xml new file mode 100644 index 0000000..23287cb --- /dev/null +++ b/yudao-module-langchat/.flattened-pom.xml @@ -0,0 +1,144 @@ + + + 4.0.0 + cn.iocoder.cloud + yudao-module-langchat + 2.3.0-jdk8-SNAPSHOT + 芋道项目基础脚手架 + https://github.com/YunaiV/ruoyi-vue-pro/yudao-module-langchat + + + cn.iocoder.cloud + yudao-spring-boot-starter-env + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-data-permission + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-tenant + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-ip + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-security + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-mybatis + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-redis + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-rpc + 2.3.0-jdk8-SNAPSHOT + compile + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + 2021.0.6.1 + compile + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + 2021.0.6.1 + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-job + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-mq + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-excel + 2.3.0-jdk8-SNAPSHOT + compile + + + org.springframework.boot + spring-boot-starter-mail + 2.7.18 + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-monitor + 2.3.0-jdk8-SNAPSHOT + compile + + + com.xingyuv + spring-boot-starter-justauth + 1.0.8 + compile + + + cn.hutool + hutool-core + + + + + com.github.binarywang + wx-java-mp-spring-boot-starter + 4.6.0 + compile + + + com.github.binarywang + wx-java-miniapp-spring-boot-starter + 4.6.0 + compile + + + com.xingyuv + spring-boot-starter-captcha-plus + 1.0.8 + compile + + + + + huaweicloud + huawei + https://mirrors.huaweicloud.com/repository/maven/ + + + aliyunmaven + aliyun + https://maven.aliyun.com/repository/public + + + diff --git a/yudao-module-langchat/pom.xml b/yudao-module-langchat/pom.xml new file mode 100644 index 0000000..f639e84 --- /dev/null +++ b/yudao-module-langchat/pom.xml @@ -0,0 +1,21 @@ + + + + + cn.iocoder.cloud + yudao + ${revision} + + 4.0.0 + + yudao-module-langchat-biz + + yudao-module-langchat + pom + + ${project.artifactId} + + + + diff --git a/yudao-module-langchat/yudao-module-langchat-biz/.flattened-pom.xml b/yudao-module-langchat/yudao-module-langchat-biz/.flattened-pom.xml new file mode 100644 index 0000000..947f2d0 --- /dev/null +++ b/yudao-module-langchat/yudao-module-langchat-biz/.flattened-pom.xml @@ -0,0 +1,144 @@ + + + 4.0.0 + cn.iocoder.cloud + yudao-module-langchat-biz + 2.3.0-jdk8-SNAPSHOT + 芋道项目基础脚手架 + https://github.com/YunaiV/ruoyi-vue-pro/yudao-module-langchat-biz + + + cn.iocoder.cloud + yudao-spring-boot-starter-env + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-data-permission + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-tenant + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-ip + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-security + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-mybatis + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-redis + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-rpc + 2.3.0-jdk8-SNAPSHOT + compile + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + 2021.0.6.1 + compile + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + 2021.0.6.1 + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-job + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-mq + 2.3.0-jdk8-SNAPSHOT + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-excel + 2.3.0-jdk8-SNAPSHOT + compile + + + org.springframework.boot + spring-boot-starter-mail + 2.7.18 + compile + + + cn.iocoder.cloud + yudao-spring-boot-starter-monitor + 2.3.0-jdk8-SNAPSHOT + compile + + + com.xingyuv + spring-boot-starter-justauth + 1.0.8 + compile + + + cn.hutool + hutool-core + + + + + com.github.binarywang + wx-java-mp-spring-boot-starter + 4.6.0 + compile + + + com.github.binarywang + wx-java-miniapp-spring-boot-starter + 4.6.0 + compile + + + com.xingyuv + spring-boot-starter-captcha-plus + 1.0.8 + compile + + + + + huaweicloud + huawei + https://mirrors.huaweicloud.com/repository/maven/ + + + aliyunmaven + aliyun + https://maven.aliyun.com/repository/public + + + diff --git a/yudao-module-langchat/yudao-module-langchat-biz/pom.xml b/yudao-module-langchat/yudao-module-langchat-biz/pom.xml new file mode 100644 index 0000000..8462d22 --- /dev/null +++ b/yudao-module-langchat/yudao-module-langchat-biz/pom.xml @@ -0,0 +1,167 @@ + + + + cn.iocoder.cloud + yudao-module-langchat + ${revision} + + 4.0.0 + yudao-module-langchat-biz + jar + + ${project.artifactId} + + + + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-env + + + + + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-data-permission + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-tenant + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-ip + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-security + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-mybatis + + + + cn.iocoder.cloud + yudao-spring-boot-starter-redis + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-rpc + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-job + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-mq + + + + + + + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-test + test + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-excel + + + + org.springframework.boot + spring-boot-starter-mail + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-monitor + + + + + com.xingyuv + spring-boot-starter-justauth + + + + com.github.binarywang + wx-java-mp-spring-boot-starter + + + com.github.binarywang + wx-java-miniapp-spring-boot-starter + + + + com.xingyuv + spring-boot-starter-captcha-plus + + + + + + + ${project.artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + + repackage + + + + + + + + diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/LangChatApp.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/LangChatApplication.java similarity index 78% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/LangChatApp.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/LangChatApplication.java index b2a0f1b..617b7bd 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/LangChatApp.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/LangChatApplication.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package cn.tycoding.langchat; +package cn.iocoder.yudao.module.langchat; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.scheduling.annotation.EnableAsync; /** * @author tycoding * @since 2024/2/4 */ //@EnableFileStorage -@EnableAsync @SpringBootApplication -public class LangChatApp { +@MapperScan("cn.iocoder.yudao.module.langchat.server.mapper") +public class LangChatApplication { public static void main(String[] args) { - SpringApplication.run(LangChatApp.class, args); + SpringApplication.run(LangChatApplication.class, args); } } diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/annotation/ApiLog.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/annotation/ApiLog.java similarity index 94% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/annotation/ApiLog.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/annotation/ApiLog.java index 4cd1a37..2aa7858 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/annotation/ApiLog.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/annotation/ApiLog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.annotation; +package cn.iocoder.yudao.module.langchat.server.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/EmbeddingRefreshEvent.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/EmbeddingRefreshEvent.java similarity index 94% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/EmbeddingRefreshEvent.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/EmbeddingRefreshEvent.java index 1466ec6..a4ff9f4 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/EmbeddingRefreshEvent.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/EmbeddingRefreshEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.component; +package cn.iocoder.yudao.module.langchat.server.component; import org.springframework.context.ApplicationEvent; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/ModelTypeEnum.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/ModelTypeEnum.java similarity index 93% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/ModelTypeEnum.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/ModelTypeEnum.java index bb1fceb..bb52ffa 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/ModelTypeEnum.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/ModelTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.component; +package cn.iocoder.yudao.module.langchat.server.component; import lombok.Getter; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/ProviderRefreshEvent.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/ProviderRefreshEvent.java similarity index 94% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/ProviderRefreshEvent.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/ProviderRefreshEvent.java index e919176..c46c164 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/ProviderRefreshEvent.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/ProviderRefreshEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.component; +package cn.iocoder.yudao.module.langchat.server.component; import org.springframework.context.ApplicationEvent; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/SpringContextHolder.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/SpringContextHolder.java similarity index 97% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/SpringContextHolder.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/SpringContextHolder.java index bcb6a4d..f53c3c4 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/component/SpringContextHolder.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/component/SpringContextHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.component; +package cn.iocoder.yudao.module.langchat.server.component; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcEmbedStoreController.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcEmbedStoreController.java similarity index 85% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcEmbedStoreController.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcEmbedStoreController.java index a729a1b..f254e37 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcEmbedStoreController.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcEmbedStoreController.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.controller; +package cn.iocoder.yudao.module.langchat.server.controller; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; -import cn.tycoding.langchat.server.component.EmbeddingRefreshEvent; -import cn.tycoding.langchat.server.entity.AigcEmbedStore; -import cn.tycoding.langchat.server.service.AigcEmbedStoreService; -import cn.tycoding.langchat.server.annotation.ApiLog; -import cn.tycoding.langchat.server.component.SpringContextHolder; -import cn.tycoding.langchat.server.utils.MybatisUtil; -import cn.tycoding.langchat.server.utils.QueryPage; +import cn.iocoder.yudao.module.langchat.server.component.EmbeddingRefreshEvent; +import cn.iocoder.yudao.module.langchat.server.entity.AigcEmbedStore; +import cn.iocoder.yudao.module.langchat.server.service.AigcEmbedStoreService; +import cn.iocoder.yudao.module.langchat.server.annotation.ApiLog; +import cn.iocoder.yudao.module.langchat.server.component.SpringContextHolder; +import cn.iocoder.yudao.module.langchat.server.utils.MybatisUtil; +import cn.iocoder.yudao.module.langchat.server.utils.QueryPage; -import cn.tycoding.langchat.server.utils.R; +import cn.iocoder.yudao.module.langchat.server.utils.R; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcKnowledgeController.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcKnowledgeController.java similarity index 84% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcKnowledgeController.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcKnowledgeController.java index 01c0842..f5f5a9c 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcKnowledgeController.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcKnowledgeController.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.controller; +package cn.iocoder.yudao.module.langchat.server.controller; import cn.hutool.core.util.StrUtil; -import cn.tycoding.langchat.server.entity.AigcDocs; -import cn.tycoding.langchat.server.entity.AigcEmbedStore; -import cn.tycoding.langchat.server.entity.AigcKnowledge; -import cn.tycoding.langchat.server.entity.AigcModel; -import cn.tycoding.langchat.server.mapper.AigcDocsMapper; -import cn.tycoding.langchat.server.provider.KnowledgeStoreFactory; -import cn.tycoding.langchat.server.service.AigcEmbedStoreService; -import cn.tycoding.langchat.server.service.AigcKnowledgeService; -import cn.tycoding.langchat.server.service.AigcModelService; -import cn.tycoding.langchat.server.annotation.ApiLog; -import cn.tycoding.langchat.server.utils.MybatisUtil; -import cn.tycoding.langchat.server.utils.QueryPage; +import cn.iocoder.yudao.module.langchat.server.entity.AigcDocs; +import cn.iocoder.yudao.module.langchat.server.entity.AigcEmbedStore; +import cn.iocoder.yudao.module.langchat.server.entity.AigcKnowledge; +import cn.iocoder.yudao.module.langchat.server.entity.AigcModel; +import cn.iocoder.yudao.module.langchat.server.mapper.AigcDocsMapper; +import cn.iocoder.yudao.module.langchat.server.provider.KnowledgeStoreFactory; +import cn.iocoder.yudao.module.langchat.server.service.AigcEmbedStoreService; +import cn.iocoder.yudao.module.langchat.server.service.AigcKnowledgeService; +import cn.iocoder.yudao.module.langchat.server.service.AigcModelService; +import cn.iocoder.yudao.module.langchat.server.annotation.ApiLog; +import cn.iocoder.yudao.module.langchat.server.utils.MybatisUtil; +import cn.iocoder.yudao.module.langchat.server.utils.QueryPage; -import cn.tycoding.langchat.server.utils.R; +import cn.iocoder.yudao.module.langchat.server.utils.R; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcMessageController.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcMessageController.java similarity index 83% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcMessageController.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcMessageController.java index 2b71f81..1584d52 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcMessageController.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcMessageController.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.controller; +package cn.iocoder.yudao.module.langchat.server.controller; import cn.hutool.core.util.StrUtil; -import cn.tycoding.langchat.server.entity.AigcMessage; -import cn.tycoding.langchat.server.service.AigcMessageService; -import cn.tycoding.langchat.server.annotation.ApiLog; -import cn.tycoding.langchat.server.utils.MybatisUtil; -import cn.tycoding.langchat.server.utils.QueryPage; +import cn.iocoder.yudao.module.langchat.server.entity.AigcMessage; +import cn.iocoder.yudao.module.langchat.server.service.AigcMessageService; +import cn.iocoder.yudao.module.langchat.server.annotation.ApiLog; +import cn.iocoder.yudao.module.langchat.server.utils.MybatisUtil; +import cn.iocoder.yudao.module.langchat.server.utils.QueryPage; -import cn.tycoding.langchat.server.utils.R; +import cn.iocoder.yudao.module.langchat.server.utils.R; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcModelController.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcModelController.java similarity index 83% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcModelController.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcModelController.java index 2b5be3d..8e1f0dc 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/controller/AigcModelController.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/controller/AigcModelController.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.controller; +package cn.iocoder.yudao.module.langchat.server.controller; import cn.hutool.core.util.StrUtil; -import cn.tycoding.langchat.server.component.ProviderRefreshEvent; -import cn.tycoding.langchat.server.component.SpringContextHolder; -import cn.tycoding.langchat.server.entity.AigcModel; -import cn.tycoding.langchat.server.service.AigcModelService; -import cn.tycoding.langchat.server.annotation.ApiLog; -import cn.tycoding.langchat.server.utils.MybatisUtil; -import cn.tycoding.langchat.server.utils.QueryPage; +import cn.iocoder.yudao.module.langchat.server.component.ProviderRefreshEvent; +import cn.iocoder.yudao.module.langchat.server.component.SpringContextHolder; +import cn.iocoder.yudao.module.langchat.server.entity.AigcModel; +import cn.iocoder.yudao.module.langchat.server.service.AigcModelService; +import cn.iocoder.yudao.module.langchat.server.annotation.ApiLog; +import cn.iocoder.yudao.module.langchat.server.utils.MybatisUtil; +import cn.iocoder.yudao.module.langchat.server.utils.QueryPage; -import cn.tycoding.langchat.server.utils.R; +import cn.iocoder.yudao.module.langchat.server.utils.R; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcApp.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcApp.java similarity index 97% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcApp.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcApp.java index 8122b43..fa6f674 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcApp.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcApp.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcAppApi.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcAppApi.java similarity index 96% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcAppApi.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcAppApi.java index ab765fd..cdda786 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcAppApi.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcAppApi.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcConversation.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcConversation.java similarity index 97% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcConversation.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcConversation.java index 985c3b8..abb270c 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcConversation.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcConversation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcDocs.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcDocs.java similarity index 96% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcDocs.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcDocs.java index b028411..4a8b9f5 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcDocs.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcDocs.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcDocsSlice.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcDocsSlice.java similarity index 96% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcDocsSlice.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcDocsSlice.java index b795d44..237a3ac 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcDocsSlice.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcDocsSlice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcEmbedStore.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcEmbedStore.java similarity index 96% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcEmbedStore.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcEmbedStore.java index 93890b9..4570ba3 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcEmbedStore.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcEmbedStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcKnowledge.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcKnowledge.java similarity index 97% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcKnowledge.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcKnowledge.java index 1bc8612..dced548 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcKnowledge.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcKnowledge.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcMessage.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcMessage.java similarity index 97% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcMessage.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcMessage.java index cfa1752..3e1b2d7 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcMessage.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcModel.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcModel.java similarity index 96% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcModel.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcModel.java index df3cb74..c25b675 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/AigcModel.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/AigcModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/SysDept.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/SysDept.java similarity index 96% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/SysDept.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/SysDept.java index a5fac56..a1c1f69 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/SysDept.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/SysDept.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/SysRole.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/SysRole.java similarity index 95% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/SysRole.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/SysRole.java index 1761d99..49a2b33 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/SysRole.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/SysRole.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/SysUser.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/SysUser.java similarity index 97% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/SysUser.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/SysUser.java index 925607c..c358087 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/SysUser.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/SysUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/UserInfo.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/UserInfo.java similarity index 96% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/UserInfo.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/UserInfo.java index 9bc2716..1147538 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/entity/UserInfo.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/entity/UserInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.entity; +package cn.iocoder.yudao.module.langchat.server.entity; import lombok.Data; import lombok.experimental.Accessors; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/package-info.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/package-info.java similarity index 57% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/package-info.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/package-info.java index 4e0d4a2..a4c6968 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/package-info.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.tycoding.langchat.server.framework; +package cn.iocoder.yudao.module.langchat.server.framework; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/security/ApiConstants.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/security/ApiConstants.java similarity index 86% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/security/ApiConstants.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/security/ApiConstants.java index 7f575ba..5b0d442 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/security/ApiConstants.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/security/ApiConstants.java @@ -1,4 +1,4 @@ -package cn.tycoding.langchat.server.framework.security; +package cn.iocoder.yudao.module.langchat.server.framework.security; import cn.iocoder.yudao.framework.common.enums.RpcConstants; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/security/config/SecurityConfiguration.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/security/config/SecurityConfiguration.java similarity index 91% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/security/config/SecurityConfiguration.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/security/config/SecurityConfiguration.java index 9ac187c..58445b8 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/framework/security/config/SecurityConfiguration.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/security/config/SecurityConfiguration.java @@ -1,7 +1,7 @@ -package cn.tycoding.langchat.server.framework.security.config; +package cn.iocoder.yudao.module.langchat.server.framework.security.config; import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer; -import cn.tycoding.langchat.server.framework.security.ApiConstants; +import cn.iocoder.yudao.module.langchat.server.framework.security.ApiConstants; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/security/core/package-info.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/security/core/package-info.java new file mode 100644 index 0000000..fc863b8 --- /dev/null +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/framework/security/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.iocoder.yudao.module.langchat.server.framework.security.core; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcConversationMapper.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcConversationMapper.java similarity index 87% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcConversationMapper.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcConversationMapper.java index 254572e..2cc13be 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcConversationMapper.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcConversationMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.mapper; +package cn.iocoder.yudao.module.langchat.server.mapper; -import cn.tycoding.langchat.server.entity.AigcConversation; +import cn.iocoder.yudao.module.langchat.server.entity.AigcConversation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcDocsMapper.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcDocsMapper.java similarity index 87% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcDocsMapper.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcDocsMapper.java index 427dbcc..beee89b 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcDocsMapper.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcDocsMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.mapper; +package cn.iocoder.yudao.module.langchat.server.mapper; -import cn.tycoding.langchat.server.entity.AigcDocs; +import cn.iocoder.yudao.module.langchat.server.entity.AigcDocs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcDocsSliceMapper.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcDocsSliceMapper.java similarity index 87% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcDocsSliceMapper.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcDocsSliceMapper.java index 9e4d1d6..21550ad 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcDocsSliceMapper.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcDocsSliceMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.mapper; +package cn.iocoder.yudao.module.langchat.server.mapper; -import cn.tycoding.langchat.server.entity.AigcDocsSlice; +import cn.iocoder.yudao.module.langchat.server.entity.AigcDocsSlice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcEmbedStoreMapper.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcEmbedStoreMapper.java similarity index 87% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcEmbedStoreMapper.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcEmbedStoreMapper.java index fbcad09..8ded639 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcEmbedStoreMapper.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcEmbedStoreMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.mapper; +package cn.iocoder.yudao.module.langchat.server.mapper; -import cn.tycoding.langchat.server.entity.AigcEmbedStore; +import cn.iocoder.yudao.module.langchat.server.entity.AigcEmbedStore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcKnowledgeMapper.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcKnowledgeMapper.java similarity index 87% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcKnowledgeMapper.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcKnowledgeMapper.java index 9bf63eb..8ef0ca7 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcKnowledgeMapper.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcKnowledgeMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.mapper; +package cn.iocoder.yudao.module.langchat.server.mapper; -import cn.tycoding.langchat.server.entity.AigcKnowledge; +import cn.iocoder.yudao.module.langchat.server.entity.AigcKnowledge; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcMessageMapper.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcMessageMapper.java similarity index 96% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcMessageMapper.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcMessageMapper.java index d40e29d..0f851d6 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcMessageMapper.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcMessageMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.mapper; +package cn.iocoder.yudao.module.langchat.server.mapper; import cn.hutool.core.lang.Dict; -import cn.tycoding.langchat.server.entity.AigcMessage; +import cn.iocoder.yudao.module.langchat.server.entity.AigcMessage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcModelMapper.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcModelMapper.java similarity index 87% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcModelMapper.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcModelMapper.java index 303b76d..c73e688 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/AigcModelMapper.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/AigcModelMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.mapper; +package cn.iocoder.yudao.module.langchat.server.mapper; -import cn.tycoding.langchat.server.entity.AigcModel; +import cn.iocoder.yudao.module.langchat.server.entity.AigcModel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/SysUserMapper.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/SysUserMapper.java similarity index 88% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/SysUserMapper.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/SysUserMapper.java index b2c81dd..1dfa9e4 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/mapper/SysUserMapper.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/mapper/SysUserMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.mapper; +package cn.iocoder.yudao.module.langchat.server.mapper; import cn.hutool.core.lang.Dict; -import cn.tycoding.langchat.server.entity.SysUser; -import cn.tycoding.langchat.server.entity.UserInfo; +import cn.iocoder.yudao.module.langchat.server.entity.SysUser; +import cn.iocoder.yudao.module.langchat.server.entity.UserInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/provider/KnowledgeStoreFactory.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/provider/KnowledgeStoreFactory.java similarity index 84% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/provider/KnowledgeStoreFactory.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/provider/KnowledgeStoreFactory.java index f54f314..1ffd4b7 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/provider/KnowledgeStoreFactory.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/provider/KnowledgeStoreFactory.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.provider; +package cn.iocoder.yudao.module.langchat.server.provider; -import cn.tycoding.langchat.server.entity.AigcEmbedStore; -import cn.tycoding.langchat.server.entity.AigcKnowledge; -import cn.tycoding.langchat.server.entity.AigcModel; -import cn.tycoding.langchat.server.service.AigcEmbedStoreService; -import cn.tycoding.langchat.server.service.AigcKnowledgeService; -import cn.tycoding.langchat.server.service.AigcModelService; +import cn.iocoder.yudao.module.langchat.server.entity.AigcEmbedStore; +import cn.iocoder.yudao.module.langchat.server.entity.AigcKnowledge; +import cn.iocoder.yudao.module.langchat.server.entity.AigcModel; +import cn.iocoder.yudao.module.langchat.server.service.AigcEmbedStoreService; +import cn.iocoder.yudao.module.langchat.server.service.AigcKnowledgeService; +import cn.iocoder.yudao.module.langchat.server.service.AigcModelService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcEmbedStoreService.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcEmbedStoreService.java similarity index 86% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcEmbedStoreService.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcEmbedStoreService.java index fdca261..2ded47a 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcEmbedStoreService.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcEmbedStoreService.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.service; +package cn.iocoder.yudao.module.langchat.server.service; -import cn.tycoding.langchat.server.entity.AigcEmbedStore; +import cn.iocoder.yudao.module.langchat.server.entity.AigcEmbedStore; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcKnowledgeService.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcKnowledgeService.java similarity index 82% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcKnowledgeService.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcKnowledgeService.java index 2d5f449..30147b5 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcKnowledgeService.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcKnowledgeService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.service; +package cn.iocoder.yudao.module.langchat.server.service; -import cn.tycoding.langchat.server.entity.AigcDocs; -import cn.tycoding.langchat.server.entity.AigcDocsSlice; -import cn.tycoding.langchat.server.entity.AigcKnowledge; +import cn.iocoder.yudao.module.langchat.server.entity.AigcDocs; +import cn.iocoder.yudao.module.langchat.server.entity.AigcDocsSlice; +import cn.iocoder.yudao.module.langchat.server.entity.AigcKnowledge; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcMessageService.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcMessageService.java similarity index 86% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcMessageService.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcMessageService.java index 0e19247..e42251f 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcMessageService.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcMessageService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.service; +package cn.iocoder.yudao.module.langchat.server.service; -import cn.tycoding.langchat.server.entity.AigcConversation; -import cn.tycoding.langchat.server.entity.AigcMessage; -import cn.tycoding.langchat.server.utils.QueryPage; +import cn.iocoder.yudao.module.langchat.server.entity.AigcConversation; +import cn.iocoder.yudao.module.langchat.server.entity.AigcMessage; +import cn.iocoder.yudao.module.langchat.server.utils.QueryPage; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcModelService.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcModelService.java similarity index 86% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcModelService.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcModelService.java index 5db1667..e21480e 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/AigcModelService.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/AigcModelService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.service; +package cn.iocoder.yudao.module.langchat.server.service; -import cn.tycoding.langchat.server.entity.AigcModel; -import cn.tycoding.langchat.server.utils.QueryPage; +import cn.iocoder.yudao.module.langchat.server.entity.AigcModel; +import cn.iocoder.yudao.module.langchat.server.utils.QueryPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcEmbedStoreServiceImpl.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcEmbedStoreServiceImpl.java similarity index 75% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcEmbedStoreServiceImpl.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcEmbedStoreServiceImpl.java index 7744de5..4ff3c32 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcEmbedStoreServiceImpl.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcEmbedStoreServiceImpl.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.service.impl; +package cn.iocoder.yudao.module.langchat.server.service.impl; -import cn.tycoding.langchat.server.entity.AigcEmbedStore; -import cn.tycoding.langchat.server.mapper.AigcEmbedStoreMapper; -import cn.tycoding.langchat.server.service.AigcEmbedStoreService; +import cn.iocoder.yudao.module.langchat.server.entity.AigcEmbedStore; +import cn.iocoder.yudao.module.langchat.server.mapper.AigcEmbedStoreMapper; +import cn.iocoder.yudao.module.langchat.server.service.AigcEmbedStoreService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; /** @@ -28,7 +27,6 @@ import org.springframework.stereotype.Service; * @since 2024/10/28 */ @Service -@RequiredArgsConstructor public class AigcEmbedStoreServiceImpl extends ServiceImpl implements AigcEmbedStoreService { } diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcKnowledgeServiceImpl.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcKnowledgeServiceImpl.java similarity index 84% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcKnowledgeServiceImpl.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcKnowledgeServiceImpl.java index fde76f4..c2d4484 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcKnowledgeServiceImpl.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcKnowledgeServiceImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.service.impl; +package cn.iocoder.yudao.module.langchat.server.service.impl; -import cn.tycoding.langchat.server.entity.AigcDocs; -import cn.tycoding.langchat.server.entity.AigcDocsSlice; -import cn.tycoding.langchat.server.entity.AigcKnowledge; -import cn.tycoding.langchat.server.mapper.AigcDocsMapper; -import cn.tycoding.langchat.server.mapper.AigcDocsSliceMapper; -import cn.tycoding.langchat.server.mapper.AigcKnowledgeMapper; -import cn.tycoding.langchat.server.service.AigcKnowledgeService; +import cn.iocoder.yudao.module.langchat.server.entity.AigcDocs; +import cn.iocoder.yudao.module.langchat.server.entity.AigcDocsSlice; +import cn.iocoder.yudao.module.langchat.server.entity.AigcKnowledge; +import cn.iocoder.yudao.module.langchat.server.mapper.AigcDocsMapper; +import cn.iocoder.yudao.module.langchat.server.mapper.AigcDocsSliceMapper; +import cn.iocoder.yudao.module.langchat.server.mapper.AigcKnowledgeMapper; +import cn.iocoder.yudao.module.langchat.server.service.AigcKnowledgeService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @author tycoding @@ -83,7 +84,7 @@ public class AigcKnowledgeServiceImpl extends ServiceImpl vectorIds = aigcDocsSliceMapper.selectList(selectWrapper) .stream() .map(AigcDocsSlice::getVectorId) - .toList(); + .collect(Collectors.toList()); log.debug("slices of doc: [{}], count: [{}]", docsId, vectorIds.size()); return vectorIds; } diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcMessageServiceImpl.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcMessageServiceImpl.java similarity index 90% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcMessageServiceImpl.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcMessageServiceImpl.java index 0a60b42..337e427 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcMessageServiceImpl.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcMessageServiceImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.service.impl; +package cn.iocoder.yudao.module.langchat.server.service.impl; import cn.hutool.core.util.StrUtil; -import cn.tycoding.langchat.server.entity.AigcConversation; -import cn.tycoding.langchat.server.entity.AigcMessage; -import cn.tycoding.langchat.server.entity.SysUser; -import cn.tycoding.langchat.server.mapper.AigcConversationMapper; -import cn.tycoding.langchat.server.mapper.AigcMessageMapper; -import cn.tycoding.langchat.server.mapper.SysUserMapper; -import cn.tycoding.langchat.server.service.AigcMessageService; -import cn.tycoding.langchat.server.utils.QueryPage; +import cn.iocoder.yudao.module.langchat.server.entity.AigcConversation; +import cn.iocoder.yudao.module.langchat.server.entity.AigcMessage; +import cn.iocoder.yudao.module.langchat.server.entity.SysUser; +import cn.iocoder.yudao.module.langchat.server.mapper.AigcConversationMapper; +import cn.iocoder.yudao.module.langchat.server.mapper.AigcMessageMapper; +import cn.iocoder.yudao.module.langchat.server.mapper.SysUserMapper; +import cn.iocoder.yudao.module.langchat.server.service.AigcMessageService; +import cn.iocoder.yudao.module.langchat.server.utils.QueryPage; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcModelServiceImpl.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcModelServiceImpl.java similarity index 89% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcModelServiceImpl.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcModelServiceImpl.java index 1881a8d..41cfe11 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/service/impl/AigcModelServiceImpl.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/service/impl/AigcModelServiceImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.service.impl; +package cn.iocoder.yudao.module.langchat.server.service.impl; import cn.hutool.core.util.StrUtil; -import cn.tycoding.langchat.server.component.ModelTypeEnum; -import cn.tycoding.langchat.server.entity.AigcModel; -import cn.tycoding.langchat.server.mapper.AigcModelMapper; -import cn.tycoding.langchat.server.service.AigcModelService; -import cn.tycoding.langchat.server.utils.QueryPage; +import cn.iocoder.yudao.module.langchat.server.component.ModelTypeEnum; +import cn.iocoder.yudao.module.langchat.server.entity.AigcModel; +import cn.iocoder.yudao.module.langchat.server.mapper.AigcModelMapper; +import cn.iocoder.yudao.module.langchat.server.service.AigcModelService; +import cn.iocoder.yudao.module.langchat.server.utils.QueryPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/utils/MybatisUtil.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/utils/MybatisUtil.java similarity index 96% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/utils/MybatisUtil.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/utils/MybatisUtil.java index f900ef9..5290181 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/utils/MybatisUtil.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/utils/MybatisUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.utils; +package cn.iocoder.yudao.module.langchat.server.utils; import cn.hutool.core.lang.Dict; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/utils/QueryPage.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/utils/QueryPage.java similarity index 94% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/utils/QueryPage.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/utils/QueryPage.java index 6b33de6..a51f061 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/utils/QueryPage.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/utils/QueryPage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.utils; +package cn.iocoder.yudao.module.langchat.server.utils; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/utils/R.java b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/utils/R.java similarity index 97% rename from yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/utils/R.java rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/utils/R.java index fd71066..6bcaf7d 100644 --- a/yudao-langchat-server/src/main/java/cn/tycoding/langchat/server/utils/R.java +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/java/cn/iocoder/yudao/module/langchat/server/utils/R.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.tycoding.langchat.server.utils; +package cn.iocoder.yudao.module.langchat.server.utils; import lombok.Data; import org.springframework.http.HttpStatus; diff --git a/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-dev.yaml b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-dev.yaml new file mode 100644 index 0000000..f065e93 --- /dev/null +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-dev.yaml @@ -0,0 +1,214 @@ +--- #################### 注册中心 + 配置中心相关配置 #################### + +spring: + cloud: + nacos: + server-addr: 192.168.0.17:8848 # Nacos 服务器地址 + username: nacos # Nacos 账号 + password: nacos # Nacos 密码 + discovery: # 【配置中心】配置项 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP + metadata: + version: 1.0.0 # 服务实例的版本号,可用于灰度发布 + config: # 【注册中心】配置项 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP + +--- #################### 数据库相关配置 #################### +spring: + # 数据源配置项 + autoconfigure: + exclude: + - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置,使用 dynamic-datasource-spring-boot-starter 配置多数据源 + - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置 + datasource: + druid: # Druid 【监控】相关的全局配置 + web-stat-filter: + enabled: true + stat-view-servlet: + enabled: true + allow: # 设置白名单,不填则允许所有访问 + url-pattern: /druid/* + login-username: # 控制台管理用户名和密码 + login-password: + filter: + stat: + enabled: true + log-slow-sql: true # 慢 SQL 记录 + slow-sql-millis: 100 + merge-sql: true + wall: + config: + multi-statement-allow: true + dynamic: # 多数据源配置 + druid: # Druid 【连接池】相关的全局配置 + initial-size: 1 # 初始连接数 + min-idle: 1 # 最小连接池数量 + max-active: 20 # 最大连接池数量 + max-wait: 600000 # 配置获取连接等待超时的时间,单位:毫秒 + time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位:毫秒 + min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间,单位:毫秒 + max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间,单位:毫秒 + validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效 + test-while-idle: true + test-on-borrow: false + test-on-return: false + primary: master + datasource: + master: + url: jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例 + # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 + # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 + # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例 + # url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例 + username: root + password: root + # username: sa # SQL Server 连接的示例 + # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # SQL Server 连接的示例 + # username: SYSDBA # DM 连接的示例 + # password: SYSDBA # DM 连接的示例 + slave: # 模拟从库,可根据自己需要修改 + lazy: true # 开启懒加载,保证启动速度 + url: jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true + username: root + password: root + + # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 + redis: + host: 192.168.0.21 # 地址 + port: 6379 # 端口 + database: 0 # 数据库索引 + password: 123456 # 密码,建议生产环境开启 + +--- #################### MQ 消息队列相关配置 #################### + +# rocketmq 配置项,对应 RocketMQProperties 配置类 +rocketmq: + name-server: 127.0.0.1:9876 # RocketMQ Namesrv + +spring: + # RabbitMQ 配置项,对应 RabbitProperties 配置类 + rabbitmq: + host: 10.31.0.128 # RabbitMQ 服务的地址 + port: 5672 # RabbitMQ 服务的端口 + username: guest # RabbitMQ 服务的账号 + password: guest # RabbitMQ 服务的密码 + # Kafka 配置项,对应 KafkaProperties 配置类 + kafka: + bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址,可以设置多个,以逗号分隔 + +--- #################### 定时任务相关配置 #################### + +xxl: + job: + enabled: false # 是否开启调度中心,默认为 true 开启 + admin: + addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址 + +--- #################### 服务保障相关配置 #################### + +# Lock4j 配置项 +lock4j: + acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒 + expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒 + +--- #################### 监控相关配置 #################### + +# Actuator 监控端点的配置项 +management: + endpoints: + web: + base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator + exposure: + include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ,可以开放所有端点。 + +# Spring Boot Admin 配置项 +spring: + boot: + admin: + # Spring Boot Admin Client 客户端的相关配置 + client: + instance: + service-host-type: IP # 注册实例时,优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME] + +# 日志文件配置 +logging: + level: + # 配置自己写的 MyBatis Mapper 打印日志 + cn.iocoder.yudao.module.system.dal.mysql: debug + cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info + org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿:先禁用,Spring Boot 3.X 存在部分错误的 WARN 提示 + +--- #################### 微信公众号、小程序相关配置 #################### +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: wxa69ab825b163be19 # 测试号(Kongdy 提供的) + # secret: bd4f9fab889591b62aeac0d7b8d8b4a0 + # 存储配置,解决 AccessToken 的跨节点的共享 + config-storage: + type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取 + 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 的前缀 + http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 + +--- #################### 芋道相关配置 #################### + +# 芋道配置项,设置当前项目所有自定义的配置 +yudao: + env: # 多环境的配置项 + tag: ${HOSTNAME} + captcha: + enable: false # 本地环境,暂时关闭图片验证码,方便登录等接口的测试 + security: + mock-enable: true + access-log: # 访问日志的配置项 + enable: false + wxa-code: + env-version: develop # 小程序版本: 正式版为 "release";体验版为 "trial";开发版为 "develop" + wxa-subscribe-message: + miniprogram-state: developer # 跳转小程序类型:开发版为 “developer”;体验版为 “trial”为;正式版为 “formal” + +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_APP: # 微信小程序 + 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:: + timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟 diff --git a/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-local.yaml b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-local.yaml new file mode 100644 index 0000000..363357c --- /dev/null +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-local.yaml @@ -0,0 +1,213 @@ +--- #################### 注册中心 + 配置中心相关配置 #################### + +spring: + cloud: + nacos: + server-addr: 192.168.0.17:8848 # Nacos 服务器地址 + username: nacos # Nacos 账号 + password: nacos # Nacos 密码 + discovery: # 【配置中心】配置项 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP + metadata: + version: 1.0.0 # 服务实例的版本号,可用于灰度发布 + config: # 【注册中心】配置项 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP + +--- #################### 数据库相关配置 #################### +spring: + # 数据源配置项 + autoconfigure: + exclude: + - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置,使用 dynamic-datasource-spring-boot-starter 配置多数据源 + - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置 + datasource: + druid: # Druid 【监控】相关的全局配置 + web-stat-filter: + enabled: true + stat-view-servlet: + enabled: true + allow: # 设置白名单,不填则允许所有访问 + url-pattern: /druid/* + login-username: # 控制台管理用户名和密码 + login-password: + filter: + stat: + enabled: true + log-slow-sql: true # 慢 SQL 记录 + slow-sql-millis: 100 + merge-sql: true + wall: + config: + multi-statement-allow: true + dynamic: # 多数据源配置 + druid: # Druid 【连接池】相关的全局配置 + initial-size: 1 # 初始连接数 + min-idle: 1 # 最小连接池数量 + max-active: 20 # 最大连接池数量 + max-wait: 600000 # 配置获取连接等待超时的时间,单位:毫秒 + time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位:毫秒 + min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间,单位:毫秒 + max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间,单位:毫秒 + validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效 + test-while-idle: true + test-on-borrow: false + test-on-return: false + primary: master + datasource: + master: + url: jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例 + # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 + # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 + # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例 + # url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例 + username: root + password: root + # username: sa # SQL Server 连接的示例 + # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # SQL Server 连接的示例 + # username: SYSDBA # DM 连接的示例 + # password: SYSDBA # DM 连接的示例 + slave: # 模拟从库,可根据自己需要修改 + lazy: true # 开启懒加载,保证启动速度 + url: jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true + username: root + password: root + + # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 + redis: + host: 192.168.0.21 # 地址 + port: 6379 # 端口 + database: 0 # 数据库索引 + password: 123456 # 密码,建议生产环境开启 + +--- #################### MQ 消息队列相关配置 #################### + +# rocketmq 配置项,对应 RocketMQProperties 配置类 +rocketmq: + name-server: 127.0.0.1:9876 # RocketMQ Namesrv + +spring: + # RabbitMQ 配置项,对应 RabbitProperties 配置类 + rabbitmq: + host: 10.31.0.128 # RabbitMQ 服务的地址 + port: 5672 # RabbitMQ 服务的端口 + username: guest # RabbitMQ 服务的账号 + password: guest # RabbitMQ 服务的密码 + # Kafka 配置项,对应 KafkaProperties 配置类 + kafka: + bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址,可以设置多个,以逗号分隔 + +--- #################### 定时任务相关配置 #################### + +xxl: + job: + enabled: false # 是否开启调度中心,默认为 true 开启 + admin: + addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址 + +--- #################### 服务保障相关配置 #################### + +# Lock4j 配置项 +lock4j: + acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒 + expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒 + +--- #################### 监控相关配置 #################### + +# Actuator 监控端点的配置项 +management: + endpoints: + web: + base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator + exposure: + include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ,可以开放所有端点。 + +# Spring Boot Admin 配置项 +spring: + boot: + admin: + # Spring Boot Admin Client 客户端的相关配置 + client: + instance: + service-host-type: IP # 注册实例时,优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME] + +# 日志文件配置 +logging: + level: + # 配置自己写的 MyBatis Mapper 打印日志 + cn.iocoder.yudao.module.langchat.server.mapper: debug + org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿:先禁用,Spring Boot 3.X 存在部分错误的 WARN 提示 + +--- #################### 微信公众号、小程序相关配置 #################### +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: wxa69ab825b163be19 # 测试号(Kongdy 提供的) + # secret: bd4f9fab889591b62aeac0d7b8d8b4a0 + # 存储配置,解决 AccessToken 的跨节点的共享 + config-storage: + type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取 + 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 的前缀 + http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 + +--- #################### 芋道相关配置 #################### + +# 芋道配置项,设置当前项目所有自定义的配置 +yudao: + env: # 多环境的配置项 + tag: ${HOSTNAME} + captcha: + enable: false # 本地环境,暂时关闭图片验证码,方便登录等接口的测试 + security: + mock-enable: true + access-log: # 访问日志的配置项 + enable: false + wxa-code: + env-version: develop # 小程序版本: 正式版为 "release";体验版为 "trial";开发版为 "develop" + wxa-subscribe-message: + miniprogram-state: developer # 跳转小程序类型:开发版为 “developer”;体验版为 “trial”为;正式版为 “formal” + +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_APP: # 微信小程序 + 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:: + timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟 diff --git a/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-prd.yaml b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-prd.yaml new file mode 100644 index 0000000..f065e93 --- /dev/null +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application-prd.yaml @@ -0,0 +1,214 @@ +--- #################### 注册中心 + 配置中心相关配置 #################### + +spring: + cloud: + nacos: + server-addr: 192.168.0.17:8848 # Nacos 服务器地址 + username: nacos # Nacos 账号 + password: nacos # Nacos 密码 + discovery: # 【配置中心】配置项 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP + metadata: + version: 1.0.0 # 服务实例的版本号,可用于灰度发布 + config: # 【注册中心】配置项 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP + +--- #################### 数据库相关配置 #################### +spring: + # 数据源配置项 + autoconfigure: + exclude: + - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置,使用 dynamic-datasource-spring-boot-starter 配置多数据源 + - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置 + datasource: + druid: # Druid 【监控】相关的全局配置 + web-stat-filter: + enabled: true + stat-view-servlet: + enabled: true + allow: # 设置白名单,不填则允许所有访问 + url-pattern: /druid/* + login-username: # 控制台管理用户名和密码 + login-password: + filter: + stat: + enabled: true + log-slow-sql: true # 慢 SQL 记录 + slow-sql-millis: 100 + merge-sql: true + wall: + config: + multi-statement-allow: true + dynamic: # 多数据源配置 + druid: # Druid 【连接池】相关的全局配置 + initial-size: 1 # 初始连接数 + min-idle: 1 # 最小连接池数量 + max-active: 20 # 最大连接池数量 + max-wait: 600000 # 配置获取连接等待超时的时间,单位:毫秒 + time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位:毫秒 + min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间,单位:毫秒 + max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间,单位:毫秒 + validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效 + test-while-idle: true + test-on-borrow: false + test-on-return: false + primary: master + datasource: + master: + url: jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例 + # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 + # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 + # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例 + # url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例 + username: root + password: root + # username: sa # SQL Server 连接的示例 + # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # SQL Server 连接的示例 + # username: SYSDBA # DM 连接的示例 + # password: SYSDBA # DM 连接的示例 + slave: # 模拟从库,可根据自己需要修改 + lazy: true # 开启懒加载,保证启动速度 + url: jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true + username: root + password: root + + # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 + redis: + host: 192.168.0.21 # 地址 + port: 6379 # 端口 + database: 0 # 数据库索引 + password: 123456 # 密码,建议生产环境开启 + +--- #################### MQ 消息队列相关配置 #################### + +# rocketmq 配置项,对应 RocketMQProperties 配置类 +rocketmq: + name-server: 127.0.0.1:9876 # RocketMQ Namesrv + +spring: + # RabbitMQ 配置项,对应 RabbitProperties 配置类 + rabbitmq: + host: 10.31.0.128 # RabbitMQ 服务的地址 + port: 5672 # RabbitMQ 服务的端口 + username: guest # RabbitMQ 服务的账号 + password: guest # RabbitMQ 服务的密码 + # Kafka 配置项,对应 KafkaProperties 配置类 + kafka: + bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址,可以设置多个,以逗号分隔 + +--- #################### 定时任务相关配置 #################### + +xxl: + job: + enabled: false # 是否开启调度中心,默认为 true 开启 + admin: + addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址 + +--- #################### 服务保障相关配置 #################### + +# Lock4j 配置项 +lock4j: + acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒 + expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒 + +--- #################### 监控相关配置 #################### + +# Actuator 监控端点的配置项 +management: + endpoints: + web: + base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator + exposure: + include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ,可以开放所有端点。 + +# Spring Boot Admin 配置项 +spring: + boot: + admin: + # Spring Boot Admin Client 客户端的相关配置 + client: + instance: + service-host-type: IP # 注册实例时,优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME] + +# 日志文件配置 +logging: + level: + # 配置自己写的 MyBatis Mapper 打印日志 + cn.iocoder.yudao.module.system.dal.mysql: debug + cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info + org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿:先禁用,Spring Boot 3.X 存在部分错误的 WARN 提示 + +--- #################### 微信公众号、小程序相关配置 #################### +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: wxa69ab825b163be19 # 测试号(Kongdy 提供的) + # secret: bd4f9fab889591b62aeac0d7b8d8b4a0 + # 存储配置,解决 AccessToken 的跨节点的共享 + config-storage: + type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取 + 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 的前缀 + http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 + +--- #################### 芋道相关配置 #################### + +# 芋道配置项,设置当前项目所有自定义的配置 +yudao: + env: # 多环境的配置项 + tag: ${HOSTNAME} + captcha: + enable: false # 本地环境,暂时关闭图片验证码,方便登录等接口的测试 + security: + mock-enable: true + access-log: # 访问日志的配置项 + enable: false + wxa-code: + env-version: develop # 小程序版本: 正式版为 "release";体验版为 "trial";开发版为 "develop" + wxa-subscribe-message: + miniprogram-state: developer # 跳转小程序类型:开发版为 “developer”;体验版为 “trial”为;正式版为 “formal” + +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_APP: # 微信小程序 + 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:: + timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟 diff --git a/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application.yaml b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application.yaml new file mode 100644 index 0000000..358afec --- /dev/null +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/application.yaml @@ -0,0 +1,125 @@ +spring: + application: + name: langchat-server + + profiles: + active: local + + main: + allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。 + allow-bean-definition-overriding: true # 允许 Bean 覆盖,例如说 Feign 等会存在重复定义的服务 + + config: + import: + - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 + - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 + + # Servlet 配置 + servlet: + # 文件上传相关配置项 + multipart: + max-file-size: 16MB # 单个文件大小 + max-request-size: 32MB # 设置总上传的文件大小 + + # Jackson 配置项 + jackson: + serialization: + write-dates-as-timestamps: true # 设置 LocalDateTime 的格式,使用时间戳 + write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401,而是直接 1611460870401 + write-durations-as-timestamps: true # 设置 Duration 的格式,使用时间戳 + fail-on-empty-beans: false # 允许序列化无属性的 Bean + + # Cache 配置项 + cache: + type: REDIS + redis: + time-to-live: 1h # 设置过期时间为 1 小时 + +server: + port: 48091 + +logging: + file: + name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径 + +--- #################### 接口文档配置 #################### + +springdoc: + api-docs: + enabled: true # 1. 是否开启 Swagger 接文档的元数据 + path: /v3/api-docs + swagger-ui: + enabled: true # 2.1 是否开启 Swagger 文档的官方 UI 界面 + path: /swagger-ui + default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档 + +knife4j: + enable: true # 2.2 是否开启 Swagger 文档的 Knife4j UI 界面 + setting: + language: zh_cn + +# MyBatis Plus 的配置项 +mybatis-plus: + configuration: + map-underscore-to-camel-case: true # 虽然默认为 true ,但是还是显示去指定下。 + global-config: + db-config: + id-type: NONE # “智能”模式,基于 IdTypeEnvironmentPostProcessor + 数据源的类型,自动适配成 AUTO、INPUT 模式。 + # id-type: AUTO # 自增 ID,适合 MySQL 等直接自增的数据库 + # id-type: INPUT # 用户输入 ID,适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库 + # id-type: ASSIGN_ID # 分配 ID,默认使用雪花算法。注意,Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时,需要去除实体类上的 @KeySequence 注解 + logic-delete-value: 1 # 逻辑已删除值(默认为 1) + logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) + banner: false # 关闭控制台的 Banner 打印 + type-aliases-package: ${yudao.info.base-package}.dal.dataobject + encryptor: + password: XDV71a+xqStEA3WH # 加解密的秘钥,可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成 + +mybatis-plus-join: + banner: false # 关闭控制台的 Banner 打印 + +# Spring Data Redis 配置 +spring: + data: + redis: + repositories: + enabled: false # 项目未使用到 Spring Data Redis 的 Repository,所以直接禁用,保证启动速度 + +# VO 转换(数据翻译)相关 +easy-trans: + is-enable-global: true # 启用全局翻译(拦截所有 SpringMVC ResponseBody 进行自动翻译 )。如果对于性能要求很高可关闭此配置,或通过 @IgnoreTrans 忽略某个接口 + +--- #################### MQ 消息队列相关配置 #################### + +--- #################### 定时任务相关配置 #################### + +xxl: + job: + executor: + appname: ${spring.application.name} # 执行器 AppName + logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 + accessToken: default_token # 执行器通讯TOKEN + +--- #################### 芋道相关配置 #################### + +yudao: + info: + version: 1.0.0 + base-package: cn.iocoder.yudao.module.langchat + web: + admin-ui: + url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 + xss: + enable: false + exclude-urls: # 如下 url,仅仅是为了演示,去掉配置也没关系 + - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 + swagger: + title: 管理后台 + description: 提供管理员管理的所有功能 + version: ${yudao.info.version} + tenant: # 多租户相关配置项 + enable: true + ignore-urls: + - /admin-api/pay/notify/** # 支付回调通知,不携带租户编号 + +debug: false diff --git a/yudao-langchat-server/src/main/resources/banner.txt b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/banner.txt similarity index 100% rename from yudao-langchat-server/src/main/resources/banner.txt rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/banner.txt diff --git a/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/logback-spring.xml b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..b1b9f3f --- /dev/null +++ b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/logback-spring.xml @@ -0,0 +1,76 @@ + + + + + + + + + +       + + + ${PATTERN_DEFAULT} + + + + + + + + + + ${PATTERN_DEFAULT} + + + + ${LOG_FILE} + + + ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} + + ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} + + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} + + ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} + + ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} + + + + + + 0 + + 256 + + + + + + + + ${PATTERN_DEFAULT} + + + + + + + + + + + + + + + + + + + + + + diff --git a/yudao-langchat-server/src/main/resources/static/favicon.ico b/yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/static/favicon.ico similarity index 100% rename from yudao-langchat-server/src/main/resources/static/favicon.ico rename to yudao-module-langchat/yudao-module-langchat-biz/src/main/resources/static/favicon.ico diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml b/yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml index 0f90d49..72ea42a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml @@ -3,7 +3,7 @@ spring: cloud: nacos: - server-addr: 10.31.0.128:8848 # Nacos 服务器地址 + server-addr: 192.168.0.17:8848 # Nacos 服务器地址 username: nacos # Nacos 账号 password: nacos # Nacos 密码 discovery: # 【配置中心】配置项 @@ -57,30 +57,30 @@ spring: primary: master datasource: master: - url: jdbc:mysql://10.31.0.128:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例 # url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例 username: root - password: chinasoft@123 + password: root # username: sa # SQL Server 连接的示例 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # SQL Server 连接的示例 # username: SYSDBA # DM 连接的示例 # password: SYSDBA # DM 连接的示例 slave: # 模拟从库,可根据自己需要修改 lazy: true # 开启懒加载,保证启动速度 - url: jdbc:mysql://10.31.0.128:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true + url: jdbc:mysql://192.168.0.17:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true username: root - password: chinasoft@123 + password: root # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 redis: - host: 10.31.0.128 # 地址 + host: 192.168.0.17 # 地址 port: 6379 # 端口 database: 0 # 数据库索引 -# password: 123456 # 密码,建议生产环境开启 + password: 123456 # 密码,建议生产环境开启 --- #################### MQ 消息队列相关配置 ####################