# Conflicts: # dq-financial-hrms/pom.xml # dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/UserController.java # dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/ApiGlobalFilter.java # dq-govern-gateway/src/main/resources/application.yml # dq-govern-gateway/src/main/resources/bootstrap.propertiesmaster
shijie
5 years ago
commit
29540a25a4
106 changed files with 820 additions and 173 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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 |
||||||
@ -0,0 +1,47 @@ |
|||||||
|
<?xml version="1.0" encoding="UTF-8"?> |
||||||
|
|
||||||
|
<configuration> |
||||||
|
<!--定义日志文件的存储地址,使用绝对路径--> |
||||||
|
<property name="LOG_HOME" value="d:/logs/daqing/crms_auth"/> |
||||||
|
|
||||||
|
<!-- Console 输出设置 --> |
||||||
|
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> |
||||||
|
<encoder> |
||||||
|
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符--> |
||||||
|
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern> |
||||||
|
<charset>utf8</charset> |
||||||
|
</encoder> |
||||||
|
</appender> |
||||||
|
|
||||||
|
<!-- 按照每天生成日志文件 --> |
||||||
|
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> |
||||||
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> |
||||||
|
<!--日志文件输出的文件名--> |
||||||
|
<fileNamePattern>${LOG_HOME}/crms_auth.%d{yyyy-MM-dd}.log</fileNamePattern> |
||||||
|
</rollingPolicy> |
||||||
|
<encoder> |
||||||
|
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern> |
||||||
|
</encoder> |
||||||
|
</appender> |
||||||
|
|
||||||
|
<!-- 异步输出 --> |
||||||
|
<appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender"> |
||||||
|
<!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> |
||||||
|
<discardingThreshold>0</discardingThreshold> |
||||||
|
<!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> |
||||||
|
<queueSize>512</queueSize> |
||||||
|
<!-- 添加附加的appender,最多只能添加一个 --> |
||||||
|
<appender-ref ref="FILE"/> |
||||||
|
</appender> |
||||||
|
|
||||||
|
|
||||||
|
<logger name="org.apache.ibatis.cache.decorators.LoggingCache" level="DEBUG" additivity="false"> |
||||||
|
<appender-ref ref="CONSOLE"/> |
||||||
|
</logger> |
||||||
|
<logger name="org.springframework.boot" level="DEBUG"/> |
||||||
|
<root level="info"> |
||||||
|
<!--<appender-ref ref="ASYNC"/>--> |
||||||
|
<appender-ref ref="FILE"/> |
||||||
|
<appender-ref ref="CONSOLE"/> |
||||||
|
</root> |
||||||
|
</configuration> |
||||||
@ -0,0 +1,10 @@ |
|||||||
|
<?xml version="1.0" encoding="UTF-8"?> |
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||||
|
|
||||||
|
<mapper namespace="com.daqing.financial.crauth.dao.CustomerLoginDao"> |
||||||
|
|
||||||
|
<select id="getCustomer" parameterType="string" resultType="com.daqing.framework.domain.crms.CustomerEntity"> |
||||||
|
SELECT phone,password FROM crms_customer WHERE phone = #{phone} |
||||||
|
</select> |
||||||
|
|
||||||
|
</mapper> |
||||||
Binary file not shown.
@ -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); |
||||||
|
} |
||||||
|
} |
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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); |
||||||
|
} |
||||||
|
} |
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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; |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,92 @@ |
|||||||
|
package com.daqing.framework.domain.crms.ext; |
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModelProperty; |
||||||
|
import lombok.Data; |
||||||
|
import lombok.ToString; |
||||||
|
|
||||||
|
import java.io.Serializable; |
||||||
|
|
||||||
|
/** |
||||||
|
* @auther River |
||||||
|
* @date 2020/9/29 11:00 |
||||||
|
*/ |
||||||
|
@Data |
||||||
|
@ToString |
||||||
|
public class CustomerCompanyDTO implements Serializable { |
||||||
|
|
||||||
|
/** |
||||||
|
* 客户编号 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "客户编号") |
||||||
|
private String code; |
||||||
|
/** |
||||||
|
* 客户类型：1、企业类型，0：个人类型 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "企业类型") |
||||||
|
private Integer type; |
||||||
|
/** |
||||||
|
* 客户经理 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "客户经理") |
||||||
|
private Long manager; |
||||||
|
/** |
||||||
|
* 客户名称 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "客户名称") |
||||||
|
private String name; |
||||||
|
/** |
||||||
|
* 联系地址 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "联系地址") |
||||||
|
private String addr; |
||||||
|
/** |
||||||
|
* 联系电话 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "联系电话") |
||||||
|
private String phone; |
||||||
|
/** |
||||||
|
* 注册资金 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "注册资金") |
||||||
|
private String registeredCapital; |
||||||
|
/** |
||||||
|
* 所属行业 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "所属行业") |
||||||
|
private String industry; |
||||||
|
/** |
||||||
|
* 成立年限 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "成立年限") |
||||||
|
private Integer years; |
||||||
|
/** |
||||||
|
* 所在区域 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "所在区域") |
||||||
|
private String region; |
||||||
|
/** |
||||||
|
* 股东名称 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "股东名称") |
||||||
|
private String shareholder; |
||||||
|
/** |
||||||
|
* 关联企业 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "关联企业") |
||||||
|
private String affiliatedCompany; |
||||||
|
/** |
||||||
|
* 员工个数 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "员工个数") |
||||||
|
private String empNum; |
||||||
|
/** |
||||||
|
* 联系人 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "联系人") |
||||||
|
private String linkman; |
||||||
|
/** |
||||||
|
* 业务来源 |
||||||
|
*/ |
||||||
|
@ApiModelProperty(value = "业务来源") |
||||||
|
private String businessSource; |
||||||
|
} |
||||||
@ -0,0 +1,101 @@ |
|||||||
|
package com.daqing.framework.domain.crms.ext; |
||||||
|
|
||||||
|
import lombok.Data; |
||||||
|
import lombok.ToString; |
||||||
|
|
||||||
|
import java.io.Serializable; |
||||||
|
|
||||||
|
/** |
||||||
|
* @auther River |
||||||
|
* @date 2020/9/29 11:01 |
||||||
|
*/ |
||||||
|
@Data |
||||||
|
@ToString |
||||||
|
public class CustomerPersonalDTO implements Serializable { |
||||||
|
|
||||||
|
/** |
||||||
|
* 客户编号 |
||||||
|
*/ |
||||||
|
private String code; |
||||||
|
/** |
||||||
|
* 客户类型：1、企业类型，0：个人类型 |
||||||
|
*/ |
||||||
|
private Integer type; |
||||||
|
/** |
||||||
|
* 客户经理 |
||||||
|
*/ |
||||||
|
private Long manager; |
||||||
|
/** |
||||||
|
* 客户名称 |
||||||
|
*/ |
||||||
|
private String name; |
||||||
|
/** |
||||||
|
* 联系地址 |
||||||
|
*/ |
||||||
|
private String addr; |
||||||
|
/** |
||||||
|
* 联系电话 |
||||||
|
*/ |
||||||
|
private String phone; |
||||||
|
/** |
||||||
|
* 身份证号 |
||||||
|
*/ |
||||||
|
private String idCard; |
||||||
|
/** |
||||||
|
* 年龄 |
||||||
|
*/ |
||||||
|
private Integer age; |
||||||
|
/** |
||||||
|
* 性别：1、男，0、女 |
||||||
|
*/ |
||||||
|
private Integer gender; |
||||||
|
/** |
||||||
|
* 婚姻状况：1、已婚，0、未婚 |
||||||
|
*/ |
||||||
|
private Integer maritalStatus; |
||||||
|
/** |
||||||
|
* 学历 |
||||||
|
*/ |
||||||
|
private Integer education; |
||||||
|
/** |
||||||
|
* 工作单位 |
||||||
|
*/ |
||||||
|
private String employer; |
||||||
|
/** |
||||||
|
* 职务 |
||||||
|
*/ |
||||||
|
private String position; |
||||||
|
/** |
||||||
|
* 工作年限 |
||||||
|
*/ |
||||||
|
private Integer workingYears; |
||||||
|
/** |
||||||
|
* 社保账号 |
||||||
|
*/ |
||||||
|
private String socialSecurityNum; |
||||||
|
/** |
||||||
|
* 居住情况 |
||||||
|
*/ |
||||||
|
private String livingSituation; |
||||||
|
/** |
||||||
|
* 户籍地址 |
||||||
|
*/ |
||||||
|
private String residenceAddr; |
||||||
|
/** |
||||||
|
* 业务来源 |
||||||
|
*/ |
||||||
|
private String businessSource; |
||||||
|
/** |
||||||
|
* 紧急联系人 |
||||||
|
*/ |
||||||
|
private String emergencyLinkman; |
||||||
|
/** |
||||||
|
* 紧急联系人关系 |
||||||
|
*/ |
||||||
|
private String emergencyLinkmanRelationship; |
||||||
|
/** |
||||||
|
* 紧急联系人电话 |
||||||
|
*/ |
||||||
|
private String emergencyLinkmanPhone; |
||||||
|
|
||||||
|
} |
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue