From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失，进行系统恢复，并屏蔽一个非git提交的模块； 2、增加文件《增加一个单位（orgTag）》。
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml | 24 +-----------------------
1 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
index a591cdf..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
@@ -1,25 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-pj
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.wechat.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8087
-server:
- port: ${pipIrr.wechat.webPort}
- servlet:
- context-path: /wx #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.wechat.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
-#闃块噷鐭俊鏈嶅姟
-aliyun:
- sms:
- sms-access-key-id: LTAI5tPCmHqfyJ9YnoPorEwt
- sms-access-key-secret: sU2CoLdNgcjnf5uPPU2dY7NNGNvOIX
- sms-template-code: SMS_460776024
- sms-sign-name: 澶х鑺傛按
\ No newline at end of file
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
--
Gitblit v1.8.0