zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:b0771db696a74f7df525ab84e114c9ab5e6a5bc5
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
...
compare: zenghuapei:bac30ebbbfe0428217b64577314447e0d61d2fc4
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

15 Commits
b0771db696 ... bac30ebbbf

Author SHA1 Message Date
tianyu bac30ebbbf Merge branch 'master' into feature/mall_product 2023-05-29 20:25:40 +08:00
tangqian 31e0ce4e7a Merge branch 'feature/mall_product' 2023-05-29 19:23:34 +08:00
tangqian 575dbb8b6a fix: 退出登录忽略租户 2023-05-29 19:22:48 +08:00
tangqian b1ac278cc2 fix: 退出登录忽略租户 2023-05-29 19:22:22 +08:00
tangqian a9d141e2dc Merge branch 'feature/mall_product' 2023-05-29 15:00:19 +08:00
perry d699437155 Merge branch 'feature/mall_product_new' 2023-05-29 12:55:27 +08:00
perry 9b5f694e1b Merge remote-tracking branch 'origin/master' 2023-05-29 09:46:53 +08:00
perry 36a744a6ef Merge branch 'feature/mall_product_new' 2023-05-29 09:46:38 +08:00
tangqian 9894119ba8 Merge branch 'feature/mall_product' 2023-05-26 14:39:17 +08:00
perry 664b5c9b4c Merge branch 'feature/mall_product_new' 2023-05-26 13:50:29 +08:00
perry 5fd0973bf3 Merge branch 'feature/mall_product_new' 2023-05-26 13:47:54 +08:00
perry f4751d6057 Merge branch 'feature/mall_product_new' 2023-05-26 13:46:04 +08:00
perry 819e255920 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	yudao-server/src/main/resources/application-test.yaml
 2023-05-26 13:17:12 +08:00
axzsd c20e342515 配置文件 2023-05-26 11:20:53 +08:00
axzsd 01e846efc9 构建文件 2023-05-26 11:17:55 +08:00
1 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

5
yudao-server/src/main/resources/application-test.yaml
View File

@ -222,7 +222,6 @@ wx:
port: 6369 # 端口
database: 16 # 数据库索引
password: 20221122@dev # 密码，建议生产环境开启
phone:
query-url: https://cmx.bskies.cc:8000/cyywl-phone-query-api/
token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0
query-url: http://192.168.1.94:4006/cyywl-phone-query-api/
token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0