From 52da3d98f1be36d1735f939778ea151a7fd1bb52 Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Wed, 23 Oct 2024 15:04:36 +0800 Subject: [PATCH 1/6] 'commit' --- .../ds-base/html/pages/ylt/occupy/index.html | 315 ++++++++++++++++++ 1 file changed, 315 insertions(+) create mode 100644 dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html diff --git a/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html b/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html new file mode 100644 index 00000000..bcc881d3 --- /dev/null +++ b/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html @@ -0,0 +1,315 @@ + + + + + + + + + + + +
+ + 首页 + 业务管理 + 占位费设置 + +
+
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+
+ + +
+
+ + + + + + + + \ No newline at end of file From 4eea5f67107b23048eccdb6f154a2fe15da88dc3 Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Wed, 23 Oct 2024 15:11:16 +0800 Subject: [PATCH 2/6] 'commit' --- dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html b/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html index bcc881d3..5ec72645 100644 --- a/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html +++ b/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html @@ -96,7 +96,7 @@
- +
@@ -182,23 +182,21 @@ } }); - - }); $("#saveFreeTime").click(function () { var freeTime = $("#freeTime").val(); if (!freeTime) { - layer.msg('请输入每小时收费金额！', { + layer.msg('请输入免费时长！', { icon: 2, time: 1000 }); return; } - var regex = /^\d+(\.\d+)?$/; + var regex = /^\d+$/; if (!regex.test(freeTime)) { - layer.msg('只允许请输入不小于0的数字！', { + layer.msg('只允许请输入不小于0的正整数！', { icon: 2, time: 2000 }); From 98d76b1eb773734edc52c82009dd8d37f127aca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 23 Oct 2024 16:58:13 +0800 Subject: [PATCH 3/6] 'commit' --- 操作文档/9、EtlCloud数据集成.md | 128 +++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 操作文档/9、EtlCloud数据集成.md diff --git a/操作文档/9、EtlCloud数据集成.md b/操作文档/9、EtlCloud数据集成.md new file mode 100644 index 00000000..14705344 --- /dev/null +++ b/操作文档/9、EtlCloud数据集成.md @@ -0,0 +1,128 @@ +> Linux 一键部署包安装 +> https://www.etlcloud.cn/helpDocument.html?id=648ac032c5ccee14c6641a94 + +> 安装包下载 +> https://www.etlcloud.cn/download.html?type=5&categoryId=6371e5004071f26ef2416667 + + + +### 一、前期准备 + +#### 操作系统 + +```shell +RockyLinux 9.4 +``` + +#### 查看SeLinux状态 + +```shell +sestatus +``` + +``` +SELinux status: enabled +SELinuxfs mount: /sys/fs/selinux +SELinux root directory: /etc/selinux +Loaded policy name: targeted +Current mode: enforcing +Mode from config file: enforcing +Policy MLS status: enabled +Policy deny_unknown status: allowed +Memory protection checking: actual (secure) +Max kernel policy version: 33 +``` + +#### 关闭Selinux + +```shell +grubby --update-kernel ALL --args selinux=0 + +``` + +#### 关闭防火墙 + +```shell +systemctl disable firewalld.service +systemctl stop firewalld + +# 检查防火墙状态： +systemctl status firewalld +``` + + + +#### 重启生效 + +```shell +reboot +``` + +```shell +[root@etl ~]# sestatus +SELinux status: disabled +``` + + + +### 二、下载安装包 + +![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202410231617978.png)![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202410231617503.png) + + + +#### 阿里云源加速 + +```shell +sudo sed -e 's|^mirrorlist=|#mirrorlist=|g' \ + -e 's|^#baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.sdu.edu.cn/rocky|g' \ + -i.bak \ + /etc/yum.repos.d/rocky-extras.repo \ + /etc/yum.repos.d/rocky.repo + +dnf makecache +``` + + + +```shell +yum install -y unzip lrzsz wget make +mkdir /usr/restcloud -p +cd /usr/restcloud +rz -be 上传 +restcloud3.7.zip + +unzip restcloud3.7.zip +cd restcloud_V3.7/ + +# 安装依赖包 +wget https://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/compat-openssl10-1.0.2o-3.el8.x86_64.rpm + +rpm -ivh compat-openssl10-1.0.2o-3.el8.x86_64.rpm + +# 执行安装包 +chmod +x restcloud_install.sh +./restcloud_install.sh +``` + +**访问地址：** + +``` +http://10.10.14.214:8080/restcloud/admin/login + +用户名密码: +admin +pass +``` + + + +#### 重启$Tomcat$ + +``` +ps -aux |grep tomcat //查看tomcat进程 +kill -9 进程id //终止进程 +cd /usr/tomcat/bin //进入tomcat/bin目录 +./startup.sh && tail -f ../logs/catalina.out //启动tomcat并打印启动日志 +``` + From 714bc2d41edd610148172131f7b159bec17b4be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Thu, 24 Oct 2024 07:52:30 +0800 Subject: [PATCH 4/6] 'commit' --- 操作文档/9、EtlCloud数据集成.md | 40 +++++++++++++----------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/操作文档/9、EtlCloud数据集成.md b/操作文档/9、EtlCloud数据集成.md index 14705344..198ec6db 100644 --- a/操作文档/9、EtlCloud数据集成.md +++ b/操作文档/9、EtlCloud数据集成.md @@ -14,7 +14,7 @@ RockyLinux 9.4 ``` -#### 查看SeLinux状态 +#### 查看$SeLinux$状态 ```shell sestatus @@ -33,7 +33,7 @@ Memory protection checking: actual (secure) Max kernel policy version: 33 ``` -#### 关闭Selinux +#### 关闭$Selinux$ ```shell grubby --update-kernel ALL --args selinux=0 @@ -52,6 +52,20 @@ systemctl status firewalld +#### 阿里云源加速 + +```shell +sudo sed -e 's|^mirrorlist=|#mirrorlist=|g' \ + -e 's|^#baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.sdu.edu.cn/rocky|g' \ + -i.bak \ + /etc/yum.repos.d/rocky-extras.repo \ + /etc/yum.repos.d/rocky.repo + +dnf makecache +``` + + + #### 重启生效 ```shell @@ -69,21 +83,7 @@ SELinux status: disabled ![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202410231617978.png)![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202410231617503.png) - - -#### 阿里云源加速 - -```shell -sudo sed -e 's|^mirrorlist=|#mirrorlist=|g' \ - -e 's|^#baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.sdu.edu.cn/rocky|g' \ - -i.bak \ - /etc/yum.repos.d/rocky-extras.repo \ - /etc/yum.repos.d/rocky.repo - -dnf makecache -``` - - +#### 开始安装 ```shell yum install -y unzip lrzsz wget make @@ -105,7 +105,7 @@ chmod +x restcloud_install.sh ./restcloud_install.sh ``` -**访问地址：** +#### 访问地址 ``` http://10.10.14.214:8080/restcloud/admin/login @@ -115,7 +115,11 @@ admin pass ``` +#### 添加授权 + +![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202410240746944.png) +![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202410240746165.png) #### 重启$Tomcat$ From 162f182ccaf3a8485241a9a7ec9f4d0036ace7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Thu, 24 Oct 2024 09:35:33 +0800 Subject: [PATCH 5/6] 'commit' --- 操作文档/7、DataEase.md | 48 +++++++++++------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/操作文档/7、DataEase.md b/操作文档/7、DataEase.md index 2c7d1232..e9e93412 100644 --- a/操作文档/7、DataEase.md +++ b/操作文档/7、DataEase.md @@ -107,54 +107,32 @@ http://10.10.14.203/ -### 三、配置外网访问 - -frpc.ini 配置在：10.10.14.203 - -```shell -[root@dataease frp]# cat frpc.ini -[common] -server_addr = www.wmarkj.com -server_port = 7000 - -[dsideal_DataEaseV2] -type=tcp -local_ip=10.10.14.203 -local_port=80 -remote_port=27080 - -[dsideal_DataEaseV1] -type=tcp -local_ip=10.10.14.204 -local_port=8887 -remote_port=27081 -``` - - - -### 四、访问方式 +### 三、访问方式 ```xml 系统登录信息如下: -内网访问地址: http://10.10.14.203 -外网访问地址：http://www.wmarkj.com:27080 +访问地址: https://www.edusoa.com/dataease 用户名: admin 初始密码: DataEase@123456 ``` -![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202409131316541.png) +![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202410240933597.png) -![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202409131323392.png) +在华为云上部署的$DataEaseV2$ -在华为云上部署的DataEaseV2 - +``` 117.78.60.214 52025 DsIdeal@123 +``` ![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202410171024499.png) + + +### 四、异常记录 + #### $Centos$ $7.9$ $root$账号，输入$reboot$不重新启动，怎么办？ 答： @@ -173,11 +151,15 @@ curl -sSL https://dataease.oss-cn-hangzhou.aliyuncs.com/quick_start_v2.sh | sh -#### 备份与还原 +### 五、备份与还原 ``` +# 原版本机器上运行 +dectl upgrade + # 两个机器都要执行 service dataease stop + # 在备份的机器上执行 tar -jcv -f dataease.tar.bz2 /opt/dataease2.0 From 4183bd942fdb5ab26819836e8c44ee067942813f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Thu, 24 Oct 2024 09:46:35 +0800 Subject: [PATCH 6/6] 'commit' --- 操作文档/7、DataEase.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/操作文档/7、DataEase.md b/操作文档/7、DataEase.md index e9e93412..713d52db 100644 --- a/操作文档/7、DataEase.md +++ b/操作文档/7、DataEase.md @@ -101,8 +101,28 @@ mkdir /root/nginx_logs docker run --name openresty -d -v /root/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf -v /root/nginx_logs:/var/log/nginx -p 80:80 openresty/openresty:1.25.3.1-5-alpine-fat ``` + + +#### 如果不想按/进行发布，而是想采用$/dataease/$进行发布的话 + +> 参考：[DataEase v2 设置动态访问路径，使用 Nginx 路径代理 - FIT2CLOUD 知识库](https://kb.fit2cloud.com/?p=57a47d64-4eda-4ae8-a0b0-4329e57b13ff) + +**步骤1** + +```shell +vi /opt/dataease2.0/conf/application.yml ``` -http://10.10.14.203/ + +```yaml +server: + servlet: + context-path: /dataease +``` + +**步骤2** + +```shell +echo 'DE_CONTEXT_PATH=/dataease' >> /opt/dataease2.0/.env ```