diff --git a/projects/IoTCenter/wwwroot/js/site.js b/projects/IoTCenter/wwwroot/js/site.js index bf85a65e..9be0c5e1 100644 --- a/projects/IoTCenter/wwwroot/js/site.js +++ b/projects/IoTCenter/wwwroot/js/site.js @@ -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(); } }); diff --git a/projects/IoTNode/wwwroot/js/site.js b/projects/IoTNode/wwwroot/js/site.js index bf85a65e..9be0c5e1 100644 --- a/projects/IoTNode/wwwroot/js/site.js +++ b/projects/IoTNode/wwwroot/js/site.js @@ -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(); } }); diff --git a/projects/UserCenter/Views/Home/Index.cshtml b/projects/UserCenter/Views/Home/Index.cshtml index 62138156..505607fa 100644 --- a/projects/UserCenter/Views/Home/Index.cshtml +++ b/projects/UserCenter/Views/Home/Index.cshtml @@ -10,7 +10,7 @@
- @site.Description + @site.Description

@site.Name

diff --git a/projects/UserCenter/wwwroot/js/site.js b/projects/UserCenter/wwwroot/js/site.js index bf85a65e..9be0c5e1 100644 --- a/projects/UserCenter/wwwroot/js/site.js +++ b/projects/UserCenter/wwwroot/js/site.js @@ -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(); } }); diff --git a/projects/lib/local/js/site.js b/projects/lib/local/js/site.js index bf85a65e..9be0c5e1 100644 --- a/projects/lib/local/js/site.js +++ b/projects/lib/local/js/site.js @@ -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(); } }); diff --git a/publish/src/linux-x64/publish/apps/minio/minio b/publish/src/linux-x64/publish/apps/minio/minio index 90ee5c13..04524b3f 100644 Binary files a/publish/src/linux-x64/publish/apps/minio/minio and b/publish/src/linux-x64/publish/apps/minio/minio differ diff --git a/publish/src/linux-x64/publish/conf/nginx.conf b/publish/src/linux-x64/publish/conf/nginx.conf index e88364e1..37b11893 100644 --- a/publish/src/linux-x64/publish/conf/nginx.conf +++ b/publish/src/linux-x64/publish/conf/nginx.conf @@ -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/ { diff --git a/publish/src/linux-x64/publish/conf/supervisord.conf b/publish/src/linux-x64/publish/conf/supervisord.conf index e6af3252..0f95b558 100644 --- a/publish/src/linux-x64/publish/conf/supervisord.conf +++ b/publish/src/linux-x64/publish/conf/supervisord.conf @@ -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 diff --git a/publish/src/linux-x64/publish/docker/conf/nginx/nginx.development.conf b/publish/src/linux-x64/publish/docker/conf/nginx/nginx.development.conf index 229792ce..8015a5e4 100644 --- a/publish/src/linux-x64/publish/docker/conf/nginx/nginx.development.conf +++ b/publish/src/linux-x64/publish/docker/conf/nginx/nginx.development.conf @@ -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/ { diff --git a/publish/src/linux-x64/publish/docker/data/portainer/config.json b/publish/src/linux-x64/publish/docker/data/portainer/config.json index 8571a774..c737fbce 100644 --- a/publish/src/linux-x64/publish/docker/data/portainer/config.json +++ b/publish/src/linux-x64/publish/docker/data/portainer/config.json @@ -1 +1 @@ -{"HttpHeaders":{"X-PortainerAgent-ManagerOperation":"1","X-PortainerAgent-PublicKey":"3059301306072a8648ce3d020106082a8648ce3d0301070342000461ec08defe5e041c2d6fe4b02e42f67ba27dfb8cc2c356de0dee559635763353fdf8251af063ed4ad0d6530c1c8f87d2f6a8742b3288fb159f6812d346f99a8c","X-PortainerAgent-Signature":"Z9Sq9EgEdmKEmNOXOU+1hTcxGUWGS7cJiiJ/JkTfR3VvWVNKxfJn2YfD7g3QHpPXErriEUua2A5K/1G/D0Rtyw"}} \ No newline at end of file +{"HttpHeaders":{"X-PortainerAgent-ManagerOperation":"1","X-PortainerAgent-PublicKey":"3059301306072a8648ce3d020106082a8648ce3d0301070342000461ec08defe5e041c2d6fe4b02e42f67ba27dfb8cc2c356de0dee559635763353fdf8251af063ed4ad0d6530c1c8f87d2f6a8742b3288fb159f6812d346f99a8c","X-PortainerAgent-Signature":"aR98eG+boihcSNN/UeY3pgJFLaMpeQnzkd4x+yC436m8LK7h92SZ+cMQB0we3UlkKb33R6dtAdIl0oEkSzM5tQ"}} \ No newline at end of file diff --git a/publish/src/linux-x64/publish/docker/data/portainer/portainer.db b/publish/src/linux-x64/publish/docker/data/portainer/portainer.db index 25d13d57..38516e4f 100644 Binary files a/publish/src/linux-x64/publish/docker/data/portainer/portainer.db and b/publish/src/linux-x64/publish/docker/data/portainer/portainer.db differ diff --git a/publish/src/linux-x64/publish/install.txt b/publish/src/linux-x64/publish/install.txt index 66db7261..085cd5bb 100644 --- a/publish/src/linux-x64/publish/install.txt +++ b/publish/src/linux-x64/publish/install.txt @@ -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 diff --git a/publish/src/linux-x64/publish/supervisor/minio.conf b/publish/src/linux-x64/publish/supervisor/minio.conf index ba6823fd..ceef7c5e 100644 --- a/publish/src/linux-x64/publish/supervisor/minio.conf +++ b/publish/src/linux-x64/publish/supervisor/minio.conf @@ -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 \ No newline at end of file