From 9b53881b40861128f95a274f5b7114330981d994 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Sun, 27 Sep 2020 20:01:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B5=84=E6=BA=90=E5=90=8E?= =?UTF-8?q?=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 35 ---------- .../financial/crms/CustomerControllerApi.java | 2 - .../impl/CustomerLoginServiceImpl.java | 2 +- .../src/main/resources/bootstrap.properties | 6 +- .../mapper/crmsauth/CustomerLoginMapper.xml | 2 +- .../target/classes/bootstrap.properties | 19 ++++++ .../DqFinancialCrmsAuthApplication.class | Bin 0 -> 1077 bytes .../crauth/config/AuthorizationServer.class | Bin 0 -> 6455 bytes .../crauth/config/SecurityConfig.class | Bin 0 -> 3713 bytes .../financial/crauth/config/TokenConfig.class | Bin 0 -> 716 bytes .../controller/CustomerLoginController.class | Bin 0 -> 929 bytes .../crauth/dao/CustomerLoginDao.class | Bin 0 -> 357 bytes .../crauth/service/CustomerLoginService.class | Bin 0 -> 157 bytes .../impl/CustomerLoginServiceImpl.class | Bin 0 -> 2402 bytes .../target/classes/logback-spring.xml | 47 ++++++++++++++ .../mapper/crmsauth/CustomerLoginMapper.xml | 10 +++ .../DqFinancialCrmsAuthApplicationTests.class | Bin 0 -> 586 bytes .../financial/crms/config/CorsConfig.java | 33 ++++++++++ .../crms/controller/CustomerController.java | 33 ++++++---- .../financial/crms/dao/CustomerDao.java | 2 +- .../service/impl/CustomerServiceImpl.java | 61 ++++++++++++------ .../mapper/crms/CompanyCustomerDao.xml | 4 +- .../resources/mapper/crms/CustomerDao.xml | 6 +- .../mapper/crms/PersonalCustomerDao.xml | 4 +- .../META-INF/dq-financial-crms.kotlin_module | Bin 0 -> 16 bytes .../crms/DqFinancialCrmsApplication.class | Bin 0 -> 1059 bytes .../financial/crms/config/CorsConfig.class | Bin 0 -> 1478 bytes .../financial/crms/config/IPageConfig.class | Bin 0 -> 715 bytes .../crms/controller/CustomerController.class | Bin 0 -> 6241 bytes .../crms/dao/CompanyCustomerDao.class | Bin 0 -> 748 bytes .../financial/crms/dao/CustomerDao.class | Bin 0 -> 1660 bytes .../crms/dao/PersonalCustomerDao.class | Bin 0 -> 757 bytes .../crms/feign/HrmsFeignService.class | Bin 0 -> 1669 bytes .../crms/service/CustomerService.class | Bin 0 -> 1557 bytes .../service/impl/CustomerServiceImpl.class | Bin 0 -> 21097 bytes .../mapper/crms/CompanyCustomerDao.xml | 4 +- .../classes/mapper/crms/CustomerDao.xml | 6 +- .../mapper/crms/PersonalCustomerDao.xml | 4 +- .../DqFinancialCrmsApplicationTests.class | Bin 0 -> 2800 bytes .../financial/hrms/config/CorsConfig.java | 33 ++++++++++ .../financial/hrms/service/DeptService.java | 2 + .../hrms/service/impl/DeptServiceImpl.java | 6 +- .../financial/hrms/config/CorsConfig.class | Bin 0 -> 1478 bytes .../hrms/controller/EmployeeController.class | Bin 4184 -> 4262 bytes .../framework/model/response/CommonCode.java | 4 ++ .../model/response/PromptSuccess.java | 32 +++++++++ .../model/response/ResponseResult.java | 4 ++ .../framework/model/response/CommonCode.class | Bin 2745 -> 3120 bytes .../model/response/PromptSuccess.class | Bin 0 -> 722 bytes .../model/response/ResponseResult.class | Bin 4428 -> 4579 bytes .../domain/crms/PersonalCustomerEntity.java | 6 +- .../domain/crms/ext/CustomerCompanyTO.java | 1 + .../domain/crms/ext/CustomerPersonalVO.java | 6 +- .../framework/domain/crms/ext/CustomerTO.java | 2 - .../domain/crms/request/CustomerRequest.java | 6 ++ .../framework/domain/hrms/ext/EmployeeVO.java | 2 - .../domain/crms/PersonalCustomerEntity.class | Bin 8305 -> 8305 bytes .../domain/crms/ext/CustomerCompanyTO.class | Bin 2290 -> 2290 bytes .../domain/crms/ext/CustomerPersonalVO.class | Bin 10355 -> 10419 bytes .../domain/crms/ext/CustomerTO.class | Bin 3934 -> 3934 bytes .../domain/crms/ext/ManagerName.class | Bin 0 -> 1374 bytes .../domain/crms/request/CustomerRequest.class | Bin 3090 -> 3283 bytes .../domain/crms/response/CrmsCode.class | Bin 0 -> 2585 bytes .../domain/hrms/ext/EmployeeVO.class | Bin 1823 -> 1823 bytes .../daqing/framework/utils/PageUtils.class | Bin 2369 -> 2369 bytes .../com/daqing/framework/utils/Query.class | Bin 2748 -> 2261 bytes .../src/main/resources/application.yml | 19 +++++- .../META-INF/dq-govern-gateway.kotlin_module | Bin 0 -> 16 bytes .../target/classes/application.yml | 34 ++++++++++ .../target/classes/bootstrap.properties | 9 +++ .../target/classes/jwt.properties | 1 + 71 files changed, 344 insertions(+), 103 deletions(-) delete mode 100644 .gitignore create mode 100644 dq-financial-crms-auth/target/classes/bootstrap.properties create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplication.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/AuthorizationServer.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/SecurityConfig.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/TokenConfig.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/controller/CustomerLoginController.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/dao/CustomerLoginDao.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/CustomerLoginService.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.class create mode 100644 dq-financial-crms-auth/target/classes/logback-spring.xml create mode 100644 dq-financial-crms-auth/target/classes/mapper/crmsauth/CustomerLoginMapper.xml create mode 100644 dq-financial-crms-auth/target/test-classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplicationTests.class create mode 100644 dq-financial-crms/src/main/java/com/daqing/financial/crms/config/CorsConfig.java create mode 100644 dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class create mode 100644 dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class create mode 100644 dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java create mode 100644 dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java create mode 100644 dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class create mode 100644 dq-govern-gateway/target/classes/META-INF/dq-govern-gateway.kotlin_module create mode 100644 dq-govern-gateway/target/classes/application.yml create mode 100644 dq-govern-gateway/target/classes/bootstrap.properties create mode 100644 dq-govern-gateway/target/classes/jwt.properties diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c85ae303..00000000 --- a/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -target/ -logs/ -.mvn/ -mvnw -mvnw.cmd -!**/src/main/** -!**/src/test/** - -src/main/resources/docs/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ - -### VS Code ### -.vscode/ diff --git a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java index 20f60a65..6f35451c 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java @@ -10,8 +10,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; /** * @Author: gongsj. diff --git a/dq-financial-crms-auth/src/main/java/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.java b/dq-financial-crms-auth/src/main/java/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.java index 9c564a85..dfda02ee 100644 --- a/dq-financial-crms-auth/src/main/java/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.java +++ b/dq-financial-crms-auth/src/main/java/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.java @@ -32,7 +32,7 @@ public class CustomerLoginServiceImpl implements CustomerLoginService, UserDetai List authorities = new ArrayList<>(); authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN")); System.out.println(customer); - UserDetails userDetails = new User(customer.getCode(),new BCryptPasswordEncoder().encode(customer.getPassword()),authorities); + UserDetails userDetails = new User(customer.getPhone(),new BCryptPasswordEncoder().encode(customer.getPassword()),authorities); return userDetails; } diff --git a/dq-financial-crms-auth/src/main/resources/bootstrap.properties b/dq-financial-crms-auth/src/main/resources/bootstrap.properties index 160ddf8b..3e67ab07 100644 --- a/dq-financial-crms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-crms-auth/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ -#服务名称 -spring.application.name=dq-financial-crms -#配置中心地址 +#锟斤拷锟斤拷锟斤拷锟斤拷 +spring.application.name=dq-financial-crms-auth +#锟斤拷锟斤拷锟斤拷锟侥碉拷址 spring.cloud.nacos.config.server-addr=192.168.31.142:8848 spring.cloud.nacos.config.namespace=37d72d30-3178-4173-8b5e-269a23355ed9 #spring.cloud.nacos.config.group=prod diff --git a/dq-financial-crms-auth/src/main/resources/mapper/crmsauth/CustomerLoginMapper.xml b/dq-financial-crms-auth/src/main/resources/mapper/crmsauth/CustomerLoginMapper.xml index 13e9de18..ac1cc76d 100644 --- a/dq-financial-crms-auth/src/main/resources/mapper/crmsauth/CustomerLoginMapper.xml +++ b/dq-financial-crms-auth/src/main/resources/mapper/crmsauth/CustomerLoginMapper.xml @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/dq-financial-crms-auth/target/classes/bootstrap.properties b/dq-financial-crms-auth/target/classes/bootstrap.properties new file mode 100644 index 00000000..160ddf8b --- /dev/null +++ b/dq-financial-crms-auth/target/classes/bootstrap.properties @@ -0,0 +1,19 @@ + +#服务名称 +spring.application.name=dq-financial-crms +#配置中心地址 +spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.namespace=37d72d30-3178-4173-8b5e-269a23355ed9 +#spring.cloud.nacos.config.group=prod + +spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +spring.cloud.nacos.config.ext-config[0].group=dev +spring.cloud.nacos.config.ext-config[0].refresh=true + +spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +spring.cloud.nacos.config.ext-config[1].group=dev +spring.cloud.nacos.config.ext-config[1].refresh=true + +spring.cloud.nacos.config.ext-config[2].data-id=other.yml +spring.cloud.nacos.config.ext-config[2].group=dev +spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplication.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..63b951973efc44ed8465d5b489a1eb52e5d71396 GIT binary patch literal 1077 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 literal 0 HcmV?d00001 diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/TokenConfig.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/TokenConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..5e113698a4c88c5c2fb6ffa9799e55bff399a792 GIT binary patch literal 716 zcmbV~%SuBr5QhKM+SYoh_si0q3K}WmMiEpH#HyfDaG9Q_HMJ+voSdp}r7Jex+tUkxHOv;#kI6iyipcnLI*%EK+@{jXZ87vMELIt^yQVG~ zN)@H$Q5x5zJrlJyWyUKe678z6%E!HA)?KKCVYL#OnAgR%(oNn_TIfiLHjk`G-35<~ zZm1?dGnZ2D27iO0=zMtUj3xH=!eYhPCQq&`5gJy+^2XRpp2#S*%H46}L1lhrO-I$G z<)OJt3q8kEdlwY-cDM4k)zdtF2HqBQRmZiK zj2z~XrI+Eq4Cp~1Pqsi2r<2jyzw`+95PlDk&4pwMMe>Kb1sEg`@#1HT#o literal 0 HcmV?d00001 diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/controller/CustomerLoginController.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/controller/CustomerLoginController.class new file mode 100644 index 0000000000000000000000000000000000000000..8d4b500dbf1aa1cd6abe2d94f05bfd4ce9c0c1b8 GIT binary patch literal 929 zcmbtS%We}f6g}=FnGn*nq~#GPuU(4--V_N5RDmJ^i{YULWy8wjxT%ZBPHj*7Td+c6 z!3XeBRqr$}xybJK72>wJ=^osHfZqdf1IA-Y2O%#F3}&+<2rZUjjVq9Rr!?O8o1I+^-@=Fxb}zsA62a~Jh|{y+f>@Q=ld7xeo5@J z{ySXGPo<3pQie4A97X-LGR84%{ojlkmd^(IF5go!;y!BhA*+>uej-vjn-p=fjBNeE zSFkVSEZ`EIjgw>tE%Mt_04|dU@)yw|R7HMBQAJL=3!ll%Q&;Aw$tiV-FdZT+)4uW% nETBu?%5UV7U*&p#kz1X~U8NGPofL8%)n#3ZZ;}or_7Xc^Z5k;S8$ZUG=oD0(~9Cv-$iy56fDm2HNK&4&{ujDgZ0(?JU8rgiLWB` zb3jM$9A0$E4z1TFxK0lS3mkG(iKda|7@8oKtLBSyxZ(C8Zq1X@tqTwNFQ&DT(+$?Zwa+ltF)0+QE z9j8oX#ur%DBVAQNUhjDRqSOMn@~*BrW%2KGtS&2o3wh61Yqe@g1@|Pi2@L18D=S4Ac;>sgn22^gs?T=B z6RO~;=PJjm?p0cW6=Kc`8MI`$qGkC$cQ4e<=o5y(`b7S*d@7xaq^k;%0hms;MH?!& z7I;zJadn`a8YPrfB)v-L7-@^~oND?ED;7TdvTX7X<0Wvj1=o>Z%epE(pW&*8M|g6K zO;o4&0TV+_Lp(*#48Bf%N~va!|P7L zgi0+3(vMV`$;;xPyQ!TBQ{ihmTGBPYe3Y{SH#*^H*Lhj6J1ROvCXj2}kWNZH zU!NFjCx;Dq@HnUAbncervOvrBI4J29v+qQx3iU8jRW@>6W5CAZ4&Z5LgH1DH>r}GJ z0*-5@by>hNS4ULw|3eY&Vp~1Fvd#gKjg)@d*wsF}!01G(U8^;oJX}0#hel zliig;K|QIFso43CGqZUa2;4cjy}A1GzIdh4E3&#$VN&zzOs9%?hZp}Sx-f=|5Txud zq~m-V^paj8?ILCK;dq5#4yhpRncRo?wZVRqquC4|ev6|WZ@}9W4$j}jRdhEF|Aij@ zfR)ML(RJ+wy1TG?fW+25de){7(7QEk?W6An`n&MpHzcQ?W8eVx7U?So805AKoDMz5 ztJC`!zMU9P{6b;fFa}(r384A`svV)?t5iG5aS87?jGBoRH;tkRc#j;WH=i{h;6tJu w;p=AtDau>oe-hXD3Ywx!11IK9bNxD35?pa`gR>q%F~&tV8{@4b$9)9+3)YCuUH||9 literal 0 HcmV?d00001 diff --git a/dq-financial-crms-auth/target/classes/logback-spring.xml b/dq-financial-crms-auth/target/classes/logback-spring.xml new file mode 100644 index 00000000..9d44c6c1 --- /dev/null +++ b/dq-financial-crms-auth/target/classes/logback-spring.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + utf8 + + + + + + + + ${LOG_HOME}/crms_auth.%d{yyyy-MM-dd}.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + 0 + + 512 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-crms-auth/target/classes/mapper/crmsauth/CustomerLoginMapper.xml b/dq-financial-crms-auth/target/classes/mapper/crmsauth/CustomerLoginMapper.xml new file mode 100644 index 00000000..ac1cc76d --- /dev/null +++ b/dq-financial-crms-auth/target/classes/mapper/crmsauth/CustomerLoginMapper.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/dq-financial-crms-auth/target/test-classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplicationTests.class b/dq-financial-crms-auth/target/test-classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplicationTests.class new file mode 100644 index 0000000000000000000000000000000000000000..d5a57e61ad9c115d1177e58d0e9e5b672bc35f11 GIT binary patch literal 586 zcmbtRO-lnY5S?s4R@>Fq>cyMKs$eeSMN!sDPm6*ry=T+3P2Ek}Y*zhSo&*p60DqJ? zNh=6m1Ov%rUgo`dNj^T`-T~kg_8L%uoe(-9>=LM7NG0thflBvqM4;N!V?m&mNF{E| zJQZfh(hQMKqB+Y(%t)87!K$6ff*}`qEkL{-NW^oINrEXI`pU7<4`{EEiAOJkV5YOD!tXwJAFA71xOSh7nYuM&Rn7 z*T$?z;P list = customerService.updateCustomerById(ids); + if (list == null){ + return new ResponseResult(CommonCode.INVALID_PARAM); + }else if (Objects.equals(list.get(0),PromptSuccess.getDeleteSuccess())){ + return ResponseResult.SUCCESS(); + }else if (Objects.equals(list.get(0),PromptSuccess.getDeleteFail())){ + return new ResponseResult(CommonCode.DELETE_FAIL); + } + else { + return new ResponseResult>().SUCCESS_DATA(list); + } - return new ResponseResult>().SUCCESS(customerService.updateCustomerById(ids)); } /** * 淇濆瓨涓汉绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/savePersonal") - @Override public ResponseResult savePersonal(@RequestBody CustomerPersonalTO customerPersonalTO) { boolean result = customerService.saveCustomerPersonal(customerPersonalTO.getCustomerEntity(), customerPersonalTO.getPersonalCustomerEntity()); - return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } /** * 淇濆瓨浼佷笟绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/saveCompany") - @Override + @ApiOperation(value = "淇濆瓨浼佷笟绫诲瀷瀹㈡埛淇℃伅", response = CustomerCompanyTO.class) public ResponseResult saveCompany(@RequestBody CustomerCompanyTO customerCompanyTO) { boolean result = customerService.saveCustomerCompany(customerCompanyTO.getCustomerEntity(), customerCompanyTO.getCompanyCustomerEntity()); - return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } /** * 鏇存柊涓汉绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/updatePersonal") - @Override public ResponseResult updatePersonal(@RequestBody CustomerPersonalTO customerPersonalTO) { boolean result = customerService.updateCustomerPersonal(customerPersonalTO.getCustomerEntity(), customerPersonalTO.getPersonalCustomerEntity()); - return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL); } /** * 鏇存柊浼佷笟绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/updateCompany") - @Override public ResponseResult updateCompany(@RequestBody CustomerCompanyTO customerCompanyTO) { boolean result = customerService.updateCustomerCompany(customerCompanyTO.getCustomerEntity(), customerCompanyTO.getCompanyCustomerEntity()); - return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL); } /** * 瀵煎嚭鏁版嵁鍒癳xcel */ - @Override @GetMapping("/excelExport") public void excelExportCustomer(HttpServletResponse response){ @@ -123,7 +132,6 @@ public class CustomerController implements CustomerControllerApi { /** * 瀵煎嚭excel妯℃澘 */ - @Override @GetMapping("/excelTemplate") public void excelTemplate(HttpServletResponse response){ @@ -134,7 +142,6 @@ public class CustomerController implements CustomerControllerApi { * 瀵煎叆excel鏁版嵁 */ @PostMapping("/excelImport") - @Override public void excelImportCustomer(MultipartFile file){ customerService.excelImportCustomer(file); diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java index cfc687d1..f8e8585f 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java @@ -25,7 +25,7 @@ public interface CustomerDao extends BaseMapper { CustomerEntity queryCustomerById(Long id); - void updateCustomerById(@Param("ids") List ids); + boolean updateCustomerById(@Param("ids") List ids); List queryCustomerNameById(@Param("ids") List ids); diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 5405652b..8220f2e7 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -15,13 +15,14 @@ import com.daqing.framework.domain.crms.PersonalCustomerEntity; import com.daqing.framework.domain.crms.ext.*; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.domain.crms.response.CrmsCode; +import com.daqing.framework.domain.hrms.EmployeeEntity; import com.daqing.framework.domain.hrms.ext.EmployeeTO; import com.daqing.framework.domain.hrms.ext.EmployeeVO; -import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.exception.ExceptionCast; +import com.daqing.framework.model.response.CommonCode; +import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; -import com.daqing.framework.utils.SnowflakeIdUtils; import com.daqing.framework.utils.excel.ExcelUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -71,7 +72,7 @@ public class CustomerServiceImpl extends ServiceImpl customers = customerEntityIPage.getRecords(); // 鑾峰彇鎵鏈夌殑瀹㈡埛缁忕悊id - Long[] ids = customers.stream().map(CustomerEntity::getId).toArray(Long[]::new); + Long[] ids = customers.stream().map(CustomerEntity::getManager).toArray(Long[]::new); if (ids != null && ids.length != 0) { //TODO 杩滅▼璋冪敤鏌ヨ瀹㈡埛缁忕悊淇℃伅鐨勬帴鍙 @@ -100,22 +101,31 @@ public class CustomerServiceImpl extends ServiceImpl().SUCCESS(null); + return new ResponseResult(CommonCode.INEXISTENCE); + } + String name = PromptSuccess.getNoBeing(); + if (customer.getManager() != null){ + ResponseResult employee = hrmsFeignService.getEmployeeById(customer.getManager()); + if (employee.getData() != null){ + // 瀹㈡埛缁忕悊濮撳悕 + name = hrmsFeignService.getEmployeeById(customer.getManager()).getData().getName(); + } } - // 瀹㈡埛缁忕悊濮撳悕 - String name = hrmsFeignService.getEmployeeById(customer.getManager()).getData().getName(); // 鍒ゆ柇璇ュ鎴风殑绫诲瀷 if (Objects.equals(customer.getType(), CrmsConstant.CustomerType.PERSONAL_CUSTOMER.getType())) { PersonalCustomerEntity personalCustomerEntity = personalCustomerDao.queryPersonalCustomerById(id); - //灏佽涓汉绫诲瀷瀹㈡埛淇℃伅 + // 灏佽涓汉绫诲瀷瀹㈡埛淇℃伅 CustomerPersonalVO customerPersonalVO = this.setPersonal(customer, name, personalCustomerEntity); return new ResponseResult().SUCCESS(customerPersonalVO); } else { CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.queryCompanyCustomerById(id); - //灏佽浼佷笟绫诲瀷瀹㈡埛淇℃伅 + // 灏佽浼佷笟绫诲瀷瀹㈡埛淇℃伅 CustomerCompanyVO customerCompanyVO = this.setCompany(customer, name, companyCustomerEntity); return new ResponseResult().SUCCESS(customerCompanyVO); } @@ -129,12 +139,18 @@ public class CustomerServiceImpl extends ServiceImpl updateCustomerById(Long[] ids) { - + if (ids == null || ids.length == 0){ + return null; + } //TODO 杩滅▼璋冪敤瀹℃壒妯″潡鍒ゆ柇鎵閫夊鎴锋槸鍚﹀湪瀹℃壒,杩斿洖姝ｅ湪瀹℃壒鐨勫鎴风殑id闆嗗悎Long[] idArray List idArray = new ArrayList<>();// 鍋囪涓鸿繑鍥炵殑姝ｅ湪瀹℃壒鐨勫鎴穒d闆嗗悎 if (idArray.size() == 0 || idArray == null) { - customerDao.updateCustomerById(Arrays.asList(ids)); - return new ArrayList<>(); + boolean customer = customerDao.updateCustomerById(Arrays.asList(ids)); + List success = new ArrayList<>(); + success.add(PromptSuccess.getDeleteSuccess()); + List fail = new ArrayList<>(); + fail.add(PromptSuccess.getDeleteFail()); + return customer ? success : fail; } else { return customerDao.queryCustomerNameById(idArray); } @@ -149,14 +165,14 @@ public class CustomerServiceImpl extends ServiceImpl pageCheckout(Integer page, Integer size) { - Integer count = this.count(new QueryWrapper().eq("del_or_not", CrmsConstant.NOT_DELETE));//鏌ヨ瀹㈡埛鏈夋晥鎬绘潯鏁 + // 鏌ヨ瀹㈡埛鏈夋晥鎬绘潯鏁 + Integer count = this.count(new QueryWrapper().eq("del_or_not", CrmsConstant.NOT_DELETE)); if (size == null || size < 1) { size = 10; } diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml index 46b05a0b..7ca13ac9 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml @@ -28,8 +28,8 @@ INSERT INTO crms_company_customer - (id,registered_capital,industry,years,region,shareholder,affiliated_company,emp_num,linkman,business_source,customer_id) - values (#{id},#{registeredCapital},#{industry},#{years},#{region},#{shareholder},#{affiliatedCompany},#{empNum},#{linkman}, + (registered_capital,industry,years,region,shareholder,affiliated_company,emp_num,linkman,business_source,customer_id) + values (#{registeredCapital},#{industry},#{years},#{region},#{shareholder},#{affiliatedCompany},#{empNum},#{linkman}, #{businessSource},#{customerId}); diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml index dc175407..36ac5037 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml @@ -70,10 +70,10 @@ - + INSERT INTO crms_customer - (id,code,type,manager,name,addr,phone,del_or_not,status,create_time,motify_time) - VALUES (#{id},#{code},#{type},#{manager},#{name},#{addr},#{phone},0,0,#{createTime},#{motifyTime}) + (code,type,manager,name,addr,phone,del_or_not,status,create_time,motify_time) + VALUES (#{code},#{type},#{manager},#{name},#{addr},#{phone},0,0,#{createTime},#{motifyTime}) diff --git a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml index f6812751..9222e27c 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml @@ -36,9 +36,9 @@ INSERT INTO crms_personal_customer - (id,customer_id,id_card,age,gender,marital_status,education,employer,position,working_years,social_security_num,living_situation + (customer_id,id_card,age,gender,marital_status,education,employer,position,working_years,social_security_num,living_situation ,residence_addr,business_source,emergency_linkman,emergency_linkman_relationship,emergency_linkman_phone) - VALUES (#{id},#{customerId},#{idCard},#{age},#{gender},#{maritalStatus},#{education},#{employer},#{position},#{workingYears}, + VALUES (#{customerId},#{idCard},#{age},#{gender},#{maritalStatus},#{education},#{employer},#{position},#{workingYears}, #{socialSecurityNum},#{livingSituation},#{residenceAddr},#{businessSource},#{emergencyLinkman},#{emergencyLinkmanRelationship}, #{emergencyLinkmanPhone}); diff --git a/dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module b/dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..8fb60192d378759239a3ecbf60eac8c8de446e9c GIT binary patch literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..518270b3722c5358bfd4761a6858da7dceed4ed1 GIT binary patch literal 1059 zcmbVLO>fgc5S>laCN(K-Qz(?LlyXUP$X==lDX3EGl2d?+pm6AEz23On+Pm(0UEpVN z0&(C6@S_m3PMQQM^nfMrdS-Utn>RE5_4~(9062gb9+cs61)g~D6rNR}L15*TRMH+2 zSZeMM36y;u3IgkWsl?kn355B;f*3vZzUC|*G9#TmahC15%m{S)TqiVSS5ifEBo$L! zvY2v{Wc1{!cjNHUK1$PAa%QDgU1Up`R0Ou0XZ;Iy&1lRJU|`&-@dB2HGUNJMm@gB`lN)!wWK?1EUWx3T{tC5UyBj}*ebc}(&o6%Va zfcLEUj2P46P+uphRw#DBnd_oA6Ig>~SRrumKl4z5-5NZHJ?!jk7~TaJf?EQuMcpXG zjpfWq!BI9jPF2vH8!A6$S=L=JNBg&`_9sGJ z`*Q0Wkgr9!imM9)tidX-webP);0{`=Xs;oNyWApLucoZa^@0&^ pa2M7KKN1o&TsE7l=Sitin1~6sdUJ@~_?Y4F$UhCcY{*+=sIYc%iI|Z5c@F*_!A1VMH`)S+|<0 zS)uqGTKoiRtqbnymNko`F6imBv(4=Bea^7hm0g!`e^pg9k;WjyN;fXL|Nql3hM9BS z+gw|{G_YXe5f)86#uEmXGqHqa6GbgnuuQ9H<;eIHw3XSjVt1^DuH_j+{sODWkkak5 zTuyttS=keINW*WN)_vcl_A?m!+--=>D#J+TeYV_zpaBgAB3yG_|DdFVBWUj2r7@3W zx`6dNOL51E;KJEdvL-3X@M-K;s9!_zALuK=9sOobd2fht*LP^yl&HyoUQ0*68D4aW z+;w42X5JAbVzQLEpjUHg$rpE!qJJ#?iGlu1Fi3KUZWd`qx;J+O_AUB(m}FmMOksr1 zW)pyGxK1~!6gMb{cK(7M`U1E4Y({5$#%VHDDdLtKhvGLo0`X|r&M zE62FHlRrZLSMrWQXPiWWhUHdlGTsrFN+-Olw9v5DBi7{SjgVFVmmEBR0Ig!2kdN literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class new file mode 100644 index 0000000000000000000000000000000000000000..8ea5279ad5f41819492ccf8210df6febe3ac18e4 GIT binary patch literal 6241 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 literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class new file mode 100644 index 0000000000000000000000000000000000000000..364a01cf32c40f498ff83191642542fe913633e9 GIT binary patch literal 748 zcmbVK%}xR_82rkw;vb4ceE|a(>%kkwL{JkAL?ej@Zy&oAiraSSb}@VK#XR@`K9uoe zNrbE?IW%o2oz8ToU*8{}0B{ENGVGP1R)&2Bhm%;?q+?WwI_bobGfLQYa_cj=Yjnpr zMIN9Y@~+XtRVHgU_+Zc&nx;$Ui`vv7x>6_Sk;zkB!<{%Ty6`GS-B@B)p zV@g(uCmG2>ATG5wj%*oCxgK|o9dZoO8woB`w;UG-_}nFFol;J}ZAy*WlNiiv^wDIi zByp;7@gwHxFrX9^|3^F}2Gl)`JblJ|fk6R^v@6lB$e;{B&>E~Sph^mDWFVq%5+w&) Pu$|63P^Gy9D!z??$;RHW3q_TnmQ)3$pvr~2&P*E`XQo4UPc%Q|N4W3< z`~!c+^2~H5At6ZV&c#f3-@eatPv0NEzI`X6EvlAjqfDD+dd6txES09)P}VW}T5SY6 z=1rkv73!47-KKELwxiT?`Nhe^DxGi~TPm@c&u7TGc~yV`Ck;ceKnE=g0B*%T(`bcXH+>#afs!6WmPkheQaJNiFSFL zfYL@on-&*s5u8Y_^6qjmP(UMrD4b1oM3e%sQeYU}%qdcY-0kj%jP|OHQ_>66khA zC#_x+|JeV+MK5c(S8%nIw$WT!Tzdb@J^!gw5zp9JuYF)Np~9?)(Yx)@Ty}Ep)uFuK zf-2s3Wz-(I=fw6gc7%aibLkjiSG4|>e@=s_@y z8w3$>Dqzf-v{W5a*!l(G`Ly#^W_0SD!}MMAR0hsJ@Ug?ezf#d|OT%}Cl?VCu-*`NG ztWy)n*D3=47K?IT3jI9m5u>$Xo)6J`^9p+Vyii>&n{!16FvXHUiO3JBQ0V@ELR921 zAi4*F5x;ayjz?me5y*~j0`s>#iD^Ys*iYj$Q=&4KYuOfGiDv0K*7*{CjOOs&urv>o z1zN-*GnvAZB!Xy(mU~_xTEUI?u$p_A%VPHISD<{0ZjV#GGgf(x?hb<8%Y)s&D0)B- aq2+@ohdhiGBl?7WF6q literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class new file mode 100644 index 0000000000000000000000000000000000000000..ab7598c4191e64a27c0879baa4f980f01e0dcc88 GIT binary patch literal 757 zcmbVK%T59@6up(l2)i$x{gjD6*SQ7AR{t%`Z}s2lC1n>H9!I>HT2(8U?e zksyOLNh;MCCnC#Y(5$VjRexr17-gspeQ@i?TWN3Fz^5fT8GjCDyPs!1|s?}yUV@N%0a_`PDyewkX=6{q!rJTD>(Hpb z&@bvkKcF8~b=J-e2oeg&vex$aoSAcWcK-hR{RaRx;AI|O{aP*eO>}L`U%0 zNX7R>P4o|tKT~s{8DA0a{yw-c5HCCp=ps3S--&d~og!EG{@rU7kiQf-s*SAUct6r=ponK|c;z%GhX1CXBNpIc6 zmy9HvySKu24Hx`>>LZsNhp)gGi$3$_FMz^`-y8Elp(?1G;Y0dKh7hyCqdy&(0n zu-UqfLkD-IB9%*@=@9NB&6hfc9qHg3JIxrp8+*(grDK=t0R5(g@C5i#N%ZXqE4uCV zru2pHNTJs4>1ObDbQtzy+_5J=rMQ@%CSfv9lcr0@*E9nL8JfNT*(`%8$kLUgw;at# zTJm&f;10~tx<&lN zQc3r345W&9jI>Rv62s|1u|S!{7Ws?`L|e+zh*@5}V!iQYC`H8`K8-Fa>N1P|<08Tk z>TS_Yn9Vc>@aAg2ts&sH)tK(!En=-0c6vc#A9JG;788(-(a9aIOG$kvvBLI)s~t-C zOO6|#3Cx8>1#&O~YiYryYD{2xnDDleDNFhU;{U<7K(8_g9NksyJa=*R2w7K)S_X^` z)q@M(%e)uzc&C>tZA&l$FY-?7QN#6V%q=~#Hl^?J*UlAXO9dOB2uzoqhRN}8O<9H8 zY_yc_Qj@x>58l`r?@);yDN?2_-78nSBIX`<(t{D0_41I*G{%M{a6Z&YA3Dc8w0Z42 zOi2-`jLLq8Sz*#RGnDr%PmEBBk41!>HeC$3*t)u5%8V2p=K6J}tuh^QM-rR2G$4NkBPu*2lJ0XO%cHNjo&y9$C(M7FffU` zDcsGDLk-0=esusmnt^M@(IkQEUNsAI=m^t&tm|X2g6dW8u?9D) p>YHADYqa(4(bjk1?tsZX4{#qI3{(%j>d_@DB$m^A4C|ielRx3O)%gGb literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..e9a3f040a0e1f30424dc5cae5e0208cf01a909df GIT binary patch literal 21097 zcmc&+34B!5)j#LXByTc#KnR-w6%|CbFsR6qAQeK8XcCZwC2EU9GQdb?CeBQdSgreB z6?f6PpjNC}x9X4pB5I4(w$|>ot!ou+?PhB?H@^S5Z^@gd|feL&o>m)5WcaL zh;J+Aukr1r#JpLcyAAeB*L#ZjUjBNJM)7?HZxIal8~lwR4U;Jz;0FcCLk52{NM-!6 z!H*R2qx_h3e_ZDHmfSuO{3q$qC{WSs_g1!)X#la}p8yn~+#;<7!+JNapua#t}w z!_Uf8&k3T-&ulz%Ok-w2LZ1$r$=F@9ZW zdm~8g0`2BE<>_0}_FK7qTW;Tx`S%p_yZoM9erNFSh2-~x{0IJ{!GALN&jJ2RfIkRQ zlTh_n{#$@Q4AKg@`8)qZF8?(6Uq$?H{wT;F^CtoRRBk?#zI(w!MTTM_>2gD4VmsEU;-w*#OfYM@*O1?gN>BA3C2 zDwWS6h8h}B!-90a8ZP%E1UkS_WkI@xFAu1ZMQW5f5I5=|Lme#GMho6Upd#u}Lmd{R zYlN;bLAq9`xkil@k`9;VS7Z$!^BOfy+Kv!tyj&)rvzjQ-B!MOiRE~=vXp&(~(xpkB zHd$k*2o#bF5X96}fsPdDD1nX^XqrIB2sB-w83N4|XqG?~0#yn$TcBeFnj;X*DW;AS zXs$r>1ga8fzChIiEfDBBhU!~ohVSPKy@Nt5WYePUm=9A5W-go%`1fFc2zIX zB7qhQbdo?z1ZohdQJ|#)EfZ+DKq~}l66j=sP7&x-fxajZs9K?pH`JF5wbD?hF%>tr zr_za7Bso8vV476hoQQ>5!e>O|YeK7|@o>C38g30WCu1qJCPG!+ohzBjmbAyy(O6_z zG!oK7S=LSc76 zXl{Etab`3bX#v_HZINUu5f8U|W@9?K57HL*90XjYSWjCx-jRjss6J3t^%w(8C2PTi z1(E2Qcta$)KH3~%>J86o=^0v>GX{7HXGi1F^c*JN_zBCH{8fn-pc+&gjYsO+W2+*` z#xQsZ%4-wN;nrp0WK{0$Mt^#36wIC7%K}msb)jgit<{y6O>zy|Ktj&y>EZR^P-_?xuZgE4Ya+?Yd`(`(aOK&Oh=rqZOFxnkpiQOSIhR=Xl@qdvb%(a6 zqphjX;_#ZtQh`9$z+@!V2IYw?iKNs%tS{d(zpm> zv(_TBg=EEe?y7v_q6VgdsL;SPMNhUWoQOqR678W_$113Ds;#v>6>3f-BcWI%9c~Gy z!=W1K4>bNZJ#I)IX5nEfdX|XQu`Zh#OcnXp)E`EIR+-Y3e_mQ68`6<@3N{!5>1(2} zHjIHGi&<)JgYqE`Rn;)xbcbFLw8Ck{1ioksu7gkUtgSW?UxTs3v(>Vr%~8#&97bpB zs4I4Rp<+xS&>E_CWmP!`==Tqc_Dh1rG4IAj8cTS;WZ65V`L$<>fOU|E{!FjL@Xh?^f*VTpFv|rNUBy6ZvNCFMjjFb>|R~JdIO|&cyi{#Vr z%}^)pb{uT;I%-;&7I@u{R3O&^vMnH(Z#_Dy6?d~#_V?9ga;5EA==&P$>@5)`T^1Z4Y99Ug2K5OAhp zImdn}#`+NR8lo+8lgV%g)7YF5UX!<%EB@}VUb<;^ zOQ)g+wQpU#a=CEWnL%i#=^_Z#kKe4?01}LjDnyuUsUMO3& z9FD;7vmdyW4vB1Nj!?D4>}JXg)VeynyLLZ}dG<<1D^U8=qGf&y1`J#gLpv z+rr6osLp{FL|Y?T0B-InzPESp*dql3x!G>fP7UCR+nS+Tv2YyeUoyAu*e7r6tp4?I zw?M3#fg>Qk*HVE3y=);epUw5Q&fcAyC!g8BWG){+#8a=qJ_fcl47C=U6-=g7oKgPTS8W>ujEu2a>f)bP)&B+K9$+{^@rJ)!WY((NM z7IZ{DBJG%>BdZ$#3*)*5L_m?a3gI%lXl3~UOk9)*ddPT$^XtW?D=wpyN~k9o9%g5(H)l&np(rLRW0GM?(Wgp zsc=E#YbNwam*Ijo$V0ASdP%db4~LPpY313h%GR3R_apljPYx^QRAvpy#_mw$jIoIl zD{V-$Cz~S@@|h0Ec`iF_Q$*(^dCC`9Q>cX_i8S_2Lft3})`wf$fz916vLBiBdwL&r zwW*@&bW^QUt)`0M!l!ZA32^Gte=erKrjO?82~ z&{P+xi;=u%yFHUr3};>;p|lSP?_)R0P?wnMQgxZBE>~9|u@Fqo_OqMVh@16n6@n}3 zN_gqKeS0kx4fR!1U8SxT4A+=ERBbfXwd!g^U1zH6g}FDV8%=c+4`afnUmi-lyH}34 zx4fpQZWaW$sM8I#$y8rcw;SpXQ{AcVGU;u4$55M1b+@|5;D_kcxJ*SC^3zYfSn?VOQk=Q$462GI_lErl}s5sUA^}n(8ru9#`LD8jNNktRKHZOnCe&bz9TTbLbrr6 z)UQqT8}+K8UNhC}>YBXMV!}Q5Z{BnJ)24buy=tmA)mx_et$Mo;#mf_}nWpxOAD(KU zKP+_E=J+?KTJPH~Bz!owv22mp6g2G}=no&oNB2kUwy3jbHhBimG}RvAYuHrps&AOQ zilJ`rsU4!SzcbbE)%&LUgW8Em)on*kS}gYRN2ZbbN#2|o((J&$^18b6mX<>nF04qU zDq=Bl6`0^p>d&V7i~4}6Qn;Ph+390~=0vd@9gq0_}wad}N7whv{Q@1fTNxOrIZZz5;ad6$)es6hJid70HO8K*a)?0u2yo zpg@BJDv=R`Wkjh!Lj)QsPlw6V;nFrj+71w?OrVhhjS}cUfesSrV1Y&pbcjHQ3Uru2 zV+0y2(BT4&6X*zm#>*TNWR8i_Hc8qh3sf%96oEnlO%>=!fsPXBXmO`H7&;*=e@-FA zn0sVlhk8jIdQ&cl&OX;kc@OxqMjz>Q1o@|SjLIH|P5JJyVV8K=Gxp+fqp&wc+(&85 zG`V-{$Ua0vj?z85RRS}Olcv76yRwYD21!*IN6OIXd^uMyn;BUoSfwF$h}Ixm_Z0QR z#(QgZrxHeFKtCLWIQ9O}tZr^eA4IQeXD48Sm$lg<$~j+Wy3eW;^7@2sb=XH@m7Uw} zj}Ywx+q~1}KM9o;E{Wio92%B7T<{jhg~&rA;TS?;)>ErB1Xkf;WzaXxcMKH3yCGm# z>t6obO*kvu|2oQx$3D#{fM;&ShW+R)%2v0>tqtb|Hh{$6%CPjZvIs}D6AQP&Y`mp+ zPXykIIBPsm4?`8@*=(_wi1%iE({Vmk@7Y)EO4uZK%R~Ea`AOJ=R&8 zg}}_Yt%=7Y$*R_HDkVBOcyaZThDG&rYgbk+ZD?FnSG|Pkxcq|a_ncUp72>tuvJ@Rt z72@Tbuoy-^?EptxSyIUM4-&d^3kLl@S((m(b01j@KJoKtN-io_V~mESRaMmu4NMEY zcx}txhYt2s!jv#V{oATW8jSPw*1fZ_~)e0`NkXZutpC7^bV#GBmU$_NF=EJrEJo_X z8gbpyt1gj_uI{kTf=ur*HQsUChnMvlxZ^Zz;fr_*z-@VdM$=&PSneGfx_z6_ppX7@ zO$V>W)8=MC4s10 z9SqOPq@1b&dSa{%r|RLmwSIxU{D-FYZ&xb^MdJu9^T;pVF`tJ(>a=g zm&w1S>@`K_-H1??4)WSPIKg^l^@_!dmNep{p{8-4Z?E=>4gAyLmZgK70#%hO{BKWBmt$O;6pL{uUFIBQtO!h~MoHC|cNfAoK zBAqh9N~xy9n)2#RUlCc7aW|72<}SLX&dd2gG@f2&ov4`T?QMx<@9N*P!D(+qR!Syf z=p(E}c<*3%c1U)(44WT+!U@8%0x(e=v#`#pR)npVVu;6GyfzVs5CUklLCtoZf$Pnb zSew;Z_Ftstlsh=mff#^W?8n3+aq+B9Fzi-FM`CkZTCiCpXf3D+m}*+8!by--gjNSG zMEhKMJG@Z33Lrg?N9rM)xzf{tC10w;%lheXEA%bhj_FJAIHyS{u5M{>)~{n@0|`Am zx1xl$odCO>eS7ZkY;hu`x0da5araJ&m*x0+1yY};NLXIA9fYyjEkn_#AtB%9Xoxho zgU$|o+dwjdyv?QPT^n5wgbmSjyG?B=`u1p)b>kJZXiFsC9I==w>&|H!j9&BFQ}~WU zDrFs?qAWqT+_oX;SB)>DtN}KBK_R{_7LG%X=-IP%be_ITB6z0@ud$`pMzJ9?I?uT5 z9tY&XVe8xhc?R2$gqKSqYv9#zmJ6+E6RBIg%+qYSmKG#wNo+HTRBPhSov6DlGEsLM z6de;p39Mao%z+1@yt2FssJ`ej--35O%zCN)o5~|fN3gFl|Y=6}U>z1s; zzB7Es!lG&uiFNIe()YbS*+zh&czJvwa{ksxYOK}MPJcXkySF84pcLDm@1Zqi?_<4* zpgk=@L@O*MQfc_`&7Q-1FeKl4m=5l}A00}s(rd)@I{8V-Nk8DX@HNFkeEt@nN=}x0 zwBcB}M;lJ^bK3BoPIO@Rvf`~Y@=*;H2n1^VBrB|- zfw<14!8D)BXaUw*LsRKQT1<6x3N50wfRfZeXVWsen3mI5X$9RxO>`HY3Rlj;%Gc6N z`Wt;n0rZ?gf2V&?5&Dm%e*y|()F}EF{ae;Z57^uj=p*`AbMyiF1d!5CKc&ye2Rg2$ zyG zdY%Sur%_Fh(}7#*phrdSle*|&MRk+iC!^&_Cmm8hIYWo;rXxkP0(Q}15U#(>58>{n zky*`J-eWQ}Rt6pZIE~BD5uG%C6OBW+37BG{44pW+yv)CqCRG#&4O?k)SwV)%g^DTY z67qDJn$rceTl%m7nm~}KpQ2cJD~+TW9ZYeWKy6e`XV5foyNXiKkak){9k@G-z5;1q zM(5CtbS`bC^XWmlK@?qe1IbF$Pcr5v}^u;Fi4175GwJb}>Kj;%GGkDx5G}GWC zj?$tlU>*&`%;R|i6ikeECXk89Vv}}LVA9T8seoZ0M}lid)lKfAqnS350ijicd&Zct`S5{no`g+=@c4Tb)HMsrxqfJ^7%?_c1Y z*a8^p12`3+;v>OWyxL$f7B0I`Q_?bNJ5_+4m7O$uC>^_QQ1jIp`aU9=Fqo;)c-H5ocVR2=*}QPFfi_-YRGLp0#6-}eya_h~y zsZVJY^KqLo*5baG^ct4*I+pYXmh>i;^j4os zvZR!~q#P;rSW-_Z&E{h*UF9xVYyeWa!|{LiXT8{B7oCJu1@5kkmH^PnOM^Jag_6c# zn`aj-ttdnulA&diu^>`qXnE<1`)Jr?eYcBNST1o3m6qErO?J!PCnlAbo?Lp$c4~qr zIJJ|$IJxvo+i3-ER%Yn5428E)uMEo{RLj@ z1LQM*Mf=~7xqL`rc)d2{9w}rHS0Q$9M4oXyGK`xL!*50mzn%7KUM~TLdGM@~!x+FY zT}K_^$(1}uJSVVU$X@{D!yFsVa_(cLi$0favLMcy| zv}qlH){4M(iUEitiw{cNAAyfT>mwi^w!IXW72CKb3#9EOQDI63-&SU3=nS334M5V4 zn`DMkTlT&@5qB`B^ztoxH=t(NAClTZ(t4PoOOo+_M-oi?Od-iK$qkNP@JZb0>cu5U zrU|Lt03Jmn5lklWVYGn9&>|j-pZYkQ!aNQPKLWqOGM?5Wu-u3g=Icma9zhcFI80(Y zQi`2?6up8F@)m;Z`+N+2h~WA$LaXALT*MW~;oyyVHqYZZTn&w=M_4`yTGI$~T#D9H zV1QDZ+zqq65mYSV#VAr1;8$Lb;gcu`*N{MvKMe6COkdc&2=9y~e z$90`_PJKD*zOR%Q$ePm`I&V9j-&A_RR=Q9kGjzhthm5UCQTa#)zn~5|=SoxVscr*t--Xsg2vf zEFU#OY0d!Tr%Q1s`xOOlO=`6ip~VEgp=5kQu*87{BThh7g^h)Q{(+jEMatPyfZr1> zNa7D)DY00q4uK>PXKAmKkfDmtPQv!MNm#U^a64TC{%@>s;ux|qJNBF*kd8gqV)qEK z7(SmNu(9ITfONKUC(BT=n6%dBsmZ7g%(Crzz13M2+ zQg@{Y=uV9kGu%pZtdaXOg9qF2@@{#4iBNO#l~C+!AkS-Iy4O)1Uk|5z1Fhj3A(Eb}L1V{fdrQyLpBIJb1 zRwB?qnBA$z&%y(I%LcQEeYW9K+{tb`4-$_7lYx})(f|ayxy%pyxm({t=J#me-VA+R z1CafF+R1Fm(ES?tMur~Hz=IijNCV%@(8C&dBtwsC;IRxnu7Pi5=m`xxnW2mZwq~eP z16>)~rh)Al+M$7`GPF|zPiJVC2A;{#vl@6VL*Fj*cRM*t7oNaQ>XTFoe?N-1(xKdm zR8)3vw$W_fPSw1F>iH>J&O2fAPveKxc2Sa_fsQ;&7x8m+6@Qy<;_uL%yqoUl=jk#2 zE^Xr%=sAAT<0yB#(%!9gL8QG~??MURcO$Jh08%cZr}VCtHL0`kwn+FyXRzXWSv0c(E+*8Uo- z{S8?ADp>m(So=Cy`vzG1CRqCxSo>SB_HD5C9k6zfhlLwm7H)J|xY1?dM&wxsY8GCq zHvxOFa28QXP!3xx7Itsfk9>-jcB_Q7U4NpU*WRw@^Z5eEz>Zz#mx!01ss(Z(U!*@T z*7*pmlP|&Fr76Bl-G&FHkl7CWh~KTpmHB4*X8S7eQ;s*G9W@CYjE`?&I2R4w!FTdq F{{si$=F|WH literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml index 46b05a0b..7ca13ac9 100644 --- a/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml @@ -28,8 +28,8 @@ INSERT INTO crms_company_customer - (id,registered_capital,industry,years,region,shareholder,affiliated_company,emp_num,linkman,business_source,customer_id) - values (#{id},#{registeredCapital},#{industry},#{years},#{region},#{shareholder},#{affiliatedCompany},#{empNum},#{linkman}, + (registered_capital,industry,years,region,shareholder,affiliated_company,emp_num,linkman,business_source,customer_id) + values (#{registeredCapital},#{industry},#{years},#{region},#{shareholder},#{affiliatedCompany},#{empNum},#{linkman}, #{businessSource},#{customerId}); diff --git a/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml index dc175407..36ac5037 100644 --- a/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml @@ -70,10 +70,10 @@ - + INSERT INTO crms_customer - (id,code,type,manager,name,addr,phone,del_or_not,status,create_time,motify_time) - VALUES (#{id},#{code},#{type},#{manager},#{name},#{addr},#{phone},0,0,#{createTime},#{motifyTime}) + (code,type,manager,name,addr,phone,del_or_not,status,create_time,motify_time) + VALUES (#{code},#{type},#{manager},#{name},#{addr},#{phone},0,0,#{createTime},#{motifyTime}) diff --git a/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml index f6812751..9222e27c 100644 --- a/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml +++ b/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml @@ -36,9 +36,9 @@ INSERT INTO crms_personal_customer - (id,customer_id,id_card,age,gender,marital_status,education,employer,position,working_years,social_security_num,living_situation + (customer_id,id_card,age,gender,marital_status,education,employer,position,working_years,social_security_num,living_situation ,residence_addr,business_source,emergency_linkman,emergency_linkman_relationship,emergency_linkman_phone) - VALUES (#{id},#{customerId},#{idCard},#{age},#{gender},#{maritalStatus},#{education},#{employer},#{position},#{workingYears}, + VALUES (#{customerId},#{idCard},#{age},#{gender},#{maritalStatus},#{education},#{employer},#{position},#{workingYears}, #{socialSecurityNum},#{livingSituation},#{residenceAddr},#{businessSource},#{emergencyLinkman},#{emergencyLinkmanRelationship}, #{emergencyLinkmanPhone}); diff --git a/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class b/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class new file mode 100644 index 0000000000000000000000000000000000000000..9e78cf07b9df7e7b9d2cd04517d1163839d54dfb GIT binary patch literal 2800 zcmb7Gi&hgy82&aO3vrc*msV}Pq6M@rB3dz)79&*JDAXXn)Hc)pr=UN9P25zR&@LVSe!xF(qL~wv^ zgxh5|Qu>4tJZ=qK%qVSp6)V?^>_xFEAL$+C_i6sC1`6eMu_bKHU~6r>I+g{!-Dm+X zy~LYMb=z2H2<7*x9loW7;xyG4k}R&r44|#CYm1(!uT;fw#;4(N1Ct}&{dt24osWa9 zY|pZm)V6`E|62`l-j`}Es4fcan35q=mahbH=*T%&=XQ9HBwf*gHE^SQ(FTFC6}`8e zz*jm-m87ii@H`F5iH!W^X)p)tXMc0|rz|XB(ZuH#9-?Al36Cr+>*X+xn0RdA3p_FLrG>BX zH6yFNj8rHZ%@9X}efXw;r~G_dz^H}qAWW=Sa8NZNE!41TV$Fh!rv|1vLASc3*|2+L zgqD+H_XJ1N!pgdI*f9qpsdW1;gb$c!14l=iRh}?al%6$3T~mj4Mdz8ZRT&yElPoOM zSivLnqaAW72NN}@)u)qgiLInryD(}C36f9>C6_n=IiX(f=w5@=z(Bi~4E)f|Viyp5 zH_2q%162@Mp+p2HaX1Gy*9(eo>Mf8t#Z?{L*Ws6f5Flz*2yi<0EW zDV*k)EYSj*e~cE+P8x~z3Kf8<_`MxwqPau0q*nqxRB?fFLtoMd}#;P z{mUu1`Z2+;_ObtG436!fup0{z5oCK literal 0 HcmV?d00001 diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java new file mode 100644 index 00000000..25645947 --- /dev/null +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java @@ -0,0 +1,33 @@ +package com.daqing.financial.hrms.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + +/** + * 瀹炵幇鍩烘湰鐨勮法鍩熻姹 + * + * @auther River + * @date 2020/9/25 15:09 + */ +@Configuration +public class CorsConfig { + + @Bean + public CorsFilter corsFilter() { + final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource(); + final CorsConfiguration corsConfiguration = new CorsConfiguration(); + /*鏄惁鍏佽璇锋眰甯︽湁楠岃瘉淇℃伅*/ + corsConfiguration.setAllowCredentials(true); + /*鍏佽璁块棶鐨勫鎴风鍩熷悕*/ + corsConfiguration.addAllowedOrigin("*"); + /*鍏佽鏈嶅姟绔闂殑瀹㈡埛绔姹傚ご*/ + corsConfiguration.addAllowedHeader("*"); + /*鍏佽璁块棶鐨勬柟娉曞悕,GET POST绛*/ + corsConfiguration.addAllowedMethod("*"); + urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration); + return new CorsFilter(urlBasedCorsConfigurationSource); + } +} diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java index e889d69a..c80b9576 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java @@ -25,5 +25,7 @@ public interface DeptService extends IService { boolean deleteByIds(Long[] ids); List listDepartmentAndEmployeeTree(); + + List getDepartmentAndEmployee(Long id); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java index 5779712a..df39dadb 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java @@ -158,7 +158,6 @@ public class DeptServiceImpl extends ServiceImpl implements public List listDepartmentAndEmployeeTree() { return this.getListDepartmentAndEmployeeTree(deptDao.listDepartment(), 0L); } - private List getListDepartmentAndEmployeeTree(List list, Long parentId){ return list.stream() .filter(dept -> parentId.equals(dept.getParentId())) // 杩囨护鍑洪儴闂╥d涓烘墍閫塱d鐨勯儴闂ㄤ俊鎭(涔熶负閫掑綊鐨勭粨鏋滄潯浠讹紝鎵句笉鍒版墍瀵瑰簲鐨勯儴闂╥d) @@ -169,4 +168,9 @@ public class DeptServiceImpl extends ServiceImpl implements .sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))) // 鏍规嵁鎵閫夋帓搴忎俊鎭繘琛屾帓搴 .collect(Collectors.toList()); } + + @Override + public List getDepartmentAndEmployee(Long id) { + return null; + } } \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..5999cda2358cf4952773e315ff0b766bf606ace3 GIT binary patch literal 1478 zcmb7EZBG+H5Pr54TF+BTc~MjZ5w&k{fQUj7g+}9tB8eyoe%to8W$}8adspy>_(Svy z7)ksA{wU+@T|?0pB5g9WJAG#6nV0Ra-#>l=Sio}w1DHzSo`IOw_YK4`W#9oa`jkx~ zr*&S7f)>+B%xJ8Yz^s9*m`h+jfrkuzE7Fz0Dnm~uyUh?UdA4BaFH2XvZZ;}Hz2y~$ zEa|dW<<2%&Qr}y~c(5ydhUs$EYgjh_B;C4IlP-6wk~`L}YWP;wb8E70l|1E_!ef!a zsM77FbONEsIg>4Ws&4ro6}i_GZ-@g=eXtHhg<@$;=p4bxdAzBdb?yth9kQu-AU$`> zYpNU#=i8KZoR=RP~{r{hSG0dFn z-salsWdaK(9%0eMV?1GCITK4*Hc`}K1wNcZNBz`lh)50mT*jVX-K z*^B_VhU;{rN^ygNXy-5Jp)as}jM&Z*ddkO$lkVLp#J{8O5Q#!Md5BA)G(vefpEe7J zxN?lEJNYB@e}Ne+=5CaOBuC~o5>rZ9#ao#rqevYCi7w%8;wPncW8Dn+O< V!o>&|@t+_aqr$bEJh9#d{s3gkoa+Dp literal 0 HcmV?d00001 diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class index 3ae3e99b67092a1089b5e9ee3bb6f3390da08b1c..c623421454aef39cc712789caca858b88854cb11 100644 GIT binary patch delta 667 zcmZXQ&rTCz6vcltr5Rej4oU)IB7~-zD2Y}Jf{02{M8&Cpuv8JX4p4QVOwlP7_O9K` zBN%mUSn0wC&=+vw!Y3i#Z%W#Ti+ktZJLjD5-t%kdQ@Z?P@7s4^l$|6!6cZd~p^Fj^ zEgmK5ps3TLo;fY%H^|DQH=OD`c50o1VvL$%lbXeA#Tx=eoh`)-4aFR96%O0G?>c8=Mm+r4^pxXHCqTxV7exFJ*}wC3by`=oqy(yjJM`}X7oJST1x qyB)jf#y=k1{*RzNa43YoyB9NeME|b5XmT%Fx<{(}($BXRfAANVHe%`k delta 592 zcmZWl$udJx5Ir{ukGOeARgeW06{=JWi3l-<7$PzlLJ&dB^Blt;_<{Ea6l*Fw3-+q) zEtGGtu~quMq>>Vg+pqh)bGrNVeeJs?@%r=h48VmeJ&cGHqa4#Em_by+tR6Z55!ios1BCJVRm#`sW^D%L!N%d<#b;Vm8+t^`nDi6%0ylJZq z9J|=#*vA2boltwDK!Ti>IpjFPp@d_O6P$9KA;~d_a}GZ)I0Cp#y%hPhOs5p`TZ>r> zhGu%UBx-Z1m3%R@Q11^Ou5zH2Dwzz_p&lAE(BA?EhvGGu%uX~>$r&-)=usaBeOzc) zz6_PhwINi~A>cSz5^j|%32vu4p-ZK$*K}toJ^7Sg^eLxu*zG|-kusw_q^_VR6Eu+3 zdh@k|r2UqowzO6T#}J0ez=+tGWNE~gv*b}Njpi(6PU9i6pRRFJ8j{o3_;Z7?e*$rX d0D_9GEM^T+|1eF|U|e0=NZAC{li9_megQNWPW=D? diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java index 259467a7..12b33839 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java @@ -16,6 +16,10 @@ public enum CommonCode implements ResultCode { SUCCESS(true, 10000, "鎿嶄綔鎴愬姛锛"), FAIL(false, 11111, "鎿嶄綔澶辫触锛"), + INEXISTENCE(false,10004,"鎶辨瓑,褰撳墠瀹㈡埛淇℃伅宸蹭笉瀛樺湪!"), + UPDATE_FAIL(false,10005,"鏇存柊淇℃伅澶辫触!"), + SAVE_FAIL(false,10006,"鏂板淇℃伅澶辫触!"), + DELETE_FAIL(false,10007,"鍒犻櫎澶辫触!"), UNAUTHENTICATED(false, 10001, "姝ゆ搷浣滈渶瑕佺櫥闄嗙郴缁燂紒"), UNAUTHORISE(false, 10002, "鏉冮檺涓嶈冻锛屾棤鏉冩搷浣滐紒"), INVALID_PARAM(false, 10003, "闈炴硶鍙傛暟锛"), diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java new file mode 100644 index 00000000..4e293dbf --- /dev/null +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java @@ -0,0 +1,32 @@ +package com.daqing.framework.model.response; + +/** + * 鎻愮ず淇℃伅 + * + * @auther River + * @date 2020/9/27 11:56 + */ +public class PromptSuccess { + + private static final String DELETE_SUCCESS = "鍒犻櫎鎴愬姛!"; + + private static final String DELETE_FAIL = "鍒犻櫎澶辫触!"; + + private static final String NO_BEING = "璇ュ憳宸ュ凡涓嶅瓨鍦"; + + public static String getDeleteSuccess(){ + + return PromptSuccess.DELETE_SUCCESS; + } + + public static String getDeleteFail(){ + + return PromptSuccess.DELETE_FAIL; + } + + public static String getNoBeing(){ + + return PromptSuccess.NO_BEING; + } + +} diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java index c897e97e..10afea2e 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java @@ -56,6 +56,10 @@ public class ResponseResult { return new ResponseResult<>(true, 10000, t, "鎿嶄綔鎴愬姛锛"); } + public ResponseResult SUCCESS_DATA(T t){ + return new ResponseResult<>(false,20000,t,"鎿嶄綔澶辫触!"); + } + public static ResponseResult FAIL() { return new ResponseResult(CommonCode.FAIL); } diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class index 2f3adc83252c986700346f328a7478cbdc6acabf..a66c7457a5a047e145fbf6d4d08efcfbcb85bc20 100644 GIT binary patch literal 3120 zcmbVNTUS$85dIDcw4XmwE{SL8`VYsKgLzEVt$WHP{wIh#1TT6QaFWv_-U{ zv=$WwwJzJ`Lsbk4wrI7l{T(L2lmDQrv-gP-A?=dp;mquB&o_H!&&lH~_Z>bsBVOu>}Vi=wTl(`}j2QYmtg>5r>!zXbB98=wUL%ki#O5u*D~A@u`T< z*y3{$U$FI;%;i@iDnxwE@T1IUuZV3TjxqJPi0vZ2Vd}Rcc8KU>>Io55BKnznQiMsw zDW-lWVyB4HOdSwm7IB8DXGK(t7-Z`AA}lHheOE>Nz}Dw9_)&u)0UEj4Y_`aXCTp#LG;6(O zk5z86)SE4|YHqAHHCft}y;RxM@?1}=w$xf)>|{3Ao0^+;S?ZgtX0oqlOpY|ztTOpY zx7N3qYOU36jV7C^PJm9f*jg;MHjB;HV57i;A*a(73iGyo5SBX(iQm zISxC@JPt}o?g>y{6tiX(d2O~(!sUAxpK;1zhbQEsLpK1vZt=s3S4|&^N zfhI@0hY$_-+pu3iwP9h@MT-wqs`Wb^o)$;I%?^m2qV`c$1*i-~?8dGy@*Ide(BcbuD;Il5+bdp)VRHpT9v%@jk5=}F0!~+ro7F6H zZWc;eqv=q~o{Bmh&f|iB(#4IF4mMoWp$6~junSflcH=#|v-usoGvxMkxB@!tg_9;G zE(9HhaY=_}*y-90vFX^RLmOJy)@5q4lI3hn2-}A}3>%@0N|wjwgQI5o7kiN#cW3VX%=fl2cun-w-RP~8C6PzxA}0qT zx35S0C!aq4DcXA{G8umQU?6hqVr1mz3LUmH>+I;|d(rb_F$3<3wst66=f@(~ugu%3 zVq58v{%f#IsHE4->C?m-{BpdG`<=1)S^_U|k;{%?MKu^S;1Z2&8@}`93 z-LNMhi}S87eTaAG-Czdy zXQT!rPRt+ESW~Dt#@a&JWsQ-HkGO}ADNlMm6I|7TA}xyxd9FzG%qAc&DAMYLWO|Gf zkQWrGI00EiJDdtx*bNOO13^0lwOuMusk7GVr6rSieH?`xTB=rM6?aN+aA+BamM5#S z*5*hnIJA;OZ>A8GE3M+tY7VW@5R@ma<&c3xMIu4@l95Bj94gT>W|p*$W2GD`(=)0h zt>;)d$KKL2Znm_6V;ecPNuR2c-j?3s&}O~%5v8CCqfoZ1!&oNUlfzgk+f%|=E!#C= z7-YK`MzL(y6I4oquyPUvZX}T!#%6gO0&5RtnoDW&fh=T0!W#N+K@PnLxm5H#1dxwD ZYLZJRz-=tSpGc?nQyQZKF5)F&|37XX`G^1j delta 1238 zcmaJb{tVrgriIz(oj9J$8w4hxdpv|uB(^n zHjY&aH0(sPh8Em6;;qi~7PM+8fk(lb1>?cD_mAeEPJf?y_G@-nLn%DQtTo$QM)=j5 zomwtsKORpkgvaN{Mi$1Wq^yFj(`_Z@N_fI;wqhkz1o}a!-nE<Dfvx&7^#}_q~sPX#uwG&OVBf4AuWuocd&Hm**0@R zp000@RF0%_?L;N&d6LSPRDm$-F1=7P?s%Iq8I$96w}+ujQ(Agubgq|05|9WTxpY>; YNrO&8Cz3IMSQ^#R!1m(+sZBWe2Vha86#xJL diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class new file mode 100644 index 0000000000000000000000000000000000000000..ac2567bafcdc3fbbc1e0dba12cd83b6417e345f0 GIT binary patch literal 722 zcmb7>OG_J36vzKJnIw}KUr}416?fW&LvdLtXq<>JL}4^rxtZLiW9MOKZrZOP1)=UN z6xxM>Zp11=q>Fw4KS!tNmnc0MgDky}3%~-Vb4X(>gK-rTDkfD- zW$=ulZ$&rsO?}(kDi(FqWGEOr{5{tk?$tF@2DVp!$3t%_iiR~_;c4Bz5Tg$H((dpHBlX&Fnq!}F?My+PlI{SUG9~~b?U%u01cMDms?g&d_1_@dwkil0OJ(%Vcjthe$ZmMW{R$j*{?67h&qLaEkIjrThtu{sTUcr1t;- literal 0 HcmV?d00001 diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class index 2dfdcba691cf8c1b08ba2c3183b26f5bc2085a84..63461c4a675058345d730284fd84c959cf216722 100644 GIT binary patch literal 4579 zcmbtWZF5^k6@IRDuXJtSM6w*)vEzahr$m-)t2Ci${6<_SAuhI4A~#LKOL8Ntwi3NK zlH3v~g@%`=g}%@h3QTAErI0WAK$*sww!qLYWrp8DJAC60P|9<5ucRwS&8Wd6?>&2V z_w3o{Jm>8Gwh;&t?ABXUh4)h^s4gvuM~bf#Q3V4O8zri&{Xit`j#+=^=;x^U5b!cFGf!fNuwg^QVVWzs-< zD!W>6D;p)w4J|7 z7BWj4`3srSvU?$?3>MRF?vz`~O5anOm9;E=KCqB3=94S#Wp0yvyyWIHPZmp;l6jiS zB}Bu{z*zZ*I6zjvX*Z;AlS(CGeHtBdJ`9ClKU-9azCzJdEb zuLT01dUS5?Xewpkf!Ii^%M~m&G>*r75%FStm!^!0fkQC@a+m8J?=o{tlmW$i;Sgn8XE(kIe7jkb)RowKYMR#50AIp_09(LL-92LI} z*lTWiO(SGIa&mt0C;`yarrVx(_THK&cBQBfuOdj0Mj8u)cW_@QeOL`}E~D9eFgCS3 z;T!P`&D^eHU{b}6QaW=iD`lpe`QXcoaUqd|aXju|FYa~lCG2xBim?!07R^JVIU*X; z@BYtUg+lnHg9*GMTO2eH{`l1w{`r?TKEC$yN6)|c?>|2y>Q%z7)gQg}_P^fw{cZ<` zWkC!h4$fiO!K}D3CvF_YF$XEp9ml+b^Ekp=T9>+6}qih(hI?p7J*qe=sATsX*TaL3{KI}JDNR!!~CG>6^1*@yXrFwrIy zq|_!XR9|uc2I5LiP)}k~-a*|sl5Fo|?`i5y(Z+AVi0`_Iw)o&p1ma^iVZKd$0AFU? z3ybYO&Wxd*R=3k?Hxjs?+PGfNN6Z2C#J>1pC`mkNQ zqn&9s>A5jXN9C{ceb{IIg!WtL_#?Z9LL$g7cv6E4rf6O;Jcpp#C@c%iu6>b2wDT4m zS)}39iyrj(6t4Lc#`l$A)KM~)#jT9x|W6#(QQpOo%+8wZD&FG z3~07Df#xv1WXWMG(9H5HfLZZ(&~}4@ACO+&)_a|`rV(jutRv!0ZiRoj(4&75G3 zRY5Na>u}1LhI0Xn%`696wJb^P&!M{IC7ke(Jyr8LaTDQIE$f0+&xERFo}GoKo(Yd| z|8L;rZKvQ~zRGZCe54>XKLu|{ZP^&*DMCd4Y9jszSmuqy2e5w!D{v$6H`t4#@l8Zj zmqOPl|KF4`cB1S=tDWv8_PQs`vA?6U-~13=*Wrxyo155CUE4EZaZ1lbu-}q7!4DC= zj&1!`f3P~q6t0`T0;HpUTzglG`c*utYDo|BIK?8>h8d>LW7Gxsoxy2JCR|<`XDC@% z#V(ws6jT*abLgta6K&(0wDB$Oy$78k`#;zo!nYmg6ZD4g9sX?N6YSJtJ0Ifm-tb}~ z+!fAR0@>C?^;5Q*_nba!tVhE$qmN>#!p3 z`Km5@ewriQOEQJf+mXa|gvK_}tMok+rVR9(-iR#$;m}}npbzLhJ)i@G*;Pqk@i}!t z-ElFNyEOd|u;le&g_7wz$!QN%fii>Or|3a|P#P?b#-}`)*J+d9JuuY}aaE%MUtdk= zfmNMQontntIE_a6+R~umDS{?d`0)GaJ97&=qy3v05ZpGgD>|s<=qB!oenHFKoA_dM zNXtF^M0c~<#Gb9SEbOaghdprW;S-InID8;`p42NYpBr1tLd0jT%8RgS zx#qE9;P%%`INonIDFWRk(K(2mRSkT S()Yj`{n1hu7rC+xm;MK?R8%bh literal 4428 zcmbVPTX$2(75aW_2yz$_o!|S23$i+tt3LYxQ@uy!H>2rr(}9M>;Y}mV%c(vuDqqJ>PtL z&z|Fd{_jtJ1@IVt*@kU6-wGQSq*<0G-;M%`(yT~xF@jPn%BZw)Zq>$%(!V5{m&N*$ z3}2DvRcT(6=5_JiHm*qjwlqJt@eAqSvGK0-S8cp!<9!i7h~Ps5 zk@9LLlP#AG7-tNanc_m0;ta(Fx8fRz&7OB(bW_W2VKH_5-1%&#GH#$Xom(upmDLh$ zL-X_0MDq0EE^-`Pkgk++g+)$>Cvt^cWy-*&_?el2N6%pRB=?(ETX)Xp3fW_;`E%LQ zynAk0IV@(}<&$nHCu2`(R+e(ayn8lN%%>LIi`*vlLdnf%Un-U^r1EsNoGN9@E5$-N zn>yhM>{pisfA4Ia%S$W1+r9VUZ-N9&(dlFHW)~BL9Cloe-A0t&*uW#-*8_=9KRZ2r zD4jO2CqCTlaz#s(jid2EM7$W^rz@jkU~im++~<1p@cx-u=2xzq_R}&HA7)}k7PE>o z=39K2*(u|LDnYw>>;@@n#fMd5w$X6T&&_(#MgJ)FI`>Mk>f>kNGQd1Rw#z$#XjvLzBC>Aqdx$Tp?(29BDj zUcL=_t~!3=J~Cn=A=$hkU2!uP=G+x^;aHqhwXid8;gH}qU@y7lCC!la%!!$~LnJ`w zGGTk@?Cn(~cBQBfuOdj2hU+VVcknVRS3}7!HT;59jcoN|H_22S zc94;CM{7H3o(=45l8S1PYihxCF`q9Mbb2*c6>BTxy>VAovV{c$qrtoCXH+0H>UiVA z0p9-aoSylv>AKzgtNg9*@Gzh5ZTvtm(IP2FsYS9*^~?eAk|;SrJrj}gM(ReflWmHl zH>fw+cPDPcNNl-1918tNb zb`n+!n+bRufeEx;?XC)K5KrJqZdQXa=)q{^wHota3=*jPw0{Nr^zYGn8*RVkkWVYy zFniDe-zbdJy>R$EwSv1-7MNW_(PXUsHXK=`>C=mz3}EW4V(P?%3X@>ccx6tgp+n9k zxRnm!B&nbJHk2D0pq$`R-hQ@%azA^)ZYBPJmYWoU*m@N<9U9BSR%1ytI#{eD4cvv+ zyW7&FJ60r*!yvkj^~`N;%AIEE5b?3RH9%>uce|r0w+4=4#&b7Iv=ZsCx+%5$p#$8Z z{OKTus{sys_n}6o%xOBG#t$2L4mImp?pH9KYo2E@=P`S-iaB`;9nE^ywWF4lzGt}s zLxH3`#{G}unR`ybz079!lG@Pt6nw0-XJdq?h>-a!$;5A9nKzSvhy5k2(9PuEV9$*t z*3hYj6rv;iyDoDabaBw-4`RnSijA40|3G`6`8B$3z!~i`*RauF+dXE{q zVj>wPIco`J>o00BW&L|kQ$m)fqn5I@3c#-hFC;^BE6>8I==g*=IS?IR67qiqJ9_*E ztf+g|*L9tprqn!JI?=o)&IzI)7+i9XYtu_Yj!8fZ-PZoQ{RbcmEbuP%W_ z!q2MbCeGlv#2;eG+k|tJ%)m)bd87)JS%kkq4??8UU~x3Q;mN!~i;NzCsiw%QnhgcU z%Ag09Z{XXQ^(vatDL;HPX?TsKNfqAr6?#wK#-`ZjHS`H@Yv_+{(Q?-s24W9rIktue zV-IP$n_X-xn>9SVzLs?cYS})IoLcxq zUaorC(0}iTL`R~}Y)}rm)E+vX{T^hXzxw&muRdfXb^GOWmhluxiiM7+z9h0zzm{T^ Tpp||HULYPVEn diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class index f893721274b53c0a4fff29bd634a731b0c29f895..3de4bb98066a69d0def0fd5ac4ce4be415b0bb34 100644 GIT binary patch delta 187 zcmewyusLwUS*Ci!rz>YYUB3Hy*S4o^TQv-?h dDzZr|nw4?$p_f<*AzGr@QBhw&jMkC^0(ax3cA_nk+Cn=A5eKshTMR00009 z0RRbQWOZX>oEtv@PP5z_DGUKKlLjcQ6xT4Z diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class index 74f4f0f231d4ed4089441071203faa80080ce452..db53adb8be85617fee7e103267516e04459ec141 100644 GIT binary patch delta 183 zcmca7cTaAEFFPaub)MF2_qDx&}Z delta 183 zcmca7cTaAEFFT{)b)MF3b_D#-u< diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class new file mode 100644 index 0000000000000000000000000000000000000000..4c36b24ae195ad0c46c490d8614db2ccb72ec09c GIT binary patch literal 1374 zcmb7CTTc^F5dKcP+g+9gO1W9A)(dJclm)~K6nv0CLQ>F(A<-uf?b=^R%wbu>APRkmVn%_Xk)IW2 zPF&9mb6dfJ1{DPrcZ9#I;-2vL6)Z9+4Q}(Q=`tird;B#w>fEjx+n#IL)gnV|*|II~ z0YfyC-C>Ycor=jYRI+SytJT;w-KTuFPB)2?Q|9#@?pop;UP@lgYBJ21%1*XM$<6gdd6lj$QJ!4V6AF;;SIxRCfjQ`t=W+?mN}myMvj>W zEncTF&LlkA-80KxG5ef>IcK?tzZhi4s|jIrL1XGfrvd-^^sJV-y(Tai)EaNr0*Oek z4QlcD$;RdyVNe`%&1S3aQC3H-=LAv{;cchomd$lb$QkbtV@9k+$1oB)h7f0%{a-nC zT*oCH7m(DE644ZHFido>`(ewfR|MhF4)jdOdqu|*XfG_QBZnl7cv>DPMhyA>zG+t& z3cYr5ZapDh5m)KG4$@<0hzN!hDHIc7vLkdd$TRYC?ilP71rdyrjro^D7^7GZ5-^Sl zIx)eO?AhYah1ebK}HBI#u6OF#H4lD=N;w9)MquH z`v6%w%Kt?4J>=+7{s*F))44Vz|44znHBDwoD*Q%&Qu>AAL+FL1)JDwDkdC@21pF6* z_9sKE;xf_%K86`wAx$E*^E3&aCaGzCxJHpgA3cn4#6|Lgsw`&f4H7VwPe5d9EkKxf zP+^-YHIb-II$m6sR(w9Gc(F!o)Oh|7N}&zq#Y(C-KrSc^0iq<}P28f!GA5CsC<2Wb wWqlUR=Mn69o&JailKKYq*)jSOS{wZWn_NOC)5bve>f;@&PlbpKd0*Y>f3q+4M*si- literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class index 6c3330fafe92594c84e72035d845b175b13f6ad2..6d892785237a638764686e327681a18453c02417 100644 GIT binary patch literal 3283 zcmbVNZEqA+6n>`N*_rOnw#(9jD=!u;*jHA?7no8MYSC(2u*E7U%5*!l1G_tAX0}lL zWHiQLNbmzO@uMFkCTKKjA@~yY11A0f{s2V&gNgCEGqc;-Wj-_}yXT&J&vVW_Z}-e! z|K9o)z>|0{g)KPQ1_kd3@~$AK1Th4eQ&3ECofpIu(9?oj5M)shOOP`{a8^Mng)C00 zD2uhC!WQe2igPL)6|M?T98?u7D>yG9RkY{LBhHjjHYMaH&KS!^p=4AR3NxN#RThRN z|>3A!& zBQG1JDlcif|IHWoE?>QO<+6lb{)HC`6j}4W(L#}iJ;$&ro?Do*y{T%cL}jIHx~{Q6 z^{#tYF9pB5H!t7+;Fr5MZ~gt%EeTq&>UwtBbdIeo5wy=^)LdijHY`<}rpt zM_kWvynt8C%6z~j_gfXqJ0PL8w{KQLVw7P>=$No7=2W#jNBah|AaZ3Fjnb^)SYjU@ zCcH(9Y0)Q&cDXQboMQ$Hryb_@yzQJV%-dzgRVX@Tx8RuPs;27|MnkWsgFSuBESR3S zv{sbP-o8jI^|EvbSVPEN4ZyXaeS?v>HEPbRg`VPetQLL7ZM?jz_rbeGS~>)-;r2~Y zWbJYR^-V^vr)uZ0K; z20h0H9A{uhr^hG97&-Z*W4hInCn4PsPNt`^_bH9Im+FZ)qV}v^>e)dv@mb8+Ri|hk zwnSrh*6JFz`A0NdzzW-9usfO~|M((%lgIT`jc|wz zcGr`|ZECPPOcys&pN13IBO$xyNYH-FnSaDtIAd}il&p)vj7Skm!*@tZt^=^Jc`H2^tjl`Gggq&7Ewfh zWgY#MrR3T{AgfI}#9e`_#8vLU0qHv*wwpBRA8w==&;kIS;HM1aSxnMKeXP$mcaSE2e_GHp|XBzj`# zPo(pS+t_do+E6~Ric}4e)@4G{dNMByO!78z*O1A}`D6s7=?X!buI3d1QbUlES0kW| z-bPSHPvzSLC>4U*@~H@@T~8C#u50FX_>AHrzP=K2+jOMBPz{& zk{#Zk81ZYiH9Ne>imBOwYfy$((Q!(gr}cyozm|~@UWRXQ2|MOmBK_U(}Eb*6F(t){027Ua;w-V^1&t78Sv>jW50`pM7w+lW`vWkbBM_6ZMgiVBzNO;TdxVQfUeHxVo literal 3090 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 D)m2^$ literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class index 17080d31e564f9bb527e96d0502a18533c299c24..7c23d39d9a2ceaadc2d849628f86eceaf14327bb 100644 GIT binary patch delta 85 zcmbQwH=l3AZDvNE$#obWmu6538gJ0}F#G11EzS10RDqgD`^ygCv6`gBpX?v7n!rU1oK!D8(k`ivQqw{y6%<^aWVfnp8-RVN?f delta 163 zcmX>obWmu6538gx0}F!*11Ezi10RDKgD`_RgCv6mgBpY7F5nBSI`{c=NwyfR^tPDPr89Bu#zhTp7^q(xlZp#`B6bk{1m9pzI vhEHA!6pIFm#el{B0mb4c>v7n!CIiJ%z+&wj`i$w5w{y6%W&_1?fMN~+OFkdP diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class index 61fc91e42fee98338188804013a2b877728ad7bd..883edeaa19dbea90b778f880029ffb20317f0832 100644 GIT binary patch delta 703 zcmZ9JTTc^F6otR(OqpRiBw#z$f|pjR7O1U)Rsn^AcflKIy+jk67)a6ZVAY_Bp})YF zdGcRqd{JY3HSyj5;U9pwPTNRy=45A|wX@dVYoBl7uYuan?XTZ~3GVwOIqkEH$+!UX z`7To)#RSuwaXITV!>q@cOVuaAoWbWk&iS0@f=AisB9~k)yIlGBGPIqlIMF-%hnFG@ z*hfBkU$e0m*UvMO$)IWN(t7GYuW{}$6D56H=3vTe`C zl6R|d-=u^yM%bh2F zlDy(!N*vLfjcMT}YK*g@cWzSU4RgE|YFs{~SF!bX&Q^C$gB_BFanX`aLF)FVXd{fO zt;dFhM>X66Cn<7N$ch$K5~Wv7`Y0>&+jh-hofaLtriHQFVIC9nxaukFEruOuaGM#I XahD05?n+K*46~d>OwB4vVx0N|3%*j1 delta 1038 zcmZvb%TLr`6vcm?Dbr5r0)zo(00jXZ6de>qULyDaQ4|#gQBf*0;P4bW8eL6{YZH^M zNK9P1g_s!Pb7|t%xRs3wYySX^_v@&jv1!`-oqNxHoZEgbd=trj{PF4?(8QcYjH4D& zy7L53mu1jn(v;6JjvJh?I7zR`L4!Vvd`>C6-{iE#83s&REY5PyWYEIoyuk&FVlJx4 zA!S`s?#l+l1|u4w&h&gb)1|GB=LhvZN$xEKKbYlI*wnJu>(b-3S8PVPs!=fQ+;bAM z&iqtjD6^EFpE9^+bDc4bcCT8CdS3$737c|m*xY1XLwD23`v#89EhY?-HYp}Gf{r_3 zGo{Q%;q9&(TuP>v`ZK9Hn?Y{dq?xvvQP!*qs`7gD$cyj#m^NUg-E#|>lXG`64>Th2 zfqy&ds8@Za7VkQFT gJ@$ifgEoV9xeLRk1;18P)FHj(w$#ZHAq4392`w|M^Z)<= diff --git a/dq-govern-gateway/src/main/resources/application.yml b/dq-govern-gateway/src/main/resources/application.yml index 2241cc7f..414ef3d1 100644 --- a/dq-govern-gateway/src/main/resources/application.yml +++ b/dq-govern-gateway/src/main/resources/application.yml @@ -13,8 +13,23 @@ spring: # - Query=url,qq # - id: hrms_route - uri: lb://dq-financial-hrms + #uri: lb://dq-financial-hrms + uri: http://dq-financial-hrms predicates: - Path=/api/** filters: - - RewritePath=/api/(?.*),/ $\{segment} \ No newline at end of file + - RewritePath=/api/(?.*),/ $\{segment} + +# - id: crms_auth +# uri: lb://dq-financial-crms +# predicates: +# - Path=/crms/** +# filters: +# - RewritePath=/crms/(?.*),/ $\{segment} + + redis: + host: + port: + password: + database: 1 + timeout: 60s \ No newline at end of file diff --git a/dq-govern-gateway/target/classes/META-INF/dq-govern-gateway.kotlin_module b/dq-govern-gateway/target/classes/META-INF/dq-govern-gateway.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..8fb60192d378759239a3ecbf60eac8c8de446e9c GIT binary patch literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ literal 0 HcmV?d00001 diff --git a/dq-govern-gateway/target/classes/application.yml b/dq-govern-gateway/target/classes/application.yml new file mode 100644 index 00000000..f50d514a --- /dev/null +++ b/dq-govern-gateway/target/classes/application.yml @@ -0,0 +1,34 @@ +spring: + cloud: + gateway: + routes: +# - id: test_route +# uri: https://www.baidu.com +# predicates: +# - Query=url,baidu +# +# - id: qq_route +# uri: https://www.qq.com +# predicates: +# - Query=url,qq +# + - id: hrms_route + uri: lb://dq-financial-hrms + predicates: + - Path=/api/hrms/** + filters: + - RewritePath=/api/(?.*),/ $\{segment} + - + - id: crms_auth + uri: lb://dq-financial-crms + predicates: + - Path=/crms/** + filters: + - RewritePath=/crms/(?.*),/ $\{segment} + + redis: + host: + port: + password: + database: 1 + timeout: 60s \ No newline at end of file diff --git a/dq-govern-gateway/target/classes/bootstrap.properties b/dq-govern-gateway/target/classes/bootstrap.properties new file mode 100644 index 00000000..5d6a98ae --- /dev/null +++ b/dq-govern-gateway/target/classes/bootstrap.properties @@ -0,0 +1,9 @@ +#鏈嶅姟鍚嶇О +spring.application.name=dq-govern-gateway +#閰嶇疆涓績鍦板潃 +spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25 + +spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml +spring.cloud.nacos.config.ext-config[0].group=dev +spring.cloud.nacos.config.ext-config[0].refresh=true \ No newline at end of file diff --git a/dq-govern-gateway/target/classes/jwt.properties b/dq-govern-gateway/target/classes/jwt.properties new file mode 100644 index 00000000..55a67a44 --- /dev/null +++ b/dq-govern-gateway/target/classes/jwt.properties @@ -0,0 +1 @@ +jwt.ignoreUrlList=/route-api/login,/route-api/refresh \ No newline at end of file