Commit 9aedbabd authored by 廖旭伟's avatar 廖旭伟

Merge remote-tracking branch 'origin/master'

parents 115ba3d5 c9dbebab
Pipeline #2980 failed with stages
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
<description>填单系统</description> <description>填单系统</description>
<properties> <properties>
<profiles.phpServer></profiles.phpServer>
<profiles.wx.appId></profiles.wx.appId>
<profiles.wx.appSecret></profiles.wx.appSecret>
</properties> </properties>
<profiles> <profiles>
...@@ -67,6 +70,9 @@ ...@@ -67,6 +70,9 @@
<profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.phpServer>http://172.15.28.116:8090</profiles.phpServer>
<profiles.wx.appId>wx341ad2eafbc209f0</profiles.wx.appId>
<profiles.wx.appSecret>e2ec6077a40938a384c723b67b491af0</profiles.wx.appSecret>
</properties> </properties>
</profile> </profile>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment