From e66224c00db12d13bc05c1ce32b138411a5bcfd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 23 Feb 2024 02:08:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BE=9Bxm=E7=9A=84=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E6=9C=8D=E5=90=AF=E5=8A=A8=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start-service/bootstrap-xm.sh                 | 44 +++++++++++++++++++
 .../com/xm/core/mapper/XmProductMapper.xml    |  5 +++
 2 files changed, 49 insertions(+)
 create mode 100644 start-service/bootstrap-xm.sh

diff --git a/start-service/bootstrap-xm.sh b/start-service/bootstrap-xm.sh
new file mode 100644
index 00000000..5a767beb
--- /dev/null
+++ b/start-service/bootstrap-xm.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+######################################################################################
+###          xm  starter
+###          cyc 20190221
+###
+###
+#####################################################################################
+cd ..
+
+
+SERVICE_NAME=xm
+MVERSION=M
+SVERSION="2.0.0-RELEASE"
+PROFILES=prod
+
+echo "将启动${SERVICE_NAME} 主版本${MVERSION} 子版本号${SVERSION} 配置文件${PROFILES}"
+
+if [ ! -d "./start-service/pid" ];then
+  mkdir ./start-service/pid
+fi
+
+# 清理进程
+if [ -f "./start-service/pid/${SERVICE_NAME}.pid" ];then
+	PID=$(cat "./start-service/pid/${SERVICE_NAME}.pid")
+	kill -9 ${PID}
+	echo "成功停止服务${SERVICE_NAME}"
+fi
+
+
+# 执行启动程序
+echo "启动服务${SERVICE_NAME}"
+
+JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+
+# 单体应用
+nohup ${JAVA_HOME}/bin/java -server -Xms512m -Xmx512m -Dfile.encoding=UTF-8 -jar ./lib/${SERVICE_NAME}-bootstrap-${SVERSION}.jar --spring.profiles.active=${PROFILES} >/dev/null 2>&1 &
+
+# cloud应用
+#nohup ${JAVA_HOME}/bin/java -server -Xms512m -Xmx512m -Dfile.encoding=UTF-8 -jar ./lib/${SERVICE_NAME}-cloud-bootstrap-${SVERSION}.jar --spring.profiles.active=${PROFILES} >/dev/null 2>&1 &
+
+# 记录进程号
+echo $! > ./start-service/pid/${SERVICE_NAME}.pid
+
+echo "启动服务成功!!!!!!!! pid $!"
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
index f7d828f4..45b16636 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
@@ -66,8 +66,13 @@
             inner join xm_product_project_link ppl on res.id=ppl.product_id and ppl.project_id=#{ext.linkProjectId}
         </if>
         <where>
+            ${@com.mdp.Util@trimWhere(ew.customSqlSegment)}
             <include refid="whereForMap"/> 
         </where>
+        <!--下面双引号内可以添加默认排序，如果前端没有上传排序，将使用引号内的排序规则-->
+        ${@com.mdp.Util@trimOrderBy(ew.customSqlSegment,'')}
+        <!--下面双引号内可以添加默认分组，如果前端没有上传分组，将使用引号内的分组规则-->
+        ${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')}
         <if test="ext.linkProjectId !=null and ext.linkProjectId!=''">
             order by ppl.seq asc
         </if>