Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
8776743e16
|
|
@ -15,7 +15,6 @@ repositories {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile group: 'junit', name: 'junit', version: '4.12'
|
testCompile group: 'junit', name: 'junit', version: '4.12'
|
||||||
|
|
||||||
compile project(":netty")
|
compile project(":netty")
|
||||||
compile project(":hotfix")
|
compile project(":hotfix")
|
||||||
compile project(":common")
|
compile project(":common")
|
||||||
|
|
@ -28,7 +27,6 @@ dependencies {
|
||||||
compile("com.google.protobuf:protobuf-java:2.5.0")
|
compile("com.google.protobuf:protobuf-java:2.5.0")
|
||||||
compile("com.fasterxml.jackson.core:jackson-core:2.3.1")
|
compile("com.fasterxml.jackson.core:jackson-core:2.3.1")
|
||||||
compile("com.fasterxml.jackson.core:jackson-databind:2.3.3")
|
compile("com.fasterxml.jackson.core:jackson-databind:2.3.3")
|
||||||
compile("org.apache.poi:poi-ooxml:3.12")
|
|
||||||
compile files("${System.properties['java.home']}/../lib/tools.jar")
|
compile files("${System.properties['java.home']}/../lib/tools.jar")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,67 +0,0 @@
|
||||||
#server info
|
|
||||||
server.id = 10180
|
|
||||||
server.openTime = 20190101000101
|
|
||||||
|
|
||||||
|
|
||||||
# redis config
|
|
||||||
# Redis数据库索引(默认为0)
|
|
||||||
spring.redis.database=0
|
|
||||||
# Redis服务器地址
|
|
||||||
spring.redis.host=60.1.1.14
|
|
||||||
# Redis服务器连接端口
|
|
||||||
spring.redis.port=6379
|
|
||||||
# Redis服务器连接密码(默认为空)
|
|
||||||
spring.redis.password=
|
|
||||||
# 连接池最大连接数(使用负值表示没有限制)
|
|
||||||
spring.redis.pool.max-active=8
|
|
||||||
# 连接池最大阻塞等待时间(使用负值表示没有限制)
|
|
||||||
spring.redis.pool.max-wait=-1
|
|
||||||
# 连接池中的最大空闲连接
|
|
||||||
spring.redis.pool.max-idle=8
|
|
||||||
# 连接池中的最小空闲连接
|
|
||||||
spring.redis.pool.min-idle=0
|
|
||||||
# 连接超时时间(毫秒)
|
|
||||||
spring.redis.timeout=0
|
|
||||||
|
|
||||||
spring.redis.expireTime = -1
|
|
||||||
|
|
||||||
|
|
||||||
#spring.data.mongodb.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/ysj_wx_1
|
|
||||||
#spring.data.mongodb2.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/develop_ysj_wx_1
|
|
||||||
#mongodb2 develop
|
|
||||||
spring.data.mongodb.uri = mongodb://60.1.1.14:27017/ysj_msy
|
|
||||||
mongodb.options.maxWaitTime = 120000
|
|
||||||
mongodb.options.connectTimeout = 1000
|
|
||||||
mongodb.options.socketTimeout = 0
|
|
||||||
mongodb.options.threadsAllowedToBlockForConnectionMultiplier = 20
|
|
||||||
mongodb.options.connectionsPerHost = 256
|
|
||||||
mongodb.options.minConnectionsPerHost = 5
|
|
||||||
mongodb.options.maxConnectionIdleTime = 1000
|
|
||||||
|
|
||||||
|
|
||||||
# netty config
|
|
||||||
netty.tcpPort = 18090
|
|
||||||
netty.chatTcpPort = 20001
|
|
||||||
netty.logintcpPort = 18091
|
|
||||||
netty.udpPort = 18092
|
|
||||||
netty.udpTargetIp=127.0.0.1
|
|
||||||
netty.udpTargetPort=10001
|
|
||||||
netty.reconnectDelay=3000
|
|
||||||
netty.bossThreadCount=1
|
|
||||||
netty.workerThreadCount=10
|
|
||||||
netty.readTimeout=32
|
|
||||||
netty.writeTimeout=32
|
|
||||||
netty.allTimeout=35
|
|
||||||
|
|
||||||
|
|
||||||
#core
|
|
||||||
services.core.ip=60.1.1.180
|
|
||||||
services.core.port=7900
|
|
||||||
services.core.area=1000
|
|
||||||
services.core.id=1
|
|
||||||
services.core.weight=5
|
|
||||||
|
|
||||||
#arena service
|
|
||||||
services.fight.key=key_dir_checkserver_Hash
|
|
||||||
|
|
||||||
logging.config = conf/logback-boot.xml
|
|
||||||
|
|
@ -3,4 +3,6 @@ include 'netty'
|
||||||
include 'serverlogic'
|
include 'serverlogic'
|
||||||
include 'hotfix'
|
include 'hotfix'
|
||||||
include 'common'
|
include 'common'
|
||||||
|
include 'test'
|
||||||
|
include 'test'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
plugins {
|
||||||
|
id 'java'
|
||||||
|
}
|
||||||
|
|
||||||
|
version 'unspecified'
|
||||||
|
|
||||||
|
sourceCompatibility = 1.8
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenLocal()
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
testCompile group: 'junit', name: 'junit', version: '4.12'
|
||||||
|
compile("org.apache.poi:poi-ooxml:3.12")
|
||||||
|
}
|
||||||
Binary file not shown.
|
|
@ -0,0 +1,2 @@
|
||||||
|
Manifest-Version: 1.0
|
||||||
|
|
||||||
|
|
@ -1,10 +1,6 @@
|
||||||
package com.ljsd.jieling.util;
|
|
||||||
|
|
||||||
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
||||||
import org.apache.poi.ss.usermodel.*;
|
import org.apache.poi.ss.usermodel.*;
|
||||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
@ -13,10 +9,12 @@ import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class ExcelUtils {
|
public class ExcelUtils {
|
||||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExcelUtils.class);
|
// private static final Logger LOGGER = LoggerFactory.getLogger(ExcelUtils.class);
|
||||||
private static boolean isWrite = true;
|
private static boolean isWrite = true;
|
||||||
|
// excel文件地址
|
||||||
private static String excelPath ="tmp/";
|
private static String excelPath ="tmp/";
|
||||||
private static String path = "C:/ljsd/jieling_conf/";
|
// 生成txt文件地址
|
||||||
|
private static String path = "conf/server/";
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
readExcelData();
|
readExcelData();
|
||||||
|
|
@ -51,7 +49,8 @@ public class ExcelUtils {
|
||||||
Object cellData;
|
Object cellData;
|
||||||
sheet = wb.getSheetAt(0);
|
sheet = wb.getSheetAt(0);
|
||||||
String sheetName = sheet.getSheetName();
|
String sheetName = sheet.getSheetName();
|
||||||
LOGGER.info("collection name={}", sheetName);
|
System.out.println("buildDataInfo => collection name="+sheetName);
|
||||||
|
// LOGGER.info("collection name={}", sheetName);
|
||||||
int rownum = sheet.getPhysicalNumberOfRows();
|
int rownum = sheet.getPhysicalNumberOfRows();
|
||||||
FileWriter fw = new FileWriter(path + sheetName + ".txt");
|
FileWriter fw = new FileWriter(path + sheetName + ".txt");
|
||||||
PrintWriter out = new PrintWriter(fw);
|
PrintWriter out = new PrintWriter(fw);
|
||||||
|
|
@ -91,7 +90,8 @@ public class ExcelUtils {
|
||||||
private static void bulidMapInfo(Workbook wb) throws IOException {
|
private static void bulidMapInfo(Workbook wb) throws IOException {
|
||||||
Sheet sheet = wb.getSheetAt(0);
|
Sheet sheet = wb.getSheetAt(0);
|
||||||
String sheetName = sheet.getSheetName();
|
String sheetName = sheet.getSheetName();
|
||||||
LOGGER.info("collection name={}", sheetName);
|
System.out.println("bulidMapInfo => collection name="+sheetName);
|
||||||
|
// LOGGER.info("collection name={}", sheetName);
|
||||||
int rowNum = sheet.getPhysicalNumberOfRows();
|
int rowNum = sheet.getPhysicalNumberOfRows();
|
||||||
FileWriter fw = new FileWriter(path + sheetName + ".txt");
|
FileWriter fw = new FileWriter(path + sheetName + ".txt");
|
||||||
PrintWriter out = new PrintWriter(fw);
|
PrintWriter out = new PrintWriter(fw);
|
||||||
Loading…
Reference in New Issue