Skip to content

M
map-parent
Commit 24ec5360 by yangyang
Options

同步(西藏)

parent 9e22b2e8
Showing with 243 additions and 24 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkTrail.java
package com.founder.commonutils.model.newPublicEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.IOException;
import java.io.Serializable;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import org.springframework.beans.BeanUtils;
import org.springframework.web.multipart.MultipartFile;
/**
* (TbStClgj)表实体类
......@@ -85,6 +81,11 @@ public class SkTrail extends Model<SkTrail> implements Comparable<SkTrail>{
private String score;
/**
* 火车、飞机、寄递 出发1/达到2
*/
private String status;
/**
* 获取主键值
*
* @return 主键值
......
common/common_utils/src/main/java/com/founder/commonutils/util/NetworkUtil.java 0 → 100644
package com.founder.commonutils.util;
import javax.servlet.http.HttpServletRequest;
import java.net.InetAddress;
import java.net.UnknownHostException;
/**
* @Description 常用获取客户端信息的工具
*/
public class NetworkUtil {
/**
* 获取请求主机IP地址,如果通过代理进来，则透过防火墙获取真实IP地址;
*
* @param request
* @return
* @throws
*/
/**
* 获取当前网络ip
* @param request
* @return
*/
public static String getIpAddr(HttpServletRequest request){
String ipAddress = request.getHeader("X-Real-IP");
if(ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
ipAddress = request.getHeader("Proxy-Client-IP");
}
if(ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
ipAddress = request.getHeader("WL-Proxy-Client-IP");
}
if(ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
ipAddress = request.getRemoteAddr();
if("127.0.0.1".equals(ipAddress) ||
"0:0:0:0:0:0:0:1".equals(ipAddress)){
//根据网卡取本机配置的IP
InetAddress inet=null;
try {
inet = InetAddress.getLocalHost();
} catch (UnknownHostException e) {
e.printStackTrace();
}
ipAddress= inet.getHostAddress();
}
}
//对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
if(ipAddress!=null && ipAddress.length()>15){
//"***.***.***.***".length() = 15
if(ipAddress.indexOf(",")>0){
ipAddress = ipAddress.substring(0,ipAddress.indexOf(","));
}
}
return ipAddress;
}
}
common/pom.xml
......@@ -145,6 +145,13 @@
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.10</version>
</dependency>
<!--jasypt start-->
<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot-starter</artifactId>
<version>2.1.1</version>
</dependency>
<!--jasypt end-->
</dependencies>
<build>
<plugins>
......
common/service_base/src/main/java/com/founder/servicebase/logs/SysLogAspect.java
......@@ -8,6 +8,7 @@ import com.founder.commonutils.model.newPublicEntity.ThirdToken;
import com.founder.commonutils.model.newPublicEntity.Token;
import com.founder.commonutils.util.JwtUser;
import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.util.NetworkUtil;
import com.founder.servicebase.logs.mapper.mysqlMapper.SkSysLogMapper;
import io.jsonwebtoken.Claims;
import lombok.SneakyThrows;
......@@ -141,8 +142,8 @@ public class SysLogAspect {
toString());
LOG.info("HTTP_METHOD : " + request.getMethod());
LOG.info("IP : " + request.getRemoteAddr());
sysLog.setIp(request.getRemoteAddr());
LOG.info("IP : " + NetworkUtil.getIpAddr(request));
sysLog.setIp(NetworkUtil.getIpAddr(request));
//开始调用时间
// 计时并调用目标函数
......
service/publicapi/src/main/resources/bootstrap-dev.properties
......@@ -10,15 +10,17 @@ logging.level.root=INFO
#mysql?????????
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.xzxtdb.url=jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.xzxtdb.username=root
spring.datasource.xzxtdb.password=gkptCcYy123
spring.datasource.xzxtdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
spring.datasource.xzxtdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
spring.datasource.xzxtdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
spring.datasource.xzxtdb.type=com.alibaba.druid.pool.DruidDataSource
#oracle?????????(?????)
spring.datasource.qgdb.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.qgdb.url=jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.qgdb.username=root
spring.datasource.qgdb.password=gkptCcYy123
spring.datasource.qgdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
spring.datasource.qgdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
spring.datasource.qgdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
spring.datasource.qgdb.type=com.alibaba.druid.pool.DruidDataSource
#xml???
mybatis-plus.mapper-locations=classpath*:com/founder/publicapi/mapper/*/xml/*.xml
#es?????????
......
service/publicapi/src/main/resources/bootstrap-prod.properties
......@@ -10,15 +10,16 @@ logging.level.root=INFO
#mysql���ݿ�����
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.xzxtdb.url=jdbc:mysql://155.200.1.23:1106/xzxt?allowPublicKeyRetrieval=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
spring.datasource.xzxtdb.username=root
spring.datasource.xzxtdb.password=XzxtPwd#54
spring.datasource.xzxtdb.url=ENC(tiSZbUuzhdixQN8Dzz8Z+qVWXvVloz282KIqk3q/cjv1t3AQ/BwwkHFroqOtGySHLh1KQgly/wZyX3sdaTeyKOQyw75WCJBqpNiWugbRcKBF7eeGAQdvtMHEAJTomycF+Y7P6COEHAFRjW2OjvSx+Sqm3DeOl5XxbfpQWLFktGTTCO/18+JejVJ8b8odRxYRXAyLB/BA12f8DYqVWlsaLM7HvBZdhW9RLGVH1OHM+s5gCnLoQKZoZ4zwounPD/dpfAPo9a4U1U6qNIpXsfin2FweY3xZUhJH)
spring.datasource.xzxtdb.username=ENC(AcwX02W3j68cs+8BTDI9Sw==)
spring.datasource.xzxtdb.password=ENC(kB78UiJzT7X+gn2hy9HnYO8JZJhfBnVQ)
spring.datasource.xzxtdb.type=com.alibaba.druid.pool.DruidDataSource
#oracle���ݿ�����(ȫ����)
spring.datasource.qgdb.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.qgdb.url=jdbc:mysql://155.200.1.23:1106/xzxt?allowPublicKeyRetrieval=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
spring.datasource.qgdb.username=root
spring.datasource.qgdb.password=XzxtPwd#54
spring.datasource.qgdb.url=ENC(tiSZbUuzhdixQN8Dzz8Z+qVWXvVloz282KIqk3q/cjv1t3AQ/BwwkHFroqOtGySHLh1KQgly/wZyX3sdaTeyKOQyw75WCJBqpNiWugbRcKBF7eeGAQdvtMHEAJTomycF+Y7P6COEHAFRjW2OjvSx+Sqm3DeOl5XxbfpQWLFktGTTCO/18+JejVJ8b8odRxYRXAyLB/BA12f8DYqVWlsaLM7HvBZdhW9RLGVH1OHM+s5gCnLoQKZoZ4zwounPD/dpfAPo9a4U1U6qNIpXsfin2FweY3xZUhJH)
spring.datasource.qgdb.username=ENC(kB78UiJzT7X+gn2hy9HnYO8JZJhfBnVQ)
spring.datasource.qgdb.password=ENC(kB78UiJzT7X+gn2hy9HnYO8JZJhfBnVQ)
#xmlɨ��
mybatis-plus.mapper-locations=classpath*:com/founder/publicapi/mapper/*/xml/*.xml
#es�������ر�
......
service/publicapi/src/main/resources/bootstrap.properties
......@@ -4,4 +4,9 @@ server.port=1003
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
logging.level.root=INFO
\ No newline at end of file
logging.level.root=INFO
#加密秘钥
jasypt.encryptor.password=lybgeek
#指定解密算法(默认)
jasypt.encryptor.algorithm=PBEWithMD5AndDES
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment