From a92b97225a0676c3645b72d8945542f7db2e05ae Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 07 五月 2025 11:26:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-file/src/main/resources/bootstrap-prod.yml | 17 +++++
aps-modules/aps-system/src/main/resources/bootstrap-prod.yml | 17 +++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml | 4
aps-auth/src/main/resources/bootstrap-prod.yml | 18 ++++++
aps-visual/aps-monitor/src/main/resources/bootstrap-prod.yml | 17 +++++
aps-gateway/src/main/resources/bootstrap-prod.yml | 34 +++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java | 2
aps-modules/aps-core/src/main/resources/bootstrap-prod.yml | 17 +++++
aps-modules/aps-job/src/main/resources/bootstrap-prod.yml | 17 +++++
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java | 2
10 files changed, 141 insertions(+), 4 deletions(-)
diff --git a/aps-auth/src/main/resources/bootstrap-prod.yml b/aps-auth/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..d8c041b
--- /dev/null
+++ b/aps-auth/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,18 @@
+# Spring
+spring:
+ cloud:
+ nacos:
+ discovery:
+ # 鏈嶅姟娉ㄥ唽鍦板潃
+ server-addr: 192.168.12.243:8850
+ namespace: prod
+ # 娉ㄥ唽Nacos鏃跺鍔犲厓鏁版嵁 鐢ㄤ簬GateWay杞彂
+ config:
+ # 閰嶇疆涓績鍦板潃
+ server-addr: 192.168.12.243:8850
+ # 閰嶇疆鏂囦欢鏍煎紡
+ file-extension: yml
+ # 鍏变韩閰嶇疆
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ namespace: prod
diff --git a/aps-gateway/src/main/resources/bootstrap-prod.yml b/aps-gateway/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..13a1121
--- /dev/null
+++ b/aps-gateway/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,34 @@
+
+# Spring
+spring:
+ cloud:
+ nacos:
+ discovery:
+ # 鏈嶅姟娉ㄥ唽鍦板潃
+ server-addr: 192.168.12.243:8850
+ namespace: prod
+ # 娉ㄥ唽Nacos鏃跺鍔犲厓鏁版嵁 鐢ㄤ簬GateWay杞彂
+ config:
+ # 閰嶇疆涓績鍦板潃
+ server-addr: 192.168.12.243:8850
+ # 閰嶇疆鏂囦欢鏍煎紡
+ file-extension: yml
+ # 鍏变韩閰嶇疆
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ namespace: prod
+ sentinel:
+ # 鍙栨秷鎺у埗鍙版噿鍔犺浇
+ eager: true
+ transport:
+ # 鎺у埗鍙板湴鍧�
+ dashboard: 192.168.12.239:8718
+ # nacos閰嶇疆鎸佷箙鍖�
+ datasource:
+ ds1:
+ nacos:
+ server-addr: 192.168.12.243:8850
+ dataId: sentinel-aps-gateway
+ groupId: DEFAULT_GROUP
+ data-type: json
+ rule-type: gw-flow
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java
index 9654f51..16a850c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java
@@ -35,7 +35,7 @@
@GetMapping("/list")
public TableDataInfo list(ApsBom apsBom)
{
- startPage();
+// startPage();
List<ApsBom> list = apsBomService.selectApsBomList(apsBom);
return getDataTable(list);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
index c8846f0..00845b6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
@@ -54,7 +54,7 @@
/** 鎬绘暟閲� */
@Excel(name = "鎬绘暟閲�")
- private BigDecimal totalNum;
+ private BigDecimal total_num;
/** 鍑嗗宸ユ椂 */
@Excel(name = "鍑嗗宸ユ椂")
diff --git a/aps-modules/aps-core/src/main/resources/bootstrap-prod.yml b/aps-modules/aps-core/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..b205e1c
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,17 @@
+# Spring
+spring:
+ cloud:
+ nacos:
+ discovery:
+ # 鏈嶅姟娉ㄥ唽鍦板潃
+ server-addr: 192.168.12.243:8850
+ namespace: prod
+ config:
+ # 閰嶇疆涓績鍦板潃
+ server-addr: 192.168.12.243:8850
+ # 閰嶇疆鏂囦欢鏍煎紡
+ file-extension: yml
+ namespace: prod
+ # 鍏变韩閰嶇疆
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
index 50f1f10..35da42e 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
@@ -39,8 +39,8 @@
<where>
<if test="bomLineId != null and bomLineId != ''"> and bom_line_id = #{bomLineId}</if>
<if test="bomHeaderId != null and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
- <if test="itemCode != null and itemCode != ''"> and item_code like '%'||#{itemCode}||'%'</if>
- <if test="itemName != null and itemName != ''"> and item_name like '%'|| #{itemName}||'%'</if>
+ <if test="itemCode != null and itemCode != ''"> and item_code like '%' || #{itemCode} || '%'</if>
+ <if test="itemName != null and itemName != ''"> and item_name like '%' || #{itemName} || '%'</if>
<if test="params.beginStartDate != null and params.beginStartDate != '' and params.endStartDate != null and params.endStartDate != ''"> and start_date between #{params.beginStartDate} and #{params.endStartDate}</if>
<if test="params.beginEndDate != null and params.beginEndDate != '' and params.endEndDate != null and params.endEndDate != ''"> and end_date between #{params.beginEndDate} and #{params.endEndDate}</if>
<if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
diff --git a/aps-modules/aps-file/src/main/resources/bootstrap-prod.yml b/aps-modules/aps-file/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..b205e1c
--- /dev/null
+++ b/aps-modules/aps-file/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,17 @@
+# Spring
+spring:
+ cloud:
+ nacos:
+ discovery:
+ # 鏈嶅姟娉ㄥ唽鍦板潃
+ server-addr: 192.168.12.243:8850
+ namespace: prod
+ config:
+ # 閰嶇疆涓績鍦板潃
+ server-addr: 192.168.12.243:8850
+ # 閰嶇疆鏂囦欢鏍煎紡
+ file-extension: yml
+ namespace: prod
+ # 鍏变韩閰嶇疆
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/aps-modules/aps-job/src/main/resources/bootstrap-prod.yml b/aps-modules/aps-job/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..af976cd
--- /dev/null
+++ b/aps-modules/aps-job/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,17 @@
+# Spring
+spring:
+ cloud:
+ nacos:
+ discovery:
+ # 鏈嶅姟娉ㄥ唽鍦板潃
+ server-addr: 192.168.12.243:8850
+ namespace: prod
+ config:
+ # 閰嶇疆涓績鍦板潃
+ server-addr: 192.168.12.243:8850
+ # 閰嶇疆鏂囦欢鏍煎紡
+ file-extension: yml
+ namespace: prod
+ # 鍏变韩閰嶇疆
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/aps-modules/aps-system/src/main/resources/bootstrap-prod.yml b/aps-modules/aps-system/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..fffeeaa
--- /dev/null
+++ b/aps-modules/aps-system/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,17 @@
+# Spring
+spring:
+ cloud:
+ nacos:
+ discovery:
+ # 鏈嶅姟娉ㄥ唽鍦板潃
+ server-addr: 192.168.12.243:8850
+ namespace: prod
+ config:
+ # 閰嶇疆涓績鍦板潃
+ server-addr: 192.168.12.243:8850
+ # 閰嶇疆鏂囦欢鏍煎紡
+ file-extension: yml
+ # 鍏变韩閰嶇疆
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ namespace: prod
diff --git a/aps-visual/aps-monitor/src/main/resources/bootstrap-prod.yml b/aps-visual/aps-monitor/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..af976cd
--- /dev/null
+++ b/aps-visual/aps-monitor/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,17 @@
+# Spring
+spring:
+ cloud:
+ nacos:
+ discovery:
+ # 鏈嶅姟娉ㄥ唽鍦板潃
+ server-addr: 192.168.12.243:8850
+ namespace: prod
+ config:
+ # 閰嶇疆涓績鍦板潃
+ server-addr: 192.168.12.243:8850
+ # 閰嶇疆鏂囦欢鏍煎紡
+ file-extension: yml
+ namespace: prod
+ # 鍏变韩閰嶇疆
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
--
Gitblit v1.9.3