From b71a7be70205e1cb4b6d331c78b216a491be1297 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 19 六月 2023 09:24:40 +0800
Subject: [PATCH] 本地调试
---
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 16 --------
ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-gateway/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-auth/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml | 8 ++--
12 files changed, 44 insertions(+), 60 deletions(-)
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index 2f5a770..650d4e1 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 4a64425..95ed46d 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
index 423911f..d4fcd40 100644
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -18,12 +18,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
index 1367b5d..c1065bc 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
index 91e477e..b70af9b 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
index e2cda09..89bee3a 100644
--- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
index 58dc3e4..73eb18f 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
index 79ddc73..8db7a2e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index bece712..1276082 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -86,22 +86,6 @@
</collection>
</resultMap>
- <resultMap id="mgtShopOrderResultMap" type="com.ruoyi.order.domain.vo.MgtShopOrderPageVo">
- <result column="orderId" property="orderId"/>
- <result column="orderStatus" property="orderStatus"/>
- <result column="orderNo" property="orderNo"/>
- <result column="shopId" property="shopId"/>
- <result column="orderMoney" property="orderMoney"/>
- <result column="discountMoney" property="discountMoney"/>
- <result column="receivableMoney" property="receivableMoney"/>
- <result column="payMoney" property="payMoney"/>
- <result column="orderFrom" property="orderFrom" />
- <result column="createTime" property="createTime" />
- <collection property="mgtOrderGoodsVoList" ofType="com.ruoyi.order.domain.vo.MerOrderGoodsPageVo">
- <result column="goodsName" property="goodsName"/>
- <result column="buyNum" property="buyNum"/>
- </collection>
- </resultMap>
<resultMap id="mgtShopOrderResultMap" type="com.ruoyi.order.domain.vo.MgtShopOrderPageVo">
<result column="orderId" property="orderId"/>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
index 5e8dd18..def416e 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index 0cd36c2..a310a03 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
index f9c405e..16510ce 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
+++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 47.109.78.184:5000
- #server-addr: 127.0.0.1:8848
+ #server-addr: 47.109.78.184:5000
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置
--
Gitblit v1.7.1