调整部分文件

setup-project-manager/pom.xml

@@ -26,6 +26,7 @@
 		<profiles.publish.path>/home/publish</profiles.publish.path>
 		<profiles.filepath>/mortals/app/data</profiles.filepath>
 		<profiles.nacosUrl>http://127.0.0.1:8848</profiles.nacosUrl>
+		<profiles.server.debug>21568</profiles.server.debug>
 	</properties>
 
 	<profiles>
@@ -40,7 +41,6 @@
 					<![CDATA[jdbc:mysql://localhost:3306/setup-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
 				<profiles.datasource.username>root</profiles.datasource.username>
 				<profiles.datasource.password>12345678</profiles.datasource.password>
-
 				<profiles.publish.path>E:\pic\publish\</profiles.publish.path>
 			</properties>
 		</profile>
@@ -48,11 +48,11 @@
 			<id>test</id>
 			<properties>
 				<profiles.active>test</profiles.active>
+				<profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=25599</profiles.server.debug>
 				<profiles.datasource.uri>
 					<![CDATA[jdbc:mysql://192.168.0.98:3306/setup-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.publish.path>/home/publish/</profiles.publish.path>
 			</properties>
 		</profile>

setup-project-manager/src/main/bin/deploy.sh

@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
 
 JAVA_HOME="/usr/local/java/jdk1.8"
 SERVICE_PATH="/usr/lib/systemd/system"
-PUBLISH_PATH="@profiles.publish.path@"
+PUBLISH_PATH="/home/publish"
 PROJECT_NAME="@project.artifactId@"
 
 PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
@@ -35,7 +35,7 @@ clear_deploy() {
   SERVICE=$1
   EXECPATH=$2
   #清理后台自启服务
-  rm -rf ${SERVICE}
+  rm -f ${SERVICE}
   #清理执行文件目录
   rm -rf ${EXECPATH}
 }
@@ -82,6 +82,7 @@ start_service() {
 project_deploy() {
   writelog "${PROJECT_NAME}_deploy"
   systemctl stop ${PROJECT_NAME}
+  sleep 5
   clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   writelog "${PROJECT_NAME}_clear_finish"
   tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
@@ -103,8 +104,6 @@ project_ui_deploy() {
 main() {
   echo "后台服务部署"
   project_deploy
-  echo "前端服务部署"
-  project_ui_deploy
   exit ${RETVAL}
 }
 

setup-project-manager/src/main/bin/start.sh

 #!/bin/sh
 PORT="@profiles.server.port@"
+DEBUG=@profiles.server.debug@
 BASEDIR=`dirname $0`/..
 BASEDIR=`(cd "$BASEDIR"; pwd)`
 PROJECT_NAME="@project.artifactId@";
 MAIN_CLASS="$PROJECT_NAME-@project.version@.jar";
 LOG_PATH="@profiles.log.path@/$PROJECT_NAME"
-GC_PATH=$LOG_PATH/PROJECT_NAME"-gc.log"
-HS_ERR_PATH=$LOG_PATH/PROJECT_NAME"-hs_err.log"
-HEAP_DUMP_PATH=$LOG_PATH/PROJECT_NAME"-heap_dump.hprof"
+GC_PATH=$LOG_PATH/$PROJECT_NAME"-gc.log"
+HS_ERR_PATH=$LOG_PATH/$PROJECT_NAME"-hs_err.log"
+HEAP_DUMP_PATH=$LOG_PATH/$PROJECT_NAME"-heap_dump.hprof"
 TEMP_PATH=$LOG_PATH/temp/
 SUCCESS=0
 FAIL=9
-if [ ! -n "$PORT" ]; then  
+if [ ! -n "$PORT" ]; then
 	echo $"Usage: $0 {port}"
 	exit $FAIL
 fi
-if [ ! -d $LOG_PATH ]; 
-then     
-    mkdir -p $LOG_PATH; 
+if [ ! -d $LOG_PATH ];
+then
+    mkdir -p $LOG_PATH;
 fi
-if [ ! -d $TEMP_PATH ]; 
-then     
-    mkdir -p $TEMP_PATH; 
+if [ ! -d $TEMP_PATH ];
+then
+    mkdir -p $TEMP_PATH;
 fi
 if [ -z "$JAVACMD" ] ; then
   if [ -n "$JAVA_HOME" ] ; then
@@ -32,8 +33,9 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD=`which java`
-	echo  "Error: JAVA_HOME is $JAVACMD"
+    JAVACMD=`which java > /dev/null 2>&1`
+	echo  "Error: JAVA_HOME is not defined correctly."
+    exit $ERR_NO_JAVA
   fi
 fi
 
@@ -44,7 +46,7 @@ fi
 
 if [ -e "$BASEDIR" ]
 then
-  JAVA_OPTS="-Xms512M -Xmx1024M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$GC_PATH -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=$HS_ERR_PATH -XX:HeapDumpPath=$HEAP_DUMP_PATH"
+  JAVA_OPTS="-Xms1024M -Xmx2048M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$GC_PATH -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=$HS_ERR_PATH -XX:HeapDumpPath=$HEAP_DUMP_PATH"
 fi
 
 CLASSPATH=$CLASSPATH_PREFIX:
@@ -55,12 +57,11 @@ cd "$BASEDIR/boot";
 echo "starting application $PROJECT_NAME......"
 exec "$JAVACMD" $JAVA_OPTS \
 				$EXTRA_JVM_ARGUMENTS \
+				$DEBUG \
 				-Dapp.name="$PROJECT_NAME" \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
 				-Djava.io.tmpdir=$TEMP_PATH \
-				-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \
-				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=21059 \
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

setup-project-manager/src/main/java/com/mortals/xhx/ManagerApplication.java

 package com.mortals.xhx;
 
+import com.mortals.framework.service.ICacheService;
+import com.mortals.framework.service.impl.LocalCacheServiceImpl;
 import com.mortals.framework.springcloud.boot.BaseWebApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ImportResource;
 
 @SpringBootApplication(scanBasePackages = {"com.mortals"})
@@ -12,6 +15,12 @@ import org.springframework.context.annotation.ImportResource;
 @ImportResource(locations = {"classpath:config/spring-config.xml"})
 public class ManagerApplication extends BaseWebApplication {
 
+    @Bean
+    public ICacheService cacheService() {
+        return new LocalCacheServiceImpl();
+    }
+
+
     public static void main(String[] args) {
         SpringApplication.run(ManagerApplication.class, args);
     }

setup-project-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartService.java

@@ -31,7 +31,7 @@ public class DemoStartService implements IApplicationService {
     @Override
     public void start() {
         ThreadPool.getInstance().init(10);
-        resourceService.refreshResourceUrl("com.mortals.xhx", null);
+      //  resourceService.refreshResourceUrl("com.mortals.xhx", null);
 
         logger.info("开始服务..[配置已加载完成，但部分框架还未初始化，比如：Kafka]");
     }