feat: 更新依赖。

This commit is contained in:
lanyulei
2024-11-19 11:53:20 +08:00
parent a463c8f81c
commit 0049928c81
4 changed files with 85 additions and 83 deletions

View File

@@ -1,4 +1,4 @@
FROM node:14.18-alpine as web FROM node:22.11.0-alpine3.20 as web
WORKDIR /opt/workflow 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 && \ RUN apk update && \
apk add --no-cache git && \ apk add --no-cache git && \
rm -rf /var/cache/apk/* /tmp/* /var/tmp/* $HOME/.cache 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 WORKDIR ferry_web
RUN npm install -g pnpm --registry=https://registry.npmmirror.com
RUN npm install -g cnpm --registry=https://registry.npmmirror.com RUN export NODE_OPTIONS=--openssl-legacy-provider && pnpm install
RUN npm uninstall node-sass && npm i -D sass --registry=https://registry.npmmirror.com
RUN cnpm install
RUN echo $'# just a flag\n\ RUN echo $'# just a flag\n\
ENV = \'production\'\n\n\ ENV = \'production\'\n\n\
# base api\n\ # base api\n\
VUE_APP_BASE_API = \'\''\ VUE_APP_BASE_API = \'\''\
> .env.production > .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 WORKDIR /opt/workflow/ferry
COPY . . COPY . .
@@ -28,7 +26,7 @@ ARG GOPROXY="https://goproxy.cn"
RUN go mod download RUN go mod download
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ferry . 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 MAINTAINER lanyulei

View File

@@ -17,7 +17,7 @@
## 基于Gin + Vue + Element UI前后端分离的工单系统 ## 基于Gin + Vue + Element UI前后端分离的工单系统
新版工单演示地址(非开源):[http://fdevops.com:8000](http://fdevops.com:8000) 新版工单演示地址(非开源):[http://123.56.102.227/](http://123.56.102.227/)
账号密码lanyulei / lanyulei 账号密码lanyulei / lanyulei
@@ -33,14 +33,18 @@
基于casbin的RBAC权限控制借鉴了go-admin项目的前端权限管理可以在页面对API、菜单、页面按钮等操作进行灵活且简单的配置。 基于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) 文档: [https://www.fdevops.com/docs/ferry](https://www.fdevops.com/docs/ferry-tutorial-document/introduction)
@@ -158,4 +162,4 @@ QQ群 5734794540
[MIT](https://github.com/lanyulei/ferry/blob/master/LICENSE) [MIT](https://github.com/lanyulei/ferry/blob/master/LICENSE)
Copyright (c) 2022 lanyulei Copyright (c) 2024 lanyulei

View File

@@ -1,66 +1,66 @@
script: script:
path: ./static/scripts path: ./static/scripts
settings: settings:
application: application:
domain: localhost:8002 domain: localhost:8002
host: 0.0.0.0 host: 0.0.0.0
ishttps: false ishttps: false
mode: dev mode: dev
name: ferry-test name: ferry-test
port: "8002" port: "8002"
readtimeout: 1 readtimeout: 1
writertimeout: 2 writertimeout: 2
database: database:
dbtype: mysql dbtype: mysql
host: 127.0.0.1 host: 192.168.31.94
name: ferry name: ferry
password: 123456 password: 123456
port: 3306 port: 3306
username: root username: root
dingtalk: dingtalk:
agentid: 1234567890 agentid: 1234567890
appkey: your dingtalk appkey appkey: your dingtalk appkey
appsecret: your dingtalk appsecret appsecret: your dingtalk appsecret
enable: false enable: false
domain: domain:
gethost: 1 gethost: 1
url: localhost:9527 url: localhost:9527
email: email:
alias: ferry alias: ferry
host: smtp.163.com host: smtp.163.com
pass: your password pass: your password
port: 465 port: 465
user: fdevops@163.com user: fdevops@163.com
gorm: gorm:
logmode: 0 logmode: 0
maxidleconn: 0 maxidleconn: 0
maxopenconn: 20000 maxopenconn: 20000
jwt: jwt:
secret: ferry secret: ferry
timeout: 86400 timeout: 86400
ldap: ldap:
anonymousquery: 0 anonymousquery: 0
basedn: dc=fdevops,dc=com basedn: dc=fdevops,dc=com
bindpwd: 123456 bindpwd: 123456
binduserdn: cn=admin,dc=fdevops,dc=com binduserdn: cn=admin,dc=fdevops,dc=com
host: localhost host: localhost
port: 389 port: 389
tls: 0 tls: 0
userfield: uid userfield: uid
log: log:
compress: 1 compress: 1
consolestdout: 1 consolestdout: 1
filestdout: 0 filestdout: 0
level: debug level: debug
localtime: 1 localtime: 1
maxage: 30 maxage: 30
maxbackups: 300 maxbackups: 300
maxsize: 10240 maxsize: 10240
path: ./logs/ferry.log path: ./logs/ferry.log
public: public:
islocation: 0 islocation: 0
redis: redis:
url: redis://:123456@127.0.0.1:6379 url: redis://:123456@192.168.31.94:6379
ssl: ssl:
key: keystring key: keystring
pem: temp/pem.pem pem: temp/pem.pem

View File

@@ -13,8 +13,8 @@ env:
ferry: ferry:
image: image:
repository: beatrueman/ferry repository: lanyulei/ferry
tag: "1.0.0" tag: "1.0.9"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
service: service: