From 924298633d1f320245b19e2d7ca3f08c4fc5a91a Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 11 Jul 2024 14:57:38 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/views/system/user/index.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/jsowell-ui/src/views/system/user/index.vue b/jsowell-ui/src/views/system/user/index.vue index 48a78e42d..59aa8ab92 100644 --- a/jsowell-ui/src/views/system/user/index.vue +++ b/jsowell-ui/src/views/system/user/index.vue @@ -29,10 +29,10 @@ - + - + @@ -207,6 +207,13 @@ + + + + + + + From 4cb02202b99b9d06330974acfb72fbd590882e89 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 11 Jul 2024 16:01:08 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=BA=20=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/PileMerchantInfoServiceImpl.java | 8 ++++---- jsowell-ui/src/views/pile/merchant/index.vue | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index edc2d9dc1..744a451b5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -173,12 +173,12 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService { int i = pileMerchantInfoMapper.insertPileMerchantInfo(pileMerchantInfo); // 3 创建运营商管理员 - if (StringUtils.isNotBlank(dto.getUserName())) { + if (StringUtils.isNotBlank(dto.getManagerPhone())) { SysUser user = new SysUser(); user.setDeptId(deptId); - user.setUserName(dto.getUserName()); - user.setNickName(dto.getUserName() + "运营商管理员"); - user.setPassword(dto.getPassword()); + user.setUserName(dto.getManagerPhone()); + user.setNickName(dto.getMerchantName() + "-管理员"); + user.setPassword("a" + dto.getManagerPhone()); user.setStatus(Constants.ZERO); user.setPostIds(new Long[]{}); user.setRoleIds(new Long[]{3L}); diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue index c8135b14e..6dcb758f1 100644 --- a/jsowell-ui/src/views/pile/merchant/index.vue +++ b/jsowell-ui/src/views/pile/merchant/index.vue @@ -295,6 +295,7 @@ export default { message: "请输入负责人电话号码", trigger: "blur", }, + { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' } ], servicePhone: [ { From b507b28c89f96c4931058828e65c5f853ab0b8f2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 11 Jul 2024 16:24:02 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=BA=20=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/views/pile/merchant/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue index 6dcb758f1..dbce136f0 100644 --- a/jsowell-ui/src/views/pile/merchant/index.vue +++ b/jsowell-ui/src/views/pile/merchant/index.vue @@ -153,7 +153,7 @@ - + 第三方小程序登录拼接授权链接 From a731ecf7019d597f30bfa02fd119a3a350abd598 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 12 Jul 2024 10:32:45 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E5=AE=81?= =?UTF-8?q?=E5=A4=8F=E4=BA=A4=E6=8A=95Service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/JiangSuPlatformServiceImpl.java | 5 ++++ .../NingXiaJiaoTouPlatformServiceImpl.java | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NingXiaJiaoTouPlatformServiceImpl.java diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java index 070e608fe..bc210d724 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java @@ -284,6 +284,11 @@ public class JiangSuPlatformServiceImpl implements ThirdPartyPlatformService { return resultMap; } + /** + * 推送告警信息 + * @param dto + * @return + */ @Override public String notificationAlarmInfo(PushAlarmInfoDTO dto) { List nrAlarmInfos = new ArrayList<>(); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NingXiaJiaoTouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NingXiaJiaoTouPlatformServiceImpl.java new file mode 100644 index 000000000..05afdcd14 --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NingXiaJiaoTouPlatformServiceImpl.java @@ -0,0 +1,25 @@ +package com.jsowell.thirdparty.platform.service.impl; + +import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; +import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory; +import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService; +import org.springframework.stereotype.Service; + +/** + * 宁夏交投平台 + * + * @author Lemon + * @Date 2024/7/11 14:15:50 + */ +@Service +public class NingXiaJiaoTouPlatformServiceImpl implements ThirdPartyPlatformService { + // 平台类型 + private final String thirdPlatformType = ThirdPlatformTypeEnum.NING_XIA_JIAO_TOU.getTypeCode(); + + @Override + public void afterPropertiesSet() throws Exception { + ThirdPartyPlatformFactory.register(thirdPlatformType, this); + } + + +} From c48c30d28219b2027dde3a2cf6dd0948b7387fff Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 12 Jul 2024 10:38:42 +0800 Subject: [PATCH 05/11] =?UTF-8?q?update=20=20=E8=B0=83=E6=95=B4=E5=85=85?= =?UTF-8?q?=E7=94=B5=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BD=8D=E7=BD=AE=EF=BC=8C=E4=B8=8E=E5=90=8E=E7=AE=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=BF=9B=E8=A1=8C=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/api/uniapp/{ => custom}/AgentDevController.java | 2 +- .../com/jsowell/api/uniapp/{ => custom}/AuthCardController.java | 2 +- .../com/jsowell/api/uniapp/{ => custom}/JumpController.java | 2 +- .../jsowell/api/uniapp/{ => custom}/JumpXixiaoController.java | 2 +- .../com/jsowell/api/uniapp/{ => custom}/MemberController.java | 2 +- .../jsowell/api/uniapp/{ => custom}/OccupyOrderController.java | 2 +- .../com/jsowell/api/uniapp/{ => custom}/OrderController.java | 2 +- .../java/com/jsowell/api/uniapp/{ => custom}/PayController.java | 2 +- .../jsowell/api/uniapp/{ => custom}/PersonPileController.java | 2 +- .../com/jsowell/api/uniapp/{ => custom}/PileController.java | 2 +- .../com/jsowell/api/uniapp/{ => custom}/TempController.java | 2 +- .../web/controller/pile/PileConnectorInfoController.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/AgentDevController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/AuthCardController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/JumpController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/JumpXixiaoController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/MemberController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/OccupyOrderController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/OrderController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/PayController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/PersonPileController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/PileController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{ => custom}/TempController.java (99%) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AgentDevController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AgentDevController.java index 09a69a051..f21e63784 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AgentDevController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AuthCardController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AuthCardController.java index 9014fda2f..59fdc442f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AuthCardController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpController.java index 1cffbe6fa..f04bcc843 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.jsowell.common.UserAgentUtils; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpXixiaoController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpXixiaoController.java index 1053cbb91..22b927272 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpXixiaoController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/MemberController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/MemberController.java index d7ba9c045..244ff7207 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/MemberController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OccupyOrderController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OccupyOrderController.java index cbf9a9b08..e1feff8f0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OccupyOrderController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OrderController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OrderController.java index f87fac2ce..b8c2e2baf 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OrderController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PayController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PayController.java index 15f71dde1..9b0711e5e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PayController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PersonPileController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PersonPileController.java index 88425b634..41b586fe9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PersonPileController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PileController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PileController.java index 2dc63b057..790d6c1f3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PileController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/TempController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/TempController.java index 194150aa4..4793d7b32 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/TempController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp; +package com.jsowell.api.uniapp.custom; import com.alibaba.fastjson2.JSON; import com.jsowell.adapay.dto.BalancePaymentRequestDTO; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java index a34a417c4..d1eb7a7d0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java @@ -1,7 +1,7 @@ package com.jsowell.web.controller.pile; import com.alibaba.fastjson2.JSON; -import com.jsowell.api.uniapp.PileController; +import com.jsowell.api.uniapp.custom.PileController; import com.jsowell.common.annotation.Log; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.page.TableDataInfo; From 931c1b272c027c4f678d210c33aba4d6f00f40c3 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 12 Jul 2024 10:48:40 +0800 Subject: [PATCH 06/11] update --- .../api/uniapp/{custom => customer}/AgentDevController.java | 2 +- .../api/uniapp/{custom => customer}/AuthCardController.java | 2 +- .../api/uniapp/{custom => customer}/JumpController.java | 4 +--- .../api/uniapp/{custom => customer}/JumpXixiaoController.java | 2 +- .../api/uniapp/{custom => customer}/MemberController.java | 2 +- .../uniapp/{custom => customer}/OccupyOrderController.java | 2 +- .../api/uniapp/{custom => customer}/OrderController.java | 2 +- .../api/uniapp/{custom => customer}/PayController.java | 3 +-- .../api/uniapp/{custom => customer}/PersonPileController.java | 2 +- .../api/uniapp/{custom => customer}/PileController.java | 2 +- .../api/uniapp/{custom => customer}/TempController.java | 2 +- .../web/controller/pile/PileConnectorInfoController.java | 2 +- 12 files changed, 12 insertions(+), 15 deletions(-) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/AgentDevController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/AuthCardController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/JumpController.java (98%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/JumpXixiaoController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/MemberController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/OccupyOrderController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/OrderController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/PayController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/PersonPileController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/PileController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/api/uniapp/{custom => customer}/TempController.java (99%) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AgentDevController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/AgentDevController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AgentDevController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/AgentDevController.java index f21e63784..dcf6cafde 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AgentDevController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/AgentDevController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AuthCardController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/AuthCardController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AuthCardController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/AuthCardController.java index 59fdc442f..826132741 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/AuthCardController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/AuthCardController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java similarity index 98% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java index f04bcc843..3912069b2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.jsowell.common.UserAgentUtils; @@ -13,7 +13,6 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.common.util.file.FileUtils; import com.jsowell.pile.domain.PileBasicInfo; -import com.jsowell.pile.dto.QueryConnectorListDTO; import com.jsowell.pile.service.IThirdpartySnRelationService; import com.jsowell.pile.service.MemberGroupService; import com.jsowell.pile.service.PileBasicInfoService; @@ -23,7 +22,6 @@ import com.jsowell.pile.vo.uniapp.PileConnectorVO; import com.jsowell.pile.vo.web.ThirdPartySnRelationVO; import com.jsowell.service.PileService; import com.jsowell.thirdparty.common.CommonService; -import eu.bitwalker.useragentutils.UserAgent; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpXixiaoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpXixiaoController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java index 22b927272..2a30c1f8b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/JumpXixiaoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/MemberController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java index 244ff7207..566471cc6 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OccupyOrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OccupyOrderController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OccupyOrderController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OccupyOrderController.java index e1feff8f0..73e78618a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OccupyOrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OccupyOrderController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OrderController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java index b8c2e2baf..f0be54b3a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/OrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PayController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java index 9b0711e5e..7d28bec43 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; @@ -8,7 +8,6 @@ import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.adapay.AdapayPayChannelEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum; -import com.jsowell.common.enums.ykc.ScenarioEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PersonPileController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java index 41b586fe9..b226c8abf 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PersonPileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PileController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java index 790d6c1f3..3c234ce06 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/TempController.java rename to jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java index 4793d7b32..5028c16ed 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/custom/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java @@ -1,4 +1,4 @@ -package com.jsowell.api.uniapp.custom; +package com.jsowell.api.uniapp.customer; import com.alibaba.fastjson2.JSON; import com.jsowell.adapay.dto.BalancePaymentRequestDTO; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java index d1eb7a7d0..0b82bcf50 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java @@ -1,7 +1,7 @@ package com.jsowell.web.controller.pile; import com.alibaba.fastjson2.JSON; -import com.jsowell.api.uniapp.custom.PileController; +import com.jsowell.api.uniapp.customer.PileController; import com.jsowell.common.annotation.Log; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.page.TableDataInfo; From 41a4094c96607f9541b10429d060ba4849c82aaa Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 12 Jul 2024 11:12:18 +0800 Subject: [PATCH 07/11] update --- jsowell-ui/src/views/pile/merchant/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue index dbce136f0..1df3d0bc2 100644 --- a/jsowell-ui/src/views/pile/merchant/index.vue +++ b/jsowell-ui/src/views/pile/merchant/index.vue @@ -153,7 +153,7 @@ -