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 00000000..63b95197 Binary files /dev/null and b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplication.class differ diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/AuthorizationServer.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/AuthorizationServer.class new file mode 100644 index 00000000..d60a76b8 Binary files /dev/null and b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/AuthorizationServer.class differ diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/SecurityConfig.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/SecurityConfig.class new file mode 100644 index 00000000..65a8ced3 Binary files /dev/null and b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/SecurityConfig.class differ 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 00000000..5e113698 Binary files /dev/null and b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/TokenConfig.class differ 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 00000000..8d4b500d Binary files /dev/null and b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/controller/CustomerLoginController.class differ diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/dao/CustomerLoginDao.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/dao/CustomerLoginDao.class new file mode 100644 index 00000000..ed12926e Binary files /dev/null and b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/dao/CustomerLoginDao.class differ diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/CustomerLoginService.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/CustomerLoginService.class new file mode 100644 index 00000000..27441924 Binary files /dev/null and b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/CustomerLoginService.class differ diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.class new file mode 100644 index 00000000..a6e458b4 Binary files /dev/null and b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.class differ 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 00000000..d5a57e61 Binary files /dev/null and b/dq-financial-crms-auth/target/test-classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplicationTests.class differ diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/config/CorsConfig.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/config/CorsConfig.java new file mode 100644 index 00000000..a5336047 --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/config/CorsConfig.java @@ -0,0 +1,33 @@ +package com.daqing.financial.crms.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-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java index 118b574e..a38c37a5 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -5,14 +5,18 @@ import com.daqing.financial.crms.service.CustomerService; import com.daqing.framework.domain.crms.ext.CustomerCompanyTO; import com.daqing.framework.domain.crms.ext.CustomerPersonalTO; import com.daqing.framework.domain.crms.request.CustomerRequest; +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 io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Objects; /** @@ -63,57 +67,62 @@ public class CustomerController implements CustomerControllerApi { /** * 鏍规嵁瀹㈡埛id鍒犻櫎鎵閫夊鎴 */ - @Override @DeleteMapping("/deleteCustomer") public ResponseResult deleteCustomer(@RequestBody Long[] ids){ + List 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 00000000..8fb60192 Binary files /dev/null and b/dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module differ 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 00000000..518270b3 Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class new file mode 100644 index 00000000..6f152156 Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class new file mode 100644 index 00000000..176a6cff Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class differ 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 00000000..8ea5279a Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class differ 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 00000000..364a01cf Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class new file mode 100644 index 00000000..060ed43c Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class differ 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 00000000..ab7598c4 Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class new file mode 100644 index 00000000..19fe26e9 Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class new file mode 100644 index 00000000..f7c2de0c Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class differ 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 00000000..e9a3f040 Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class differ 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 00000000..9e78cf07 Binary files /dev/null and b/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class differ 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 00000000..5999cda2 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class differ 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 3ae3e99b..c6234214 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class differ 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 2f3adc83..a66c7457 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class and b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class differ 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 00000000..ac2567ba Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class differ 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 2dfdcba6..63461c4a 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class and b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class differ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java index a1d6e1d1..b2dc52e2 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java @@ -44,13 +44,13 @@ public class PersonalCustomerEntity implements Serializable { */ private Integer gender; /** - * 濠氬Щ鐘跺喌锛1銆佸凡濠氾紝0銆佹湭濠 + * 濠氬Щ鐘跺喌,0:鏈,1:宸插,2:绂诲紓,3:鍐嶅 */ private Integer maritalStatus; /** - * 瀛﹀巻 + * 瀛﹀巻,0:鏈,1:澶т笓,2:楂樿亴,3:涓笓,4:鍏朵粬 */ - private String education; + private Integer education; /** * 宸ヤ綔鍗曚綅 */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java index febc0b8b..9c9f7752 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java @@ -18,6 +18,7 @@ public class CustomerCompanyTO implements Serializable { /** * 瀹㈡埛鍩烘湰淇℃伅 */ + private CustomerEntity customerEntity; /** * 浼佷笟绫诲瀷淇℃伅 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java index ae968347..54f11476 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java @@ -65,13 +65,13 @@ public class CustomerPersonalVO extends BaseRowModel implements Serializable { /** * 濠氬Щ鐘跺喌锛1銆佸凡濠氾紝0銆佹湭濠 */ - @ExcelProperty(value = "濠氬Щ鐘跺喌(1:宸插,0:鏈)",index = 9) + @ExcelProperty(value = "濠氬Щ鐘跺喌(0:鏈,1:宸插,2:绂诲紓,3:鍐嶅)",index = 9) private Integer maritalStatus; /** * 瀛﹀巻 */ - @ExcelProperty(value = "瀛﹀巻",index = 10) - private String education; + @ExcelProperty(value = "瀛﹀巻(0:鏈,1:澶т笓,2:楂樿亴,3:涓笓,4:鍏朵粬)",index = 10) + private Integer education; /** * 宸ヤ綔鍗曚綅 */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerTO.java index eb6940ae..2af040ac 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerTO.java @@ -1,7 +1,5 @@ package com.daqing.framework.domain.crms.ext; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.metadata.BaseRowModel; import lombok.Data; import lombok.ToString; diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CustomerRequest.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CustomerRequest.java index 7ae6aac3..2d3bdcd8 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CustomerRequest.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CustomerRequest.java @@ -1,10 +1,13 @@ package com.daqing.framework.domain.crms.request; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import lombok.ToString; +import javax.validation.constraints.NotNull; + /** * 璁板綍瀹㈡埛鍩烘湰淇℃伅 @@ -20,6 +23,9 @@ public class CustomerRequest implements Serializable { /** * 瀹㈡埛缂栧彿鎴栬呭悕绉 */ + + @ApiModelProperty(value = "璁㈠崟鍚") + @NotNull(message = "鍟婂晩鍟婁笉鑳戒负绌") private String codeOrName; /** * 瀹㈡埛绫诲瀷 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeVO.java index 04bf2f0b..82ccda76 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeVO.java @@ -1,7 +1,5 @@ package com.daqing.framework.domain.hrms.ext; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.metadata.BaseRowModel; import lombok.Data; import lombok.ToString; diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class index 3219752b..adc9c109 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class index 8338956b..bc268638 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class differ 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 f8937212..3de4bb98 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class differ 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 74f4f0f2..db53adb8 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class differ 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 00000000..4c36b24a Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class differ 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 6c3330fa..6d892785 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class new file mode 100644 index 00000000..b35c4610 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class differ 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 17080d31..7c23d39d 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class index 92c8442e..c6ed9be0 100644 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class and b/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class differ 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 61fc91e4..883edeaa 100644 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class and b/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class differ 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 00000000..8fb60192 Binary files /dev/null and b/dq-govern-gateway/target/classes/META-INF/dq-govern-gateway.kotlin_module differ 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