冲突后的正式环境代码更改

admin

2019-04-12 4fc1db714a767ab3bf2106028cbd59f3580e7180

冲突后的正式环境代码更改

 fanli/libs/jd-cps-client-2.2.jar

Binary files differ

 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -13,9 +13,9 @@
public class Constant {

    public static boolean IS_TASK = false;

    // 外网环境

    public static boolean IS_OUTNET = false;

    public static boolean IS_OUTNET = true;



    public static boolean IS_TEST = true;

    public static boolean IS_TEST = false;



    public static int PAGE_SIZE = 20;

    public static int[] TASK_TYPE = { 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008// 微信任务类型编号


 fanli/src/main/resource/druid.properties

@@ -1,8 +1,8 @@
druid.driverClassName=com.mysql.jdbc.Driver

#本地测试

druid.url=jdbc:mysql://192.168.1.253:3306/ec_quan

druid.username=root

druid.password=123456

#druid.url=jdbc:mysql://192.168.1.253:3306/ec_quan

#druid.username=root

#druid.password=123456






@@ -18,9 +18,9 @@




#外网正式

#druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan

#druid.username=root

#druid.password=Yeshi2016@

druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan

druid.username=root

druid.password=Yeshi2016@



#外网本地测试

#druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan


 fanli/src/main/resource/redis.properties

@@ -1,8 +1,8 @@
#redis.addr=172.16.16.15

redis.addr=192.168.1.253

redis.addr=172.16.16.15

#redis.addr=192.168.1.253

redis.port=6379

#redis.auth=crs-43yhgz0i:Yeshi2016@

redis.auth=123456

redis.auth=crs-43yhgz0i:Yeshi2016@

#redis.auth=123456

redis.max_active=1024

redis.max_idle=200

redis.max_wait=10000