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

Merge #16 into master from cc_20250916_new

Browse Source 
大屏Iot获取token接口

* cc_20250916_new: (6 commits squashed)

  - feat:第三方Iot接口对接

  - Merge branch 'refs/heads/master' into cc_20250916_new
    
    # Conflicts:
    #	coolstore-partner-web/src/main/resources/application-local.properties

  - fix

  - fix:修改http请求工具

  - Merge branch 'refs/heads/master' into cc_20250916_new
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-web/src/main/resources/application-ab.properties
    #	coolstore-partner-web/src/main/resources/application-local.properties
    #	coolstore-partner-web/src/main/resources/application-online.properties
    #	coolstore-partner-web/src/main/resources/application-test.properties

  - fix:短信签名修改

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/16
This commit is contained in:
王非凡
2025-12-19 09:07:35 +00:00
committed by 苏竹红
parent bd2d97130a
commit 32ae1b7315
10 changed files with 131 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -314,8 +314,11 @@ public enum ErrorCodeEnum {
MESSAGE_NOT_HANDLED(1610008,"当前消息无需处理，请确认消息处理类型！",null),
MESSAGE_PUBLISH(1610009,"您选择通知任务正在发布中，请稍后重试！",null),
NOT_FLAGSHIP_STORE(1610010,"非直营店，无法跳过缴费阶段！",null),
NOT_FLAGSHIP_STORE_NOT_EXIST(1610011,"当前阶段加盟类型不能变更！",null),
NOT_FLAGSHIP_STORE(16100005,"非直营店，无法跳过缴费阶段！",null),
NOT_FLAGSHIP_STORE_NOT_EXIST(16100006,"当前阶段加盟类型不能变更！",null),
API_ERROR(1610007,"第三方API请求异常",null),
JOIN_MODE_NOT_ALLOW_OPERATE(1610012,"加盟部人员只能新建加盟店或联营店，请确认！",null),
STORE_NOT_FIND(1610013,"门店不存在",null),
SHOP_NAME_INVALID(1610014, "门店名称包含禁止关键词",null),