From a9e42bd044e835f49a08b9d5852ef10e669cd153 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 15 七月 2024 18:00:07 +0800
Subject: [PATCH] zjh 2024/07/15-1
---
ltkj-admin/src/main/resources/application-xiaochengxu.yml | 242 ++++++++++++++++++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 6
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 14 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 6
ltkj-admin/src/main/resources/application.yml | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java | 112 +++++++++++++--
6 files changed, 353 insertions(+), 28 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
index b9085b3..7f18c74 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
@@ -1,27 +1,41 @@
package com.ltkj.web.controller.app;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.utils.StringUtils;
import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.hosp.domain.HisApiConfig;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
+import com.ltkj.hosp.service.HisApiConfigService;
import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.hosp.service.ITjOrderService;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDictTypeService;
+import com.ltkj.web.controller.his.HisApiGetMethodService;
+import com.ltkj.web.controller.his.HisApiMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
@@ -41,6 +55,16 @@
@Autowired
private ISysDictTypeService dictTypeService;
+
+ @Resource
+ private ISysConfigService sysConfigService;
+
+ @Autowired
+ private HisApiConfigService hisApiConfigService;
+ @Autowired
+ private HisApiMethodService controller;
+ @Autowired
+ private HisApiGetMethodService hisApiGetMethodService;
/**
* 灏忕▼搴忓氨璇婁汉鍒楄〃
@@ -83,6 +107,8 @@
*/
@PostMapping("/addNew")
@ApiOperation(value = "灏忕▼搴�-鏂板骞剁粦瀹氬氨璇婁汉")
+ @Transactional
+ @RepeatSubmit
public AjaxResult addNew(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
if (tjCustomer == null) {
return AjaxResult.error("娣诲姞澶辫触");
@@ -110,22 +136,19 @@
wq.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer customer = customerService.getOne(wq);
+ String key = sysConfigService.selectConfigByKey("sfkqdyhis");
+
if (customer != null) {
-// BeanUtils.copyBeanProp(tjCustomer, customer);
-// String substring = cusIdcard.substring(cusIdcard.length() - 6);
-// substring = DigestUtils.md5DigestAsHex(substring.getBytes());
-// customer.setCusPassword(substring);
-// customer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(cusIdcard), "yyyy-MM-dd"));
-// tjCustomer.setCusSex(Long.valueOf(MatchUtils.getSexByIdCard(cusIdcard)));
-// // tjCustomer.setAddr(MatchUtils.getNativePlace(Integer.parseInt(cusIdcard)));
-// tjCustomer.setAge(String.valueOf(MatchUtils.getAgeByIdCard(cusIdcard)));
-// tjCustomer.setIdType("1");
-// tjCustomer.setAgeUnit("0");
-// if (customerService.updateById(customer)) {
-// return AjaxResult.success(tjCustomer);
-// }
customer.setConnect(tjCustomer.getConnect());
- customerService.updateById(customer);
+ if (customerService.updateById(customer)) {
+ if(null !=key && key.equals("Y")){
+ AjaxResult xinXi = suijieHisXinXi(tjCustomer);
+ if(!xinXi.get("code").toString().equals("200")){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("娣诲姞灏辫瘖浜轰俊鎭け璐�!" + xinXi.get("msg").toString());
+ }
+ }
+ }
return AjaxResult.success(customer);
}
String substring = cusIdcard.substring(cusIdcard.length() - 6);
@@ -142,6 +165,13 @@
tjCustomer.setCusNumber(0L);
tjCustomer.setCusIsvip("N");
if (customerService.save(tjCustomer)) {
+ if(null !=key && key.equals("Y")){
+ AjaxResult xinXi = suijieHisXinXi(tjCustomer);
+ if(!xinXi.get("code").toString().equals("200")){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("娣诲姞灏辫瘖浜轰俊鎭け璐�!" + xinXi.get("msg").toString());
+ }
+ }
return AjaxResult.success(tjCustomer);
}
return AjaxResult.error("娣诲姞澶辫触");
@@ -165,7 +195,7 @@
if (tjCustomer == null) {
return AjaxResult.error();
}
- LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper();
+ LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusIdcard, tjCustomer.getCusIdcard());
wq.eq(TjCustomer::getCusPhone, tjCustomer.getCusPhone());
wq.eq(TjCustomer::getCusName, tjCustomer.getCusName());
@@ -196,10 +226,13 @@
*/
@PostMapping("/updateCustomerBy")
@ApiOperation(value = "灏忕▼搴�-淇敼灏辫瘖浜轰俊鎭�")
+ @Transactional
+ @RepeatSubmit
public AjaxResult updateCustomerBy(@RequestBody TjCustomer tjCustomer) {
if (tjCustomer == null) {
return AjaxResult.error("淇敼澶辫触");
}
+ String key = sysConfigService.selectConfigByKey("sfkqdyhis");
TjCustomer one = customerService.getById(tjCustomer);
one.setCusName(tjCustomer.getCusName());
one.setCusIdcard(tjCustomer.getCusIdcard());
@@ -207,6 +240,13 @@
one.setCusNational(tjCustomer.getCusNational());
one.setCusMarryStatus(tjCustomer.getCusMarryStatus());
if (customerService.updateById(one)) {
+ if(null !=key && key.equals("Y")){
+ AjaxResult xinXi = suijieHisXinXi(one);
+ if(!xinXi.get("code").toString().equals("200")){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("娣诲姞灏辫瘖浜轰俊鎭け璐�!" + xinXi.get("msg").toString());
+ }
+ }
return AjaxResult.success(one);
}
return AjaxResult.error("淇敼澶辫触");
@@ -246,4 +286,46 @@
return success(data);
}
+
+
+ //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
+ public JSONObject getJSONObject(String builder) {
+ String Response = JSONUtil.parseObj(builder).getStr("Response");
+ return JSONUtil.parseObj(Response);
+ }
+
+ //鑾峰彇鏂规硶杩斿洖鍊间俊鎭�
+ public String getAjaxResult(AjaxResult result) {
+ return result.get("data").toString();
+ }
+
+
+ private AjaxResult suijieHisXinXi(TjCustomer tjCustomer) {
+ AjaxResult result = controller.Outpincreateapply(tjCustomer);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ JSONArray resultDatass = object.getJSONArray("ResultData");
+ Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
+ if (null != resultData && resultData.size() > 0) {
+ String pationid = resultData.get("PationId").toString();
+ if (null != pationid) {
+ tjCustomer.setPationId(pationid);
+ customerService.updateById(tjCustomer);
+ //淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
+ resultData.put("cardId",pationid);
+ JSONObject object4 = JSONUtil.parseObj(resultData);
+ LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
+ HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
+ hisApiGetMethodService.save(object4, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
+ }
+
+ }
+ return AjaxResult.success();
+ }
+ return AjaxResult.error(object.getStr("ResultContent"));
+ }
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 4dbdc3a..f9e5da0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -212,9 +212,9 @@
wq.eq(TjReservation::getIsExpire, 2);
TjReservation tjReservation = tjReservationService.getOne(wq);
if (tjReservation != null) {
- if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
- return AjaxResult.error("鏈埌棰勭害鏃堕棿");
- }
+// if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
+// return AjaxResult.error("鏈埌棰勭害鏃堕棿");
+// }
if (null != tjReservation.getReservationTime() && DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
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 41ecea5..a164968 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
@@ -896,9 +896,9 @@
if (null != tjReservation) {
tjOrder.setReservationId(tjReservation.getId());
mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
- if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
- return AjaxResult.error("鏈埌棰勭害鏃堕棿");
- }
+// if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
+// return AjaxResult.error("鏈埌棰勭害鏃堕棿");
+// }
if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index f5b106c..2f1cd87 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -158,13 +158,13 @@
public TableDataInfo list(TjReservation tjReservation) {
startPage();
List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
- if(null !=list && list.size()>0){
- for (TjReservation reservation : list) {
- reservation.setName(MatchUtils.hideCusName(reservation.getName()));
- reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
- reservation.setIdCard(MatchUtils.hideIdCardNum(reservation.getIdCard()));
- }
- }
+// if(null !=list && list.size()>0){
+// for (TjReservation reservation : list) {
+// reservation.setName(MatchUtils.hideCusName(reservation.getName()));
+// reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
+// reservation.setIdCard(MatchUtils.hideIdCardNum(reservation.getIdCard()));
+// }
+// }
return getDataTable(list);
}
diff --git a/ltkj-admin/src/main/resources/application-xiaochengxu.yml b/ltkj-admin/src/main/resources/application-xiaochengxu.yml
new file mode 100644
index 0000000..f7d5fa7
--- /dev/null
+++ b/ltkj-admin/src/main/resources/application-xiaochengxu.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: /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://127.0.0.1:5011/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.yml b/ltkj-admin/src/main/resources/application.yml
index 7fbd094..967aa1c 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -2,6 +2,7 @@
#dev 鍏徃 寮�鍙�/閮ㄧ讲浣跨敤
#prod 娉惧窛鍘块儴缃叉寮忕幆澧冧娇鐢�
#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
+#xiaochengxu 娉惧窛鍘块儴缃插皬绋嬪簭鐜浣跨敤
spring:
profiles:
active: dev
\ No newline at end of file
--
Gitblit v1.8.0