重新设置配置文件

log-manager/pom.xml

@@ -82,6 +82,41 @@
 				<skipDeploy>false</skipDeploy>
 			</properties>
 		</profile>
+
+		<profile>
+			<id>yibin-test</id>
+			<properties>
+				<profiles.active>yibin-test</profiles.active>
+				<profiles.server.ip>127.0.0.1</profiles.server.ip>
+				<profiles.server.port>18225</profiles.server.port>
+				<profiles.nginx.port>11092</profiles.nginx.port>
+				<profiles.server.gatewayport>11078</profiles.server.gatewayport>
+				<profiles.server.path>/logservice</profiles.server.path>
+				<profiles.publish.path>/home/publish</profiles.publish.path>
+				<profiles.datasource.uri>
+					<![CDATA[jdbc:mysql://127.0.0.1:3306/log-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
+				<profiles.datasource.username>root</profiles.datasource.username>
+				<profiles.datasource.password>nacos@2020</profiles.datasource.password>
+				<profiles.redis.uri>127.0.0.1</profiles.redis.uri>
+				<profiles.redis.port>6379</profiles.redis.port>
+				<profiles.redis.username></profiles.redis.username>
+				<profiles.redis.password>hotel@2020</profiles.redis.password>
+				<profiles.redis.database>9</profiles.redis.database>
+				<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
+				<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
+				<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
+				<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
+				<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
+				<profiles.log.level>INFO</profiles.log.level>
+				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+				<profiles.filepath>/mortals/app/data</profiles.filepath>
+				<package.environment>test</package.environment>
+				<skipDeploy>false</skipDeploy>
+			</properties>
+		</profile>
 		<profile>
 			<id>product</id>
 			<properties>
@@ -128,21 +163,21 @@
 				<profiles.server.path>/sampleform</profiles.server.path>
 				<profiles.publish.path>/home/publish</profiles.publish.path>
 				<profiles.datasource.uri>
-					<![CDATA[jdbc:mysql://127.0.0.1:3306/log-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
+					<![CDATA[jdbc:mysql://172.15.28.121:3306/log-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
 				<profiles.datasource.username>root</profiles.datasource.username>
 				<profiles.datasource.password>xhx@2022</profiles.datasource.password>
-				<profiles.redis.uri>127.0.0.1</profiles.redis.uri>
+				<profiles.redis.uri>172.15.28.120</profiles.redis.uri>
 				<profiles.redis.port>6379</profiles.redis.port>
 				<profiles.redis.username></profiles.redis.username>
 				<profiles.redis.password>hotel@2020</profiles.redis.password>
 				<profiles.redis.database>9</profiles.redis.database>
-				<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
+				<profiles.rabbitmq.host>172.15.28.115</profiles.rabbitmq.host>
 				<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
 				<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
 				<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
 				<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
 				<profiles.log.level>INFO</profiles.log.level>
-				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+				<profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>

log-manager/src/main/bin/deploy.sh

@@ -40,6 +40,13 @@ clear_deploy() {
   rm -rf ${EXECPATH}
 }
 
+#清理ui
+clear_ui_deploy() {
+  EXEC_UI_PATH=$1
+  rm -rf ${EXEC_UI_PATH}
+  mkdir -p ${EXEC_UI_PATH}
+}
+
 build_service() {
   SERVICE=$1
   EXECPATH=$2
@@ -82,11 +89,21 @@ project_deploy() {
   writelog "${PROJECT_NAME}_deploy_finish"
 }
 
+#部署前台服务
+project_ui_deploy() {
+  writelog "${PROJECT_NAME}_ui_deploy"
+  clear_ui_deploy ${PROJECT_UI_EXECPATH}
+  tar -zvxf ./${PROJECT_UI_FILENAME} -C ${PUBLISH_PATH}
+  writelog "${PROJECT_NAME}_ui_deploy_finish"
+
+}
 
 #主函数
 main() {
   echo "后台服务部署"
   project_deploy
+  echo "前端服务部署"
+  project_ui_deploy
   exit ${RETVAL}
 }
 

log-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java

 package com.mortals.xhx.base.system.param.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.IParam;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.DataUtil;
@@ -32,6 +34,15 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
         return "ParamEntity.paramKey";
     }
 
+    @Override
+    protected void saveBefore(ParamEntity entity, Context context) throws AppException {
+        //过滤换行符
+        entity.setParamKey(StrUtil.removeAllLineBreaks(entity.getParamKey()));
+        entity.setParamValue(StrUtil.removeAllLineBreaks(entity.getParamValue()));
+        super.saveBefore(entity, context);
+    }
+
+
     @Override
     public String getValueByKey(String key) {
         List<ParamEntity> list = this.getCacheList();