修改热门词汇

fill-manager/pom.xml

@@ -12,7 +12,7 @@
 
 	<artifactId>fill-manager</artifactId>
 	<packaging>jar</packaging>
-	<description>基础服务管理平台</description>
+	<description>填单系统</description>
 
 	<properties>
 	</properties>
@@ -48,7 +48,7 @@
 				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-				<profiles.log.path>/mortals/app/logs</profiles.log.path>
+				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 			</properties>
 		</profile>
 		<profile>
@@ -66,6 +66,29 @@
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
 			</properties>
 		</profile>
+
+
+		<profile>
+			<id>yibin</id>
+			<properties>
+				<profiles.active>yibin</profiles.active>
+				<profiles.server.port>19211</profiles.server.port>
+				<profiles.queue.type>rabbitmq</profiles.queue.type>
+				<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.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>
+				<profiles.filepath>/mortals/app/data</profiles.filepath>
+				<profiles.log.level>INFO</profiles.log.level>
+
+			</properties>
+		</profile>
+
 	</profiles>
 
 	<dependencies>

fill-manager/src/main/bin/check_server.sh

+#!/bin/bash
+PORT="@profiles.server.port@"
+PROJECT_NAME="@project.artifactId@";
+MAIN_CLASS="$PROJECT_NAME-@project.version@.jar";
+SHELL_NAME=$0
+SHELL_LOG="${SHELL_NAME}.log"
+
+LOG_DATE='date "+%Y-%m-%d"'
+LOG_TIME='date "+%H-%M-%S"'
+
+CDATE=$(date "+%Y-%m-%d")
+CTIME=$(date "+%H-%M-%S")
+
+#写日志
+writelog() {
+  LOGINFO=$1
+  echo "${CDATE} ${CTIME}: ${SHELL_NAME} : ${LOGINFO}" >>${SHELL_LOG}
+}
+jcpid=`ps -ef | grep -v "grep" | grep "$MAIN_CLASS" | grep "app.port=$PORT" | sed -n '1P' | awk '{print $2}'`
+
+if [ $jcpid ]; then
+		writelog "The $PROJECT_NAME start finished, PID is $jcpid"
+		exit $SUCCESS
+	else
+    writelog "start service..."
+    systemctl stop ${PROJECT_NAME} && systemctl start ${PROJECT_NAME}
+fi
+

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

+#!/bin/sh
+RETVAL=$?
+SHELL_NAME="deploy"
+BASEDIR=$(dirname $0)
+BASEDIR=$( (
+  cd "$BASEDIR"
+  pwd
+))
+LOCK_FILE="/tmp/deploy.lock"
+# 时间变量
+CDATE=$(date "+%Y-%m-%d")
+CTIME=$(date "+%H:%M:%S")
+SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
+
+JAVA_HOME="/usr/local/java/jdk1.8"
+SERVICE_PATH="/usr/lib/systemd/system"
+PUBLISH_PATH="@profiles.publish.path@"
+PROJECT_NAME="@project.artifactId@"
+
+PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
+PROJECT_UI_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}-ui/dist"
+PROJECT_FILENAME="${PROJECT_NAME}.tar.gz"
+PROJECT_UI_FILENAME="${PROJECT_NAME}-ui.tar.gz"
+PROJECT_SERVICE="${SERVICE_PATH}/${PROJECT_NAME}.service"
+
+#写日志
+writelog() {
+  LOGINFO=$1
+  echo "${CDATE} ${CTIME}: ${SHELL_NAME} : ${LOGINFO}" >>${SHELL_LOG}
+  echo ${LOGINFO}
+}
+
+#清理目标
+clear_deploy() {
+  SERVICE=$1
+  EXECPATH=$2
+  #清理后台自启服务
+  rm -rf ${SERVICE}
+  #清理执行文件目录
+  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
+  echo "" >${SERVICE}
+  echo "[Unit]" >>${SERVICE}
+  echo "Description=${PROJECT_NAME}" >>${SERVICE}
+  echo "After=network.target" >>${SERVICE}
+  echo "" >>${SERVICE}
+  echo "[Service]" >>${SERVICE}
+  echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>${SERVICE}
+  echo "Type=forking" >>${SERVICE}
+  echo "ExecStart=${EXECPATH}/bin/start.sh" >>${SERVICE}
+  echo "ExecStop=${EXECPATH}/bin/shutdown.sh" >>${SERVICE}
+  echo "PrivateTmp=true" >>${SERVICE}
+  echo "" >>${SERVICE}
+  echo "[Install]" >>${SERVICE}
+  echo "WantedBy=multi-user.target" >>${SERVICE}
+  writelog "${PROJECT_NAME}服务创建完成!"
+
+}
+
+#启动服务与nginx
+start_service() {
+  systemctl enable ${PROJECT_NAME}
+  systemctl daemon-reload
+  writelog "${PROJECT_NAME}服务启动..."
+  systemctl stop ${PROJECT_NAME} && systemctl start ${PROJECT_NAME}
+  project_status=$(systemctl status "${PROJECT_NAME}"|grep Active |awk '{print $2}')
+  jcpid=$(ps -ef | grep -v "grep" | grep "${PROJECT_NAME} " | awk '{print $2}')
+  writelog "${PROJECT_NAME}服务启动,PID is ${jcpid} ,status:${project_status}"
+}
+#部署后台服务
+project_deploy() {
+  writelog "${PROJECT_NAME}_deploy"
+  clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
+  writelog "${PROJECT_NAME}_clear_finish"
+  tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
+  build_service ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
+  start_service
+  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}
+}
+
+main $1

fill-manager/src/main/java/com/mortals/xhx/base/system/oper/service/impl/OperLogServiceImpl.java

@@ -153,5 +153,4 @@ public class OperLogServiceImpl extends AbstractCRUDServiceImpl<OperLogDao,OperL
         }
         operLogEntity.setContent(content.toString());
     }
-	
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/common/utils/WordUtil.java

@@ -77,7 +77,7 @@ public class WordUtil {
 
     public static String convertWordToJPEG(String inputFile, String jpegPath) {
         try {
-            log.info(String.format("文件转换开始：%s", DateUtils.getCurrStrDateTime()));
+            log.info(String.format("word to jpg文件转换开始：%s", DateUtils.getCurrStrDateTime()));
             // 转换开始前时间
             long old = System.currentTimeMillis();
             // 新建的PDF文件路径
@@ -130,7 +130,7 @@ public class WordUtil {
 
 
     public static void pdfToImages(String filePath, String jpegPath) {
-        log.info(String.format("文件转换开始：%s", DateUtils.getCurrStrDateTime()));
+        log.info(String.format("pdf to images文件转换开始：%s", DateUtils.getCurrStrDateTime()));
         // 转换开始前时间
         long old = System.currentTimeMillis();
         File file = new File(jpegPath);

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -78,7 +78,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
 
     @Value("${upload.path}")
     private String filePath;
-    @Value("${upload.url:http://localhost:17215/fsm/file/commonupload?prePath=/file/uploadfile}")
+    @Value("${upload.url:http://localhost:17215/fsm/file/commonupload?prePath=/file/fileupload}")
     private String uploadUrl;
     @Autowired
     private UploadService uploadService;