From 0049928c81e265badc11054b4bbfffd2171a5afb Mon Sep 17 00:00:00 2001 From: lanyulei Date: Tue, 19 Nov 2024 11:53:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 16 +++-- README.md | 20 ++++--- config/settings.dev.yml | 128 ++++++++++++++++++++-------------------- deploy/helm/values.yaml | 4 +- 4 files changed, 85 insertions(+), 83 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba1c5e12..d1e7bdf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.18-alpine as web +FROM node:22.11.0-alpine3.20 as web WORKDIR /opt/workflow @@ -6,21 +6,19 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/re RUN apk update && \ apk add --no-cache git && \ rm -rf /var/cache/apk/* /tmp/* /var/tmp/* $HOME/.cache -RUN git clone https://gitee.com/yllan/ferry_web.git +RUN git clone https://github.com/lanyulei/ferry_web WORKDIR ferry_web - -RUN npm install -g cnpm --registry=https://registry.npmmirror.com -RUN npm uninstall node-sass && npm i -D sass --registry=https://registry.npmmirror.com -RUN cnpm install +RUN npm install -g pnpm --registry=https://registry.npmmirror.com +RUN export NODE_OPTIONS=--openssl-legacy-provider && pnpm install RUN echo $'# just a flag\n\ ENV = \'production\'\n\n\ # base api\n\ VUE_APP_BASE_API = \'\''\ > .env.production -RUN npm run build:prod +RUN export NODE_OPTIONS=--openssl-legacy-provider && pnpm run build:prod -FROM golang:1.18 AS build +FROM golang:1.22-alpine3.20 AS build WORKDIR /opt/workflow/ferry COPY . . @@ -28,7 +26,7 @@ ARG GOPROXY="https://goproxy.cn" RUN go mod download RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ferry . -FROM alpine AS prod +FROM alpine:3.20.3 AS prod MAINTAINER lanyulei diff --git a/README.md b/README.md index 1b13acaa..e28cfc99 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ## 基于Gin + Vue + Element UI前后端分离的工单系统 -新版工单演示地址（非开源）：[http://fdevops.com:8000](http://fdevops.com:8000) +新版工单演示地址（非开源）：[http://123.56.102.227/](http://123.56.102.227/) 账号密码：lanyulei / lanyulei @@ -33,14 +33,18 @@ 基于casbin的RBAC权限控制，借鉴了go-admin项目的前端权限管理，可以在页面对API、菜单、页面按钮等操作，进行灵活且简单的配置。 -演示demo: [http://fdevops.com:8001/#/dashboard](http://fdevops.com:8001/#/dashboard) +[//]: # (演示demo: [http://fdevops.com:8001/#/dashboard](http://fdevops.com:8001/#/dashboard)) -``` -账号：admin -密码：123456 +[//]: # (```) -演示demo登陆需要取消ldap验证，就是登陆页面取消ldap的打勾。 -``` +[//]: # (账号：admin) + +[//]: # (密码：123456) + +[//]: # () +[//]: # (演示demo登陆需要取消ldap验证，就是登陆页面取消ldap的打勾。) + +[//]: # (```) 文档: [https://www.fdevops.com/docs/ferry](https://www.fdevops.com/docs/ferry-tutorial-document/introduction) @@ -158,4 +162,4 @@ QQ群 5：734794540 [MIT](https://github.com/lanyulei/ferry/blob/master/LICENSE) -Copyright (c) 2022 lanyulei +Copyright (c) 2024 lanyulei diff --git a/config/settings.dev.yml b/config/settings.dev.yml index 1f2a4cc8..9789c2e8 100644 --- a/config/settings.dev.yml +++ b/config/settings.dev.yml @@ -1,66 +1,66 @@ script: - path: ./static/scripts + path: ./static/scripts settings: - application: - domain: localhost:8002 - host: 0.0.0.0 - ishttps: false - mode: dev - name: ferry-test - port: "8002" - readtimeout: 1 - writertimeout: 2 - database: - dbtype: mysql - host: 127.0.0.1 - name: ferry - password: 123456 - port: 3306 - username: root - dingtalk: - agentid: 1234567890 - appkey: your dingtalk appkey - appsecret: your dingtalk appsecret - enable: false - domain: - gethost: 1 - url: localhost:9527 - email: - alias: ferry - host: smtp.163.com - pass: your password - port: 465 - user: fdevops@163.com - gorm: - logmode: 0 - maxidleconn: 0 - maxopenconn: 20000 - jwt: - secret: ferry - timeout: 86400 - ldap: - anonymousquery: 0 - basedn: dc=fdevops,dc=com - bindpwd: 123456 - binduserdn: cn=admin,dc=fdevops,dc=com - host: localhost - port: 389 - tls: 0 - userfield: uid - log: - compress: 1 - consolestdout: 1 - filestdout: 0 - level: debug - localtime: 1 - maxage: 30 - maxbackups: 300 - maxsize: 10240 - path: ./logs/ferry.log - public: - islocation: 0 - redis: - url: redis://:123456@127.0.0.1:6379 - ssl: - key: keystring - pem: temp/pem.pem + application: + domain: localhost:8002 + host: 0.0.0.0 + ishttps: false + mode: dev + name: ferry-test + port: "8002" + readtimeout: 1 + writertimeout: 2 + database: + dbtype: mysql + host: 192.168.31.94 + name: ferry + password: 123456 + port: 3306 + username: root + dingtalk: + agentid: 1234567890 + appkey: your dingtalk appkey + appsecret: your dingtalk appsecret + enable: false + domain: + gethost: 1 + url: localhost:9527 + email: + alias: ferry + host: smtp.163.com + pass: your password + port: 465 + user: fdevops@163.com + gorm: + logmode: 0 + maxidleconn: 0 + maxopenconn: 20000 + jwt: + secret: ferry + timeout: 86400 + ldap: + anonymousquery: 0 + basedn: dc=fdevops,dc=com + bindpwd: 123456 + binduserdn: cn=admin,dc=fdevops,dc=com + host: localhost + port: 389 + tls: 0 + userfield: uid + log: + compress: 1 + consolestdout: 1 + filestdout: 0 + level: debug + localtime: 1 + maxage: 30 + maxbackups: 300 + maxsize: 10240 + path: ./logs/ferry.log + public: + islocation: 0 + redis: + url: redis://:123456@192.168.31.94:6379 + ssl: + key: keystring + pem: temp/pem.pem diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml index 78e3be07..63da22ae 100644 --- a/deploy/helm/values.yaml +++ b/deploy/helm/values.yaml @@ -13,8 +13,8 @@ env: ferry: image: - repository: beatrueman/ferry - tag: "1.0.0" + repository: lanyulei/ferry + tag: "1.0.9" pullPolicy: IfNotPresent service: