update

Former-commit-id: 1437b9caacfc25aa3a566b653aa4c3ccc0bd6494
Former-commit-id: b154fcb76d9ac34d35f5e20c222838d0f8871542

publish/build.ps1

@@ -9,7 +9,14 @@ if(Test-Path dist)
 }
 
 echo 'copy src to dist'
-Copy-Item  ./src/* ./dist -Recurse -Exclude @('./src/docker/log/*','./src/docker/log/*','.gitignore','start-dev.cmd','docker-compose.override.yml','nginx.dev.conf')
+Copy-Item  ./src/* ./dist -Recurse -Exclude @('./src/linux-x64/publish/log/*','.gitignore','dev.cmd','docker-compose.override.yml','nginx.dev.conf')
+Remove-Item ./dist/linux-x64/publish/log/* -recurse -force
+Remove-Item ./dist/linux-x64/publish/data/* -recurse -force
+
+#$source =  (Get-Item -Path './src').FullName
+#$dest =  (Get-Item -Path './dist').FullName
+#$exclude =  @('dev.cmd','docker-compose.override.yml','nginx.dev.conf')
+#Get-ChildItem $source -Recurse -Exclude $exclude | where {$_.FullName -notlike (Get-Item -Path './src/linux-x64/publish/log/').FullName} | Copy-Item -Destination {Join-Path $dest $_.FullName.Substring($source.length)}
 
 echo 'copy project files to dist folder'
 Copy-Item  ../projects/WebMVC/wwwroot ./dist/linux-x64/publish/apps/WebMVC/wwwroot -recurse

publish/src/linux-x64/publish/.gitignore

@@ -1,4 +1,3 @@
 .vscode
 log
-docker/log
-docker/data
+data

publish/src/linux-x64/publish/conf/nginx.conf

@@ -1,78 +0,0 @@
-#user  nobody;
-worker_processes 1;
-
-#error_log  logs/error.log;
-#error_log  logs/error.log  notice;
-#error_log  logs/error.log  info;
-
-#pid        logs/nginx.pid;
-events {
-    worker_connections 1024;
-}
-
-
-http {
-    include mime.types;
-    default_type application/octet-stream;
-
-    sendfile on;
-
-    keepalive_timeout 65;
-
-    server {
-        listen 0.0.0.0:80;
-        server_name localhost;
-
-        location / {
-            #proxy_set_header Host $host:$server_port;
-            if ($http_user_agent ~* "(mobile|android|ipad|iphone|ipod|tablet)") {
-                proxy_pass http://localhost:5002;
-                break;
-            }
-            proxy_pass http://localhost:5001/;
-        }
-
-        location ^~ /dfs/ {
-            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://localhost:9000/;
-        }
-
-        location ^~ /live/ {
-            proxy_pass http://localhost:8080/live/;
-        }
-
-        location ^~ /video/ {
-            proxy_pass http://localhost:8080/video/;
-        }
-
-        location ^~ /influxdb/ {
-            proxy_pass http://localhost:8086/;
-        }
-
-        location ^~ /UserCenter/ {
-            proxy_pass http://localhost:8010/UserCenter/;
-        }
-
-        location ^~ /IoTCenter/ {
-            proxy_pass http://localhost:8011/IoTCenter/;
-        }
-
-        location ^~ /IoTCenter/hub {
-            proxy_pass http://localhost:8011/IoTCenter/hub;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-        }
-
-        location ^~ /JobServer/ {
-            proxy_pass http://localhost:8013/JobServer/;
-        }
-
-        error_page 500 502 503 504 /50x.html;
-        location = /50x.html {
-            root html;
-        }
-    }
-}

publish/src/linux-x64/publish/docker-compose.override.yml

@@ -3,18 +3,18 @@ version: "3.8"
 services:
     srs:
         volumes:
-            - ./docker/conf/srs/dev:/usr/local/srs/conf        
+            - ./conf/srs/dev:/usr/local/srs/conf        
     website:
         volumes:
-            - ../../../../projects/Platform/wwwroot:/root/nginx/html/desktop
-            - ../../../../projects/WebSPA/wwwroot:/root/nginx/html/mobile
+            - ../../../projects/Platform/wwwroot:/root/nginx/html/desktop
+            - ../../../projects/WebSPA/wwwroot:/root/nginx/html/mobile
     platform:
         image: nginx:1.18.0
         restart: always
         environment:
             TZ: "Asia/Shanghai"
         volumes:
-            - ./docker/conf/platform/nginx.dev.conf:/etc/nginx/nginx.conf
+            - ./conf/platform/nginx.dev.conf:/etc/nginx/nginx.conf
         networks:
             default:
                 ipv4_address: 172.172.0.80

publish/src/linux-x64/publish/docker-compose.yml

@@ -14,7 +14,7 @@ services:
             - 9002:9000
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
-            - ./docker/data/portainer:/data
+            - ./data/portainer:/data
         networks:
             default:
                 ipv4_address: 172.172.0.101
@@ -28,10 +28,10 @@ services:
             - 80:80
             - 443:443
         volumes:
-            - ./docker/conf/website/nginx.conf:/etc/nginx/nginx.conf
-            - ./docker/conf/website/edusoa.pem:/etc/nginx/edusoa.pem
-            - ./docker/conf/website/edusoa.key:/etc/nginx/edusoa.key
-            - ./docker/log/website:/var/log/nginx
+            - ./conf/website/nginx.conf:/etc/nginx/nginx.conf
+#            - ./conf/website/edusoa.pem:/etc/nginx/edusoa.pem
+#            - ./conf/website/edusoa.key:/etc/nginx/edusoa.key
+            - ./log/website:/var/log/nginx
             - ./apps/WebMVC/wwwroot:/root/nginx/html/desktop
             - ./apps/WebSPA/wwwroot:/root/nginx/html/mobile
         networks:
@@ -46,8 +46,8 @@ services:
         ports:
             - 8000:8000
         volumes:
-            - ./docker/conf/gateway/nginx.conf:/etc/nginx/nginx.conf
-            - ./docker/log/gateway:/var/log/nginx
+            - ./conf/gateway/nginx.conf:/etc/nginx/nginx.conf
+            - ./log/gateway:/var/log/nginx
         networks:
             default:
                 ipv4_address: 172.172.0.12
@@ -62,7 +62,7 @@ services:
         ports:
             - 9000:9000
         volumes:
-            - ./docker/data/minio:/data
+            - ./data/minio:/data
         networks:
             default:
                 ipv4_address: 172.172.0.20
@@ -77,8 +77,8 @@ services:
         ports:
             - 3306:3306
         volumes:
-            - ./docker/conf/mysql/my.cnf:/etc/my.cnf
-            - ./docker/data/mysql:/var/lib/mysql
+            - ./conf/mysql/my.cnf:/etc/my.cnf
+            - ./data/mysql:/var/lib/mysql
         healthcheck:
             test: mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
             timeout: 10s
@@ -98,7 +98,7 @@ services:
             - 8086:8086
             - 8088:8088
         volumes:
-            - ./docker/data/influxdb:/var/lib/influxdb
+            - ./data/influxdb:/var/lib/influxdb
         networks:
             default:
                 ipv4_address: 172.172.0.50
@@ -109,8 +109,8 @@ services:
         ports:
             - 6379:6379
         volumes:
-            - ./docker/data/redis:/data
-            - ./docker/conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
+            - ./data/redis:/data
+            - ./conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
         command: redis-server /usr/local/etc/redis/redis.conf
         networks:
             default:
@@ -124,8 +124,8 @@ services:
             - 8080:8080
             - 1985:1985
         volumes:
-            - ./docker/conf/srs/conf:/usr/local/srs/conf
-            - ./docker/data/srs:/usr/local/srs/objs/nginx/html/video
+            - ./conf/srs/conf:/usr/local/srs/conf
+            - ./data/srs:/usr/local/srs/objs/nginx/html/video
         networks:
             default:
                 ipv4_address: 172.172.0.60

publish/src/linux-x64/publish/install.txt

@@ -6,12 +6,6 @@ apt-get -y install supervisor
 mkdir -p /root/publish/logs
 mv /etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf.bk
 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
-chmod 777 /root/publish/apps/WebMVC/WebMVC
-chmod 777 /root/publish/apps/WebSPA/WebSPA
-chmod 777 /root/publish/apps/srs/objs/srs
+chmod 777 /root/publish/apps/Platform/Platform
 chmod 777 /root/publish/apps/srs/objs/ffmpeg/bin/ffmpeg
-chmod 777 /root/publish/apps/minio/minio
 service supervisor restart