From bda7690807e1d49870d389135d0f38e141563e80 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 31 Jul 2021 22:29:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 12 ++++++------ .../adc/da/slrs/sarResource/dao/TsResourceDao.java | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 4bed6d78..30cd07d5 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://10.96.10.171:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false #spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root @@ -14,10 +14,10 @@ spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== -##Eruept -#eureka.client.allow-redirects=true -#eureka.client.register-with-eureka=true -#eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +#Eruept +eureka.client.allow-redirects=true +eureka.client.register-with-eureka=true +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ #============================================== # 邮箱配置1 @@ -64,4 +64,4 @@ OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/ # OCR文件请求下载或在线预览时URL OCR.ocrDownPath=http://106.2.13.189:8089/downfile/ OCR.times=20 -OCR.convertType=BOTH \ No newline at end of file +OCR.convertType=BOTH diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java index 335a7986..de959ae0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarResource.dao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; import java.util.List; /** @@ -19,4 +20,6 @@ public interface TsResourceDao extends BaseMapper { List selectMenuByRole(TsResource sarMenuEO); + int insertTsRoleResource(HashMap map); + } From d83c7359da755d43c32bfcb6193ed1e6c917a1ad Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 2 Aug 2021 10:58:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E9=9D=9E=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E8=8F=9C=E5=8D=95=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=A1=A8=20=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarStandMenu/entity/SarStandMenu.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java index d0529ecd..b10b9a78 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java @@ -45,13 +45,16 @@ public class SarStandMenu extends BaseEntity { @TableField("VALID_FLAG") private Integer validFlag; - @Transient + @TableField(exist = false) private String oldMenuId; - @Transient + + @TableField(exist = false) private String standType; - @Transient + + @TableField(exist = false) private String[] idlist; - @Transient + + @TableField(exist = false) private List menuIds; From 4148f1bf6b4d62f2d54cde6058b65aafa6136ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Mon, 2 Aug 2021 05:38:46 +0000 Subject: [PATCH 3/4] Update application.properties --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 3512876a..98a129a5 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -39,7 +39,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 From 2344ccfda29d397892231dc72c07218eaac652a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Mon, 2 Aug 2021 05:40:33 +0000 Subject: [PATCH 4/4] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 30cd07d5..a21e301a 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://10.96.10.171:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false #spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root @@ -17,7 +17,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ #============================================== # 邮箱配置1