From 56d50d10e944474a092d5acbe53f95bede88ed8c Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 5 Apr 2023 16:04:07 +0800 Subject: [PATCH 1/7] update docker --- docker/copy.sh | 4 ++-- docker/nginx/conf/nginx.conf | 27 ++++++++++++++++----------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/docker/copy.sh b/docker/copy.sh index ec2915b8..318efb26 100644 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -9,8 +9,8 @@ usage() { # copy sql echo "begin copy sql " -cp ../sql/ry_20220814.sql ./mysql/db -cp ../sql/ry_config_20220510.sql ./mysql/db +cp ../sql/ry_20230223.sql ./mysql/db +cp ../sql/ry_config_20220929.sql ./mysql/db # copy html echo "begin copy html " diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index 56bf0ca2..eccee523 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -14,23 +14,28 @@ http { listen 80; server_name localhost; - location / { + location / { root /home/ruoyi/projects/ruoyi-ui; - try_files $uri $uri/ /index.html; + try_files $uri $uri/ /index.html; index index.html index.htm; } - - location /prod-api/{ - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE-HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://ruoyi-gateway:8080/; - } + + location /prod-api/{ + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://ruoyi-gateway:8080/; + } + + # 避免actuator暴露 + if ($request_uri ~ "/actuator") { + return 403; + } error_page 500 502 503 504 /50x.html; location = /50x.html { root html; } } -}# requirepass 123456 \ No newline at end of file +} \ No newline at end of file From 2ad13c9f7283bde4cef1aae86b0713eb94a2af35 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 5 Apr 2023 16:19:47 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=A4=B4=E9=83=A8=E9=A1=B5=E7=AD=BE=E6=BB=9A=E5=8A=A8=E6=9D=A1?= =?UTF-8?q?=E8=A2=AB=E9=9A=90=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98(I6ORT1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/layout/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue index 5e00d642..c7ac8f3c 100644 --- a/ruoyi-ui/src/layout/index.vue +++ b/ruoyi-ui/src/layout/index.vue @@ -78,6 +78,10 @@ export default { height: 100%; } + ::v-deep .el-scrollbar__bar.is-vertical { + z-index: 10; + } + ::v-deep .el-scrollbar__wrap { overflow-x: hidden; } From 7af254ee516adac90e351d4a4d6d1d6d4a58b9cc Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 5 Apr 2023 18:59:31 +0800 Subject: [PATCH 3/7] delete vue-multiselect style --- ruoyi-ui/src/assets/styles/index.scss | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ruoyi-ui/src/assets/styles/index.scss b/ruoyi-ui/src/assets/styles/index.scss index 9f536ae8..44c304fd 100644 --- a/ruoyi-ui/src/assets/styles/index.scss +++ b/ruoyi-ui/src/assets/styles/index.scss @@ -180,12 +180,3 @@ aside { margin-bottom: 10px; } } - -//refine vue-multiselect plugin -.multiselect { - line-height: 16px; -} - -.multiselect--active { - z-index: 1000 !important; -} From 308d497d74193193669ae2bfca79317a0a8a88bb Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 5 Apr 2023 19:00:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5comment=E8=BF=87=E9=95=BF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/generator/GenTableColumnMapper.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 9271ea65..7375f5fe 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -28,23 +28,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column - + - + - + insert into gen_table_column ( table_id, @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" )values( #{tableId}, #{columnName}, - #{columnComment}, + (select SUBSTRING_INDEX(#{columnComment}, ' ', 1)), #{columnType}, #{javaType}, #{javaField}, @@ -88,11 +88,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + update gen_table_column - column_comment = #{columnComment}, + column_comment = (select SUBSTRING_INDEX(#{columnComment}, ' ', 1)), java_type = #{javaType}, java_field = #{javaField}, is_insert = #{isInsert}, @@ -111,14 +111,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from gen_table_column where table_id in + delete from gen_table_column where table_id in #{tableId} - delete from gen_table_column where column_id in + delete from gen_table_column where column_id in #{item.columnId} From 23ae0eb43b46d2ec412603fd6d625ab25c7bbbe5 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 5 Apr 2023 19:02:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtab=E6=A0=8F=E2=80=9D?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=85=B6=E4=BB=96=E2=80=9C=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/components/IconSelect/index.vue | 2 +- ruoyi-ui/src/views/system/menu/index.vue | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/ruoyi-ui/src/components/IconSelect/index.vue index a7512b2d..20a5d1a8 100644 --- a/ruoyi-ui/src/components/IconSelect/index.vue +++ b/ruoyi-ui/src/components/IconSelect/index.vue @@ -1,7 +1,7 @@