From 8aea3ecc955f5c55024686375bc6b2fc3a989a35 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 03 七月 2024 15:44:32 +0800
Subject: [PATCH] zjh 2024/07/3-1
---
ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java | 13
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java | 59 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjJianchajianyanTreeMapper.java | 6
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 32 +
ltkj-admin/src/main/resources/application-dev.yml | 242 +++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 59 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 19
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java | 6
ltkj-admin/src/main/resources/application-test.yml | 242 +++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java | 22
ltkj-admin/src/main/resources/application.yml | 242 ----------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java | 6
ltkj-admin/src/main/resources/application-prod.yml | 242 +++++++++++
ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java | 20
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjJianchajianyanTreeServiceImpl.java | 10
ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java | 40
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjJianchajianyanTreeService.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java | 6
26 files changed, 995 insertions(+), 300 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index eac5ee5..07fe543 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -14,6 +15,8 @@
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjHybgd;
+import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import io.swagger.annotations.Api;
@@ -32,6 +35,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
+import java.math.BigDecimal;
import java.net.URL;
import java.util.*;
import java.util.stream.Collectors;
@@ -79,7 +83,10 @@
@Value("${path.filePath}")
private String value;
-
+ @Resource
+ private LtkjHybgdService ltkjHybgdService;
+ @Resource
+ private LtkjHysqdService ltkjHysqdService;
/**
* 灏忕▼搴忔煡璇綋妫�鎶ュ憡鍒楄〃
*/
@@ -166,6 +173,7 @@
TjCustomer customer = customerService.getOne(wq22);
LambdaQueryWrapper<TjOrderRemark> wqm = new LambdaQueryWrapper<>();
wqm.eq(TjOrderRemark::getTjNumber, tjNumber);
+ wqm.in(TjOrderRemark::getDeptId,"100", "240", "253", "254", "255", "257", "258", "259", "269", "270");
List<TjOrderRemark> remarkList = remarkService.list(wqm);
List<Map<String, Object>> abnormalList = new ArrayList<>();
if (null != remarkList && remarkList.size() > 0) {
@@ -241,6 +249,55 @@
return AjaxResult.success("璇ュ鎴峰湪娌℃湁浣撴椤圭洰鏁版嵁锛�");
}
+ @GetMapping("/getHyReportByTjNumber")
+ @ApiOperation(value = "灏忕▼搴�-浣撴鍖栭獙鎶ュ憡鏌ヨ璇︽儏")
+ public AjaxResult getHyReportByTjNumber(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrder::getTjNumber, tjNumber);
+ wq1.eq(TjOrder::getCheckStatus, 1);
+ TjOrder one = orderService.getOne(wq1);
+ if (one == null) {
+ return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒");
+ }
+ List<LtkjHysqd> hysqdList = ltkjHysqdService.getLtkjHysqdByTjh(one.getCardId());
+ if(null !=hysqdList && hysqdList.size()>0){
+ List<Map<String, Object>> list = new ArrayList<>();
+
+ for (LtkjHysqd hysqd : hysqdList) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("parent",hysqd.getXmmc());
+ List<LtkjHybgd> hybgdList = ltkjHybgdService.getJianYanBaoGaoDanList(hysqd.getTmh());
+ if(null !=hybgdList && hybgdList.size()>0){
+ for (LtkjHybgd hybgd : hybgdList) {
+ String jyjg = hybgd.getJyjg();
+ String fwz = hybgd.getFwz();
+ if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)){
+ try {
+ String[] fwzs = fwz.split("-");
+ BigDecimal min = new BigDecimal(fwzs[0]);
+ BigDecimal max = new BigDecimal(fwzs[1]);
+ BigDecimal jyjgval = new BigDecimal(jyjg);
+ // 姣旇緝妫�楠岀粨鏋滃拰鑼冨洿鍊�
+ if (jyjgval.compareTo(min) < 0) {
+ // jyjg 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
+ jyjg = jyjg + " 鈫�";
+ } else if (jyjgval.compareTo(max) > 0) {
+ // jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
+ jyjg = jyjg + " 鈫�";
+ }
+ hybgd.setJyjg(jyjg);
+ } catch (Exception ignored) {}
+ }
+ }
+ }
+ map.put("sons",hybgdList);
+ list.add(map);
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.success("璇ュ鎴峰湪娌℃湁浣撴椤圭洰鏁版嵁锛�");
+ }
+
/**
* 灏忕▼搴忕偣鍑讳綋妫�鎶ュ憡鏌ヨ璇︽儏,鏄剧ず韬珮浣撻噸浣撻噸鎸囨暟鏀剁缉鍘嬭垝寮犲帇
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
index 8f243c6..201cad1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -12,6 +12,7 @@
import com.ltkj.web.wxUtils.HttpClientUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -33,8 +34,10 @@
@Slf4j
@Component
public class HisApiGetMethodService {
+
+
// 鏁版嵁搴撻厤缃枃浠惰矾寰�
- private static final String CONFIG_PATH = "D:\\ltkjprojectconf\\config.properties";
+// private static final String CONFIG_PATH = url;
// private static final String CONFIG_PATH = "/Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkj_peis/ltkj-admin/src/main/resources/config.properties";
// 鏁版嵁搴撳悕
private static String DB_NAME = "";
@@ -47,27 +50,51 @@
@Autowired
private HisApiConfigService hisApiConfigService;
+ private static String url;
+
+
+ @Value ("${config.properties}")
+ public void set(String urls){
+ url=urls;
+ FileInputStream inputStream = null;
+ try {
+ inputStream = new FileInputStream(url);
+ Properties props = new Properties();
+ props.load(inputStream);
+ DB_NAME = props.getProperty("name");
+ DATA_URL = "jdbc:mysql://" + props.getProperty("ip") + ":" + props.getProperty("prot") + "/" + DB_NAME + "" +
+ "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8";
+ DATA_USER = props.getProperty("username");
+ DATA_PASS = props.getProperty("password");
+ String apiUrl = props.getProperty("his_api_url");
+ String apiPort = props.getProperty("his_api_port");
+ HIS_URL = apiUrl+":"+apiPort+"/api/His/HisRequest";
+ } catch (IOException e) {
+ System.out.println("鍒濆鍖栨暟鎹簱寮傚父 ->"+e.getMessage());
+ }
+ }
+
static {
try {
Class.forName("com.mysql.cj.jdbc.Driver");
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
- try {
- InputStreamReader reader = new InputStreamReader(new FileInputStream(CONFIG_PATH), StandardCharsets.UTF_8);
- Properties props = new Properties();
- props.load(reader);
- String api_url = props.getProperty("his_api_url");
- String port = props.getProperty("his_api_port");
- DB_NAME = props.getProperty("name");
- DATA_URL = "jdbc:mysql://" + props.getProperty("ip") + ":" + props.getProperty("prot") + "/" + DB_NAME +
- "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8";
- DATA_USER = props.getProperty("username");
- DATA_PASS = props.getProperty("password");
- HIS_URL=api_url+":"+port;
- } catch (IOException throwables) {
- throwables.printStackTrace();
- }
+// try {
+// InputStreamReader reader = new InputStreamReader(new FileInputStream(url), StandardCharsets.UTF_8);
+// Properties props = new Properties();
+// props.load(reader);
+// String api_url = props.getProperty("his_api_url");
+// String port = props.getProperty("his_api_port");
+// DB_NAME = props.getProperty("name");
+// DATA_URL = "jdbc:mysql://" + props.getProperty("ip") + ":" + props.getProperty("prot") + "/" + DB_NAME +
+// "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8";
+// DATA_USER = props.getProperty("username");
+// DATA_PASS = props.getProperty("password");
+// HIS_URL=api_url+":"+port;
+// } catch (IOException throwables) {
+// throwables.printStackTrace();
+// }
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 5874982..4d57bb4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -127,9 +127,35 @@
tjOrder.setCardId(hisRegistrationId);
orderService.updateById(tjOrder);
}
- AjaxResult error = tijianshenqing(customer, date);
- if (error != null) return error;
- return AjaxResult.success();
+
+ //娣诲姞浣撴璇婃柇
+ OutpinimpapplyDto dto=new OutpinimpapplyDto();
+ dto.setHisRegistrationId(tjOrder.getCardId());
+ dto.setMzzdid(1);
+ dto.setSqysbm("00029");
+ dto.setMzksbm("0101");
+ dto.setFbrq(date);
+ dto.setZdrq(date);
+ dto.setCzybm("00029");
+ dto.setCzyksbm("0101");
+ dto.setZs("鍋ュ悍鏌ヤ綋");
+ dto.setBs("涓嶈");
+ dto.setClyz("");
+ dto.setJws("");
+ dto.setTgjc("");
+ dto.setGms("");
+ dto.setJbbm("Z00.001");
+ dto.setJbbm1("");
+ dto.setJbbm2("");
+ dto.setFzbz("1");
+ dto.setHzqx("6");
+ dto.setSfqc("0");
+ dto.setQchs("");
+ dto.setSfqj("0");
+ dto.setJzqk(9);
+ controller.Outpinimpapply(dto);
+
+ return tijianshenqing(customer, date);
}
// }
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
index f3c65df..102d522 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
@@ -8,6 +8,7 @@
import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.web.wxUtils.HttpClientUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.io.FileInputStream;
@@ -34,9 +35,13 @@
// 鏁版嵁搴撻厤缃枃浠惰矾寰�
// private static final String CONFIG_PATH = "/Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkj_peis/ltkj-admin/src/main/resources/config.properties";
- private static final String CONFIG_PATH = "D:\\ltkjprojectconf\\config.properties";
+// private static final String CONFIG_PATH = "D:\\ltkjprojectconf\\config.properties";
- static {
+ private static String CONFIG_PATH;
+
+ @Value ("${config.properties}")
+ public void setConfigPath(String configPath) {
+ CONFIG_PATH = configPath;
try {
FileInputStream inputStream = new FileInputStream(CONFIG_PATH);
Properties props = new Properties();
@@ -49,6 +54,19 @@
}
}
+/* static {
+ try {
+ FileInputStream inputStream = new FileInputStream(CONFIG_PATH);
+ Properties props = new Properties();
+ props.load(inputStream);
+ String url = props.getProperty("his_api_url");
+ String port = props.getProperty("his_api_port");
+ HIS_URL=url+":"+port+"/api/His/";
+ } catch (IOException throwables) {
+ throwables.printStackTrace();
+ }
+ }*/
+
// @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖娉ㄥ唽淇℃伅")
public AjaxResult Outpincreateapply (TjCustomer customer) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 1d4157b..a7a40fe 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1436,18 +1436,18 @@
AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
- ArrayList<String> sqdhs = new ArrayList<>();
- ArrayList<String> xmfls = new ArrayList<>();
+// ArrayList<String> sqdhs = new ArrayList<>();
+// ArrayList<String> xmfls = new ArrayList<>();
BigDecimal cateFeeAll = BigDecimal.ZERO;
for (Map<String, String> datum : data) {
- String advId = datum.get("Adv_Id").split("_")[1];
+// String advId = datum.get("Adv_Id").split("_")[1];
BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
- String cateCode = datum.get("CateCode");
+// String cateCode = datum.get("CateCode");
cateFeeAll = cateFeeAll.add(cateFee);
- sqdhs.add(advId);
- xmfls.add(cateCode);
+// sqdhs.add(advId);
+// xmfls.add(cateCode);
}
- LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+ /* LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(LtkjJianchajianyanTree::getSqdh, sqdhs)
.in(LtkjJianchajianyanTree::getXmfl, xmfls)
.eq(LtkjJianchajianyanTree::getCardId,tjOrder.getCardId())
@@ -1456,8 +1456,9 @@
List<LtkjJianchajianyanTree> results = ltkjJianchajianyanTreeService.list(queryWrapper);
BigDecimal total = results.stream()
.map(item -> new BigDecimal(item.getFyhj()))
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- if (cateFeeAll.compareTo(total) != 0){
+ .reduce(BigDecimal.ZERO, BigDecimal::add);*/
+ BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
+ if (cateFeeAll.compareTo(fyhj) != 0){
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index c11a702..defc65b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -402,6 +402,8 @@
hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
hysqd.setSqdh(jsonObject.getStr("SQDBH"));
+ hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
+ hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
if (ltkjHysqdService.save(hysqd)) {
Map<String,Object> hashMap=new HashMap<>();
hashMap.put("jybgid",hysqd.getTmh());
@@ -431,6 +433,7 @@
bgd.setShsj(js.getStr("BGRQ"));
bgd.setShsj(js.getStr("BGRQ"));
bgd.setShys(js.getStr("SHRBH"));
+ bgd.setShysmc(js.getStr("SHRXM"));
bgd.setYcbz(js.getStr("YCTS"));
// bgd.setTpurl(js.getStr(""));
ltkjHybgdService.save(bgd);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 3b21af4..aedb917 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1870,7 +1870,7 @@
TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
customer.setCardId("0");
tjCustomerService.updateById(customer);
- String config = configService.selectConfigByKey("sfkqdyhis");
+ /* String config = configService.selectConfigByKey("sfkqdyhis");
if(null !=config && config.equals("Y")){
final String date = DateUtil.format(tjOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
OutpinimpapplyDto dto=new OutpinimpapplyDto();
@@ -1898,7 +1898,7 @@
dto.setSfqj("0");
dto.setJzqk(9);
controller.Outpinimpapply(dto);
- }
+ }*/
return AjaxResult.success("绛剧鎴愬姛锛�");
} else {
diff --git a/ltkj-admin/src/main/resources/application-dev.yml b/ltkj-admin/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..0f58c4d
--- /dev/null
+++ b/ltkj-admin/src/main/resources/application-dev.yml
@@ -0,0 +1,242 @@
+# 椤圭洰鐩稿叧閰嶇疆
+ltkj:
+ # 鍚嶇О
+ name: ltkj
+ # 鐗堟湰
+ version: 1.0.1
+ # 鐗堟潈骞翠唤
+ copyrightYear: 2022
+ # 瀹炰緥婕旂ず寮�鍏�
+ demoEnabled: true
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
+ # 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
+ #profile: D:/ltkj/uploadPath
+ profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
+# profile: http://192.168.0.5:5502/uploadPath
+
+ # 鑾峰彇ip鍦板潃寮�鍏�
+ addressEnabled: true
+ # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 5011
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
+# 鏃ュ織閰嶇疆
+#logging:
+# level:
+# com.ltkj: debug
+# org.springframework: warn
+
+# 鐢ㄦ埛閰嶇疆
+user:
+ password:
+ # 瀵嗙爜鏈�澶ч敊璇鏁�
+ maxRetryCount: 5
+ # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+ lockTime: 10
+
+# Spring閰嶇疆
+spring:
+ # 璧勬簮淇℃伅
+ messages:
+ # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
+ basename: i18n/messages
+ # 鏂囦欢涓婁紶
+ servlet:
+ multipart:
+ # 鍗曚釜鏂囦欢澶у皬
+ max-file-size: 2GB
+ # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
+ max-request-size: 2GB
+ # 鏈嶅姟妯″潡
+ devtools:
+ restart:
+ # 鐑儴缃插紑鍏�
+ enabled: true
+# cache:
+# type: ehcache
+
+ # redis 閰嶇疆
+# redis:
+# # 鍦板潃
+## host: 101.42.27.146
+# host: localhost
+# # 绔彛锛岄粯璁や负6379
+# port: 6379
+# # 鏁版嵁搴撶储寮�
+# database: 0
+# # 瀵嗙爜
+## password: 654321
+# password: 123456
+# # 杩炴帴瓒呮椂鏃堕棿
+# timeout: 120s
+# lettuce:
+# pool:
+# # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+# min-idle: 0
+# # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+# max-idle: 8
+# # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+# max-active: 8
+# # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+# max-wait: -1ms
+ # 閭欢
+ mail:
+ # from 瑕佸拰 username 涓�鑷�, 鍚﹀垯鎶ラ敊
+ from: 1138758025@qq.com
+ # 閭欢鏈嶅姟鍦板潃
+ host: smtp.qq.com
+ # 鐢ㄦ埛鍚�
+ username: 1138758025@qq.com
+ # 鎺堟潈鐮� (璁剧疆 - 璐︽埛 - POP3/SMTP鏈嶅姟)
+ password: lwsbmlbqgpaqfgdb
+ # QQ閭鍔犲瘑绔彛锛屼笉鍚岄偖绠辩殑绔彛涓嶄竴鏍�
+ port: 465
+ properties:
+ mail:
+ smtp:
+ socketFactory:
+ class: javax.net.ssl.SSLSocketFactory
+ ssl:
+ trust: smtp.qq.com
+ # 鏄惁闇�瑕佺敤鎴疯璇�
+ auth: true
+ starttls:
+ # 鍚敤TLS鍔犲瘑
+ enable: true
+ required: true
+
+# token閰嶇疆
+token:
+ # 浠ょ墝鑷畾涔夋爣璇�
+ header: Authorization
+ # 浠ょ墝瀵嗛挜
+ secret: xaltjdkjyxgs_sjh&1987
+
+ secret_key: ltkj_xaltjdkjsjh
+ # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
+ expireTime: 180
+ # 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰曪紙true鍏佽 false涓嶅厑璁革級
+ soloLogin: true
+ #鏄惁寮�鍚櫥褰曟椂鍒ゆ柇鍟嗘埛绉橀挜鏄惁杩囨湡
+ secret_key_login: true
+
+# MyBatis Plus閰嶇疆
+mybatis-plus:
+ # 鎼滅储鎸囧畾鍖呭埆鍚�
+ typeAliasesPackage: com.ltkj.**.domain
+ # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
+ mapperLocations: classpath*:mapper/**/*Mapper.xml
+ # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
+ configLocation: classpath:mybatis/mybatis-config.xml
+ global-config:
+ db-config:
+ logic-not-delete-value: 0
+ logic-delete-value: 1
+ update-strategy: not_null
+
+
+# PageHelper鍒嗛〉鎻掍欢
+pagehelper:
+ helperDialect: mysql
+ supportMethodsArguments: true
+ params: count=countSql
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
+ # 璇锋眰鍓嶇紑
+ pathMapping: /
+
+# 闃叉XSS鏀诲嚮
+xss:
+ # 杩囨护寮�鍏�
+ enabled: true
+ # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+ excludes: /system/notice,/system/package
+ # 鍖归厤閾炬帴
+ urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+# 浣撴鎶ュ憡妯℃澘鍜屾姤鍛婁复鏃剁敓鎴愬瓨鍌ㄧ殑鏂囦欢澶硅矾寰�
+path:
+ filePath: D:\Tjreport
+ # nginx鍥剧墖鏈嶅姟鍣�
+ reportServer: https://ltpeis.xaltjdkj.cn:5516/
+
+
+# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
+photoPath: D:\AppPhoto\uploadPath\
+# nginx鍥剧墖鏈嶅姟鍣�
+photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+#photoServer: http://192.168.0.5:5502/uploadPath/
+
+
+
+# 寰俊灏忕▼搴廰ppid secret
+xcx:
+ appid: wx40a545f1a8eb1d9d
+ secret: c86c1ff7f91c16380111878e9a259237
+ msgDataFormat: JSON
+ token: token # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨則oken
+ aesKey: aesKey # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨凟ncodingAESKey
+# 寮�鍙戣�呭簲璇ヨ缃垚鑷繁鐨剋x鐩稿叧淇℃伅
+wx:
+ # 灏忕▼搴�
+ miniapp:
+ appid: wx40a545f1a8eb1d9d
+ secret: c86c1ff7f91c16380111878e9a259237
+ msg-data-format: XML
+ pay:
+ #appid
+ app-id: wx40a545f1a8eb1d9d
+ mch-id: 1642930999 #鍟嗘埛鍙�
+ mch-key: Xianlutaikeji666888999shijihongL #瀵嗛挜
+ #key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
+ key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
+# pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+
+#绉湪鎶ヨ〃璁块棶鍦板潃
+jimu:
+# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
+ path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+# path: http://192.168.0.5:5000/ltkj-admin
+# path: http://10.168.0.9:5011
+# path: http://192.168.0.105:5011
+# path: http://192.168.1.113:5011
+
+
+jeecg :
+ jmreport:
+ # 鎵撳嵃绾稿紶閰嶇疆 title鎻忚堪 size瀹介珮
+ printPaper:
+ - title: 灏忕エ鎵撳嵃
+ size:
+ - 40
+ - 60
+# ip = 101.42.27.146
+# prot = 3306
+# name = ltkjpeis10
+# username = root
+# password = Root_ltkj123
+config:
+ properties: D:\ltkjprojectconf\config.properties
+ path: D:\ltkjprojectconf
\ No newline at end of file
diff --git a/ltkj-admin/src/main/resources/application-prod.yml b/ltkj-admin/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..466f695
--- /dev/null
+++ b/ltkj-admin/src/main/resources/application-prod.yml
@@ -0,0 +1,242 @@
+# 椤圭洰鐩稿叧閰嶇疆
+ltkj:
+ # 鍚嶇О
+ name: ltkj
+ # 鐗堟湰
+ version: 1.0.1
+ # 鐗堟潈骞翠唤
+ copyrightYear: 2022
+ # 瀹炰緥婕旂ず寮�鍏�
+ demoEnabled: true
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
+ # 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
+ #profile: D:/ltkj/uploadPath
+# profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
+ profile: http://192.168.0.5:5502/uploadPath
+
+ # 鑾峰彇ip鍦板潃寮�鍏�
+ addressEnabled: true
+ # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 5000
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /ltkj-admin
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
+# 鏃ュ織閰嶇疆
+#logging:
+# level:
+# com.ltkj: debug
+# org.springframework: warn
+
+# 鐢ㄦ埛閰嶇疆
+user:
+ password:
+ # 瀵嗙爜鏈�澶ч敊璇鏁�
+ maxRetryCount: 5
+ # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+ lockTime: 10
+
+# Spring閰嶇疆
+spring:
+ # 璧勬簮淇℃伅
+ messages:
+ # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
+ basename: i18n/messages
+ # 鏂囦欢涓婁紶
+ servlet:
+ multipart:
+ # 鍗曚釜鏂囦欢澶у皬
+ max-file-size: 2GB
+ # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
+ max-request-size: 2GB
+ # 鏈嶅姟妯″潡
+ devtools:
+ restart:
+ # 鐑儴缃插紑鍏�
+ enabled: true
+# cache:
+# type: ehcache
+
+ # redis 閰嶇疆
+# redis:
+# # 鍦板潃
+## host: 101.42.27.146
+# host: localhost
+# # 绔彛锛岄粯璁や负6379
+# port: 6379
+# # 鏁版嵁搴撶储寮�
+# database: 0
+# # 瀵嗙爜
+## password: 654321
+# password: 123456
+# # 杩炴帴瓒呮椂鏃堕棿
+# timeout: 120s
+# lettuce:
+# pool:
+# # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+# min-idle: 0
+# # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+# max-idle: 8
+# # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+# max-active: 8
+# # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+# max-wait: -1ms
+ # 閭欢
+ mail:
+ # from 瑕佸拰 username 涓�鑷�, 鍚﹀垯鎶ラ敊
+ from: 1138758025@qq.com
+ # 閭欢鏈嶅姟鍦板潃
+ host: smtp.qq.com
+ # 鐢ㄦ埛鍚�
+ username: 1138758025@qq.com
+ # 鎺堟潈鐮� (璁剧疆 - 璐︽埛 - POP3/SMTP鏈嶅姟)
+ password: lwsbmlbqgpaqfgdb
+ # QQ閭鍔犲瘑绔彛锛屼笉鍚岄偖绠辩殑绔彛涓嶄竴鏍�
+ port: 465
+ properties:
+ mail:
+ smtp:
+ socketFactory:
+ class: javax.net.ssl.SSLSocketFactory
+ ssl:
+ trust: smtp.qq.com
+ # 鏄惁闇�瑕佺敤鎴疯璇�
+ auth: true
+ starttls:
+ # 鍚敤TLS鍔犲瘑
+ enable: true
+ required: true
+
+# token閰嶇疆
+token:
+ # 浠ょ墝鑷畾涔夋爣璇�
+ header: Authorization
+ # 浠ょ墝瀵嗛挜
+ secret: xaltjdkjyxgs_sjh&1987
+
+ secret_key: ltkj_xaltjdkjsjh
+ # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
+ expireTime: 180
+ # 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰曪紙true鍏佽 false涓嶅厑璁革級
+ soloLogin: true
+ #鏄惁寮�鍚櫥褰曟椂鍒ゆ柇鍟嗘埛绉橀挜鏄惁杩囨湡
+ secret_key_login: true
+
+# MyBatis Plus閰嶇疆
+mybatis-plus:
+ # 鎼滅储鎸囧畾鍖呭埆鍚�
+ typeAliasesPackage: com.ltkj.**.domain
+ # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
+ mapperLocations: classpath*:mapper/**/*Mapper.xml
+ # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
+ configLocation: classpath:mybatis/mybatis-config.xml
+ global-config:
+ db-config:
+ logic-not-delete-value: 0
+ logic-delete-value: 1
+ update-strategy: not_null
+
+
+# PageHelper鍒嗛〉鎻掍欢
+pagehelper:
+ helperDialect: mysql
+ supportMethodsArguments: true
+ params: count=countSql
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
+ # 璇锋眰鍓嶇紑
+ pathMapping: /
+
+# 闃叉XSS鏀诲嚮
+xss:
+ # 杩囨护寮�鍏�
+ enabled: true
+ # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+ excludes: /system/notice,/system/package
+ # 鍖归厤閾炬帴
+ urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+# 浣撴鎶ュ憡妯℃澘鍜屾姤鍛婁复鏃剁敓鎴愬瓨鍌ㄧ殑鏂囦欢澶硅矾寰�
+path:
+ filePath: D:\Tjreport
+ # nginx鍥剧墖鏈嶅姟鍣�
+ reportServer: https://ltpeis.xaltjdkj.cn:5516/
+
+
+# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
+photoPath: D:\AppPhoto\uploadPath\
+# nginx鍥剧墖鏈嶅姟鍣�
+#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+photoServer: http://192.168.0.5:5502/uploadPath/
+
+
+
+# 寰俊灏忕▼搴廰ppid secret
+xcx:
+ appid: wx40a545f1a8eb1d9d
+ secret: c86c1ff7f91c16380111878e9a259237
+ msgDataFormat: JSON
+ token: token # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨則oken
+ aesKey: aesKey # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨凟ncodingAESKey
+# 寮�鍙戣�呭簲璇ヨ缃垚鑷繁鐨剋x鐩稿叧淇℃伅
+wx:
+ # 灏忕▼搴�
+ miniapp:
+ appid: wx40a545f1a8eb1d9d
+ secret: c86c1ff7f91c16380111878e9a259237
+ msg-data-format: XML
+ pay:
+ #appid
+ app-id: wx40a545f1a8eb1d9d
+ mch-id: 1642930999 #鍟嗘埛鍙�
+ mch-key: Xianlutaikeji666888999shijihongL #瀵嗛挜
+ #key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
+ key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
+# pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+
+#绉湪鎶ヨ〃璁块棶鍦板潃
+jimu:
+# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
+# path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+ path: http://192.168.0.5:5000/ltkj-admin
+# path: http://10.168.0.9:5011
+# path: http://192.168.0.105:5011
+# path: http://192.168.1.113:5011
+
+
+jeecg :
+ jmreport:
+ # 鎵撳嵃绾稿紶閰嶇疆 title鎻忚堪 size瀹介珮
+ printPaper:
+ - title: 灏忕エ鎵撳嵃
+ size:
+ - 40
+ - 60
+# ip = 101.42.27.146
+# prot = 3306
+# name = ltkjpeis10
+# username = root
+# password = Root_ltkj123
+config:
+ properties: D:\ltkjprojectconf\config.properties
+ path: D:\ltkjprojectconf
\ No newline at end of file
diff --git a/ltkj-admin/src/main/resources/application-test.yml b/ltkj-admin/src/main/resources/application-test.yml
new file mode 100644
index 0000000..d738ceb
--- /dev/null
+++ b/ltkj-admin/src/main/resources/application-test.yml
@@ -0,0 +1,242 @@
+# 椤圭洰鐩稿叧閰嶇疆
+ltkj:
+ # 鍚嶇О
+ name: ltkj
+ # 鐗堟湰
+ version: 1.0.1
+ # 鐗堟潈骞翠唤
+ copyrightYear: 2022
+ # 瀹炰緥婕旂ず寮�鍏�
+ demoEnabled: true
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
+ # 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
+ #profile: D:/ltkj/uploadPath
+# profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
+ profile: http://192.168.0.5:5502/uploadPath
+
+ # 鑾峰彇ip鍦板潃寮�鍏�
+ addressEnabled: true
+ # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 5001
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /ltkj-admin
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
+# 鏃ュ織閰嶇疆
+#logging:
+# level:
+# com.ltkj: debug
+# org.springframework: warn
+
+# 鐢ㄦ埛閰嶇疆
+user:
+ password:
+ # 瀵嗙爜鏈�澶ч敊璇鏁�
+ maxRetryCount: 5
+ # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+ lockTime: 10
+
+# Spring閰嶇疆
+spring:
+ # 璧勬簮淇℃伅
+ messages:
+ # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
+ basename: i18n/messages
+ # 鏂囦欢涓婁紶
+ servlet:
+ multipart:
+ # 鍗曚釜鏂囦欢澶у皬
+ max-file-size: 2GB
+ # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
+ max-request-size: 2GB
+ # 鏈嶅姟妯″潡
+ devtools:
+ restart:
+ # 鐑儴缃插紑鍏�
+ enabled: true
+# cache:
+# type: ehcache
+
+ # redis 閰嶇疆
+# redis:
+# # 鍦板潃
+## host: 101.42.27.146
+# host: localhost
+# # 绔彛锛岄粯璁や负6379
+# port: 6379
+# # 鏁版嵁搴撶储寮�
+# database: 0
+# # 瀵嗙爜
+## password: 654321
+# password: 123456
+# # 杩炴帴瓒呮椂鏃堕棿
+# timeout: 120s
+# lettuce:
+# pool:
+# # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+# min-idle: 0
+# # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+# max-idle: 8
+# # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+# max-active: 8
+# # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+# max-wait: -1ms
+ # 閭欢
+ mail:
+ # from 瑕佸拰 username 涓�鑷�, 鍚﹀垯鎶ラ敊
+ from: 1138758025@qq.com
+ # 閭欢鏈嶅姟鍦板潃
+ host: smtp.qq.com
+ # 鐢ㄦ埛鍚�
+ username: 1138758025@qq.com
+ # 鎺堟潈鐮� (璁剧疆 - 璐︽埛 - POP3/SMTP鏈嶅姟)
+ password: lwsbmlbqgpaqfgdb
+ # QQ閭鍔犲瘑绔彛锛屼笉鍚岄偖绠辩殑绔彛涓嶄竴鏍�
+ port: 465
+ properties:
+ mail:
+ smtp:
+ socketFactory:
+ class: javax.net.ssl.SSLSocketFactory
+ ssl:
+ trust: smtp.qq.com
+ # 鏄惁闇�瑕佺敤鎴疯璇�
+ auth: true
+ starttls:
+ # 鍚敤TLS鍔犲瘑
+ enable: true
+ required: true
+
+# token閰嶇疆
+token:
+ # 浠ょ墝鑷畾涔夋爣璇�
+ header: Authorization
+ # 浠ょ墝瀵嗛挜
+ secret: xaltjdkjyxgs_sjh&1987
+
+ secret_key: ltkj_xaltjdkjsjh
+ # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
+ expireTime: 180
+ # 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰曪紙true鍏佽 false涓嶅厑璁革級
+ soloLogin: true
+ #鏄惁寮�鍚櫥褰曟椂鍒ゆ柇鍟嗘埛绉橀挜鏄惁杩囨湡
+ secret_key_login: true
+
+# MyBatis Plus閰嶇疆
+mybatis-plus:
+ # 鎼滅储鎸囧畾鍖呭埆鍚�
+ typeAliasesPackage: com.ltkj.**.domain
+ # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
+ mapperLocations: classpath*:mapper/**/*Mapper.xml
+ # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
+ configLocation: classpath:mybatis/mybatis-config.xml
+ global-config:
+ db-config:
+ logic-not-delete-value: 0
+ logic-delete-value: 1
+ update-strategy: not_null
+
+
+# PageHelper鍒嗛〉鎻掍欢
+pagehelper:
+ helperDialect: mysql
+ supportMethodsArguments: true
+ params: count=countSql
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
+ # 璇锋眰鍓嶇紑
+ pathMapping: /
+
+# 闃叉XSS鏀诲嚮
+xss:
+ # 杩囨护寮�鍏�
+ enabled: true
+ # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+ excludes: /system/notice,/system/package
+ # 鍖归厤閾炬帴
+ urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+# 浣撴鎶ュ憡妯℃澘鍜屾姤鍛婁复鏃剁敓鎴愬瓨鍌ㄧ殑鏂囦欢澶硅矾寰�
+path:
+ filePath: D:\Tjreport
+ # nginx鍥剧墖鏈嶅姟鍣�
+ reportServer: https://ltpeis.xaltjdkj.cn:5516/
+
+
+# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
+photoPath: D:\AppPhoto\uploadPath\
+# nginx鍥剧墖鏈嶅姟鍣�
+#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+photoServer: http://192.168.0.5:5502/uploadPath/
+
+
+
+# 寰俊灏忕▼搴廰ppid secret
+xcx:
+ appid: wx40a545f1a8eb1d9d
+ secret: c86c1ff7f91c16380111878e9a259237
+ msgDataFormat: JSON
+ token: token # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨則oken
+ aesKey: aesKey # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨凟ncodingAESKey
+# 寮�鍙戣�呭簲璇ヨ缃垚鑷繁鐨剋x鐩稿叧淇℃伅
+wx:
+ # 灏忕▼搴�
+ miniapp:
+ appid: wx40a545f1a8eb1d9d
+ secret: c86c1ff7f91c16380111878e9a259237
+ msg-data-format: XML
+ pay:
+ #appid
+ app-id: wx40a545f1a8eb1d9d
+ mch-id: 1642930999 #鍟嗘埛鍙�
+ mch-key: Xianlutaikeji666888999shijihongL #瀵嗛挜
+ #key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
+ key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
+# pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+
+#绉湪鎶ヨ〃璁块棶鍦板潃
+jimu:
+# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
+# path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+ path: http://192.168.0.5:5001/ltkj-admin
+# path: http://10.168.0.9:5011
+# path: http://192.168.0.105:5011
+# path: http://192.168.1.113:5011
+
+
+jeecg :
+ jmreport:
+ # 鎵撳嵃绾稿紶閰嶇疆 title鎻忚堪 size瀹介珮
+ printPaper:
+ - title: 灏忕エ鎵撳嵃
+ size:
+ - 40
+ - 60
+# ip = 101.42.27.146
+# prot = 3306
+# name = ltkjpeis10
+# username = root
+# password = Root_ltkj123
+config:
+ properties: D:\ltkjprojectconf\config.properties1
+ path: D:\ltkjprojectconf
\ No newline at end of file
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 7fc75bc..7fbd094 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -1,241 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ltkj:
- # 鍚嶇О
- name: ltkj
- # 鐗堟湰
- version: 1.0.1
- # 鐗堟潈骞翠唤
- copyrightYear: 2022
- # 瀹炰緥婕旂ず寮�鍏�
- demoEnabled: true
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
- # 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
- #profile: D:/ltkj/uploadPath
- profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
-# profile: http://192.168.0.5:5502/uploadPath
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: true
- # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 5011
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-#logging:
-# level:
-# com.ltkj: debug
-# org.springframework: warn
-
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
# Spring閰嶇疆
+#dev 鍏徃 寮�鍙�/閮ㄧ讲浣跨敤
+#prod 娉惧窛鍘块儴缃叉寮忕幆澧冧娇鐢�
+#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
spring:
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
profiles:
- active: druid
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 2GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: true
-# cache:
-# type: ehcache
-
- # redis 閰嶇疆
-# redis:
-# # 鍦板潃
-## host: 101.42.27.146
-# host: localhost
-# # 绔彛锛岄粯璁や负6379
-# port: 6379
-# # 鏁版嵁搴撶储寮�
-# database: 0
-# # 瀵嗙爜
-## password: 654321
-# password: 123456
-# # 杩炴帴瓒呮椂鏃堕棿
-# timeout: 120s
-# lettuce:
-# pool:
-# # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
-# min-idle: 0
-# # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
-# max-idle: 8
-# # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
-# max-active: 8
-# # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
-# max-wait: -1ms
- # 閭欢
- mail:
- # from 瑕佸拰 username 涓�鑷�, 鍚﹀垯鎶ラ敊
- from: 1138758025@qq.com
- # 閭欢鏈嶅姟鍦板潃
- host: smtp.qq.com
- # 鐢ㄦ埛鍚�
- username: 1138758025@qq.com
- # 鎺堟潈鐮� (璁剧疆 - 璐︽埛 - POP3/SMTP鏈嶅姟)
- password: lwsbmlbqgpaqfgdb
- # QQ閭鍔犲瘑绔彛锛屼笉鍚岄偖绠辩殑绔彛涓嶄竴鏍�
- port: 465
- properties:
- mail:
- smtp:
- socketFactory:
- class: javax.net.ssl.SSLSocketFactory
- ssl:
- trust: smtp.qq.com
- # 鏄惁闇�瑕佺敤鎴疯璇�
- auth: true
- starttls:
- # 鍚敤TLS鍔犲瘑
- enable: true
- required: true
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: xaltjdkjyxgs_sjh&1987
-
- secret_key: ltkj_xaltjdkjsjh
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 180
- # 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰曪紙true鍏佽 false涓嶅厑璁革級
- soloLogin: true
- #鏄惁寮�鍚櫥褰曟椂鍒ゆ柇鍟嗘埛绉橀挜鏄惁杩囨湡
- secret_key_login: true
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚�
- typeAliasesPackage: com.ltkj.**.domain
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- db-config:
- logic-not-delete-value: 0
- logic-delete-value: 1
- update-strategy: not_null
-
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice,/system/package
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-
-# 浣撴鎶ュ憡妯℃澘鍜屾姤鍛婁复鏃剁敓鎴愬瓨鍌ㄧ殑鏂囦欢澶硅矾寰�
-path:
- filePath: D:\Tjreport
- # nginx鍥剧墖鏈嶅姟鍣�
- reportServer: https://ltpeis.xaltjdkj.cn:5516/
-
-
-# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: D:\AppPhoto\uploadPath\
-# nginx鍥剧墖鏈嶅姟鍣�
-photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
-#photoServer: http://192.168.0.5:5502/uploadPath/
-
-
-
-# 寰俊灏忕▼搴廰ppid secret
-xcx:
- appid: wx40a545f1a8eb1d9d
- secret: c86c1ff7f91c16380111878e9a259237
- msgDataFormat: JSON
- token: token # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨則oken
- aesKey: aesKey # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨凟ncodingAESKey
-# 寮�鍙戣�呭簲璇ヨ缃垚鑷繁鐨剋x鐩稿叧淇℃伅
-wx:
- # 灏忕▼搴�
- miniapp:
- appid: wx40a545f1a8eb1d9d
- secret: c86c1ff7f91c16380111878e9a259237
- msg-data-format: XML
- pay:
- #appid
- app-id: wx40a545f1a8eb1d9d
- mch-id: 1642930999 #鍟嗘埛鍙�
- mch-key: Xianlutaikeji666888999shijihongL #瀵嗛挜
- #key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
- key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
-# pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
-# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
- pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
-
-#绉湪鎶ヨ〃璁块棶鍦板潃
-jimu:
-# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
-# path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
- path: http://192.168.0.5:5000/ltkj-admin
-# path: http://10.168.0.9:5011
-# path: http://192.168.0.105:5011
-# path: http://192.168.1.113:5011
-
-
-jeecg :
- jmreport:
- # 鎵撳嵃绾稿紶閰嶇疆 title鎻忚堪 size瀹介珮
- printPaper:
- - title: 灏忕エ鎵撳嵃
- size:
- - 40
- - 60
-# ip = 101.42.27.146
-# prot = 3306
-# name = ltkjpeis10
-# username = root
-# password = Root_ltkj123
+ active: dev
\ No newline at end of file
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
index dbad06b..fa0c84b 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
@@ -17,6 +17,7 @@
import com.ltkj.system.service.ISysConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -39,6 +40,13 @@
@Slf4j
public class DruidConfig {
+ @Value ("${config.properties}")
+ private String url;
+
+ @Value ("${config.path}")
+ private String path;
+
+
@Bean
// @ConfigurationProperties("spring.datasource.druid.master")
public DataSource masterDataSource(DruidProperties druidProperties) {
@@ -48,15 +56,15 @@
// 浠庢枃浠朵腑璇诲彇閰嶇疆淇℃伅
FileInputStream fis = null;
try {
- fis = new FileInputStream("D:\\ltkjprojectconf\\config.properties");
+ fis = new FileInputStream(url);
} catch (FileNotFoundException e) {
log.info("鏁版嵁搴撹繛鎺ユ枃浠舵壘涓嶅埌 绯荤粺姝ｅ湪鍒涘缓锛�");
- File f = new File("D:\\ltkjprojectconf");
+ File f = new File(path);
if(!f.exists()){
f.mkdirs();
}
- File file = new File("D:\\ltkjprojectconf\\config.properties");
+ File file = new File(url);
try {
FileWriter fileWriter = new FileWriter(file);
fileWriter.write("ip = 浣犵殑涓绘暟鎹簱杩炴帴ip鍦板潃\n");
@@ -130,7 +138,7 @@
// 浠庢枃浠朵腑璇诲彇閰嶇疆淇℃伅
FileInputStream fis = null;
try {
- fis = new FileInputStream("D:\\ltkjprojectconf\\config.properties");
+ fis = new FileInputStream(url);
} catch (FileNotFoundException e) {
log.info("鏁版嵁搴撹繛鎺ユ枃浠舵壘涓嶅埌锛�");
}
@@ -164,7 +172,7 @@
// 浠庢枃浠朵腑璇诲彇閰嶇疆淇℃伅
FileInputStream fis = null;
try {
- fis = new FileInputStream("D:\\ltkjprojectconf\\config.properties");
+ fis = new FileInputStream(url);
} catch (FileNotFoundException e) {
log.info("鏁版嵁搴撹繛鎺ユ枃浠舵壘涓嶅埌锛�");
}
@@ -198,7 +206,7 @@
// 浠庢枃浠朵腑璇诲彇閰嶇疆淇℃伅
FileInputStream fis = null;
try {
- fis = new FileInputStream("D:\\ltkjprojectconf\\config.properties");
+ fis = new FileInputStream(url);
} catch (FileNotFoundException e) {
log.info("鏁版嵁搴撹繛鎺ユ枃浠舵壘涓嶅埌");
}
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
index c2ba0eb..78a3af4 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
@@ -1,6 +1,7 @@
package com.ltkj.framework.config;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
@@ -24,6 +25,12 @@
@EnableCaching
@Slf4j
public class RedisConfig extends CachingConfigurerSupport {
+
+ @Value ("${config.properties}")
+ private String url;
+
+ @Value ("${config.path}")
+ private String path;
@Bean
@SuppressWarnings(value = {"unchecked", "rawtypes"})
@@ -65,14 +72,14 @@
FileInputStream fis = null;
Properties props = new Properties();
try {
- fis = new FileInputStream("D:\\ltkjprojectconf\\config.properties");
+ fis = new FileInputStream(url);
} catch (FileNotFoundException e) {
log.info("閰嶇疆鏂囦欢鎵句笉鍒� 绯荤粺姝ｅ湪鍒涘缓锛�");
- File f = new File("D:\\ltkjprojectconf");
+ File f = new File(path);
if(!f.exists()){
f.mkdirs();
}
- File file = new File("D:\\ltkjprojectconf\\config.properties");
+ File file = new File(url);
try {
FileWriter fileWriter = new FileWriter(file);
fileWriter.write("ip = 浣犵殑涓绘暟鎹簱杩炴帴ip鍦板潃\n");
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java
index ff4d6d2..c15c1e8 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java
@@ -11,38 +11,38 @@
*/
@Configuration
public class DruidProperties {
- @Value("${spring.datasource.druid.initialSize}")
- private int initialSize;
+// @Value("${spring.datasource.druid.initialSize}")
+ private int initialSize=5;
- @Value("${spring.datasource.druid.minIdle}")
- private int minIdle;
+// @Value("${spring.datasource.druid.minIdle}")
+ private int minIdle=10;
- @Value("${spring.datasource.druid.maxActive}")
- private int maxActive;
+// @Value("${spring.datasource.druid.maxActive}")
+ private int maxActive=20;
- @Value("${spring.datasource.druid.maxWait}")
- private int maxWait;
+// @Value("${spring.datasource.druid.maxWait}")
+ private int maxWait=60000;
- @Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}")
- private int timeBetweenEvictionRunsMillis;
+// @Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}")
+ private int timeBetweenEvictionRunsMillis=60000;
- @Value("${spring.datasource.druid.minEvictableIdleTimeMillis}")
- private int minEvictableIdleTimeMillis;
+// @Value("${spring.datasource.druid.minEvictableIdleTimeMillis}")
+ private int minEvictableIdleTimeMillis=300000;
- @Value("${spring.datasource.druid.maxEvictableIdleTimeMillis}")
- private int maxEvictableIdleTimeMillis;
+// @Value("${spring.datasource.druid.maxEvictableIdleTimeMillis}")
+ private int maxEvictableIdleTimeMillis=900000;
// @Value("${spring.datasource.druid.validationQuery}")
// private String validationQuery;
- @Value("${spring.datasource.druid.testWhileIdle}")
- private boolean testWhileIdle;
+// @Value("${spring.datasource.druid.testWhileIdle}")
+ private boolean testWhileIdle=true;
- @Value("${spring.datasource.druid.testOnBorrow}")
- private boolean testOnBorrow;
+// @Value("${spring.datasource.druid.testOnBorrow}")
+ private boolean testOnBorrow=false;
- @Value("${spring.datasource.druid.testOnReturn}")
- private boolean testOnReturn;
+// @Value("${spring.datasource.druid.testOnReturn}")
+ private boolean testOnReturn=false;
public DruidDataSource dataSource(DruidDataSource datasource) {
/** 閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶� */
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
index 0cf4de1..555c484 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
@@ -433,6 +433,7 @@
@ApiModelProperty("灏辫瘖缂栧彿")
private String cardId;
+
@ApiModelProperty("棰勭害鍙�")
private String reservationId;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
index 7f6c269..9d66a56 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
@@ -27,4 +27,7 @@
@Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�楠�' GROUP BY a.sqdh")
List<String> getJianYanBaoGaoDan(String cardId);
+
+ @Select("SELECT * FROM ltkj_hybgd WHERE tmh=#{tmh}")
+ List<LtkjHybgd> getJianYanBaoGaoDanList(String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
index aab30a7..6229dee 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
@@ -10,6 +10,8 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import java.util.List;
+
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
* @Author: lige
@@ -25,4 +27,8 @@
@Delete("DELETE FROM ltkj_hysqd WHERE tjh=#{tjh} AND tmh=#{tmh} ")
void deletedLtkjHysqdByTjhAndTmh(@Param("tjh")String tjh,@Param("tmh")String tmh);
+
+
+ @Select("SELECT * FROM ltkj_hysqd a WHERE a.tjh=#{tjh}")
+ List<LtkjHysqd> getLtkjHysqdByTjh(@Param("tjh") String tjh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjJianchajianyanTreeMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjJianchajianyanTreeMapper.java
index bd8b4a0..75ee29e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjJianchajianyanTreeMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjJianchajianyanTreeMapper.java
@@ -2,6 +2,9 @@
import com.ltkj.hosp.domain.LtkjJianchajianyanTree;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
/**
* @author chacca
@@ -11,6 +14,9 @@
*/
public interface LtkjJianchajianyanTreeMapper extends BaseMapper<LtkjJianchajianyanTree> {
+ @Select("SELECT SUM(aa.fyhj) FROM (" +
+ "SELECT a.fyhj FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} GROUP BY a.sqdh,a.type)aa;")
+ BigDecimal getLtkjJianchajianyanTreeFyhjByCardId(String cardId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
index 21f8067..0ab1ec5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
@@ -16,4 +16,6 @@
void deletedLtkjHybgdByTjhAndTmh(String tmh);
List<String> getJianYanBaoGaoDan(String cardId);
+
+ List<LtkjHybgd> getJianYanBaoGaoDanList(String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
index e212286..583d34e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
@@ -4,6 +4,8 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
+import java.util.List;
+
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
* @Author: lige
@@ -15,4 +17,6 @@
void deletedLtkjHysqdByTjhAndTmh(String tjh,String tmh);
+
+ List<LtkjHysqd> getLtkjHysqdByTjh(String tjh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjJianchajianyanTreeService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjJianchajianyanTreeService.java
index c16d2b2..9340569 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjJianchajianyanTreeService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjJianchajianyanTreeService.java
@@ -3,6 +3,8 @@
import com.ltkj.hosp.domain.LtkjJianchajianyanTree;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.math.BigDecimal;
+
/**
* @author chacca
* @description 閽堝琛ㄣ�恖tkj_jianchajianyan_tree(妫�鏌ユ楠屽缃叧鑱旇〃)銆戠殑鏁版嵁搴撴搷浣淪ervice
@@ -10,4 +12,7 @@
*/
public interface LtkjJianchajianyanTreeService extends IService<LtkjJianchajianyanTree> {
+
+ BigDecimal getLtkjJianchajianyanTreeFyhjByCardId(String cardId);
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
index d16905d..340be1d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
@@ -32,4 +32,9 @@
public List<String> getJianYanBaoGaoDan(String cardId) {
return mapper.getJianYanBaoGaoDan(cardId);
}
+
+ @Override
+ public List<LtkjHybgd> getJianYanBaoGaoDanList(String tmh) {
+ return mapper.getJianYanBaoGaoDanList(tmh);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
index 31c15fe..fb95b97 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
@@ -10,6 +10,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
/**
* 鐥呯+鎰忚Service涓氬姟灞傚鐞�
@@ -32,4 +33,9 @@
public void deletedLtkjHysqdByTjhAndTmh(String tjh, String tmh) {
mapper.deletedLtkjHysqdByTjhAndTmh(tjh,tmh);
}
+
+ @Override
+ public List<LtkjHysqd> getLtkjHysqdByTjh(String tjh) {
+ return mapper.getLtkjHysqdByTjh(tjh);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjJianchajianyanTreeServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjJianchajianyanTreeServiceImpl.java
index 284844e..48c7b53 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjJianchajianyanTreeServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjJianchajianyanTreeServiceImpl.java
@@ -6,6 +6,9 @@
import com.ltkj.hosp.mapper.LtkjJianchajianyanTreeMapper;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+
/**
* @author chacca
* @description 閽堝琛ㄣ�恖tkj_jianchajianyan_tree(妫�鏌ユ楠屽缃叧鑱旇〃)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
@@ -15,6 +18,13 @@
public class LtkjJianchajianyanTreeServiceImpl extends ServiceImpl<LtkjJianchajianyanTreeMapper, LtkjJianchajianyanTree>
implements LtkjJianchajianyanTreeService{
+ @Resource
+ private LtkjJianchajianyanTreeMapper mapper;
+
+ @Override
+ public BigDecimal getLtkjJianchajianyanTreeFyhjByCardId(String cardId) {
+ return mapper.getLtkjJianchajianyanTreeFyhjByCardId(cardId);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java
index 73d190a..b9b289a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java
@@ -39,6 +39,8 @@
private String shsj;
@ApiModelProperty(value = "瀹℃牳鍖荤敓")
private String shys;
+ @ApiModelProperty(value = "瀹℃牳鍖荤敓濮撳悕")
+ private String shysmc;
@ApiModelProperty(value = "tpurl")
private String tpurl;
@ApiModelProperty(value = "ycbz")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java
index 292c336..6700ec3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java
@@ -35,4 +35,10 @@
private String sqdh;
@ApiModelProperty(value = "鐢宠浜哄鍚�")
private String sqrxm;
+ @ApiModelProperty(value = "瀹℃牳浜轰唬鐮�")
+ private String shrdm;
+ @ApiModelProperty(value = "瀹℃牳浜哄鍚�")
+ private String shrxm;
+
+
}
--
Gitblit v1.8.0