diff --git a/Dockerfiles/yoctools.dockerfile b/Dockerfiles/yoctools.dockerfile index 2df751a..3d8fe9e 100644 --- a/Dockerfiles/yoctools.dockerfile +++ b/Dockerfiles/yoctools.dockerfile @@ -5,7 +5,12 @@ ENV DEBIAN_FRONTEND=noninteractive RUN sed -i "s@http://.*archive.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list \ && sed -i "s@http://.*security.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list \ && apt update \ - && apt install -y git lz4 unzip python3-pip + && apt install -y curl git lz4 unzip python3-pip \ + && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \ + && apt update \ + && apt install -y nodejs \ + && apt clean \ + && rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN pip3 install yoctools pyyaml && cd /usr/bin && ln -s python3 python diff --git a/WebApplication/model/BlogSession.cpp b/WebApplication/model/BlogSession.cpp index 4b413a5..6803468 100644 --- a/WebApplication/model/BlogSession.cpp +++ b/WebApplication/model/BlogSession.cpp @@ -1,11 +1,11 @@ #include "BlogSession.h" #include +#include #include #include -#include -#include #include -#include +#include +#include class BlogOAuth : public std::vector { public: @@ -57,6 +57,10 @@ Wt::Dbo::ptr BlogSession::user() const { return Wt::Dbo::ptr(); } +Wt::Signal> &BlogSession::commentsChanged() { + return m_commentsChanged; +} + Wt::Auth::PasswordService *BlogSession::passwordAuth() const { return &blogPasswords; } diff --git a/WebApplication/model/BlogSession.h b/WebApplication/model/BlogSession.h index 084c279..39ec755 100644 --- a/WebApplication/model/BlogSession.h +++ b/WebApplication/model/BlogSession.h @@ -19,9 +19,7 @@ public: return m_login; } Wt::Dbo::ptr user() const; - Wt::Signal> &commentsChanged() { - return commentsChanged_; - } + Wt::Signal> &commentsChanged(); BlogUserDatabase &users() { return m_users; } @@ -32,6 +30,6 @@ private: Wt::Dbo::SqlConnectionPool &m_connectionPool; BlogUserDatabase m_users; Wt::Auth::Login m_login; - Wt::Signal> commentsChanged_; + Wt::Signal> m_commentsChanged; }; #endif // __BLOGSESSION_H__ \ No newline at end of file