From c1e020a2867b5529b538cf88b81b2d87b36d878b Mon Sep 17 00:00:00 2001 From: congqing <1024@cong.zone> Date: Wed, 28 Jun 2023 23:28:19 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=B0=86master=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E4=B8=ADpg=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=94=B9=E4=B8=BAmaster?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-local.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index cdc1d3fde..10ef869c2 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -47,7 +47,7 @@ spring: name: ruoyi-vue-pro url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 - # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 + # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 username: root From 1b558a02b0e5e55a900996ea67a702caf3a623ed Mon Sep 17 00:00:00 2001 From: congqing <1024@cong.zone> Date: Sun, 2 Jul 2023 01:33:59 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmember=5Fuser=20pg?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=B8=AD=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E5=AF=BC=E8=87=B4=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/postgresql/ruoyi-vue-pro.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sql/postgresql/ruoyi-vue-pro.sql b/sql/postgresql/ruoyi-vue-pro.sql index 3160f2021..5b18be16e 100644 --- a/sql/postgresql/ruoyi-vue-pro.sql +++ b/sql/postgresql/ruoyi-vue-pro.sql @@ -1487,13 +1487,13 @@ COMMIT; DROP TABLE IF EXISTS "member_user"; CREATE TABLE "member_user" ( "id" int8 NOT NULL, - "nickname" varchar(30) COLLATE "pg_catalog"."default" NOT NULL, - "avatar" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, + "nickname" varchar(30) COLLATE "pg_catalog"."default" NOT NULL DEFAULT '', + "avatar" varchar(255) COLLATE "pg_catalog"."default" NOT NULL DEFAULT '', "status" int2 NOT NULL, "mobile" varchar(11) COLLATE "pg_catalog"."default" NOT NULL, - "password" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, + "password" varchar(100) COLLATE "pg_catalog"."default" NOT NULL DEFAULT '', "register_ip" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, - "login_ip" varchar(50) COLLATE "pg_catalog"."default", + "login_ip" varchar(50) COLLATE "pg_catalog"."default" DEFAULT '', "login_date" timestamp(6), "creator" varchar(64) COLLATE "pg_catalog"."default", "create_time" timestamp(6) NOT NULL, @@ -4239,7 +4239,7 @@ CREATE TABLE "system_notify_message" ( "template_content" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL, "template_type" int4 NOT NULL, "template_params" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, - "read_status"" bool NOT NULL, + "read_status" bool NOT NULL, "read_time" timestamp(6), "creator" varchar(64) COLLATE "pg_catalog"."default", "create_time" timestamp(6) NOT NULL, From 0fa3ed94210a40131bf660004900694b3abb340c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=A4=E9=B7=B9?= <121013343@qq.com> Date: Mon, 10 Jul 2023 08:09:40 +0000 Subject: [PATCH 03/12] update yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 赤鷹 <121013343@qq.com> --- .../src/main/resources/codegen/vue3/views/form.vue.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm index 6604263ea..4e23f2f08 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm @@ -39,7 +39,7 @@ #elseif($column.htmlType == "editor")## 文本编辑器 - + #elseif($column.htmlType == "select")## 下拉框 From 01343754019dcd9b1a6cea0f5eb13f65d5ccbc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=A4=E9=B7=B9?= <121013343@qq.com> Date: Mon, 10 Jul 2023 08:23:58 +0000 Subject: [PATCH 04/12] update yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 赤鷹 <121013343@qq.com> --- .../main/resources/codegen/vue3/views/index.vue.vm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm index 58bc69bc7..1e98abe13 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm @@ -119,8 +119,9 @@ - - #foreach($column in $columns) + + + #foreach($column in $columns) #if ($column.listOperationResult) #set ($dictType=$column.dictType) #set ($javaField = $column.javaField) @@ -132,19 +133,20 @@ align="center" prop="${javaField}" :formatter="dateFormatter" + width="150px" /> #elseif("" != $column.dictType)## 数据字典 - + #else - + #end #end #end - +