From 4362e8df8b7a9a3eb2b1a69a7053e88bc03a7a13 Mon Sep 17 00:00:00 2001 From: zhuoda Date: Tue, 3 Sep 2024 22:35:00 +0800 Subject: [PATCH] =?UTF-8?q?v3.6.0=20=E4=B8=89=E7=BA=A7=E7=AD=89=E4=BF=9D?= =?UTF-8?q?=E9=87=8D=E7=A3=85=E6=9B=B4=E6=96=B0=EF=BC=9A1=E3=80=81?= =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E5=8F=8C=E5=9B=A0=E5=AD=90?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E7=99=BB=E5=BD=95=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E5=AE=9A=E6=9C=9F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81;3=E3=80=81=E3=80=90=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=91=E6=9C=80=E5=A4=A7=E6=B4=BB=E8=B7=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4;4=E3=80=81=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?= =?UTF-8?q?=E6=95=8F=E6=84=9F=E6=95=B0=E6=8D=AE=E8=84=B1=E6=95=8F;5?= =?UTF-8?q?=E3=80=81=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=94=81=E5=AE=9A=E9=85=8D=E7=BD=AE;6=E3=80=81=E3=80=90?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=91=E5=AF=86=E7=A0=81=E5=A4=8D=E6=9D=82?= =?UTF-8?q?=E5=BA=A6=E9=85=8D=E7=BD=AE;7=E3=80=81=E3=80=90=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=91=E4=B8=89=E7=BA=A7=E7=AD=89=E4=BF=9D=E5=8F=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/support/reload/ReloadCommand.java | 1 - .../src/main/resources/dev/sa-base.yaml | 20 +- .../src/main/resources/pre/sa-base.yaml | 22 +- .../src/main/resources/prod/sa-base.yaml | 12 +- .../src/main/resources/test/sa-base.yaml | 20 +- .../javascript-ant-design-vue3/.env.test | 2 +- .../src/constants/local-storage-key-const.js | 2 - .../header-message-detail-modal.vue | 5 +- .../header-user-space/header-message.vue | 333 +++++++++--------- .../components/header-user-space/index.vue | 12 - .../src/store/modules/system/user.js | 1 - .../form/code-generator-table-config-form.vue | 14 +- .../preview/code-generator-preview-modal.vue | 14 +- .../components/employee-list/index.vue | 1 + smart_admin_v3.sql | 285 ++++++++------- 15 files changed, 363 insertions(+), 381 deletions(-) diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java index c37cfa6f..7b73fed7 100644 --- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java +++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java @@ -8,7 +8,6 @@ import net.lab1024.sa.base.module.support.reload.dao.ReloadItemDao; import net.lab1024.sa.base.module.support.reload.dao.ReloadResultDao; import net.lab1024.sa.base.module.support.reload.domain.ReloadItemEntity; import net.lab1024.sa.base.module.support.reload.domain.ReloadResultEntity; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml b/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml index 5dacafb1..3cde2409 100644 --- a/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml +++ b/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml @@ -1,16 +1,16 @@ spring: # 数据库连接信息 datasource: - url: jdbc:p6spy:mysql://47.96.105.74:11024/smart_admin_v3_dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai + url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai username: root - password: 11024Lab + password: SmartAdmin666 + driver-class-name: com.p6spy.engine.spy.P6SpyDriver initial-size: 2 min-idle: 2 max-active: 10 max-wait: 60000 time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 - driver-class-name: com.p6spy.engine.spy.P6SpyDriver filters: stat druid: username: druid @@ -22,10 +22,10 @@ spring: # redis 连接池配置信息 redis: - database: 7 - host: 47.96.105.74 - port: 6666 - password: ASDasd123 + database: 1 + host: 127.0.0.1 + port: 6379 + password: timeout: 10000ms lettuce: pool: @@ -39,7 +39,7 @@ spring: host: smtp.163.com port: 465 username: lab1024@163.com - password: ROIMSIQCEXHTQFTA + password: ROIASDFJKHQFTA properties: mail: smtp: @@ -87,8 +87,8 @@ file: region: oss-cn-hangzhou endpoint: oss-cn-hangzhou.aliyuncs.com bucket-name: 1024lab-smart-admin - access-key: LTAI5tBAbehjXWyAqLhc58e1 - secret-key: asX6ZWutaoTbQL3GxsFs24CmfAcYu3 + access-key: + secret-key: url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/ private-url-expire-seconds: 3600 diff --git a/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml b/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml index 5dacafb1..13718676 100644 --- a/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml +++ b/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml @@ -1,16 +1,16 @@ spring: # 数据库连接信息 datasource: - url: jdbc:p6spy:mysql://47.96.105.74:11024/smart_admin_v3_dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai + url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai username: root - password: 11024Lab + password: SmartAdmin666 + driver-class-name: com.p6spy.engine.spy.P6SpyDriver initial-size: 2 min-idle: 2 max-active: 10 max-wait: 60000 time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 - driver-class-name: com.p6spy.engine.spy.P6SpyDriver filters: stat druid: username: druid @@ -22,10 +22,10 @@ spring: # redis 连接池配置信息 redis: - database: 7 - host: 47.96.105.74 - port: 6666 - password: ASDasd123 + database: 1 + host: 127.0.0.1 + port: 6379 + password: timeout: 10000ms lettuce: pool: @@ -39,7 +39,7 @@ spring: host: smtp.163.com port: 465 username: lab1024@163.com - password: ROIMSIQCEXHTQFTA + password: ROIASDFJKHQFTA properties: mail: smtp: @@ -87,8 +87,8 @@ file: region: oss-cn-hangzhou endpoint: oss-cn-hangzhou.aliyuncs.com bucket-name: 1024lab-smart-admin - access-key: LTAI5tBAbehjXWyAqLhc58e1 - secret-key: asX6ZWutaoTbQL3GxsFs24CmfAcYu3 + access-key: + secret-key: url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/ private-url-expire-seconds: 3600 @@ -104,7 +104,7 @@ springdoc: knife4j: enable: true basic: - enable: false + enable: true username: api # Basic认证用户名 password: 1024 # Basic认证密码 diff --git a/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml index af8fa98d..1644a5d4 100644 --- a/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml +++ b/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml @@ -3,14 +3,14 @@ spring: datasource: url: jdbc:mysql://127.0.0.1:3306/smart_admin_v3_dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai username: root - password: Zhuoda#1024lab + password: SmartAdmin666 + driver-class-name: com.mysql.cj.jdbc.Driver initial-size: 10 min-idle: 10 max-active: 100 max-wait: 60000 time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 - driver-class-name: com.mysql.cj.jdbc.Driver filters: stat druid: username: druid @@ -38,7 +38,7 @@ spring: host: smtp.163.com port: 465 username: lab1024@163.com - password: 1024lab + password: ROIASDFJKHQFTA properties: mail: smtp: @@ -84,9 +84,9 @@ file: upload-path: /home/smart_admin_v3/upload/ #文件上传目录 url-prefix: cloud: - region: oss-cn-qingdao - endpoint: oss-cn-qingdao.aliyuncs.com - bucket-name: common + region: oss-cn-hangzhou + endpoint: oss-cn-hangzhou.aliyuncs.com + bucket-name: 1024lab-smart-admin access-key: secret-key: url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/ diff --git a/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml b/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml index 5dacafb1..3cde2409 100644 --- a/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml +++ b/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml @@ -1,16 +1,16 @@ spring: # 数据库连接信息 datasource: - url: jdbc:p6spy:mysql://47.96.105.74:11024/smart_admin_v3_dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai + url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai username: root - password: 11024Lab + password: SmartAdmin666 + driver-class-name: com.p6spy.engine.spy.P6SpyDriver initial-size: 2 min-idle: 2 max-active: 10 max-wait: 60000 time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 - driver-class-name: com.p6spy.engine.spy.P6SpyDriver filters: stat druid: username: druid @@ -22,10 +22,10 @@ spring: # redis 连接池配置信息 redis: - database: 7 - host: 47.96.105.74 - port: 6666 - password: ASDasd123 + database: 1 + host: 127.0.0.1 + port: 6379 + password: timeout: 10000ms lettuce: pool: @@ -39,7 +39,7 @@ spring: host: smtp.163.com port: 465 username: lab1024@163.com - password: ROIMSIQCEXHTQFTA + password: ROIASDFJKHQFTA properties: mail: smtp: @@ -87,8 +87,8 @@ file: region: oss-cn-hangzhou endpoint: oss-cn-hangzhou.aliyuncs.com bucket-name: 1024lab-smart-admin - access-key: LTAI5tBAbehjXWyAqLhc58e1 - secret-key: asX6ZWutaoTbQL3GxsFs24CmfAcYu3 + access-key: + secret-key: url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/ private-url-expire-seconds: 3600 diff --git a/smart-admin-web/javascript-ant-design-vue3/.env.test b/smart-admin-web/javascript-ant-design-vue3/.env.test index aba8cd5c..66243b33 100644 --- a/smart-admin-web/javascript-ant-design-vue3/.env.test +++ b/smart-admin-web/javascript-ant-design-vue3/.env.test @@ -1,3 +1,3 @@ NODE_ENV=production VITE_APP_TITLE='SmartAdmin 测试环境(Test)' -VITE_APP_API_URL='http://smartadmin.dev.1024lab.net/sa-api' +VITE_APP_API_URL='http://127.0.0.1:1024' diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/local-storage-key-const.js b/smart-admin-web/javascript-ant-design-vue3/src/constants/local-storage-key-const.js index 98ece9a1..b48a1f6c 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/constants/local-storage-key-const.js +++ b/smart-admin-web/javascript-ant-design-vue3/src/constants/local-storage-key-const.js @@ -18,8 +18,6 @@ const KEY_PREFIX = 'smart_admin_'; export default { // 用户token USER_TOKEN: `${KEY_PREFIX}user_token`, - // 用户信息 - USER_INFO: `${KEY_PREFIX}user_info`, // 用户权限点 USER_POINTS: `${KEY_PREFIX}user_points`, // 用户的tag列表 diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue index 69164b5b..3e0e7a35 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue @@ -1,5 +1,5 @@ diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue index cedaa547..96e4cbe9 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue @@ -10,13 +10,6 @@