admin
2020-01-08 039a739bdc4206f849d751541fac8c4e91a9e1ac
新增沙箱环境Date类型的gson转换bug修复
2个文件已修改
7个文件已添加
74 ■■■■■ 已修改文件
fanli/pom.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-sandbox/constant.properties 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-sandbox/cos.properties 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-sandbox/mongo.properties 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-sandbox/redis.properties 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-sandbox/rocketmq.properties 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-sandbox/rocketmq.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-sandbox/xxl-job.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
utils/src/main/java/org/yeshi/utils/JsonUtil.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/pom.xml
@@ -220,6 +220,15 @@
            </properties>
        </profile>
        <profile>
            <!-- 沙箱 -->
            <id>env-sandbox</id>
            <properties>
                <profiles.active>env-sandbox</profiles.active>
            </properties>
        </profile>
    </profiles>
fanli/src/main/resource/env-sandbox/constant.properties
New file
@@ -0,0 +1,3 @@
task =false
outnetwork =true
test=true
fanli/src/main/resource/env-sandbox/cos.properties
New file
@@ -0,0 +1,5 @@
appId =1255749512
secretId =AKIDTlpgJhLjOozvd6QI2XnpfGbgV4NQJk25
secretKey =xhCSUHo55oHUQ6XicFcmfIgspX0EEzWo
bucketName =ec
region=ap-guangzhou
fanli/src/main/resource/env-sandbox/mongo.properties
New file
@@ -0,0 +1,17 @@
mongo.dbname=flq
mongo.port=27017
ƒ
mongo.host=172.16.16.40
mongo.username=admin
mongo.password=123456
mongo.connectionsPerHost=8
mongo.threadsAllowedToBlockForConnectionMultiplier=4
mongo.connectTimeout=1000
mongo.maxWaitTime=1500
mongo.autoConnectRetry=true
mongo.socketKeepAlive=true
mongo.socketTimeout=1500
mongo.slaveOk=true
mongo.writeNumber=1
mongo.riteTimeout=0
mongo.writeFsync=true
fanli/src/main/resource/env-sandbox/redis.properties
New file
@@ -0,0 +1,8 @@
redis.addr=172.16.16.3
redis.port=6379
redis.auth=weikou2014
redis.max_total=1024
redis.max_idle=200
redis.max_wait=10000
redis.timeout=5000
redis.test_on_borrow=true
fanli/src/main/resource/env-sandbox/rocketmq.properties
New file
@@ -0,0 +1,7 @@
rocketmq.AccessKey=LTAI4FwmTxVCuzTaoZtDiV8z
rocketmq.SecretKey=ixWg90QbYFKP6ae5xpAo2P1qwIyll5
#测试  http://MQ_INST_1205444665315884_Bbkj89nI.mq-internet-access.mq-internet.aliyuncs.com:80
#正式 http://MQ_INST_1205444665315884_BbaMbxF4.mq-internet-access.mq-internet.aliyuncs.com:80
rocketmq.NAMESRV_ADDR=http://MQ_INST_1205444665315884_Bbkj89nI.mq-internet-access.mq-internet.aliyuncs.com:80
fanli/src/main/resource/env-sandbox/rocketmq.xml
New file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
    <import resource="classpath:/rocket/producer.xml" />
    <import resource="classpath:/rocket/transactionProducer.xml" />
</beans>
fanli/src/main/resource/env-sandbox/xxl-job.xml
New file
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
    xsi:schemaLocation="http://www.springframework.org/schema/beans
           http://www.springframework.org/schema/beans/spring-beans.xsd
           http://www.springframework.org/schema/context
           http://www.springframework.org/schema/context/spring-context.xsd">
    <!-- 不执行任务 -->
</beans>
utils/src/main/java/org/yeshi/utils/JsonUtil.java
@@ -12,9 +12,6 @@
import java.util.Map;
import java.util.Set;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
@@ -202,7 +199,8 @@
                        desc = (nowDay - oldDay) + "天前";
                    }
                    out.value(desc);
                }
                } else
                    out.value("");
            }
            @Override