From 0a2054c67ba0b243f10edfe84b572c9b4157e3b5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 13 二月 2025 10:35:05 +0800
Subject: [PATCH] 20250213

---
 ltkj-admin/src/main/resources/application-test.yml                               |    2 
 ltkj-common/pom.xml                                                              |   50 ++--
 ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java |    3 
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictHosp.java                       |    3 
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java |    2 
 ltkj-admin/src/main/resources/logback.xml                                        |   23 --
 ltkj-admin/src/main/resources/application.yml                                    |   20 -
 pom.xml                                                                          |   52 ++--
 ltkj-admin/src/main/resources/application-dev.yml                                |    6 
 ltkj-admin/src/main/resources/application-prod.yml                               |    2 
 ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java          |    2 
 ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java            |   27 ++
 /dev/null                                                                        |  255 -------------------------
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysRoleController.java   |   82 ++++++++
 ltkj-hosp/src/main/resources/mapper/hosp/DictHospMapper.xml                      |    3 
 ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java       |    2 
 ltkj-hosp/pom.xml                                                                |   25 ++
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java  |    1 
 18 files changed, 203 insertions(+), 357 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
index 21165b2..5a7e354 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
@@ -85,6 +85,7 @@
     @ApiOperation("鐧诲綍鎺ュ彛")
     @RepeatSubmit
     public AjaxResult login(@RequestBody @ApiParam(value = "鐧诲綍瀵硅薄") LoginBody loginBody) {
+
         AjaxResult ajax = success();
         // 鐢熸垚浠ょ墝
         String token;
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysRoleController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysRoleController.java
index 7d4215e..6d114cd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysRoleController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysRoleController.java
@@ -1,10 +1,30 @@
 package com.ltkj.web.controller.system;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.RandomUtil;
+import com.ltkj.db.DataSourceConfig;
+import com.ltkj.db.DataSourceContextHolder;
+import com.ltkj.hosp.domain.DictHosp;
+import com.ltkj.hosp.service.IDictHospService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.FileCopyUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -55,6 +75,13 @@
 
     @Autowired
     private ISysDeptService deptService;
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+    @Autowired
+    private IDictHospService dictHospService;
+
+    @Value("${config.path}")
+    private String path;
 
 //    @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
@@ -245,4 +272,59 @@
         ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
         return ajax;
     }
+
+    @Autowired
+    private DataSourceConfig dataSourceConfig;
+
+    /**
+     * 浠庡簱鎵归噺鎵цsql
+     * 璇诲彇鏈湴sql鏂囦欢
+     * @return
+     */
+    @GetMapping("/execUpdateSql")
+    public AjaxResult execUpdateSql() {
+        DataSourceContextHolder.setDataSourceKey("default");
+        List<DictHosp> list = dictHospService.list();
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        boolean flag = false;
+        for (DictHosp dictHosp : list) {
+            String dbName = dictHosp.getDbname();
+            Map<String, Object> dbResult = new HashMap<>();
+            dbResult.put("database", dbName);
+            List<String> successList = new ArrayList<>();
+            List<String> errorList = new ArrayList<>();
+            try {
+                InputStreamReader reader = new InputStreamReader(Files.newInputStream(Paths.get(path + File.separator + "update.sql")), StandardCharsets.UTF_8);
+                String sqlContent = FileCopyUtils.copyToString(reader);
+                String[] sqlStatements = sqlContent.split("\\|-\\|");
+                for (String sql : sqlStatements) {
+                    sql = sql.trim();
+                    if (!sql.isEmpty()) {
+                        // INSERT INTO `api_config` (`id`, `api_url`, `api_method`, `tab_name`, `is_response`, `primary_keys`, `remark`, `result_code_key`, `result_data_key`, `type`) VALUES (${id}, '${dbName}', '${randowmStr}', '${randowmStr}', 1, 'ResultData', '1.pas 妫�鏌ョ敵璇蜂俊鎭綔搴�', 'ResultCode', 'ResultData', 'pacs');
+//                        sql = sql.replace("${dbName}",dbName).replace("${id}", IdUtil.getSnowflake().nextIdStr()).replace("${randowmStr}", RandomUtil.randomString(10));
+                        try {
+                            dataSourceConfig.addDataSource(dbName);
+                            DataSourceContextHolder.setDataSourceKey(dbName);
+                            jdbcTemplate.execute(sql);
+                            successList.add(sql);
+                        } catch (Exception e) {
+                            errorList.add(sql + "\nERROR: " + e.getMessage());
+                        }
+                    }
+                }
+            } catch (IOException e) {
+                return AjaxResult.error("璇诲彇SQL鏂囦欢澶辫触锛�" + e.getMessage());
+            }
+            dbResult.put("successSQL", successList);
+            dbResult.put("failedSQL", errorList);
+            resultList.add(dbResult);
+            if (!errorList.isEmpty())
+                flag = true;
+        }
+        DataSourceContextHolder.clear();
+        if (flag)
+            return AjaxResult.error("鎵цsql涓瓨鍦ㄥけ璐�",resultList);
+        return AjaxResult.success(resultList);
+    }
+
 }
diff --git a/ltkj-admin/src/main/resources/application-dev.yml b/ltkj-admin/src/main/resources/application-dev.yml
index beec389..ee295d4 100644
--- a/ltkj-admin/src/main/resources/application-dev.yml
+++ b/ltkj-admin/src/main/resources/application-dev.yml
@@ -21,7 +21,7 @@
 # 寮�鍙戠幆澧冮厤缃�
 server:
   # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 5011
+  port: 5000
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /
@@ -147,7 +147,7 @@
   # 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰曪紙true鍏佽 false涓嶅厑璁革級
   soloLogin: true
   #鏄惁寮�鍚櫥褰曟椂鍒ゆ柇鍟嗘埛绉橀挜鏄惁杩囨湡
-  secret_key_login: true
+  secret_key_login: false
 
 # MyBatis Plus閰嶇疆
 mybatis-plus:
@@ -251,7 +251,7 @@
 #  username = root
 #  password = Root_ltkj123
 config:
-  properties: D:\ltkjprojectconf\config.properties
+  properties: D:\ltkjprojectconf\configregion.properties
   path: D:\ltkjprojectconf
 logging:
   level:
diff --git a/ltkj-admin/src/main/resources/application-linux-dev.yaml b/ltkj-admin/src/main/resources/application-linux-dev.yaml
deleted file mode 100644
index 90c9bbd..0000000
--- a/ltkj-admin/src/main/resources/application-linux-dev.yaml
+++ /dev/null
@@ -1,252 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-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
-  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: redis
-
-  # 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
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        login-username: 10001
-        login-password: admin123
-        reset-enable: true
-        allow:
-      filters: stat,wall,log4j  # 鍚敤鏃ュ織鍜岀洃鎺ц繃婊ゅ櫒
-      stat:
-        mergeSql: true  # 鍚堝苟SQL缁熻淇℃伅
-        slowSqlMillis: 3000  # 閰嶇疆 SQL 鎱㈡煡璇㈤槇鍊硷紝鍗曚綅鏄绉掞紝3绉掑嵆 3000ms
-
-# 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: /Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/Tjreport
-  # nginx鍥剧墖鏈嶅姟鍣�
-  reportServer: https://ltpeis.xaltjdkj.cn:5516/
-
-
-#  浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: /ltkj/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: /Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkjprojectconf/gspljcxyyconfig.properties
-  path: /Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkjprojectconf
diff --git a/ltkj-admin/src/main/resources/application-linux-mjprod.yml b/ltkj-admin/src/main/resources/application-linux-mjprod.yml
deleted file mode 100644
index 6dc475d..0000000
--- a/ltkj-admin/src/main/resources/application-linux-mjprod.yml
+++ /dev/null
@@ -1,255 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-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: 5003
-  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: redis
-
-  # 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
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        login-username: 10001
-        login-password: admin123
-        reset-enable: true
-        allow:
-      filters: stat,wall,log4j  # 鍚敤鏃ュ織鍜岀洃鎺ц繃婊ゅ櫒
-      stat:
-        mergeSql: true  # 鍚堝苟SQL缁熻淇℃伅
-        slowSqlMillis: 3000  # 閰嶇疆 SQL 鎱㈡煡璇㈤槇鍊硷紝鍗曚綅鏄绉掞紝3绉掑嵆 3000ms
-
-# 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: /ltkj/Tjreport/mjprodReort
-  # nginx鍥剧墖鏈嶅姟鍣�
-  reportServer: https://ltpeis.xaltjdkj.cn:5516/
-
-
-#  浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: /ltkj/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: /ltkj/ltkjprojectconf/mjzsconfig.properties
-  path: /ltkj/ltkjprojectconf
diff --git a/ltkj-admin/src/main/resources/application-linux-mjtest.yml b/ltkj-admin/src/main/resources/application-linux-mjtest.yml
deleted file mode 100644
index 36fffc3..0000000
--- a/ltkj-admin/src/main/resources/application-linux-mjtest.yml
+++ /dev/null
@@ -1,255 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-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: 5004
-  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: redis
-
-  # 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
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        login-username: 10001
-        login-password: admin123
-        reset-enable: true
-        allow:
-      filters: stat,wall,log4j  # 鍚敤鏃ュ織鍜岀洃鎺ц繃婊ゅ櫒
-      stat:
-        mergeSql: true  # 鍚堝苟SQL缁熻淇℃伅
-        slowSqlMillis: 3000  # 閰嶇疆 SQL 鎱㈡煡璇㈤槇鍊硷紝鍗曚綅鏄绉掞紝3绉掑嵆 3000ms
-
-# 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: /ltkj/Tjreport
-  # nginx鍥剧墖鏈嶅姟鍣�
-  reportServer: https://ltpeis.xaltjdkj.cn:5516/
-
-
-#  浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: /ltkj/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: /ltkj/ltkjprojectconf/mjcsconfig.properties
-  path: /ltkj/ltkjprojectconf
diff --git a/ltkj-admin/src/main/resources/application-prod.yml b/ltkj-admin/src/main/resources/application-prod.yml
index 28ec201..d9e6174 100644
--- a/ltkj-admin/src/main/resources/application-prod.yml
+++ b/ltkj-admin/src/main/resources/application-prod.yml
@@ -21,7 +21,7 @@
 # 寮�鍙戠幆澧冮厤缃�
 server:
   # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 5000
+  port: 5001
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /ltkj-admin
diff --git a/ltkj-admin/src/main/resources/application-test.yml b/ltkj-admin/src/main/resources/application-test.yml
index c8ad41b..7b30897 100644
--- a/ltkj-admin/src/main/resources/application-test.yml
+++ b/ltkj-admin/src/main/resources/application-test.yml
@@ -21,7 +21,7 @@
 # 寮�鍙戠幆澧冮厤缃�
 server:
   # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 5001
+  port: 5002
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /ltkj-admin
diff --git a/ltkj-admin/src/main/resources/application-win-chkwyyprod.yaml b/ltkj-admin/src/main/resources/application-win-chkwyyprod.yaml
deleted file mode 100644
index 3bf475a..0000000
--- a/ltkj-admin/src/main/resources/application-win-chkwyyprod.yaml
+++ /dev/null
@@ -1,255 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-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: redis
-
-  # 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
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        login-username: 10001
-        login-password: admin123
-        reset-enable: true
-        allow:
-      filters: stat,wall,log4j  # 鍚敤鏃ュ織鍜岀洃鎺ц繃婊ゅ櫒
-      stat:
-        mergeSql: true  # 鍚堝苟SQL缁熻淇℃伅
-        slowSqlMillis: 3000  # 閰嶇疆 SQL 鎱㈡煡璇㈤槇鍊硷紝鍗曚綅鏄绉掞紝3绉掑嵆 3000ms
-
-# 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: C:\Tjreport\chkwyy
-  # nginx鍥剧墖鏈嶅姟鍣�
-  reportServer: https://ltpeis.xaltjdkj.cn:5516/
-
-
-#  浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: C:\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: C:\ltkjprojectconf\chkwyy-config.properties
-  path: C:\ltkjprojectconf
diff --git a/ltkj-admin/src/main/resources/application-win-pbkwyyprod.yaml b/ltkj-admin/src/main/resources/application-win-pbkwyyprod.yaml
deleted file mode 100644
index 34b6c30..0000000
--- a/ltkj-admin/src/main/resources/application-win-pbkwyyprod.yaml
+++ /dev/null
@@ -1,255 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-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: 5005
-  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: redis
-
-  # 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
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        login-username: 10001
-        login-password: admin123
-        reset-enable: true
-        allow:
-      filters: stat,wall,log4j  # 鍚敤鏃ュ織鍜岀洃鎺ц繃婊ゅ櫒
-      stat:
-        mergeSql: true  # 鍚堝苟SQL缁熻淇℃伅
-        slowSqlMillis: 3000  # 閰嶇疆 SQL 鎱㈡煡璇㈤槇鍊硷紝鍗曚綅鏄绉掞紝3绉掑嵆 3000ms
-
-# 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: C:\Tjreport\pbkwyy
-  # nginx鍥剧墖鏈嶅姟鍣�
-  reportServer: https://ltpeis.xaltjdkj.cn:5516/
-
-
-#  浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: C:\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:5005/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: C:\ltkjprojectconf\pbkwyy-config.properties
-  path: C:\ltkjprojectconf
diff --git a/ltkj-admin/src/main/resources/application-win-xamjyyprod.yaml b/ltkj-admin/src/main/resources/application-win-xamjyyprod.yaml
deleted file mode 100644
index 209a51e..0000000
--- a/ltkj-admin/src/main/resources/application-win-xamjyyprod.yaml
+++ /dev/null
@@ -1,255 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-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: 5003
-  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: redis
-
-  # 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
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        login-username: 10001
-        login-password: admin123
-        reset-enable: true
-        allow:
-      filters: stat,wall,log4j  # 鍚敤鏃ュ織鍜岀洃鎺ц繃婊ゅ櫒
-      stat:
-        mergeSql: true  # 鍚堝苟SQL缁熻淇℃伅
-        slowSqlMillis: 3000  # 閰嶇疆 SQL 鎱㈡煡璇㈤槇鍊硷紝鍗曚綅鏄绉掞紝3绉掑嵆 3000ms
-
-# 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: C:\Tjreport\xamjyy
-  # nginx鍥剧墖鏈嶅姟鍣�
-  reportServer: https://ltpeis.xaltjdkj.cn:5516/
-
-
-#  浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: C:\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: C:\ltkjprojectconf\xamjyy-config.properties
-  path: C:\ltkjprojectconf
diff --git a/ltkj-admin/src/main/resources/application-win-xamjyytest.yaml b/ltkj-admin/src/main/resources/application-win-xamjyytest.yaml
deleted file mode 100644
index 46e5f47..0000000
--- a/ltkj-admin/src/main/resources/application-win-xamjyytest.yaml
+++ /dev/null
@@ -1,255 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-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: 5004
-  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: redis
-
-  # 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
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        login-username: 10001
-        login-password: admin123
-        reset-enable: true
-        allow:
-      filters: stat,wall,log4j  # 鍚敤鏃ュ織鍜岀洃鎺ц繃婊ゅ櫒
-      stat:
-        mergeSql: true  # 鍚堝苟SQL缁熻淇℃伅
-        slowSqlMillis: 3000  # 閰嶇疆 SQL 鎱㈡煡璇㈤槇鍊硷紝鍗曚綅鏄绉掞紝3绉掑嵆 3000ms
-
-# 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: C:\Tjreport\xamjyy\test
-  # nginx鍥剧墖鏈嶅姟鍣�
-  reportServer: https://ltpeis.xaltjdkj.cn:5516/
-
-
-#  浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: C:\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: C:\ltkjprojectconf\xamjyy-config-test.properties
-  path: C:\ltkjprojectconf
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index bf60c66..2ac5edf 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -1,19 +1,9 @@
 # Spring閰嶇疆
-#dev  鍏徃 寮�鍙�/閮ㄧ讲浣跨敤
-#prod 娉惧窛鍘块儴缃叉寮忕幆澧冧娇鐢�(灏忕▼搴忕涔熷彲浣跨敤)
-#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
-#  linux-prod
-#  linux-test
-#  linux-mjprod
-#  linux-mjtest
-#  win-xamjyyprod
-#  win-xamjyytest
-#  win-chkwyyprod
-#  win-pbkwyyprod
-# 闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌姝ｅ紡 5001
-# 闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌娴嬭瘯 5002
-# 闄曡タ瑗垮畨鐓ゆ満鍖婚櫌姝ｅ紡 5003
-# 闄曡タ瑗垮畨鐓ゆ満鍖婚櫌娴嬭瘯 5004
+#dev  鍏徃 寮�鍙�/閮ㄧ讲浣跨敤 5000
+#prod 娉惧窛鍘块儴缃叉寮忕幆澧冧娇鐢�(灏忕▼搴忕涔熷彲浣跨敤) 5001
+#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢� 5002
+#  linux-prod 5001
+#  linux-test 5002
 spring:
   profiles:
     active: dev
diff --git a/ltkj-admin/src/main/resources/logback.xml b/ltkj-admin/src/main/resources/logback.xml
index e02a7f1..6caa35b 100644
--- a/ltkj-admin/src/main/resources/logback.xml
+++ b/ltkj-admin/src/main/resources/logback.xml
@@ -23,30 +23,7 @@
     </springProfile>
 
 
-    <!-- 鏃ュ織瀛樻斁璺緞  鐓ょН鍖婚櫌linux鐜-->
-    <springProfile name="linux-mjprod">
-        <property name="log.path" value="/ltkj/jar/logs/meiji"/>
-    </springProfile>
 
-    <springProfile name="linux-mjtest">
-        <property name="log.path" value="/ltkj/jar/logs/meiji/ceshi"/>
-    </springProfile>
-
-    <springProfile name="win-pbkwyyprod">
-        <property name="log.path" value="../../logs/pbkwyy/prod"/>
-    </springProfile>
-
-    <springProfile name="win-chkwyyprod">
-        <property name="log.path" value="../../logs/chkwyy/prod"/>
-    </springProfile>
-
-    <springProfile name="win-xamjyyprod">
-        <property name="log.path" value="../../logs/xamjyy/prod"/>
-    </springProfile>
-
-    <springProfile name="win-xamjyytest">
-        <property name="log.path" value="../../logs/xamjyy/test"/>
-    </springProfile>
 
     <!-- 鏃ュ織杈撳嚭鏍煎紡 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
diff --git a/ltkj-common/pom.xml b/ltkj-common/pom.xml
index 7c58bd2..48d238a 100644
--- a/ltkj-common/pom.xml
+++ b/ltkj-common/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>ltkj</artifactId>
+        <artifactId>ltkj_peis_region</artifactId>
         <groupId>com.ltkj</groupId>
         <version>3.8.4</version>
     </parent>
@@ -14,13 +14,13 @@
     <description>
         common閫氱敤宸ュ叿
     </description>
-<!--    <repositories>-->
-<!--        <repository>-->
-<!--            <id>com.e-iceblue</id>-->
-<!--            <name>e-iceblue</name>-->
-<!--            <url>https://repo.e-iceblue.cn/repository/maven-public/</url>-->
-<!--        </repository>-->
-<!--    </repositories>-->
+    <!--    <repositories>-->
+    <!--        <repository>-->
+    <!--            <id>com.e-iceblue</id>-->
+    <!--            <name>e-iceblue</name>-->
+    <!--            <url>https://repo.e-iceblue.cn/repository/maven-public/</url>-->
+    <!--        </repository>-->
+    <!--    </repositories>-->
     <dependencies>
 
         <dependency>
@@ -49,11 +49,11 @@
         <!--浠ヤ笂tduck-->
 
 
-<!--        <dependency>-->
-<!--            <groupId>e-iceblue</groupId>-->
-<!--            <artifactId>spire.pdf</artifactId>-->
-<!--            <version>5.4.0</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>e-iceblue</groupId>-->
+        <!--            <artifactId>spire.pdf</artifactId>-->
+        <!--            <version>5.4.0</version>-->
+        <!--        </dependency>-->
         <!-- mail-starter -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -230,13 +230,13 @@
             <version>5.2.0</version>
         </dependency>
 
-    <!--20231123瑙ｅ喅鎵撳寘闂娉ㄩ噴  鍦╨tkj pom.xml涓鍒朵竴浠�-->
-<!--        &lt;!&ndash;鍒涘缓濉厖琛ㄥ崟鍩�&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>e-iceblue</groupId>-->
-<!--            <artifactId>spire.pdf</artifactId>-->
-<!--            <version>5.4.0</version>-->
-<!--        </dependency>-->
+        <!--20231123瑙ｅ喅鎵撳寘闂娉ㄩ噴  鍦╨tkj pom.xml涓鍒朵竴浠�-->
+        <!--        &lt;!&ndash;鍒涘缓濉厖琛ㄥ崟鍩�&ndash;&gt;-->
+        <!--        <dependency>-->
+        <!--            <groupId>e-iceblue</groupId>-->
+        <!--            <artifactId>spire.pdf</artifactId>-->
+        <!--            <version>5.4.0</version>-->
+        <!--        </dependency>-->
 
         <dependency>
             <groupId>com.itextpdf</groupId>
@@ -279,11 +279,11 @@
 
         <!-- WxJava寰俊寮�鍙戝伐鍏�-->
         <!-- 灏忕▼搴�-->
-<!--        <dependency>-->
-<!--            <groupId>com.github.binarywang</groupId>-->
-<!--            <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>-->
-<!--            <version>4.0.0</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.github.binarywang</groupId>-->
+        <!--            <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>-->
+        <!--            <version>4.0.0</version>-->
+        <!--        </dependency>-->
         <!-- 寰俊鏀粯 -->
         <!-- https://mvnrepository.com/artifact/com.github.binarywang/wx-java-pay-spring-boot-starter -->
         <dependency>
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java
index 74b805f..8e56cdd 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java
@@ -34,6 +34,8 @@
      */
     private String uuid;
 
+    private String hospId;
+
     @ApiModelProperty(value = "鏄痶rue鍚alse")
     private Boolean type = false;
 
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 a3924ad..7065424 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
@@ -38,7 +38,7 @@
  *
  * @author ltkj
  */
-@Configuration
+//@Configuration
 @Slf4j
 public class DruidConfig {
 
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
index 19f520b..4ab71c6 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
@@ -1,6 +1,10 @@
 package com.ltkj.framework.config;
 
+//import com.ltkj.framework.interceptor.DBChangeInterceptor;
+import com.ltkj.framework.interceptor.DBChangeInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -11,6 +15,10 @@
 //瀹氫箟鎷︽埅鍣�
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private DBChangeInterceptor dbChangeInterceptor;
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new TokenInterceptor())
@@ -22,8 +30,23 @@
                         "/cus/package/projectListByPacId/**",
                         "/cus/hospital/getHospList",
                         "/lis/**","/api/His/**","/pacs/**",
-                        "/callBack/**",
-                        "/hosp/order/signOrderInfo"
+                        "/callBack/**"
+                });
+
+        registry.addInterceptor(dbChangeInterceptor)
+                .addPathPatterns("/**")
+                .excludePathPatterns(new String[]{
+                        "/system/dict/data/**",
+                        "/system/dict/type/**",
+                        "/captchaImage","/getCaptchaConfigKey/**",
+                        "/system/role/execUpdateSql"
+//                        ,
+//                        "/login", "/register", "/captchaImage","/cus/**","/getCaptchaConfigKey","/report/jmreport/**",
+//                        "/sqlserver/getdata/**","/api/His/**","/system/config/zx","/system/config/gxxmpym","/system/report/savePdf",
+//                        "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs","/check/ceshicc",
+//                        "/common/uploadImgExe","/common/listExeVal","/pacs/InvokeRisService/**","/check/dataSynchronizationApi",
+//                        String.valueOf(HttpMethod.GET), "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**",
+//                        "/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/jmreport/**","/lis/**","/pacs/**","/callBack/**"
                 });
     }
 }
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index db229d3..c5d788c 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -95,6 +95,7 @@
      */
     public String login(String username, String password, Boolean type,String code,String uuid) {
 
+
         String aSwitch = configService.selectConfigByKey("captcha_switch");
         if(null !=aSwitch && aSwitch.equalsIgnoreCase("Y")){
             String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
@@ -138,8 +139,8 @@
         }
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
-        recordLoginInfo(Long.valueOf(loginUser.getUserId()));
 
+        recordLoginInfo(Long.valueOf(loginUser.getUserId()));
         //鏍￠獙鍟嗗杩囨湡鍚�
         if (secretKeyLogin)
         {
diff --git a/ltkj-hosp/pom.xml b/ltkj-hosp/pom.xml
index 1c4d722..3c38f0c 100644
--- a/ltkj-hosp/pom.xml
+++ b/ltkj-hosp/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>ltkj</artifactId>
+        <artifactId>ltkj_peis_region</artifactId>
         <groupId>com.ltkj</groupId>
         <version>3.8.4</version>
     </parent>
@@ -28,6 +28,12 @@
         <dependency>
             <groupId>com.ltkj</groupId>
             <artifactId>ltkj-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>druid</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- 闆嗘垚绉湪鎶ヨ〃-->
@@ -35,6 +41,23 @@
             <groupId>org.jeecgframework.jimureport</groupId>
             <artifactId>jimureport-spring-boot-starter</artifactId>
             <version>1.5.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>druid</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
         </dependency>
 
     </dependencies>
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictHosp.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictHosp.java
index d8de12f..91ffaac 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictHosp.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictHosp.java
@@ -173,6 +173,9 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date expirationTime;
 
+//    鏁版嵁搴撳悕
+    private String dbname;
+
 
     @Override
     public String toString() {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
index 6182d21..9ad309e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
@@ -37,8 +37,6 @@
     private LtkjExamJcsqdMapper mapper;
 
     @Qualifier(value = "slaveHisDataSource")
-    @Autowired
-    private DataSource dataSource;
 
 
     @Override
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/DictHospMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/DictHospMapper.xml
index 6ad3365..d8bb389 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/DictHospMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/DictHospMapper.xml
@@ -31,6 +31,7 @@
         <result property="updateByName" column="update_by_name"/>
         <result property="imgbase64" column="imgBase64"/>
         <result property="deleted" column="deleted"/>
+<!--        <result property="dbname" column="dbname"/>-->
     </resultMap>
 
     <sql id="selectDictHospVo">
@@ -191,4 +192,4 @@
             #{hospAreaId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/pom.xml b/pom.xml
index a56b3d9..141cd06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,27 +37,27 @@
     <!-- 渚濊禆澹版槑 -->
     <dependencyManagement>
         <dependencies>
-<!--            &lt;!&ndash;瀵煎叆寰俊灏忕▼搴廠DK&ndash;&gt;-->
-<!--            <dependency>-->
-<!--                <groupId>com.github.binarywang</groupId>-->
-<!--                <artifactId>weixin-java-miniapp</artifactId>-->
-<!--                <version>3.3.0</version>-->
-<!--            </dependency>-->
-<!--            &lt;!&ndash; WxJava寰俊寮�鍙戝伐鍏�&ndash;&gt;-->
-<!--            &lt;!&ndash; 灏忕▼搴�&ndash;&gt;-->
-<!--            <dependency>-->
-<!--                <groupId>com.github.binarywang</groupId>-->
-<!--                <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>-->
-<!--                <version>${wxjava.version}</version>-->
-<!--            </dependency>-->
-<!--            &lt;!&ndash; 寰俊鏀粯 &ndash;&gt;-->
-<!--            &lt;!&ndash; https://mvnrepository.com/artifact/com.github.binarywang/wx-java-pay-spring-boot-starter &ndash;&gt;-->
-<!--            <dependency>-->
-<!--                <groupId>com.github.binarywang</groupId>-->
-<!--                <artifactId>wx-java-pay-spring-boot-starter</artifactId>-->
-<!--                <version>${wxjava.version}</version>-->
-<!--            </dependency>-->
-<!--            &lt;!&ndash; WxJava寰俊寮�鍙戝伐鍏� end&ndash;&gt;-->
+            <!--            &lt;!&ndash;瀵煎叆寰俊灏忕▼搴廠DK&ndash;&gt;-->
+            <!--            <dependency>-->
+            <!--                <groupId>com.github.binarywang</groupId>-->
+            <!--                <artifactId>weixin-java-miniapp</artifactId>-->
+            <!--                <version>3.3.0</version>-->
+            <!--            </dependency>-->
+            <!--            &lt;!&ndash; WxJava寰俊寮�鍙戝伐鍏�&ndash;&gt;-->
+            <!--            &lt;!&ndash; 灏忕▼搴�&ndash;&gt;-->
+            <!--            <dependency>-->
+            <!--                <groupId>com.github.binarywang</groupId>-->
+            <!--                <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>-->
+            <!--                <version>${wxjava.version}</version>-->
+            <!--            </dependency>-->
+            <!--            &lt;!&ndash; 寰俊鏀粯 &ndash;&gt;-->
+            <!--            &lt;!&ndash; https://mvnrepository.com/artifact/com.github.binarywang/wx-java-pay-spring-boot-starter &ndash;&gt;-->
+            <!--            <dependency>-->
+            <!--                <groupId>com.github.binarywang</groupId>-->
+            <!--                <artifactId>wx-java-pay-spring-boot-starter</artifactId>-->
+            <!--                <version>${wxjava.version}</version>-->
+            <!--            </dependency>-->
+            <!--            &lt;!&ndash; WxJava寰俊寮�鍙戝伐鍏� end&ndash;&gt;-->
 
             <dependency>
                 <groupId>com.github.javen205</groupId>
@@ -89,11 +89,11 @@
                 <artifactId>barcode4j</artifactId>
                 <version>2.1</version>
             </dependency>
-<!--            <dependency>-->
-<!--                <groupId>e-iceblue</groupId>-->
-<!--                <artifactId>spire.barcode.free</artifactId>-->
-<!--                <version>5.1.1</version>-->
-<!--            </dependency>-->
+            <!--            <dependency>-->
+            <!--                <groupId>e-iceblue</groupId>-->
+            <!--                <artifactId>spire.barcode.free</artifactId>-->
+            <!--                <version>5.1.1</version>-->
+            <!--            </dependency>-->
 
             <dependency>
                 <groupId>com.google.zxing</groupId>

--
Gitblit v1.8.0