diff --git a/Dockerfile b/Dockerfile index dc83c07..9acd837 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM docker-0.unsee.tech/nginx:1.27.0 +FROM nginx:1.27.0 COPY dist/ /usr/share/nginx/html/ -COPY nginx.conf /etc/nginx/conf.d/ +COPY nginx.conf /etc/nginx/conf.d/default.conf RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN echo 'Asia/Shanghai' > /etc/timezone RUN chmod -R 755 /usr/share/nginx/html/ diff --git a/nginx.conf b/nginx.conf index c06d45a..2ca68bb 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,106 +1,26 @@ -## -# You should look at the following URL's in order to grasp a solid understanding -# of Nginx configuration files in order to fully unleash the power of Nginx. -# https://www.nginx.com/resources/wiki/start/ -# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/ -# https://wiki.debian.org/Nginx/DirectoryStructure -# -# In most cases, administrators will remove this file from sites-enabled/ and -# leave it as reference inside of sites-available where it will continue to be -# updated by the nginx packaging team. -# -# This file will automatically load configuration files provided by other -# applications, such as Drupal or Wordpress. These applications will be made -# available underneath a path with that package name, such as /drupal8. -# -# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples. -## - -# Default server configuration -# server { listen 80 default_server; listen [::]:80 default_server; - # SSL configuration - # - # listen 443 ssl default_server; - # listen [::]:443 ssl default_server; - # - # Note: You should disable gzip for SSL traffic. - # See: https://bugs.debian.org/773332 - # - # Read up on ssl_ciphers to ensure a secure configuration. - # See: https://bugs.debian.org/765782 - # - # Self signed certs generated by the ssl-cert package - # Don't use them in a production server! - # - # include snippets/snakeoil.conf; - - #root /var/www/html; root /usr/share/nginx/html; - # Add index.php to the list if you are using PHP - #index index.html index.htm index.nginx-debian.html; index index.html; server_name _; - location /admin-service/ { - proxy_pass http://admin-service:8080/; - } + #location /admin-service/ { + #proxy_pass http://admin-service:8080/; + #} location /home-service/ { proxy_pass http://home-service:8081/; } - location /blog-service/ { - proxy_pass http://blog-service:8082/; - } + #location /blog-service/ { + #proxy_pass http://blog-service:8082/; + #} location / { - # First attempt to serve request as file, then - # as directory, then fall back to displaying a 404. try_files $uri $uri/ =404; } - - # pass PHP scripts to FastCGI server - # - #location ~ \.php$ { - # include snippets/fastcgi-php.conf; - # - # # With php-fpm (or other unix sockets): - # fastcgi_pass unix:/var/run/php/php7.4-fpm.sock; - # # With php-cgi (or other tcp sockets): - # fastcgi_pass 127.0.0.1:9000; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} -} - - -# Virtual Host configuration for example.com -# -# You can move that to a different file under sites-available/ and symlink that -# to sites-enabled/ to enable it. -# -#server { -# listen 80; -# listen [::]:80; -# -# server_name example.com; -# -# root /var/www/example.com; -# index index.html; -# -# location / { -# try_files $uri $uri/ =404; -# } -#} - +} \ No newline at end of file diff --git a/src/assets/font/霞鹜臻楷.ttf b/src/assets/font/custom.ttf similarity index 100% rename from src/assets/font/霞鹜臻楷.ttf rename to src/assets/font/custom.ttf diff --git a/src/components/Home/Ledger/LedgerCard.vue b/src/components/Home/Ledger/LedgerCard.vue index 97cea22..8679353 100644 --- a/src/components/Home/Ledger/LedgerCard.vue +++ b/src/components/Home/Ledger/LedgerCard.vue @@ -21,15 +21,14 @@ ({{ legerItem.unit }}) -