diff --git a/nl-framework/nl-spring-boot-starter-excel/pom.xml b/nl-framework/nl-spring-boot-starter-excel/pom.xml index 315df775..7b4835b5 100644 --- a/nl-framework/nl-spring-boot-starter-excel/pom.xml +++ b/nl-framework/nl-spring-boot-starter-excel/pom.xml @@ -61,7 +61,6 @@ cn.nl.cloud nl-spring-boot-starter-biz-ip - true diff --git a/nl-framework/nl-spring-boot-starter-excel/src/main/java/cn/code/nl/framework/excel/core/convert/AreaConvert.java b/nl-framework/nl-spring-boot-starter-excel/src/main/java/cn/code/nl/framework/excel/core/convert/AreaConvert.java index 7f76e29b..fbbdaed6 100644 --- a/nl-framework/nl-spring-boot-starter-excel/src/main/java/cn/code/nl/framework/excel/core/convert/AreaConvert.java +++ b/nl-framework/nl-spring-boot-starter-excel/src/main/java/cn/code/nl/framework/excel/core/convert/AreaConvert.java @@ -1,8 +1,8 @@ package cn.code.nl.framework.excel.core.convert; -import cn.hutool.core.convert.Convert; import cn.code.nl.framework.ip.core.Area; import cn.code.nl.framework.ip.core.utils.AreaUtils; +import cn.hutool.core.convert.Convert; import cn.idev.excel.converters.Converter; import cn.idev.excel.enums.CellDataTypeEnum; import cn.idev.excel.metadata.GlobalConfiguration; diff --git a/nl-framework/nl-spring-boot-starter-web/src/main/java/cn/code/nl/framework/banner/core/BannerApplicationRunner.java b/nl-framework/nl-spring-boot-starter-web/src/main/java/cn/code/nl/framework/banner/core/BannerApplicationRunner.java index 1e8ee048..1d0899e8 100644 --- a/nl-framework/nl-spring-boot-starter-web/src/main/java/cn/code/nl/framework/banner/core/BannerApplicationRunner.java +++ b/nl-framework/nl-spring-boot-starter-web/src/main/java/cn/code/nl/framework/banner/core/BannerApplicationRunner.java @@ -28,29 +28,6 @@ public class BannerApplicationRunner implements ApplicationRunner { "https://cloud.iocoder.cn/api-doc/", "https://cloud.iocoder.cn", "https://t.zsxq.com/02Yf6M7Qn"); - - // 数据报表 - System.out.println("[报表模块 nl-module-report 教程][参考 https://cloud.iocoder.cn/report/ 开启]"); - // 工作流 - System.out.println("[工作流模块 nl-module-bpm 教程][参考 https://cloud.iocoder.cn/bpm/ 开启]"); - // 商城系统 - System.out.println("[商城系统 nl-module-mall 教程][参考 https://cloud.iocoder.cn/mall/build/ 开启]"); - // ERP 系统 - System.out.println("[ERP 系统 nl-module-erp - 教程][参考 https://cloud.iocoder.cn/erp/build/ 开启]"); - // WMS 仓库管理系统 - System.out.println("[WMS 仓库管理系统 nl-module-wms - 教程][参考 https://cloud.iocoder.cn/wms/build/ 开启]"); - // CRM 系统 - System.out.println("[CRM 系统 nl-module-crm - 教程][参考 https://cloud.iocoder.cn/crm/build/ 开启]"); - // MES 系统 - System.out.println("[MES 系统 nl-module-mes - 教程][参考 https://cloud.iocoder.cn/mes/build/ 开启]"); - // IM 即时通讯 - System.out.println("[IM 即时通讯 nl-module-im - 教程][参考 https://cloud.iocoder.cn/im/build/ 开启]"); - // 微信公众号 - System.out.println("[微信公众号 nl-module-mp 教程][参考 https://cloud.iocoder.cn/mp/build/ 开启]"); - // 支付平台 - System.out.println("[支付系统 nl-module-pay - 教程][参考 https://cloud.iocoder.cn/pay/build/ 开启]"); - // AI 大模型 - System.out.println("[AI 大模型 nl-module-ai - 教程][参考 https://cloud.iocoder.cn/ai/build/ 开启]"); }); } diff --git a/nl-gateway/src/main/resources/application-dev.yaml b/nl-gateway/src/main/resources/application-dev.yaml index d2204ee5..ea24ab2f 100644 --- a/nl-gateway/src/main/resources/application-dev.yaml +++ b/nl-gateway/src/main/resources/application-dev.yaml @@ -3,9 +3,9 @@ spring: cloud: nacos: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - username: # Nacos 账号 - password: # Nacos 密码 + server-addr: 192.168.10.14:8848 # Nacos 服务器地址 + username: + password: discovery: # 【配置中心】配置项 namespace: dev # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP diff --git a/nl-gateway/src/main/resources/application.yaml b/nl-gateway/src/main/resources/application.yaml index 53cd67fa..dea31fef 100644 --- a/nl-gateway/src/main/resources/application.yaml +++ b/nl-gateway/src/main/resources/application.yaml @@ -3,7 +3,7 @@ spring: name: gateway-server profiles: - active: local + active: dev http: codecs: diff --git a/nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml b/nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml index b9a57207..8a68ca23 100644 --- a/nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml +++ b/nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml @@ -3,7 +3,7 @@ spring: cloud: nacos: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 + server-addr: 192.168.10.14:8848 # Nacos 服务器地址 username: # Nacos 账号 password: # Nacos 密码 discovery: # 【配置中心】配置项 @@ -57,19 +57,19 @@ spring: primary: master datasource: master: - url: jdbc:mysql://127.0.0.1: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/huachuang_lms?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 username: root - password: 123456 + password: 12356 slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://127.0.0.1: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/huachuang_lms?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 username: root - password: 123456 + password: 12356 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 data: redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 127.0.0.1 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 diff --git a/nl-module-infra/nl-module-infra-server/src/main/resources/application.yaml b/nl-module-infra/nl-module-infra-server/src/main/resources/application.yaml index 65d13b11..17979f30 100644 --- a/nl-module-infra/nl-module-infra-server/src/main/resources/application.yaml +++ b/nl-module-infra/nl-module-infra-server/src/main/resources/application.yaml @@ -3,7 +3,7 @@ spring: name: infra-server profiles: - active: local + active: dev main: allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 diff --git a/nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml b/nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml index 6007221a..55f25a3f 100644 --- a/nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml +++ b/nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml @@ -3,7 +3,7 @@ spring: cloud: nacos: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 + server-addr: http://192.168.10.14:8848 # Nacos 服务器地址 username: # Nacos 账号 password: # Nacos 密码 discovery: # 【配置中心】配置项 @@ -57,19 +57,19 @@ spring: primary: master datasource: master: - url: jdbc:mysql://127.0.0.1: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/huachuang_lms?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 username: root - password: 123456 + password: 12356 slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://127.0.0.1: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/huachuang_lms?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 username: root - password: 123456 + password: 12356 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 data: redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 127.0.0.1 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 @@ -95,7 +95,7 @@ spring: xxl: job: admin: - addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址 + addresses: http://192.168.10.14:8080/xxl-job-admin # 调度中心部署跟地址 --- #################### 服务保障相关配置 #################### @@ -158,7 +158,7 @@ wx: # 芋道配置项，设置当前项目所有自定义的配置 nl: - demo: true # 开启演示模式 + demo: false # 开启演示模式 justauth: enabled: true diff --git a/nl-module-system/nl-module-system-server/src/main/resources/application.yaml b/nl-module-system/nl-module-system-server/src/main/resources/application.yaml index 7c25954a..32f1873e 100644 --- a/nl-module-system/nl-module-system-server/src/main/resources/application.yaml +++ b/nl-module-system/nl-module-system-server/src/main/resources/application.yaml @@ -3,7 +3,7 @@ spring: name: system-server profiles: - active: local + active: dev main: allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 diff --git a/nl-server/src/main/resources/application-dev.yaml b/nl-server/src/main/resources/application-dev.yaml index 93868d63..a7c2ca9d 100644 --- a/nl-server/src/main/resources/application-dev.yaml +++ b/nl-server/src/main/resources/application-dev.yaml @@ -47,19 +47,19 @@ spring: primary: master datasource: master: - url: jdbc:mysql://127.0.0.1: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/huachuang_lms?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 username: root - password: 123456 + password: 12356 slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://127.0.0.1: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/huachuang_lms?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 username: root - password: 123456 + password: 12356 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 data: redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 127.0.0.1 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 @@ -70,7 +70,7 @@ xxl: job: enabled: false # 是否开启调度中心，默认为 true 开启 admin: - addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址 + addresses: http://192.168.10.14:8080/xxl-job-admin # 调度中心部署跟地址 --- #################### 消息队列相关 #################### diff --git a/nl-server/src/main/resources/application.yaml b/nl-server/src/main/resources/application.yaml index 738342ef..15be90d6 100644 --- a/nl-server/src/main/resources/application.yaml +++ b/nl-server/src/main/resources/application.yaml @@ -1,9 +1,10 @@ +# 单体启动使用！！！ spring: application: name: nl-server profiles: - active: local + active: dev main: allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/.env b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/.env index a0bfde11..67184f40 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/.env +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/.env @@ -14,7 +14,7 @@ VITE_NITRO_MOCK=false VITE_APP_TENANT_ENABLE=true # 验证码的开关 -VITE_APP_CAPTCHA_ENABLE=false +VITE_APP_CAPTCHA_ENABLE=true # 文档地址的开关 VITE_APP_DOCALERT_ENABLE=true @@ -35,4 +35,4 @@ VITE_APP_API_ENCRYPT_RESPONSE_KEY = 96103715984234343991809655248883 # VITE_APP_API_ENCRYPT_RESPONSE_KEY = MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOH8IfIFxL/MR9XIg1UDv5z1fGXQI93E8wrU4iPFovL/sEt9uSgSkjyidC2O7N+m7EKtoN6b1u7cEwXSkwf3kfK0jdWLSQaNpX5YshqXCBzbDfugDaxuyYrNA4/tIMs7mzZAk0APuRXB35Dmupou7Yw7TFW/7QhQmGfzeEKULQvnAgMBAAECgYAw8LqlQGyQoPv5p3gRxEMOCfgL0JzD3XBJKztiRd35RDh40Nx1ejgjW4dPioFwGiVWd2W8cAGHLzALdcQT2KDJh+T/tsd4SPmI6uSBBK6Ff2DkO+kFFcuYvfclQQKqxma5CaZOSqhgenacmgTMFeg2eKlY3symV6JlFNu/IKU42QJBAOhxAK/Eq3e61aYQV2JSguhMR3b8NXJJRroRs/QHEanksJtl+M+2qhkC9nQVXBmBkndnkU/l2tYcHfSBlAyFySMCQQD445tgm/J2b6qMQmuUGQAYDN8FIkHjeKmha+l/fv0igWm8NDlBAem91lNDIPBUzHL1X1+pcts5bjmq99YdOnhtAkAg2J8dN3B3idpZDiQbC8fd5bGPmdI/pSUudAP27uzLEjr2qrE/QPPGdwm2m7IZFJtK7kK1hKio6u48t/bg0iL7AkEAuUUs94h+v702Fnym+jJ2CHEkXvz2US8UDs52nWrZYiM1o1y4tfSHm8H8bv8JCAa9GHyriEawfBraILOmllFdLQJAQSRZy4wmlaG48MhVXodB85X+VZ9krGXZ2TLhz7kz9iuToy53l9jTkESt6L5BfBDCVdIwcXLYgK+8KFdHN5W7HQ== # 百度地图 -VITE_BAIDU_MAP_KEY=Y2aJXiswwPxy6mwFs1z9c7U5gwX9WfUN \ No newline at end of file +VITE_BAIDU_MAP_KEY=Y2aJXiswwPxy6mwFs1z9c7U5gwX9WfUN diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/.env.development b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/.env.development index bc15f015..5c71e36f 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/.env.development +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/.env.development @@ -4,7 +4,7 @@ VITE_PORT=5999 VITE_BASE=/ # 请求路径 -VITE_BASE_URL=http://192.168.10.14:48080 +VITE_BASE_URL=http://127.0.0.1:48080 # 接口地址 VITE_GLOB_API_URL=/admin-api # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务