diff --git a/Dockerfile b/Dockerfile index 129c7a3..ffcb706 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,13 @@ FROM dockerproxy.com/library/ubuntu:22.04 ADD dotnet-runtime-3.1.32-linux-x64.tar.gz /root/dotnet COPY libssl1.0.0_1.0.2g-1ubuntu4.20_amd64.deb /tmp COPY nats-server /usr/bin/ -COPY service_manage /yuzhen_iot/service_manage/ +COPY checksum /usr/bin/ +COPY yuzhen_iot /yuzhen_iot/ COPY start.sh /home/ -RUN apt update;dpkg --add-architecture i386;apt update;apt install -y --no-install-recommends libstdc++6 lib32stdc++6 libc6:i386 libc6 libgcc-s1 libicu70 liblttng-ust1 zlib1g vim zip unzip;\ - dpkg -i /tmp/libssl1.0.0_1.0.2g-1ubuntu4.20_amd64.deb +RUN apt update;dpkg --add-architecture i386;apt update;apt install -y --no-install-recommends libstdc++6 lib32stdc++6 libc6:i386 libc6 libgcc-s1 libicu70 liblttng-ust1 zlib1g vim zip unzip wget openssh-server;\ + dpkg -i /tmp/libssl1.0.0_1.0.2g-1ubuntu4.20_amd64.deb;\ + echo "PermitRootLogin yes\nPasswordAuthentication yes\n" >> /etc/ssh/sshd_config;\ + echo root:123456 |chpasswd WORKDIR /home diff --git a/checksum b/checksum new file mode 100755 index 0000000..89f2376 Binary files /dev/null and b/checksum differ diff --git a/service_manage/manage/app/scheduler b/service_manage/manage/app/scheduler deleted file mode 100755 index afd72c2..0000000 Binary files a/service_manage/manage/app/scheduler and /dev/null differ diff --git a/start.sh b/start.sh index 02e9cf2..f7632d6 100755 --- a/start.sh +++ b/start.sh @@ -1,6 +1,7 @@ #!/bin/sh -echo "start nats-server" -/usr/bin/nats-server -p 6000 -a 127.0.0.1 & +echo "start ssh" +service ssh start + echo "start scheduler" /yuzhen_iot/service_manage/manage/app/scheduler echo "yuzhen exit!" \ No newline at end of file diff --git a/yuzhen_iot/prod_manage/app/factory b/yuzhen_iot/prod_manage/app/factory new file mode 100755 index 0000000..35c1881 Binary files /dev/null and b/yuzhen_iot/prod_manage/app/factory differ diff --git a/yuzhen_iot/prod_manage/app/frpc b/yuzhen_iot/prod_manage/app/frpc new file mode 100755 index 0000000..b4e29dc Binary files /dev/null and b/yuzhen_iot/prod_manage/app/frpc differ diff --git a/yuzhen_iot/prod_manage/app/gotty b/yuzhen_iot/prod_manage/app/gotty new file mode 100755 index 0000000..1a1de33 Binary files /dev/null and b/yuzhen_iot/prod_manage/app/gotty differ diff --git a/yuzhen_iot/prod_manage/app/plumber b/yuzhen_iot/prod_manage/app/plumber new file mode 100755 index 0000000..14aadc2 Binary files /dev/null and b/yuzhen_iot/prod_manage/app/plumber differ diff --git a/yuzhen_iot/prod_manage/cfg/Prod_connect.json b/yuzhen_iot/prod_manage/cfg/Prod_connect.json new file mode 100755 index 0000000..c0eab7c --- /dev/null +++ b/yuzhen_iot/prod_manage/cfg/Prod_connect.json @@ -0,0 +1,16 @@ +{ + "version": 0, + "product": { + "host": "106.75.75.68", + "port": "1883", + "user": "negtlw23meh7r98o|75a1bba657d1|2", + "password": "msi4iwhn3v3308dh", + "auth_mode": 0 + }, + "ntp": { + "host": "106.75.75.68" + }, + "dlp": { + "url": "" + } +} \ No newline at end of file diff --git a/yuzhen_iot/prod_manage/cfg/gotty.conf b/yuzhen_iot/prod_manage/cfg/gotty.conf new file mode 100755 index 0000000..84d133b --- /dev/null +++ b/yuzhen_iot/prod_manage/cfg/gotty.conf @@ -0,0 +1,9 @@ +title_format = "Horseman A2x Configuration" +permit_write = true +enable_basic_auth = true +enable_tls = false +max_connection = 1 +environment = {"TERM" = "xterm-256color"} +address = "0.0.0.0" +port = "8000" +credential = "root:123456" diff --git a/service_manage/ftp/log_storage/log b/yuzhen_iot/service_manage/driver_manage/driver_files similarity index 100% rename from service_manage/ftp/log_storage/log rename to yuzhen_iot/service_manage/driver_manage/driver_files diff --git a/yuzhen_iot/service_manage/ftp/log_storage/log b/yuzhen_iot/service_manage/ftp/log_storage/log new file mode 100644 index 0000000..e69de29 diff --git a/yuzhen_iot/service_manage/manage/app/manager b/yuzhen_iot/service_manage/manage/app/manager new file mode 100755 index 0000000..c2d8776 Binary files /dev/null and b/yuzhen_iot/service_manage/manage/app/manager differ diff --git a/yuzhen_iot/service_manage/manage/app/scheduler b/yuzhen_iot/service_manage/manage/app/scheduler new file mode 100755 index 0000000..39ecc5f Binary files /dev/null and b/yuzhen_iot/service_manage/manage/app/scheduler differ diff --git a/service_manage/manage/cfg/List_Sub.json b/yuzhen_iot/service_manage/manage/cfg/List_Sub.json similarity index 100% rename from service_manage/manage/cfg/List_Sub.json rename to yuzhen_iot/service_manage/manage/cfg/List_Sub.json diff --git a/service_manage/manage/cfg/Route.json b/yuzhen_iot/service_manage/manage/cfg/Route.json similarity index 100% rename from service_manage/manage/cfg/Route.json rename to yuzhen_iot/service_manage/manage/cfg/Route.json diff --git a/yuzhen_iot/service_manage/manage/cfg/UserProgram.json b/yuzhen_iot/service_manage/manage/cfg/UserProgram.json new file mode 100644 index 0000000..dfcad67 --- /dev/null +++ b/yuzhen_iot/service_manage/manage/cfg/UserProgram.json @@ -0,0 +1,32 @@ +{ + "programs": [ + { + "name": "nats-server", + "command": "/usr/bin/nats-server", + "args": [ + "-p", + "6000", + "-a", + "127.0.0.1" + ] + }, + { + "name": "factory", + "command": "/yuzhen_iot/prod_manage/app/factory", + "args": [] + }, + { + "name": "manager", + "command": "/yuzhen_iot/service_manage/manage/app/manager", + "args": [] + }, + { + "name": "frpc", + "command": "/yuzhen_iot/prod_manage/app/frpc", + "args": [ + "-c", + "/yuzhen_iot/prod_manage/cfg/frpc.ini" + ] + } + ] +} \ No newline at end of file diff --git a/yuzhen_iot/service_manage/traffic_manage/app_files b/yuzhen_iot/service_manage/traffic_manage/app_files new file mode 100644 index 0000000..e69de29