Selaa lähdekoodia

去掉monitor挂载

xusl 3 vuotta sitten
vanhempi
commit
28138e4324

+ 1 - 1
ipfcst-console/pom.xml

@@ -21,7 +21,7 @@
   <artifactId>ipfcst-console</artifactId>
 
   <!--改版本号时注意第2位的大小包:0大包 1小包-->
-  <version>3.1.0.f2</version>
+  <version>3.1.0.f1</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+ 13 - 21
ipfcst-console/src/main/frontend/layout/components/Navbar.vue

@@ -11,16 +11,19 @@
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
-          <!--<router-link to="/">-->
-            <el-dropdown-item @click.native='jumpReport'>
-              统计查询
-            </el-dropdown-item>
-            <el-dropdown-item @click.native='jumpMonitor'>
-              系统监控
-            </el-dropdown-item>
-          <el-dropdown-item divided @click.native="logout">
-            <span style="display:block;">退出系统</span>
+          <el-dropdown-item @click.native='logout'>
+            退出系统
           </el-dropdown-item>
+                      <!--<router-link to="/">-->
+<!--            <el-dropdown-item @click.native='jumpReport'>-->
+<!--              统计查询-->
+<!--            </el-dropdown-item>-->
+<!--            <el-dropdown-item @click.native='jumpMonitor'>-->
+<!--              系统监控-->
+<!--            </el-dropdown-item>-->
+<!--          <el-dropdown-item divided @click.native="logout">-->
+<!--            <span style="display:block;">退出系统</span>-->
+<!--          </el-dropdown-item>-->
         </el-dropdown-menu>
       </el-dropdown>
     </div>
@@ -54,18 +57,7 @@
       // this.$router.push(`/login?redirect=${this.$route.fullPath}`)
       sessionStorage.clear()
       var href = window.location.href
-      window.location.href='https://'+href.split("//")[1].split(":")[0]+':9000'
-    },
-    // 查询
-    jumpReport(){
-      //页面url通常为http://localhost:8090/XXXX/images/1_15.png
-      var href = window.location.href
-      window.location.href='https://'+href.split("//")[1].split(":")[0]+':9000'
-    },
-    jumpMonitor(){
-      //页面url通常为http://localhost:8090/XXXX/images/1_15.png
-      var href = window.location.href
-      window.location.href='https://'+href.split("//")[1].split(":")[0]+':8088'
+      window.location.href='https://'+href.split("//")[1].split(":")[0]+':9001'
     }
   }
 }

+ 0 - 7
syjy/ipfcstV3/bin/install-ipfcst-centos.sh

@@ -14,30 +14,23 @@ if test -e /home/syjy/patch.zip
 	unzip -o patch.zip
 fi
 
-cp -f $basedir/settings/monitor /etc/init.d/
 cp -f $basedir/settings/console /etc/init.d/
 
-chmod 777 /etc/init.d/monitor
 chmod 777 /etc/init.d/console
 
 if test -x /usr/lib/systemd/system
 	then
-	cp -f $basedir/settings/monitor.service /usr/lib/systemd/system
 	cp -f $basedir/settings/console.service /usr/lib/systemd/system
 	
-	chmod 777 /usr/lib/systemd/system/monitor.service
 	chmod 777 /usr/lib/systemd/system/console.service
 	
 	systemctl daemon-reload
-	systemctl enable monitor
 	systemctl enable console
 	
 	else
-	chkconfig monitor on
 	chkconfig console on
 fi
 
-service monitor start
 service console start
 
 echo "Installation is complete!"

+ 0 - 9
syjy/ipfcstV3/bin/restart-monitor.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-export bindir=$basedir/bin
-
-sh $bindir/stop-monitor.sh
-sh $bindir/start-monitor.sh
-
-exit 0

+ 0 - 32
syjy/ipfcstV3/bin/start-monitor.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-export producedir=$basedir/produce
-
-export start_app_log=$basedir/logs/ipfcst_monitor.log
-
-export version="1.0.32"
-
-export app_path=$producedir/monitor/$version
-
-export JAVA_HOME=/home/syjy/ipfcstV3/jdk/jdk1.8.0_261
-export JRE_HOME=$JAVA_HOME/jre
-export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
-export PATH=$JAVA_HOME/bin:$JRE_HOME/bin:$PATH
-
-cd $app_path
-echo "Starting monitor"
-if test -r $basedir/settings/application.yml
-  then
-	cp -f $basedir/settings/application.yml $app_path/
-	echo "cp $basedir/settings/application.yml $app_path/"
-fi
-if test -x $app_path/ipfcst-monitor.jar
-  then
-	java -jar $app_path/ipfcst-monitor.jar >$start_app_log &
-	echo "monitor started, PID is $!" | sed -e "s/\b\(.\)/\u\1/g"
-  else
-	echo "Couldn't find monitor server($app_path/ipfcst-monitor.jar)"
-fi
-
-exit 0

+ 0 - 16
syjy/ipfcstV3/bin/status-monitor.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-pid_list="$(ps aux | grep ipfcst-monitor | grep -v grep | awk '{print $2}')"
-pid_count=`echo $pid_list | wc -w`
-if test $pid_count -eq 1 ; then
-  echo "Monitor running, pid is $pid_list"
-  exit 0
-elif test $pid_count -gt 1 ; then
-  echo "Multiple Monitor running $pid_list"
-  exit 1
-elif test -z $pid_list ; then
-  echo "Monitor is not running"
-  exit 1
-fi
-
-exit 0

+ 0 - 17
syjy/ipfcstV3/bin/stop-monitor.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-echo "Shutting down Monitor"
-pid_list="$(ps aux | grep ipfcst-monitor | grep -v grep | awk '{print $2}')"
-if test -z $pid_list ; then
-	echo "Monitor is not running"
-else
-	for pid in $pid_list;  
-	do  
-	if kill -0 "$pid" 2>/dev/null; then
-		echo "kill pid $pid"
-		kill -9 $pid
-	fi
-	done  
-fi
-
-exit 0

+ 0 - 9
syjy/ipfcstV3/bin/update-lib.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-
-rm -rf $basedir/ipfcst-lib
-unzip -o -d $basedir $basedir/receive/ipfcst-lib.zip
-chmod -R 777 $basedir
-
-exit 0

+ 0 - 10
syjy/ipfcstV3/bin/update-monitor.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-
-cp -f $basedir/bin/start-monitor.sh $basedir/original/bin
-unzip -o -d $basedir $basedir/receive/ipfcst-monitor.zip
-chmod -R 777 $basedir
-sh $basedir/bin/restart-monitor.sh
-
-exit 0

+ 0 - 90
syjy/ipfcstV3/produce/console/3.1.0.f2/application.yml

@@ -1,90 +0,0 @@
-server:
-  port: 9001
-  #https监听端口
-  ssl:
-    key-store: classpath:ipfcst.keystore
-    key-store-password: jiayue6677*
-    key-store-type: JKS
-spring:
-  servlet:
-    multipart:
-      max-file-size: 4096MB  # 单个文件的大小
-      max-request-size: 4096MB  # 上传文件的总大小
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    # 系统启动时执行sql 初始化表内容
-    data: classpath:sql/t_sys_user.sql
-    sql-script-encoding: utf-8
-    #schema:
-    # 每次启动时均初始化表
-    initialization-mode: always
-    druid:
-      # 数据源配置
-      username: root
-      password: '!QAZ2root'
-      url: jdbc:mysql://localhost:3306/focus?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      # 初始化 最小 最大
-      initial-size: 10
-      min-idle: 10
-      max-active: 90
-      # 配置获取连接等待超时的时间
-      max-wait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      time-between-eviction-runs-millis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      min-evictable-idle-time-millis: 300000
-      validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置多个英文逗号分隔
-      filters: stat,wall
-      # WebStatFilter配置,说明请参考Druid Wiki,配置_配置WebStatFilter
-      # 是否启用StatFilter默认值true
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-        session-stat-enable: false
-        session-stat-max-count: 1000
-        principal-cookie-name: admin
-        principal-session-name: admin
-        profile-enable: true
-      # 根据配置中的url-pattern来访问内置监控页面,如果是上面的配置,内置监控页面的首页是/druid/index.html
-      # http://loacalhsot:8081/druid
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*  # 监控页面访问路径
-        # 允许清空统计数据
-        reset-enable: true
-        login-username: admin
-        login-password: 123456
-        # StatViewSerlvet展示出来的监控信息比较敏感,是系统运行的内部情况,如果你需要做访问控制,可以配置allow和deny这两个参数
-        # deny优先于allow,如果在deny列表中,就算在allow列表中,也会被拒绝。如果allow没有配置或者为空,则允许所有访问
-        # 配置的格式
-        # <IP>
-        # 或者<IP>/<SUB_NET_MASK_size>其中128.242.127.1/24
-        # 24表示,前面24位是子网掩码,比对的时候,前面24位相同就匹配,不支持IPV6。
-        allow:
-        deny:
-  jpa:
-    hibernate:
-      naming:
-        physical-strategy: com.jiayue.ipfcst.common.data.strategy.IpfcstNamingStrategy
-      ddl-auto: update
-    show-sql: false
-logging:
-  config: classpath:logback-console.xml
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: ALWAYS

BIN
syjy/ipfcstV3/produce/console/3.1.0.f2/ipfcst-console.jar


BIN
syjy/ipfcstV3/produce/monitor/1.0.32/ipfcst-monitor.jar