Kaynağa Gözat

config:1、孙村服务器部署后,配置文件修改;2、替换项目web显示标题

lihao16 5 ay önce
ebeveyn
işleme
8b73e35e05

+ 9 - 6
smsb-admin/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ spring.boot.admin.client:
 
 --- # snail-job 配置
 snail-job:
-  enabled: true
+  enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   # group: "ruoyi_group"
   group: "smsb_group"
@@ -23,8 +23,8 @@ snail-job:
   # token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   token: "SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj"
   server:
-    host: 117.73.13.40
-    # host: 127.0.0.1
+    # host: 117.73.13.40
+    host: 127.0.0.1
     port: 17888
   # 详见 script/sql/snail_job.sql `sj_namespace` 表
   #namespace: ${spring.profiles.active}
@@ -54,11 +54,11 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          # url: jdbc:mysql://localhost:3306/smsb-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          # url: jdbc:mysql://127.0.0.1:20010/smsb-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           url: jdbc:mysql://117.73.3.135:3306/smsb-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          # password: password
-          password: Hycpb@123
+          password: password
+          # password: 7TuefPhoTnBxUWU2
         # 从库数据源
         slave:
           lazy: true
@@ -87,12 +87,15 @@ spring:
 spring.data:
   redis:
     # 地址
+    # host: 127.0.0.1
     host: 117.73.3.135
     # 端口,默认为6379
     port: 6379
     # 数据库索引
+    # database: 10
     database: 6
     # redis 密码必须配置
+    # password: VUMOzyN7edjytXDu
     password: Hycpb@123
     # 连接超时时间
     timeout: 10s

+ 14 - 8
smsb-admin/src/main/resources/application-prod.yml

@@ -1,7 +1,7 @@
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP
@@ -23,7 +23,8 @@ snail-job:
   # token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   token: "SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj"
   server:
-    host: 117.73.13.40
+    # host: 117.73.13.40
+    host: 127.0.0.1
     port: 17888
   # 详见 script/sql/snail_job.sql `sj_namespace` 表
   #namespace: ${spring.profiles.active}
@@ -53,15 +54,17 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/smsb-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://127.0.0.1:20010/smsb-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          # url: jdbc:mysql://117.73.3.135:3306/smsb-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: password
+          # password: password
+          password: 7TuefPhoTnBxUWU2
         # 从库数据源
         slave:
           lazy: true
           type: ${spring.datasource.type}
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://localhost:3306/smsb-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username:
           password:
       hikari:
@@ -84,13 +87,16 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: 117.73.3.135
+    host: 127.0.0.1
+    # host: 117.73.3.135
     # 端口,默认为6379
     port: 6379
     # 数据库索引
-    database: 6
+    database: 10
+    # database: 6
     # redis 密码必须配置
-    password: Hycpb@123
+    password: VUMOzyN7edjytXDu
+    # password: Hycpb@123
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

+ 4 - 4
smsb-admin/src/main/resources/application.yml

@@ -22,7 +22,7 @@ captcha:
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
-  port: 8084
+  port: 9094
   servlet:
     # 应用的访问路径
     context-path: /prod-api
@@ -41,13 +41,13 @@ server:
       # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
       worker: 256
   # 文件临时目录
-  tempDir: /home/inspur/temp
+  tempDir: /data/smsb-plus/temp
   # zlm4j 服务IP
   zlm4j:
-    ip: 117.73.3.135
+    ip: 221.214.76.110
   # minio 访问IP
   minio:
-    ip: 117.73.3.135
+    ip: 221.214.76.110
 
 # 日志配置
 logging:

+ 2 - 2
smsb-modules/smsb-netty/src/main/java/com/inspur/netty/server/NettyServer.java

@@ -70,9 +70,9 @@ public class NettyServer {
                             channel.pipeline().addLast(new TaskOtaHandler());
                         }
                     });
-            ChannelFuture f = b.bind(8990).sync();
+            ChannelFuture f = b.bind(18081).sync();
             if (f.isSuccess()) {
-                log.info("Server,启动Netty服务端成功,端口号:" + 8990);
+                log.info("Server,启动Netty服务端成功,端口号:" + 18081);
             }
         } catch (Exception e) {
             e.printStackTrace();

+ 3 - 3
smsb-modules/smsb-netty/src/main/java/com/inspur/netty/stream/Zlm4jServer.java

@@ -122,15 +122,15 @@ public class Zlm4jServer {
     public boolean startMediaServer() {
         boolean result = false;
         //创建http服务器 0:失败,非0:端口号
-        short http_server_port = ZLM_API.mk_http_server_start((short) 7788, 0);
+        short http_server_port = ZLM_API.mk_http_server_start((short) 3479, 0);
         result = http_server_port == 0;
         log.info("【MediaServer】HTTP流媒体服务启动:{}", result ? "失败" : "成功,端口:" + http_server_port);
         //创建rtsp服务器 0:失败,非0:端口号
-        short rtsp_server_port = ZLM_API.mk_rtsp_server_start((short) 554, 0);
+        short rtsp_server_port = ZLM_API.mk_rtsp_server_start((short) 3478, 0);
         result = rtsp_server_port == 0;
         log.info("【MediaServer】RTSP流媒体服务启动:{}", result ? "失败" : "成功,端口:" + rtsp_server_port);
         //创建rtmp服务器 0:失败,非0:端口号
-        short rtmp_server_port = ZLM_API.mk_rtmp_server_start((short) 1935, 0);
+        short rtmp_server_port = ZLM_API.mk_rtmp_server_start((short) 19350, 0);
         result = rtmp_server_port == 0;
         log.info("【MediaServer】RTMP流媒体服务启动:{}", result ? "失败" : "成功,端口:" + rtmp_server_port);
         return !result;

+ 2 - 2
smsb-modules/smsb-netty/src/main/java/com/inspur/netty/stream/service/impl/StreamServiceImpl.java

@@ -56,9 +56,9 @@ public class StreamServiceImpl implements IStreamService {
         // 1 根据设备ID查询设备信息
         SmsbDeviceVo smsbDeviceVo = smsbDeviceService.getDeviceCacheById(deviceId);
         // 2 生成推流地址
-        String streamUrl = schema + "://" + zlmIp + ":1935/" + app + "/" + smsbDeviceVo.getIdentifier();
+        String streamUrl = schema + "://" + zlmIp + ":19350/" + app + "/" + smsbDeviceVo.getIdentifier();
         // 3 前端看流地址为flv
-        String viewUrl = "http://" + zlmIp + ":7788/" + app + "/" + smsbDeviceVo.getIdentifier() + ".live.flv";
+        String viewUrl = "http://" + zlmIp + ":3479/" + app + "/" + smsbDeviceVo.getIdentifier() + ".live.flv";
         // 4 任务中心创建任务
         String taskParam = PushMessageType.CONTROL_START_STREAM.getValue();
         smsbDeviceTaskService.createNewDeviceTask(DeviceTaskConstants.DEVICE_TASK_STREAM_START, smsbDeviceVo, taskParam);

+ 1 - 1
smsb-plus-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = smsb-plus浪潮屏媒安播云平台
+VITE_APP_TITLE = 浪潮智能信发平台
 
 # 生产环境配置
 VITE_APP_ENV = 'production'

+ 2 - 2
smsb-plus-ui/index.html

@@ -5,8 +5,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="renderer" content="webkit" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-    <link rel="icon" href="/favicon.ico" />
-    <title>smsb-plus浪潮屏媒安播云平台</title>
+<!--    <link rel="icon" href="/favicon.ico" />-->
+    <title>浪潮智能信发平台</title>
     <!--[if lt IE 11
       ]><script>
         window.location.href = '/html/ie.html';

+ 1 - 1
smsb-plus-ui/vite.config.ts

@@ -25,7 +25,7 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          target: 'http://localhost:8084/prod-api',
+          target: 'http://localhost:9094/prod-api',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')