wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 1dd229bba2b29af118963b01e94655cd53df61b9
TangShanKaiPing
wanggang 5 years ago
parent 50e1d2c041
commit 1a4e07bd17
13 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File

12
projects/IoTCenter/wwwroot/js/site.js
Unescape View File

@ -1,3 +1,9 @@
function urlContent(baseUrl,path) {
if (!path.startsWith("/dfs/")) {
return baseUrl + path;
}
return path;
}
//agree with
jQuery.validator.addMethod("mustbetrue", function (value, element) {
return element.checked;
@ -200,8 +206,8 @@ function InitEditor(K) {
if (isRequired) {
$('#' + id).parents('form').validate().element('#' + id);
}
$(image_id).attr('src', baseUrl+url);
$(image_id).parent('a').attr('href', baseUrl+url);
$(image_id).attr('src', urlContent(baseUrl,url));
$(image_id).parent('a').attr('href', urlContent(baseUrl, url));
editor.hideDialog();
}
});
@ -236,7 +242,7 @@ function InitEditor(K) {
if (isRequired) {
$('#' + id).parents('form').validate().element('#' + id);
}
$(image_id).text(baseUrl+url);
$(image_id).text(url);
editor.hideDialog();
}
});

12
projects/IoTNode/wwwroot/js/site.js
Unescape View File

@ -1,3 +1,9 @@
function urlContent(baseUrl,path) {
if (!path.startsWith("/dfs/")) {
return baseUrl + path;
}
return path;
}
//agree with
jQuery.validator.addMethod("mustbetrue", function (value, element) {
return element.checked;
@ -200,8 +206,8 @@ function InitEditor(K) {
if (isRequired) {
$('#' + id).parents('form').validate().element('#' + id);
}
$(image_id).attr('src', baseUrl+url);
$(image_id).parent('a').attr('href', baseUrl+url);
$(image_id).attr('src', urlContent(baseUrl,url));
$(image_id).parent('a').attr('href', urlContent(baseUrl, url));
editor.hideDialog();
}
});
@ -236,7 +242,7 @@ function InitEditor(K) {
if (isRequired) {
$('#' + id).parents('form').validate().element('#' + id);
}
$(image_id).text(baseUrl+url);
$(image_id).text(url);
editor.hideDialog();
}
});

2
projects/UserCenter/Views/Home/Index.cshtml
Unescape View File

@ -10,7 +10,7 @@
<a href="@site.Home" class="card">
<div class="card-body">
<div style="text-align:center;">
<img src="@Url.Content(site.Icon ?? "/images/empty.png")" style="height:48px;margin:0 auto;" alt="@site.Description" />
<img src="@Url.Content2(site.Icon ?? "/images/empty.png")" style="height:48px;margin:0 auto;" alt="@site.Description" />
<p>@site.Name</p>
</div>
</div>

12
projects/UserCenter/wwwroot/js/site.js
Unescape View File

@ -1,3 +1,9 @@
function urlContent(baseUrl,path) {
if (!path.startsWith("/dfs/")) {
return baseUrl + path;
}
return path;
}
//agree with
jQuery.validator.addMethod("mustbetrue", function (value, element) {
return element.checked;
@ -200,8 +206,8 @@ function InitEditor(K) {
if (isRequired) {
$('#' + id).parents('form').validate().element('#' + id);
}
$(image_id).attr('src', baseUrl+url);
$(image_id).parent('a').attr('href', baseUrl+url);
$(image_id).attr('src', urlContent(baseUrl,url));
$(image_id).parent('a').attr('href', urlContent(baseUrl, url));
editor.hideDialog();
}
});
@ -236,7 +242,7 @@ function InitEditor(K) {
if (isRequired) {
$('#' + id).parents('form').validate().element('#' + id);
}
$(image_id).text(baseUrl+url);
$(image_id).text(url);
editor.hideDialog();
}
});

12
projects/lib/local/js/site.js
Unescape View File

@ -1,3 +1,9 @@
function urlContent(baseUrl,path) {
if (!path.startsWith("/dfs/")) {
return baseUrl + path;
}
return path;
}
//agree with
jQuery.validator.addMethod("mustbetrue", function (value, element) {
return element.checked;
@ -200,8 +206,8 @@ function InitEditor(K) {
if (isRequired) {
$('#' + id).parents('form').validate().element('#' + id);
}
$(image_id).attr('src', baseUrl+url);
$(image_id).parent('a').attr('href', baseUrl+url);
$(image_id).attr('src', urlContent(baseUrl,url));
$(image_id).parent('a').attr('href', urlContent(baseUrl, url));
editor.hideDialog();
}
});
@ -236,7 +242,7 @@ function InitEditor(K) {
if (isRequired) {
$('#' + id).parents('form').validate().element('#' + id);
}
$(image_id).text(baseUrl+url);
$(image_id).text(url);
editor.hideDialog();
}
});

BIN
publish/src/linux-x64/publish/apps/minio/minio
View File

Binary file not shown.

7
publish/src/linux-x64/publish/conf/nginx.conf
Unescape View File

@ -21,11 +21,6 @@ http {
keepalive_timeout 65;
upstream go-fastdfs {
server 10.10.24.104:8180;
ip_hash;
}
server {
listen 0.0.0.0:80;
server_name localhost;
@ -43,7 +38,7 @@ http {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://go-fastdfs/;
proxy_pass http://localhost:9000/;
}
location ^~ /live/ {

2
publish/src/linux-x64/publish/conf/supervisord.conf
Unescape View File

@ -27,6 +27,8 @@ password=pwd
; newlines). It can also contain wildcards. The filenames are
; interpreted as relative to this file. Included files *cannot*
; include files themselves.
stdout_logfile_maxbytes=10MB
stderr_logfile_maxbytes=10MB
[include]
files = /root/publish/supervisor/*.conf

2
publish/src/linux-x64/publish/docker/conf/nginx/nginx.development.conf
Unescape View File

@ -32,7 +32,7 @@ http {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://minio:9000/;
proxy_pass http://host.docker.internal:9000/;
}
location ^~ /live/ {

2
publish/src/linux-x64/publish/docker/data/portainer/config.json
Unescape View File

@ -1 +1 @@
{"HttpHeaders":{"X-PortainerAgent-ManagerOperation":"1","X-PortainerAgent-PublicKey":"3059301306072a8648ce3d020106082a8648ce3d0301070342000461ec08defe5e041c2d6fe4b02e42f67ba27dfb8cc2c356de0dee559635763353fdf8251af063ed4ad0d6530c1c8f87d2f6a8742b3288fb159f6812d346f99a8c","X-PortainerAgent-Signature":"Z9Sq9EgEdmKEmNOXOU+1hTcxGUWGS7cJiiJ/JkTfR3VvWVNKxfJn2YfD7g3QHpPXErriEUua2A5K/1G/D0Rtyw"}}
{"HttpHeaders":{"X-PortainerAgent-ManagerOperation":"1","X-PortainerAgent-PublicKey":"3059301306072a8648ce3d020106082a8648ce3d0301070342000461ec08defe5e041c2d6fe4b02e42f67ba27dfb8cc2c356de0dee559635763353fdf8251af063ed4ad0d6530c1c8f87d2f6a8742b3288fb159f6812d346f99a8c","X-PortainerAgent-Signature":"aR98eG+boihcSNN/UeY3pgJFLaMpeQnzkd4x+yC436m8LK7h92SZ+cMQB0we3UlkKb33R6dtAdIl0oEkSzM5tQ"}}

BIN
publish/src/linux-x64/publish/docker/data/portainer/portainer.db
View File

Binary file not shown.

2
publish/src/linux-x64/publish/install.txt
Unescape View File

@ -5,7 +5,7 @@ sudo service influxdb start
apt-get -y install supervisor
mkdir -p /root/publish/logs
mv /etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf.bk
mv /root/publish/supervisord.conf /etc/supervisor/supervisord.conf
mv /root/publish/conf/supervisord.conf /etc/supervisor/supervisord.conf
chmod 777 /root/publish/apps/UserCenter/UserCenter
chmod 777 /root/publish/apps/IoTCenter/IoTCenter
chmod 777 /root/publish/apps/JobServer/JobServer

5
publish/src/linux-x64/publish/supervisor/minio.conf
Unescape View File

@ -1,8 +1,9 @@
[program:minio]
directory=/root/publish/apps/minio/minio server ./data
command=/root/publish/apps/minio/
directory=/root/publish/apps/minio
command=/root/publish/apps/minio/minio server ./data
autostart=true
autorestart=true
user=root
environment=MINIO_ACCESS_KEY=admin, MINIO_SECRET_KEY=12345678
stdout_logfile=/root/publish/logs/minio.log
stderr_logfile=/root/publish/logs/minio.err
Write Preview
Loading…
Cancel
Save