From 2447aa27d4dd2a4429d07b34ea9933c1e8419dfe Mon Sep 17 00:00:00 2001 From: Mohamed Hassan Date: Sat, 16 Sep 2023 02:55:33 +0300 Subject: [PATCH] +Restore original server config.yaml --- server/config.yaml | 317 ++++++++++++++++++++--------------- web/src/view/login/index.vue | 2 +- 2 files changed, 179 insertions(+), 140 deletions(-) diff --git a/server/config.yaml b/server/config.yaml index 6671932449..4698a0dea2 100644 --- a/server/config.yaml +++ b/server/config.yaml @@ -1,156 +1,161 @@ -aliyun-oss: - endpoint: yourEndpoint - access-key-id: yourAccessKeyId - access-key-secret: yourAccessKeySecret - bucket-name: yourBucketName - bucket-url: yourBucketUrl - base-path: yourBasePath -autocode: - transfer-restart: true - root: D:\Projects\Go\gin-vue-admin - server: /server - server-api: /api/v1/%s - server-plug: /plugin/%s - server-initialize: /initialize - server-model: /model/%s - server-request: /model/%s/request/ - server-router: /router/%s - server-service: /service/%s - web: /web/src - web-api: /api - web-form: /view - web-table: /view -aws-s3: - bucket: xxxxx-10005608 - region: ap-shanghai - endpoint: "" - s3-force-path-style: false - disable-ssl: false - secret-id: your-secret-id - secret-key: your-secret-key - base-url: https://gin.vue.admin - path-prefix: github.com/flipped-aurora/gin-vue-admin/server +# github.com/flipped-aurora/gin-vue-admin/server Global Configuration + +# jwt configuration +jwt: + signing-key: qmPlus + expires-time: 7d + buffer-time: 1d + issuer: qmPlus +# zap logger configuration +zap: + level: info + format: console + prefix: "[github.com/flipped-aurora/gin-vue-admin/server]" + director: log + show-line: true + encode-level: LowercaseColorLevelEncoder + stacktrace-key: stacktrace + log-in-console: true + +# redis configuration +redis: + db: 0 + addr: 127.0.0.1:6379 + password: "" + +# email configuration +email: + to: xxx@qq.com + port: 465 + from: xxx@163.com + host: smtp.163.com + is-ssl: true + secret: xxx + nickname: test + +# system configuration +system: + env: public # Change to "develop" to skip authentication for development mode + addr: 8888 + db-type: mysql + oss-type: local # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置 + use-redis: false # 使用redis + use-multipoint: false + # IP限制次数 一个小时15000次 + iplimit-count: 15000 + # IP限制一个小时 + iplimit-time: 3600 + # 路由全局前缀 + router-prefix: "" + +# captcha configuration captcha: key-long: 6 img-width: 240 img-height: 80 - open-captcha: 0 - open-captcha-timeout: 3600 -cors: - mode: strict-whitelist - whitelist: - - allow-origin: example1.com - allow-methods: POST, GET - allow-headers: Content-Type,AccessToken,X-CSRF-Token, Authorization, Token,X-Token,X-User-Id - expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, - Content-Type - allow-credentials: true - - allow-origin: example2.com - allow-methods: GET, POST - allow-headers: content-type - expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, - Content-Type - allow-credentials: true -db-list: -- disable: true - type: "" - alias-name: "" + open-captcha: 0 # 0代表一直开启，大于0代表限制次数 + open-captcha-timeout: 3600 # open-captcha大于0时才生效 + +# mysql connect configuration +# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master） +mysql: path: "" port: "" config: "" db-name: "" username: "" password: "" - prefix: "" - singular: false - engine: "" max-idle-conns: 10 max-open-conns: 100 log-mode: "" log-zap: false -email: - to: xxx@qq.com - port: 465 - from: xxx@163.com - host: smtp.163.com - is-ssl: true - secret: xxx - nickname: test -excel: - dir: ./resource/excel/ -hua-wei-obs: - path: you-path - bucket: you-bucket - endpoint: you-endpoint - access-key: you-access-key - secret-key: you-secret-key -jwt: - signing-key: 6dd94743-7e6f-4fe9-836f-d65e1e82bb98 - expires-time: 7d - buffer-time: 1d - issuer: qmPlus -language: - language: en - dir: ./resource/lang/ -local: - path: uploads/file - store-path: uploads/file -mssql: + +# pgsql connect configuration +# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master） +pgsql: path: "" port: "" config: "" db-name: "" username: "" password: "" - prefix: "" - singular: false - engine: "" max-idle-conns: 10 max-open-conns: 100 log-mode: "" log-zap: false -mysql: - path: 127.0.0.1 - port: "3306" - config: charset=utf8mb4&parseTime=True&loc=Local - db-name: gva - username: mhassan - password: P@$$w0rD - prefix: "" - singular: false - engine: "" +oracle: + path: "" + port: "" + config: "" + db-name: "" + username: "" + password: "" max-idle-conns: 10 max-open-conns: 100 - log-mode: error + log-mode: "" log-zap: false -oracle: +mssql: path: "" port: "" config: "" db-name: "" username: "" password: "" - prefix: "" - singular: false - engine: "" max-idle-conns: 10 max-open-conns: 100 log-mode: "" log-zap: false -pgsql: +sqlite: path: "" port: "" config: "" db-name: "" username: "" password: "" - prefix: "" - singular: false - engine: "" max-idle-conns: 10 max-open-conns: 100 log-mode: "" log-zap: false +db-list: + - disable: true # 是否禁用 + type: "" # 数据库的类型,目前支持mysql、pgsql、mssql、oracle + alias-name: "" # 数据库的名称,注意: alias-name 需要在db-list中唯一 + path: "" + port: "" + config: "" + db-name: "" + username: "" + password: "" + max-idle-conns: 10 + max-open-conns: 100 + log-mode: "" + log-zap: false + +# local configuration +local: + path: uploads/file + store-path: uploads/file + +# autocode configuration +autocode: + transfer-restart: true + # root 自动适配项目根目录 + # 请不要手动配置,他会在项目加载的时候识别出根路径 + root: "" + server: /server + server-plug: /plugin/%s + server-api: /api/v1/%s + server-initialize: /initialize + server-model: /model/%s + server-request: /model/%s/request/ + server-router: /router/%s + server-service: /service/%s + web: /web/src + web-api: /api + web-form: /view + web-table: /view + +# qiniu configuration (请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址) qiniu: zone: ZoneHuaDong bucket: "" @@ -159,20 +164,17 @@ qiniu: access-key: "" secret-key: "" use-cdn-domains: false -redis: - db: 0 - addr: 127.0.0.1:6379 - password: "" -system: - env: public - addr: 8888 - db-type: mysql - oss-type: local - use-multipoint: false - use-redis: false - iplimit-count: 15000 - iplimit-time: 3600 - router-prefix: "" + +# aliyun oss configuration +aliyun-oss: + endpoint: yourEndpoint + access-key-id: yourAccessKeyId + access-key-secret: yourAccessKeySecret + bucket-name: yourBucketName + bucket-url: yourBucketUrl + base-path: yourBasePath + +# tencent cos configuration tencent-cos: bucket: xxxxx-10005608 region: ap-shanghai @@ -180,24 +182,61 @@ tencent-cos: secret-key: your-secret-key base-url: https://gin.vue.admin path-prefix: github.com/flipped-aurora/gin-vue-admin/server -timer: + +# aws s3 configuration (minio compatible) +aws-s3: + bucket: xxxxx-10005608 + region: ap-shanghai + endpoint: "" + s3-force-path-style: false + disable-ssl: false + secret-id: your-secret-id + secret-key: your-secret-key + base-url: https://gin.vue.admin + path-prefix: github.com/flipped-aurora/gin-vue-admin/server + +# huawei obs configuration +hua-wei-obs: + path: you-path + bucket: you-bucket + endpoint: you-endpoint + access-key: you-access-key + secret-key: you-secret-key + +# excel configuration +excel: + dir: ./resource/excel/ + +# timer task db clear table +Timer: start: true - spec: '@daily' - with_seconds: false + spec: "@daily" # 定时任务详细配置参考 https://pkg.go.dev/github.com/robfig/cron/v3 detail: - - tableName: sys_operation_records - compareField: created_at - interval: 2160h - - tableName: jwt_blacklists - compareField: created_at - interval: 168h -zap: - level: info - prefix: '[github.com/flipped-aurora/gin-vue-admin/server]' - format: console - director: log - encode-level: LowercaseColorLevelEncoder - stacktrace-key: stacktrace - max-age: 0 - show-line: true - log-in-console: true + - tableName: sys_operation_records + compareField: created_at + interval: 2160h + - tableName: jwt_blacklists + compareField: created_at + interval: 168h + +# 跨域配置 +# 需要配合 server/initialize/router.go -> `Router.Use(middleware.CorsByRules())` 使用 +cors: + mode: strict-whitelist # 放行模式: allow-all, 放行全部; whitelist, 白名单模式, 来自白名单内域名的请求添加 cors 头; strict-whitelist 严格白名单模式, 白名单外的请求一律拒绝 + whitelist: + - allow-origin: example1.com + allow-headers: Content-Type,AccessToken,X-CSRF-Token, Authorization, Token,X-Token,X-User-Id + allow-methods: POST, GET + expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type + + allow-credentials: true # 布尔值 + - allow-origin: example2.com + allow-headers: content-type + allow-methods: GET, POST + expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type + allow-credentials: true # 布尔值 + +# added by mohamed hassan to support multi language +language: + language: en + dir: ./resource/lang/ \ No newline at end of file diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue index bceffd0b42..19c499ab54 100644 --- a/web/src/view/login/index.vue +++ b/web/src/view/login/index.vue @@ -133,7 +133,7 @@ - enterDenterSQLitePathBName +