suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250527_desk

Browse Source 
# Conflicts:
#	coolstore-partner-web/src/main/resources/application-online.properties
This commit is contained in:
shuo.wang
2025-05-28 20:07:48 +08:00
parent 0f1b40f21f 34be028e62
commit 6d50469af2
14 changed files with 140 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java
View File

@@ -85,6 +85,12 @@ public class ShopAccountController {
return ResponseResult.success(accountService.handleAccountPassword());
}
@ApiOperation("密码数据处理3.0")
@GetMapping("/handleOldDataAccount")
public ResponseResult<Boolean> handleOldDataAccount() {
return ResponseResult.success(accountService.handleOldDataAccount());
}
}

2
coolstore-partner-web/src/main/resources/application-online.properties
View File

@@ -57,7 +57,7 @@ fixMobileOpenid=HSAY4AF322E
#xxljob配置
#xxljob配置
xxl.job.admin.addresses = https://job.coolstore.cn/xxl-job-admin/
xxl.job.admin.addresses = https://job.coolstore.cn/xxl-job-admin
xxl.job.executor.appname = ${spring.application.name}
xxl.job.executor.ip =
xxl.job.executor.port = 40301