diff --git a/adc-da-main/target/classes/application-dev.properties b/adc-da-main/target/classes/application-dev.properties index b53670e..4231dbe 100644 --- a/adc-da-main/target/classes/application-dev.properties +++ b/adc-da-main/target/classes/application-dev.properties @@ -35,7 +35,7 @@ #spring.datasource.mysql.password = root spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true spring.datasource.username = root spring.datasource.password = hzwlsoft.com @@ -86,11 +86,6 @@ MAIL_POP_PORT=110 #MAIL_USERNAME=64459@Any3.com #MAIL_PASSWORD=65316975Xiaoq - - - - - IPANDPORT=http://localhost:7061/ #redis @@ -133,10 +128,8 @@ huawei.OBS.fileMaxSize=10 #文件上传最大M数 logging.level.com.adc: debug - -# ======= ddm权限接口 集成 ========= -ddm-identity=changan_test -ddm-company=9 -ddm-ras-public-key= - +# ==== IAM???? +iam.url=https://iamuat.faw-vw.com/ +iam.appkey=xxxx +iam.appSecret=xxx diff --git a/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class b/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class index a36de78..8602114 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class and b/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class index 3f65627..17d325f 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class and b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class differ diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml index 00363a0..20c9ba3 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml @@ -162,4 +162,13 @@ ORDER BY year DESC + + + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java index 719f31a..8ad346f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java @@ -3,11 +3,7 @@ package com.adc.da.sys.service.iservice; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.vo.UserImportVO; import com.adc.da.sys.vo.UserVO; -import com.adc.da.sys.vo.ddm.DdmUserQueryVO; -import com.adc.da.sys.vo.ddm.DdmUserVO; -import com.adc.da.util.http.PageInfo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -25,13 +21,13 @@ public interface IUserEoService { */ UserEO getUserByLoginName(String userName,String usid); - /** - * 根据邮箱和id查询用户数量 - * @param email - * @param usid - * @return - */ - int getUserCountByEmail(String email,String usid); +// /** +// * 根据邮箱和id查询用户数量 +// * @param email +// * @param usid +// * @return +// */ +// int getUserCountByEmail(String email,String usid); /** * 新增或者编辑用户 @@ -55,13 +51,10 @@ public interface IUserEoService { UserEO getUserByLoginNameNotDeleted(String userName); - public PageInfo getUserPage(DdmUserQueryVO query); + public void importExcelUser(List list); List> allList(String account, String roleName); - List getUserByMail(List mailList); - - List getUserByAccount(List mailList); } diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index f73f130..1423e56 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class and b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class b/adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class index b10b21c..ecec66a 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class and b/adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class differ diff --git a/adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml b/adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml index 02aee34..2399ffb 100644 --- a/adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml +++ b/adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml @@ -6,43 +6,6 @@ - - - - com.adc.da.sys.entity.RoleEO - com.adc.da.sys.vo.ddm.DdmRoleVO - - - - id - rid - - - name - roleName - - - name - roleCode - - - remarks - rdesc - - - delFlag - enabled - - - menuEOIdList - menusstr - - - menuEOList - menus - - - com.adc.da.sys.entity.MenuEO