日报查询

fjs-scenic-wx/pom.xml

@@ -77,7 +77,11 @@
 			<artifactId>guava</artifactId>
 			<version>28.0-jre</version>
 		</dependency>
-
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>5.7.13</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<finalName>wx</finalName>

fjs-scenic-wx/src/main/java/com/fjs/scenic/controller/LeaderQueryController.java

@@ -1,7 +1,16 @@
 package com.fjs.scenic.controller;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fjs.scenic.dto.InputInfoDto;
+import com.fjs.scenic.entity.system.InpIncome;
+import com.fjs.scenic.entity.system.InputInfo;
+import com.fjs.scenic.service.system.InpIncomeService;
+import com.fjs.scenic.service.system.InputInfoService;
 import io.swagger.annotations.*;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,11 +23,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.fjs.scenic.utils.HttpReq;
 import com.fjs.scenic.utils.ReturnResult;
 import com.google.gson.JsonObject;
+
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author wgd
@@ -29,7 +37,10 @@ import java.util.Set;
 @RequestMapping("/api/leader")
 @Api(description = "领导查询")
 public class LeaderQueryController {
-
+    @Autowired
+    private InputInfoService inputInfoService;
+    @Autowired
+    private InpIncomeService inpIncomeService;
     private Logger log = LoggerFactory.getLogger(LeaderQueryController.class);
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
@@ -440,7 +451,7 @@ public class LeaderQueryController {
 
             //去重操作
             Set<String> usidSet = new HashSet<String>();
-            for(int i = 0;i < lxsdata.size();i ++) {
+            for (int i = 0; i < lxsdata.size(); i++) {
                 JSONObject jo = lxsdata.getJSONObject(i);
                 usidSet.add(jo.getString("USID"));
             }
@@ -448,8 +459,7 @@ public class LeaderQueryController {
             Iterator<String> iterator = usidSet.iterator();
 
 
-
-            while(iterator.hasNext()) {
+            while (iterator.hasNext()) {
 
                 JSONObject newjo = new JSONObject();
 
@@ -466,13 +476,13 @@ public class LeaderQueryController {
 
                 String kydStr = "";
 
-                for(int i = 0;i < lxsdata.size();i ++) {
+                for (int i = 0; i < lxsdata.size(); i++) {
 
                     JSONObject jo = lxsdata.getJSONObject(i);
 
                     String usid = jo.getString("USID");
 
-                    if(nextKey.equals(usid)) {
+                    if (nextKey.equals(usid)) {
 
                         bdMaxPnum = bdMaxPnum.add(jo.getBigDecimal("MAXPNUM"));
 
@@ -484,7 +494,7 @@ public class LeaderQueryController {
 
                         String kyd = jo.getString("KYD");
 
-                        if(kydStr.indexOf(kyd) == -1) {
+                        if (kydStr.indexOf(kyd) == -1) {
                             kydStr += kyd + ",";
                         }
 
@@ -505,7 +515,7 @@ public class LeaderQueryController {
                 JSONArray contentJa = new JSONArray();
 
                 //循环客源地数据
-                for(String kydFor : kydInfo) {
+                for (String kydFor : kydInfo) {
 
                     JSONArray typeJa = new JSONArray();
 
@@ -513,7 +523,7 @@ public class LeaderQueryController {
 
                     BigDecimal bdKydNum = new BigDecimal(0);
 
-                    for(int i = 0;i < lxsdata.size();i ++) {
+                    for (int i = 0; i < lxsdata.size(); i++) {
 
                         JSONObject jo = lxsdata.getJSONObject(i);
 
@@ -521,7 +531,7 @@ public class LeaderQueryController {
 
                         String kyd = jo.getString("KYD");
 
-                        if(nextKey.equals(usid) && kydFor.equals(kyd)) {
+                        if (nextKey.equals(usid) && kydFor.equals(kyd)) {
 
                             bdKydNum = bdKydNum.add(jo.getBigDecimal("KYDPNUM"));
 
@@ -559,4 +569,46 @@ public class LeaderQueryController {
             return ReturnResult.error(jsonData.get("describe"));
         }
     }
+
+    @ApiOperation(value = "日报", notes = "日报")
+    @GetMapping(value = "/dailyReport")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "time", value = "年月时时间", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "company", value = "小南海", required = false, dataType = "String", paramType = "query")
+    })
+    public ReturnResult dailyReport(String time, String company) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("allTotal", 0);
+        result.put("scenics", new ArrayList<>());
+        result.put("allPersonTimes", 0);
+        List<InputInfo> inputInfos = new ArrayList<>();
+        if (StringUtils.isEmpty(company)) {
+            inputInfos = inputInfoService.list(new LambdaQueryWrapper<InputInfo>().eq(InputInfo::getStaticDate, time));
+        } else {
+            inputInfos = inputInfoService.list(new LambdaQueryWrapper<InputInfo>()
+                    .eq(InputInfo::getStaticDate, time)
+                    .eq(InputInfo::getCompany, company));
+        }
+
+        if (inputInfos.isEmpty()) {
+            return ReturnResult.ok(result);
+        }
+        int total = 0;
+        int allPersonTimes = 0;
+        List<InputInfoDto> scenics = new ArrayList<InputInfoDto>();
+        for (InputInfo inputInfo : inputInfos) {
+            InputInfoDto inputInfoDto = new InputInfoDto();
+            total += inputInfo.getTotal();
+            allPersonTimes += inputInfo.getPersonTimes();
+            List<InpIncome> inpIncomes = inpIncomeService.list(new LambdaQueryWrapper<InpIncome>()
+                    .eq(InpIncome::getInputInfoId, inputInfo.getId()));
+            BeanUtil.copyProperties(inputInfo, inputInfoDto);
+            inputInfoDto.setIncome(inpIncomes);
+            scenics.add(inputInfoDto);
+        }
+        result.put("allTotal",total);
+        result.put("scenics", scenics);
+        result.put("allPersonTimes", allPersonTimes);
+        return ReturnResult.ok(result);
+    }
 }

fjs-scenic-wx/src/main/resources/application-ddm.properties

@@ -1,89 +0,0 @@
-server.port=80
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://47.95.230.126:33066/fjs-scenic?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-
-spring.redis.database=0
-spring.redis.host=119.23.48.168
-spring.redis.password=
-spring.redis.port=61379
-
-#spring.redis.database=4
-#spring.redis.host=47.111.181.152
-#spring.redis.port=6379
-#spring.redis.password=fjsfjq
-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=5000
-
-
-logging.level.com.fjs.scenic=debug
-logging.level.org.springframework.web=debug
-logging.level.org.springframework.transaction=debug
-logging.level.org.mybatis=debug
-
-
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/qj
-NGINX_PORT = 8081
-
-img.path=/data/fjs/images/
-img.addr=http://jq.fjsfjq.com/images/
-
-
-wechat.mpAppId=wx3e968eac9c59390c
-wechat.mpAppSecret=37dae10f75aa7a0de975944e6098c588
-wechat.token=mywechattoken2297455150
-
-#\u5FAE\u4FE1 API
-CERT_FILE_NAME=/usr/local/pwd/apiclient_cert.p12
-APPID=wx3e968eac9c59390c
-MCH_ID=1503862741
-API_KEY=bdaf1373e5577761bd3be4ff95714b07
-#\u652F\u4ED8\u6D88\u606F\u7684\u901A\u77E5\u5730\u5740
-NOTIFY_URL=http://t.cqhsrj.com/wechat/notify
-#\u9000\u6B3E\u6D88\u606F\u7684\u901A\u77E5\u5730\u5740
-FEFUND_NOTIFY=http://t.cqhsrj.com/wechat/refund/notify
-
-
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#ģ��ID
-CAPTACHA_PHONE = SMS_172221638
-
-
-#ota.cyt.createUser = cythlfx
-#ota.cyt.key = 12345678
-#ota.cyt.apiUrl = http://dy.jingqu.cn/service/distributor.do
-#ota.cyt.code = 1000
-#ota.cyt.pic = http://ftp.cqhsrj.com:8081/images/qj/1536914963894790.png
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = fjsWx12345678
-#ota.cyt.apiUrl = http://192.168.137.158:8080/service/distributor.do
-ota.cyt.apiUrl = http://fx.fjsfjq.com:8086/service/distributor.do
-#ota.cyt.apiUrl = http://47.99.243.13:8081/service/distributor.do
-
-
-#timmer
-#ordersTasks.timmer=* 0/5 * * * ?
-#materialTasks.timmer=0 0 1 * * ?
-
-
-

fjs-scenic-wx/src/main/resources/application-dev.properties

@@ -1,90 +1,10 @@
-#server.port=80
-server.port=8443
-server.ssl.key-store=server.keystore
-server.ssl.key-alias=tomcat
-server.ssl.enabled=true
-server.ssl.key-store-password=yangya
-server.ssl.key-store-type=JKS
-
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://119.23.48.168:61111/fjs_scenic?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+server.port=8081
+spring.datasource.url=jdbc:mysql://47.108.219.126:3306/lingdaochaxun?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=Ectrip2019
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-
+spring.datasource.password=sRGjx8iLlTfV.
 spring.redis.database=0
-spring.redis.host=119.23.48.168
-spring.redis.password=
-spring.redis.port=61379
-
-#spring.redis.database=4
-#spring.redis.host=47.111.181.152
-#spring.redis.port=6379
-#spring.redis.password=fjsfjq
-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=5000
-
-
-logging.level.com.fjs.scenic=debug
-logging.level.org.springframework.web=debug
-logging.level.org.springframework.transaction=debug
-logging.level.org.mybatis=debug
-
-
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/qj
-NGINX_PORT = 8081
-
-
-wechat.mpAppId=wxbe372bd5ea1eafc8
-wechat.mpAppSecret=f659d18eae49a2fcb649c6b868491be0
-wechat.token=yangya
-
-
-#\u5FAE\u4FE1 API
-CERT_FILE_NAME=/usr/local/pwd/apiclient_cert.p12
-APPID=wx3e968eac9c59390c
-MCH_ID=1503862741
-API_KEY=bdaf1373e5577761bd3be4ff95714b07
-#\u652F\u4ED8\u6D88\u606F\u7684\u901A\u77E5\u5730\u5740
-NOTIFY_URL=http://wx.fjsfjq.com/wechat/notify
-#\u9000\u6B3E\u6D88\u606F\u7684\u901A\u77E5\u5730\u5740
-FEFUND_NOTIFY=http://wx.fjsfjq.com/wechat/refund/notify
-
-
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#ģ��ID
-CAPTACHA_PHONE = SMS_172221638
-
-#ota.cyt.createUser = cythlfx
-#ota.cyt.key = 12345678
-#ota.cyt.apiUrl = http://dy.jingqu.cn/service/distributor.do
-#ota.cyt.code = 1000
-#ota.cyt.pic = http://ftp.cqhsrj.com:8081/images/qj/1536914963894790.png
-
-ota.cyt.createUser = cytlbzy
-#ota.cyt.key = Test1234
-ota.cyt.key = 12345678
-ota.cyt.apiUrl = http://192.168.100.11:8086/service/distributor.do
-#ota.cyt.apiUrl = http://192.168.100.153:8080/service/distributor.do
-
-
-#timmer
-#ordersTasks.timmer=* 0/5 * * * ?
-#materialTasks.timmer=0 0 1 * * ?
-
+spring.redis.host=47.108.219.126
+spring.redis.port=6379
+spring.redis.password=Dingyou2020
+#票务接口
+pw.api=http://localhost:8080/services/cytDataService/doWxQueryRequest.action

fjs-scenic-wx/src/main/resources/application-fjs.properties

@@ -1,100 +0,0 @@
-server.port=80
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://47.111.181.152:13306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.url=jdbc:mysql://rm-bp1dp13uv47555y9u.mysql.rds.aliyuncs.com:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.url=jdbc:mysql://127.0.0.1:13306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.url=jdbc:mysql://114.55.170.153:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=Fjsdy@123
-
-
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-
-spring.redis.database=4
-spring.redis.host=127.0.0.1
-#spring.redis.host=172.16.151.164
-#spring.redis.host=47.111.181.152
-spring.redis.password=fjsfjq
-spring.redis.port=6379
-#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.jedis.pool.max-active=8
-#连接池阻塞等待时间
-spring.redis.jedis.pool.max-wait=-1
-#最大空闲连接数
-spring.redis.jedis.pool.max-idle=8
-# 连接池中的最小空闲连接
-spring.redis.jedis.pool.min-idle=0
-spring.redis.timeout=5000
-
-
-#logging.level.com.fjs.scenic=debug
-#logging.level.org.springframework.web=debug
-#logging.level.org.springframework.transaction=debug
-#logging.level.org.mybatis=debug
-
-
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/qj
-NGINX_PORT = 8081
-
-#img.path=/data/fjs/images/
-#img.addr=http://jq.fjsfjq.com/images/
-
-img.path=/data/fjs/images/
-img.addr=https://wx.fjsstlyq.com/images/
-
-
-wechat.mpAppId=wx0e590add1244fd18
-wechat.mpAppSecret=8258bce8b4ebfde0ea6b8a391478ad26
-wechat.token=mywechattoken2297455150
-
-CERT_FILE_NAME=/opt/fjs/cert/apiclient_cert.p12
-APPID=wx0e590add1244fd18
-MCH_ID=1532732751
-API_KEY=bd3be4ff95714b07bdaf1373e5577761
-NOTIFY_URL=https://wx.fjsstlyq.com/wechat/notify
-FEFUND_NOTIFY=https://wx.fjsstlyq.com/wechat/refund/notify
-
-
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#\u0123\uFFFD\uFFFDID
-CAPTACHA_PHONE = SMS_172209437
-
-#c_CERT_FILE_NAME=/usr/local/pwd/apiclient_cert.p12
-#c_APPID=wx3e968eac9c59390c
-#c_MCH_ID=1503862741
-#c_API_KEY=bdaf1373e5577761bd3be4ff95714b07
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = fjsWx12345678
-#ota.cyt.apiUrl = http://fx.fjsfjq.com/service/distributor.do
-#ota.cyt.apiUrl = http://fx.fjsfjq.com/service/distributor.do
-#ota.cyt.apiUrl = http://192.168.100.118:8080/service/distributor.do
-#ota.cyt.apiUrl = http://fx.fjsfjq.com/service/distributor.do
-#ota.cyt.apiUrl = http://172.16.151.165/service/distributor.do
-ota.cyt.apiUrl = https://fx.fjsstlyq.com/service/distributor.do
-
-
-#timmer
-indexTopTasks.timmer=* 0/5 * * * ?
-
-
-

fjs-scenic-wx/src/main/resources/application-fjsdev.properties

@@ -1,91 +0,0 @@
-server.port=80
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://47.111.181.152:13306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.username=root
-#spring.datasource.password=fjsdyFx
-spring.datasource.url=jdbc:mysql://114.55.170.153:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=Fjsdy@123
-
-
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-
-spring.redis.database=4
-spring.redis.host=114.55.170.153
-spring.redis.password=fjsfjq
-spring.redis.port=6379
-#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.jedis.pool.max-active=8
-#连接池阻塞等待时间
-spring.redis.jedis.pool.max-wait=-1
-#最大空闲连接数
-spring.redis.jedis.pool.max-idle=8
-# 连接池中的最小空闲连接
-spring.redis.jedis.pool.min-idle=0
-spring.redis.timeout=5000
-
-
-#logging.level.com.fjs.scenic=debug
-#logging.level.org.springframework.web=debug
-#logging.level.org.springframework.transaction=debug
-#logging.level.org.mybatis=debug
-
-
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/qj
-NGINX_PORT = 8081
-
-img.path=/data/fjs/images/
-img.addr=http://jq.fjsfjq.com/images/
-
-
-wechat.mpAppId=wx0e590add1244fd18
-wechat.mpAppSecret=8258bce8b4ebfde0ea6b8a391478ad26
-wechat.token=mywechattoken2297455150
-
-CERT_FILE_NAME=/opt/fjs/cert/apiclient_cert.p12
-APPID=wx0e590add1244fd18
-MCH_ID=1532732751
-API_KEY=bd3be4ff95714b07bdaf1373e5577761
-NOTIFY_URL=http://wx.fjsfjq.com/wechat/notify
-FEFUND_NOTIFY=http://wx.fjsfjq.com/wechat/refund/notify
-
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#\u0123\uFFFD\uFFFDID
-CAPTACHA_PHONE = SMS_172209437
-
-#c_CERT_FILE_NAME=/usr/local/pwd/apiclient_cert.p12
-#c_APPID=wx3e968eac9c59390c
-#c_MCH_ID=1503862741
-#c_API_KEY=bdaf1373e5577761bd3be4ff95714b07
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = fjsWx12345678
-#ota.cyt.apiUrl = http://fx.fjsfjq.com/service/distributor.do
-#ota.cyt.apiUrl = http://fx.fjsfjq.com/service/distributor.do
-#ota.cyt.apiUrl = http://192.168.100.118:8080/service/distributor.do
-ota.cyt.apiUrl = http://fx.fjsfjq.com/service/distributor.do
-
-
-#timmer
-indexTopTasks.timmer= */5 * * * * ?
-
-
-

fjs-scenic-wx/src/main/resources/application-fjsfjq.properties

@@ -1,93 +0,0 @@
-server.port=80
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://47.95.230.126:33066/fjs-scenic?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-#spring.datasource.url=jdbc:mysql://47.111.181.152:13306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.url=jdbc:mysql://rm-bp1dp13uv47555y9u.mysql.rds.aliyuncs.com:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.url=jdbc:mysql://127.0.0.1:13306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.url=jdbc:mysql://114.55.170.153:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.username=root
-#spring.datasource.password=Fjsdy@123
-
-
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-
-spring.redis.database=0
-spring.redis.host=119.23.48.168
-spring.redis.password=
-spring.redis.port=61379
-#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.jedis.pool.max-active=8
-#连接池阻塞等待时间
-spring.redis.jedis.pool.max-wait=-1
-#最大空闲连接数
-spring.redis.jedis.pool.max-idle=8
-# 连接池中的最小空闲连接
-spring.redis.jedis.pool.min-idle=0
-spring.redis.timeout=5000
-
-
-#logging.level.com.fjs.scenic=debug
-#logging.level.org.springframework.web=debug
-#logging.level.org.springframework.transaction=debug
-#logging.level.org.mybatis=debug
-
-
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/qj
-NGINX_PORT = 8081
-
-img.path=/data/java/images/
-img.addr=https://fjsstlyq.com/images/
-
-
-wechat.mpAppId=wx3e968eac9c59390c
-wechat.mpAppSecret=37dae10f75aa7a0de975944e6098c588
-wechat.token=mywechattoken2297455150
-
-#\u5FAE\u4FE1 API
-CERT_FILE_NAME=/usr/local/pwd/apiclient_cert.p12
-APPID=wx3e968eac9c59390c
-MCH_ID=1503862741
-API_KEY=bdaf1373e5577761bd3be4ff95714b07
-#\u652F\u4ED8\u6D88\u606F\u7684\u901A\u77E5\u5730\u5740
-NOTIFY_URL=https://fjsstlyq.com/wechat/notify
-#\u9000\u6B3E\u6D88\u606F\u7684\u901A\u77E5\u5730\u5740
-FEFUND_NOTIFY=https://fjsstlyq.com/wechat/refund/notify
-
-
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#\u0123\uFFFD\uFFFDID
-CAPTACHA_PHONE = SMS_172221638
-
-
-#ota.cyt.createUser = cythlfx
-#ota.cyt.key = 12345678
-#ota.cyt.apiUrl = http://dy.jingqu.cn/service/distributor.do
-#ota.cyt.code = 1000
-#ota.cyt.pic = http://ftp.cqhsrj.com:8081/images/qj/1536914963894790.png
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = fjsWx12345678
-#ota.cyt.apiUrl = http://192.168.137.158:8080/service/distributor.do
-ota.cyt.apiUrl = http://fx.fjsfjq.com:8086/service/distributor.do
-#ota.cyt.apiUrl = http://47.99.243.13:8081/service/distributor.do

fjs-scenic-wx/src/main/resources/application-local.properties

@@ -1,57 +0,0 @@
-server.port=80
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-
-spring.redis.database=4
-spring.redis.host=47.111.181.152
-spring.redis.password=fjsfjq
-spring.redis.port=6379
-#最大连接数
-#spring.redis.jedis.pool.max-active=8
-#连接池阻塞等待时间
-#spring.redis.jedis.pool.max-wait=-1
-#最大空闲连接数
-#spring.redis.jedis.pool.max-idle=8
-# 连接池中的最小空闲连接
-#spring.redis.jedis.pool.min-idle=0
-spring.redis.timeout=5000
-
-#logging.level.com.fjs.scenic=debug
-#logging.level.org.springframework.web=debug
-#logging.level.org.springframework.transaction=debug
-#logging.level.org.mybatis=debug
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/qj
-NGINX_PORT = 8081
-
-
-wechat.mpAppId=wx0e590add1244fd18
-wechat.mpAppSecret=8258bce8b4ebfde0ea6b8a391478ad26
-wechat.token=mywechattoken2297455150
-
-CERT_FILE_NAME=/opt/fjs/cert/apiclient_cert.p12
-APPID=wx0e590add1244fd18
-MCH_ID=1532732751
-API_KEY=bd3be4ff95714b07bdaf1373e5577761
-NOTIFY_URL=http://wx.fjsfjq.com/wechat/notify
-FEFUND_NOTIFY=http://wx.fjsfjq.com/wechat/refund/notify
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = 12345678
-ota.cyt.apiUrl = http://172.16.151.165/service/distributor.do
-

fjs-scenic-wx/src/main/resources/application-prod.properties

@@ -0,0 +1,9 @@
+spring.datasource.url=jdbc:mysql://222.179.205.139:16004/lingdaochaxun?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+spring.datasource.username=root
+spring.datasource.password=ExcriptQj2020ABCD!@#
+spring.redis.database=0
+spring.redis.host=192.168.100.201
+spring.redis.port=6379
+spring.redis.password=
+#票务接口
+pw.api=http://127.0.0.1:8080/services/cytDataService/doWxQueryRequest.action

fjs-scenic-wx/src/main/resources/application-qjldcx.properties

@@ -1,105 +0,0 @@
-server.port=8222
-
-#spring.thymeleaf.cache=false
-#spring.thymeleaf.mode=LEGACYHTML5
-#spring.thymeleaf.encoding=UTF-8
-#spring.thymeleaf.servlet.content-type=text/html
-#spring.thymeleaf.prefix=classpath:/templates/
-#spring.thymeleaf.suffix=.html
-#freemarker
-spring.freemarker.allow-request-override=false
-spring.freemarker.allow-session-override=false
-spring.freemarker.cache=false
-spring.freemarker.charset=UTF-8
-spring.freemarker.spring.freemarker.check-template-location=true
-spring.freemarker.content-type=text/html
-spring.freemarker.enabled=true
-spring.freemarker.expose-request-attributes=false
-spring.freemarker.expose-session-attributes=false
-spring.freemarker.expose-spring-macro-helpers=true
-spring.freemarker.prefer-file-system-access=true
-spring.freemarker.suffix=.html
-spring.freemarker.template-loader-path=classpath:/templates/
-spring.freemarker.settings.template_update_delay=0
-spring.freemarker.settings.default_encoding=UTF-8
-spring.freemarker.settings.classic_compatible=true
-
-
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://222.179.205.139:16004/lingdaochaxun?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=ExcriptQj2020ABCD!@#
-
-
-spring.redis.database=0
-spring.redis.host=192.168.100.201
-spring.redis.port=6379
-spring.redis.password=
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.min-idle=0
-spring.redis.timeout=5000
-
-#票务接口
-pw.api = http://127.0.0.1:8080/services/cytDataService/doWxQueryRequest.action
-
-spring.servlet.multipart.max-file-size=100Mb
-spring.servlet.multipart.max-request-size=100Mb
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-# 驼峰命名规范 如：数据库字段是  order_id 那么 实体字段就要写成 orderId
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-logging.level.com.fjs.scenic.mapper=debug
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/fjs
-FTP_VOID_BASEPATH = /void/fjs
-NGINX_PORT = 8081
-
-
-#img.path=D://yangya//workspace//fjs-parent//fjs-scenic-manager//src//main//resources//static//images/
-#img.addr=http://127.0.0.1:8089/images/
-img.path=/data/fjs/images/
-img.addr=http://t.cqhsrj.com/images/
-
-
-CERT_FILE_NAME=/opt/fjs/cert/apiclient_cert.p12
-APPID=wx0e590add1244fd18
-MCH_ID=1532732751
-API_KEY=bd3be4ff95714b07bdaf1373e5577761
-NOTIFY_URL=http://wx.fjsfjq.com/wechat/notify
-FEFUND_NOTIFY=http://wx.fjsfjq.com/wechat/refund/notify
-
-
-
-#�������
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#ģ��ID
-CAPTACHA_PHONE = SMS_163450757
-
-
-
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = fjsWx12345678
-#ota.cyt.apiUrl = http://192.168.100.122:8080/service/distributor.do
-ota.cyt.apiUrl = http://fx.fjsfjq.com:8086/service/distributor.do
-#ota.cyt.apiUrl = http://47.99.243.13:8081/service/distributor.do
-
-
-#timmer
-ordersTasks.timmer=* 0/5 * * * ?
-materialTasks.timmer=0 0 1 * * ?
-
-
-

fjs-scenic-wx/src/main/resources/application.properties

@@ -1,2 +1,64 @@
-spring.profiles.active = qjldcx
+spring.profiles.active=@profiles.active@
+server.port=8222
+#freemarker
+spring.freemarker.allow-request-override=false
+spring.freemarker.allow-session-override=false
+spring.freemarker.cache=false
+spring.freemarker.charset=UTF-8
+spring.freemarker.spring.freemarker.check-template-location=true
+spring.freemarker.content-type=text/html
+spring.freemarker.enabled=true
+spring.freemarker.expose-request-attributes=false
+spring.freemarker.expose-session-attributes=false
+spring.freemarker.expose-spring-macro-helpers=true
+spring.freemarker.prefer-file-system-access=true
+spring.freemarker.suffix=.html
+spring.freemarker.template-loader-path=classpath:/templates/
+spring.freemarker.settings.template_update_delay=0
+spring.freemarker.settings.default_encoding=UTF-8
+spring.freemarker.settings.classic_compatible=true
+jdbc.driverClass=com.mysql.jdbc.Driver
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.min-idle=0
+spring.redis.timeout=5000
+spring.servlet.multipart.max-file-size=100Mb
+spring.servlet.multipart.max-request-size=100Mb
+mybatis.mapper-locations=classpath:mapper/**/*.xml
+mybatis.type-aliases-package=com.fjs.scenic.entity
+# 驼峰命名规范 如：数据库字段是  order_id 那么 实体字段就要写成 orderId
+mybatis.configuration.map-underscore-to-camel-case=true
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+logging.level.com.fjs.scenic.mapper=debug
+#FTP
+FTP_ADDRESS=ftp.cqhsrj.com
+FTP_PORT=21
+FTP_USERNAME=ftpuser
+FTP_PASSWORD=ectrip2018
+FTP_BASEPATH=/images/fjs
+FTP_VOID_BASEPATH=/void/fjs
+NGINX_PORT=8081
+#img.path=D://yangya//workspace//fjs-parent//fjs-scenic-manager//src//main//resources//static//images/
+#img.addr=http://127.0.0.1:8089/images/
+img.path=/data/fjs/images/
+img.addr=http://t.cqhsrj.com/images/
+CERT_FILE_NAME=/opt/fjs/cert/apiclient_cert.p12
+APPID=wx0e590add1244fd18
+MCH_ID=1532732751
+API_KEY=bd3be4ff95714b07bdaf1373e5577761
+NOTIFY_URL=http://wx.fjsfjq.com/wechat/notify
+FEFUND_NOTIFY=http://wx.fjsfjq.com/wechat/refund/notify
+#�������
+ACCESS_KEY_ID=LTAIJWmL1IRgUsUh
+ACCESS_KEY_SECRET=0v8d87GzDdlmKkkOBqxlACPhLSo0mM
+SIGN_NAME=\u68b5\u51c0\u5c71
+#ģ��ID
+CAPTACHA_PHONE=SMS_163450757
+#timmer
+ordersTasks.timmer=* 0/5 * * * ?
+materialTasks.timmer=0 0 1 * * ?
 
+ota.cyt.createUser=cytfjszy
+ota.cyt.key=fjsWx12345678
+ota.cyt.apiUrl=http://fx.fjsfjq.com:8086/service/distributor.do