huanghai
/
dsProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://10.10.14.176:3000/huanghai/dsProject

Browse Source
main
HuangHai 9 months ago
parent f0d0da8390 4183bd942f
commit 8a430416cc
3 changed files with 474 additions and 27 deletions
Show Stats Download Patch File Download Diff File

313
dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html
Unescape View File

@ -0,0 +1,313 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title></title>
<link rel="stylesheet" href="../layui/css/layui.css" />
<style>
.weadmin-nav {
padding: 0 20px;
position: relative;
z-index: 99;
border-bottom: 1px solid #e5e5e5;
line-height: 39px;
height: 39px;
overflow: hidden;
}
.weadmin-body {
padding: 15px 20px;
}
.require-star {
position: absolute;
width: 3px;
height: 14px;
background-color: #ea4335;
top: 12px;
right: 8px;
border-radius: 1.5px;
}
.input-width {
width: 350px
}
.label-width {
width: 128px
}
.mainBox {
width: 100%;
position: absolute;
top: 0px;
left: 0px;
bottom: 50px;
overflow: auto;
}
.main-container {
margin: 15px;
}
.button-container {
position: absolute;
right: 15px;
}
</style>
</head>
<body>
<div class="weadmin-nav">
<span class="layui-breadcrumb">
<a href="">首页</a>
<a href="">业务管理</a>
<a> <cite>占位费设置</cite></a>
</span>
</div>
<div class="weadmin-body">
<div class="main-container">
<div class="layui-form-item">
<label class="layui-form-label label-width"><span class="require-star"></span>每小时收费金额(元)</label>
<div class="layui-form-item layui-inline">
<input type="text" id="money" autocomplete="off" placeholder="请输入每小时收费金额"
class="layui-input input-width">
</div>
<div class="layui-form-item layui-inline">
<button type="button" class="layui-btn layui-btn-sm" id="saveMoney">
<i class="layui-icon layui-icon-ok"></i>
保存
</button>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label label-width"><span class="require-star"></span>免费时长(分钟)</label>
<div class="layui-form-item layui-inline">
<input type="text" id="freeTime" autocomplete="off" placeholder="请输入免费时长"
class="layui-input input-width">
</div>
<div class="layui-form-item layui-inline">
<button type="button" class="layui-btn layui-btn-sm" id="saveFreeTime">
<i class="layui-icon layui-icon-ok"></i>
保存
</button>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label label-width"><span class="require-star"></span>设置场站</label>
<div class="layui-form-item layui-inline" id="ID-transfer-demo-showSearch"></div>
</div>
</div>
</div>
<script src="../layui/layui.js"></script>
<script>
layui.use(function () {
var form = layui.form;
var $ = layui.jquery;
var laytpl = layui.laytpl;
var transfer = layui.transfer;
var selectedStation = [];
//获取每小时收费金额
$.ajax({
type: "GET",
async: false,
dataType: "json",
url: "/ZhuQue/hurryQuit/getOneHourMoney",
success: function (res) {
if (res.success) {
$("#money").val(res.data);
}
}
});
//获取免费时长
$.ajax({
type: "GET",
async: false,
dataType: "json",
url: "/ZhuQue/hurryQuit/getFreeDuration",
success: function (res) {
if (res.success) {
$("#freeTime").val(res.data);
}
}
});
$("#saveMoney").click(function () {
var money = $("#money").val();
if (!money) {
layer.msg('请输入每小时收费金额！', {
icon: 2,
time: 2000
});
return;
}
var regex = /^\d+(\.\d+)?$/;
if (!regex.test(money)) {
layer.msg('只允许请输入不小于0的数字！', {
icon: 2,
time: 2000
});
return;
}
$.ajax({
type: "POST",
async: false,
dataType: "json",
url: "/ZhuQue/hurryQuit/setOneHourMoney",
data: { money: money },
success: function (res) {
if (res.success) {
layer.msg('保存成功！', {
icon: 1,
time: 1000
});
} else {
layer.msg(res.msg, {
icon: 2,
time: 1000
});
}
}
});
});
$("#saveFreeTime").click(function () {
var freeTime = $("#freeTime").val();
if (!freeTime) {
layer.msg('请输入免费时长！', {
icon: 2,
time: 1000
});
return;
}
var regex = /^\d+$/;
if (!regex.test(freeTime)) {
layer.msg('只允许请输入不小于0的正整数！', {
icon: 2,
time: 2000
});
return;
}
$.ajax({
type: "POST",
async: false,
dataType: "json",
url: "/ZhuQue/hurryQuit/setFreeDuration",
data: { duration: freeTime },
success: function (res) {
if (res.success) {
layer.msg('保存成功！', {
icon: 1,
time: 1000
});
} else {
layer.msg(res.msg, {
icon: 2,
time: 1000
});
}
}
});
});
//获取已配置数据
$.ajax({
type: "GET",
async: false,
url: "/ZhuQue/hurryQuit/pageHurryQuitList?pageNum=1&pageSize=9999",
success: function (res) {
if (res.data.totalRow > 0) {
selectedStation = res.data.list.map(item => item.station_id);
}
}
});
$.ajax({
type: "GET",
async: false,
url: "/dsBase/dataAuthority/getResourceListByTypeCode?resource_type_code=STATION",
success: function (res) {
transfer.render({
elem: '#ID-transfer-demo-showSearch',
data: res.data,
value: selectedStation,
title: ['未配置', '已配置'],
height: 500,
width: 300,
showSearch: true,
onchange: function (data, index) {
if (index === 0) {
turnRight(data);
} else {
turnLeft(data);
}
},
parseData: function (res) { // 解析成规定的 data 格式
return {
"value": res.resource_id,
"title": res.resource_name
};
}
});
}
});
function turnRight(ids) {
var resIds = ids.map(item => item.value).join(',');
$.ajax({
type: "POST",
async: false,
dataType: "json",
url: "/ZhuQue/hurryQuit/addStation",
data: {
"station_ids": resIds
}
});
}
function turnLeft(ids) {
var resIds = ids.map(item => item.value).join(',');
$.ajax({
type: "POST",
async: false,
dataType: "json",
url: "/ZhuQue/hurryQuit/delStation",
data: {
"station_ids": resIds
}
});
}
});
</script>
<script>
</script>
</body>
</html>

56
操作文档/7、DataEase.md
Unescape View File

@ -101,60 +101,58 @@ 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
```
```
http://10.10.14.203/
```
#### 如果不想按/进行发布，而是想采用$/dataease/$进行发布的话
### 三、配置外网访问
> 参考：[DataEase v2 设置动态访问路径，使用 Nginx 路径代理 - FIT2CLOUD 知识库](https://kb.fit2cloud.com/?p=57a47d64-4eda-4ae8-a0b0-4329e57b13ff)
frpc.ini 配置在：10.10.14.203
**步骤1**
```shell
[root@dataease frp]# cat frpc.ini
[common]
server_addr = www.wmarkj.com
server_port = 7000
vi /opt/dataease2.0/conf/application.yml
```
```yaml
server:
servlet:
context-path: /dataease
```
[dsideal_DataEaseV2]
type=tcp
local_ip=10.10.14.203
local_port=80
remote_port=27080
**步骤2**
[dsideal_DataEaseV1]
type=tcp
local_ip=10.10.14.204
local_port=8887
remote_port=27081
```shell
echo 'DE_CONTEXT_PATH=/dataease' >> /opt/dataease2.0/.env
```
### 四、访问方式
### 三、访问方式
```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 +171,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

132
操作文档/9、EtlCloud数据集成.md
Unescape View File

@ -0,0 +1,132 @@
> 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
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
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
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
```
#### 添加授权
![](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$
```
ps -aux |grep tomcat //查看tomcat进程
kill -9 进程id //终止进程
cd /usr/tomcat/bin //进入tomcat/bin目录
./startup.sh && tail -f ../logs/catalina.out //启动tomcat并打印启动日志
```
Write Preview
Loading…
Cancel
Save