admin
2019-05-27 9eb77a12f9e170213ce8b46fc113c2f8985e6b1f
增加不同环境编译的变量
2个文件已删除
2 文件已重命名
1个文件已修改
3 文件已复制
7个文件已添加
202 ■■■■ 已修改文件
fanli/pom.xml 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/druid.properties 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-dev/cos.properties 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-dev/mongo.properties 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-dev/redis.properties 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-pro-by/cos.properties 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-pro-by/mongo.properties 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-pro-by/redis.properties 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-pro-job/cos.properties 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-pro-job/mongo.properties 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-pro-job/redis.properties 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-pro/cos.properties 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-pro/mongo.properties 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-pro/redis.properties 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/redis.properties 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/pom.xml
@@ -109,8 +109,8 @@
            <scope>system</scope>
            <systemPath>${basedir}/libs/ueditor-1.1.2.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>jd-cps-client</groupId>
            <artifactId>jd-cps-client</artifactId>
@@ -141,13 +141,71 @@
                    <include>**/*.properties</include>
                    <include>**/*.xml</include>
                </includes>
                <excludes>
                    <exclude>env-dev/**</exclude>
                    <exclude>env-pro/**</exclude>
                    <exclude>env-pro-by/**</exclude>
                    <exclude>env-pro-job/**</exclude>
                </excludes>
                <filtering>false</filtering>
            </resource>
            <resource>
                <directory>src/main/resource</directory>
                <excludes>
                    <exclude>env-dev/**</exclude>
                    <exclude>env-pro/**</exclude>
                    <exclude>env-pro-by/**</exclude>
                    <exclude>env-pro-job/**</exclude>
                </excludes>
            </resource>
            <resource>
                <directory>src/main/resource/${profiles.active}</directory>
            </resource>
        </resources>
    </build>
    <profiles>
        <profile>
            <!-- 本地开发环境 -->
            <id>env-dev</id>
            <properties>
                <profiles.active>env-dev</profiles.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <!--线上生产环境 -->
            <id>env-pro</id>
            <properties>
                <profiles.active>env-pro</profiles.active>
            </properties>
        </profile>
        <profile>
            <!-- 线上生产环境(备用) -->
            <id>env-pro-by</id>
            <properties>
                <profiles.active>env-pro-by</profiles.active>
            </properties>
        </profile>
        <profile>
            <!-- 任务执行 -->
            <id>env-pro-job</id>
            <properties>
                <profiles.active>env-pro-job</profiles.active>
            </properties>
        </profile>
    </profiles>
    <packaging>war</packaging>
</project>
fanli/src/main/resource/druid.properties
File was deleted
fanli/src/main/resource/env-dev/cos.properties
fanli/src/main/resource/env-dev/mongo.properties
New file
@@ -0,0 +1,19 @@
mongo.dbname=flq
mongo.port=27017
#开发环境
mongo.host=192.168.1.253
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-dev/redis.properties
New file
@@ -0,0 +1,8 @@
redis.addr=192.168.1.253
redis.port=6379
redis.auth=123456
redis.max_active=1024
redis.max_idle=200
redis.max_wait=10000
redis.timeout=5000
redis.test_on_borrow=true
fanli/src/main/resource/env-pro-by/cos.properties
copy from fanli/src/main/resource/cos.properties copy to fanli/src/main/resource/env-pro-by/cos.properties
fanli/src/main/resource/env-pro-by/mongo.properties
New file
@@ -0,0 +1,18 @@
mongo.dbname=flq
mongo.port=27017
#上线环境
mongo.host=127.0.0.1
mongo.username=yeshi
mongo.password=Yeshi2016@
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-pro-by/redis.properties
New file
@@ -0,0 +1,8 @@
redis.addr=127.0.0.1
redis.port=6379
redis.auth=Yeshi2016@
redis.max_active=1024
redis.max_idle=200
redis.max_wait=10000
redis.timeout=5000
redis.test_on_borrow=true
fanli/src/main/resource/env-pro-job/cos.properties
copy from fanli/src/main/resource/cos.properties copy to fanli/src/main/resource/env-pro-job/cos.properties
fanli/src/main/resource/env-pro-job/mongo.properties
fanli/src/main/resource/env-pro-job/redis.properties
New file
@@ -0,0 +1,8 @@
redis.addr=192.168.1.253
redis.port=6379
redis.auth=123456
redis.max_active=1024
redis.max_idle=200
redis.max_wait=10000
redis.timeout=5000
redis.test_on_borrow=true
fanli/src/main/resource/env-pro/cos.properties
copy from fanli/src/main/resource/cos.properties copy to fanli/src/main/resource/env-pro/cos.properties
fanli/src/main/resource/env-pro/mongo.properties
New file
@@ -0,0 +1,18 @@
mongo.dbname=flq
mongo.port=27017
#上线环境
mongo.host=172.16.16.44
mongo.username=yeshi
mongo.password=Yeshi2016@
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-pro/redis.properties
New file
@@ -0,0 +1,8 @@
redis.addr=172.16.16.15
redis.port=6379
redis.auth=crs-43yhgz0i:Yeshi2016@
redis.max_active=1024
redis.max_idle=200
redis.max_wait=10000
redis.timeout=5000
redis.test_on_borrow=true
fanli/src/main/resource/redis.properties
File was deleted