diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/RuoYiSystemApplication.java index 61d6bec1..2777e13e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/RuoYiSystemApplication.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/RuoYiSystemApplication.java @@ -5,6 +5,9 @@ import com.xhpc.common.security.annotation.EnableRyFeignClients; import com.xhpc.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.scheduling.annotation.EnableScheduling; /** * 系统模块 @@ -15,6 +18,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication +@EnableScheduling +@EnableConfigurationProperties +@ConfigurationPropertiesScan(basePackages = {"com.xhpc.system.config"}) public class RuoYiSystemApplication { public static void main(String[] args) diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/config/AliOSSProperties.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/config/AliOSSProperties.java similarity index 93% rename from xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/config/AliOSSProperties.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/config/AliOSSProperties.java index 32533144..8c3e0a52 100644 --- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/config/AliOSSProperties.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/config/AliOSSProperties.java @@ -1,4 +1,4 @@ -package com.xhpc.tenant.config; +package com.xhpc.system.config; import lombok.Data; diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/controller/XhpcTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/XhpcTenantController.java similarity index 97% rename from xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/controller/XhpcTenantController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/XhpcTenantController.java index a850e5bf..cd9a2ab5 100644 --- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/controller/XhpcTenantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/XhpcTenantController.java @@ -1,4 +1,4 @@ -package com.xhpc.tenant.controller; +package com.xhpc.system.controller; import com.xhpc.common.core.domain.R; @@ -11,8 +11,8 @@ import com.xhpc.common.util.LogUserUtils; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.model.LoginUser; -import com.xhpc.tenant.domain.XhpcTenantDomain; -import com.xhpc.tenant.service.XhpcTenantService; +import com.xhpc.system.domain.XhpcTenantDomain; +import com.xhpc.system.service.XhpcTenantService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/domain/XhpcTenantDomain.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/XhpcTenantDomain.java similarity index 97% rename from xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/domain/XhpcTenantDomain.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/XhpcTenantDomain.java index 235a34a1..478fd149 100644 --- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/domain/XhpcTenantDomain.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/XhpcTenantDomain.java @@ -1,4 +1,4 @@ -package com.xhpc.tenant.domain; +package com.xhpc.system.domain; import java.io.Serializable; import java.util.Date; diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/XhpcTenantMapper.java similarity index 93% rename from xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/XhpcTenantMapper.java index da16f089..866ba0a9 100644 --- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/XhpcTenantMapper.java @@ -1,6 +1,6 @@ -package com.xhpc.tenant.mapper; +package com.xhpc.system.mapper; -import com.xhpc.tenant.domain.XhpcTenantDomain; +import com.xhpc.system.domain.XhpcTenantDomain; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/XhpcTenantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/XhpcTenantService.java similarity index 86% rename from xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/XhpcTenantService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/XhpcTenantService.java index d3f51c50..9e93c7da 100644 --- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/XhpcTenantService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/XhpcTenantService.java @@ -1,6 +1,6 @@ -package com.xhpc.tenant.service; +package com.xhpc.system.service; -import com.xhpc.tenant.domain.XhpcTenantDomain; +import com.xhpc.system.domain.XhpcTenantDomain; import java.util.List; import java.util.Map; diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/XhpcTenantServiceImpl.java similarity index 93% rename from xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/XhpcTenantServiceImpl.java index 4c5f4c2d..8d853b1e 100644 --- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/XhpcTenantServiceImpl.java @@ -1,10 +1,10 @@ -package com.xhpc.tenant.service.impl; +package com.xhpc.system.service.impl; import com.xhpc.common.core.exception.CustomException; import com.xhpc.common.core.utils.StringUtils; -import com.xhpc.tenant.domain.XhpcTenantDomain; -import com.xhpc.tenant.mapper.XhpcTenantMapper; -import com.xhpc.tenant.service.XhpcTenantService; +import com.xhpc.system.domain.XhpcTenantDomain; +import com.xhpc.system.mapper.XhpcTenantMapper; +import com.xhpc.system.service.XhpcTenantService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/task/XhpcTenantTask.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/task/XhpcTenantTask.java similarity index 93% rename from xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/task/XhpcTenantTask.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/task/XhpcTenantTask.java index 5cd05048..0bdb6a54 100644 --- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/task/XhpcTenantTask.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/task/XhpcTenantTask.java @@ -1,10 +1,10 @@ -package com.xhpc.tenant.task; +package com.xhpc.system.task; import cn.hutool.core.date.DateUtil; import com.xhpc.common.api.SmsService; import com.xhpc.common.core.utils.StringUtils; -import com.xhpc.tenant.domain.XhpcTenantDomain; -import com.xhpc.tenant.mapper.XhpcTenantMapper; +import com.xhpc.system.domain.XhpcTenantDomain; +import com.xhpc.system.mapper.XhpcTenantMapper; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/utils/DownloadUtil.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/utils/DownloadUtil.java similarity index 93% rename from xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/utils/DownloadUtil.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/utils/DownloadUtil.java index 46f255b8..e8e5b05a 100644 --- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/utils/DownloadUtil.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/utils/DownloadUtil.java @@ -1,4 +1,4 @@ -package com.xhpc.tenant.utils; +package com.xhpc.system.utils; import cn.hutool.http.HttpUtil; import com.xhpc.common.core.utils.StringUtils; diff --git a/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/XhpcTenantMapper.xml similarity index 92% rename from xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/XhpcTenantMapper.xml index d18e3343..8c144675 100644 --- a/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/XhpcTenantMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -37,7 +37,7 @@ - select from xhpc_tenant where is_deleted=0 @@ -62,14 +62,14 @@ where tenant_id = #{tenantId,jdbcType=VARCHAR} - select from xhpc_tenant where tenant_name = #{tenantName,jdbcType=VARCHAR} - select from xhpc_tenant @@ -86,7 +86,7 @@ where tenant_id = #{tenantId,jdbcType=VARCHAR} - + insert into xhpc_tenant (tenant_id, tenant_name, `domain`, background_url, linkman, contact_number, address, station_quote, station_pile_quote, expire_time, @@ -100,7 +100,7 @@ #{updateUser,jdbcType=BIGINT}, sysdate(), #{status,jdbcType=INTEGER}, 0) - + insert into xhpc_tenant @@ -197,7 +197,7 @@ 0 - + update xhpc_tenant @@ -240,7 +240,7 @@ where tenant_id = #{tenantId,jdbcType=VARCHAR} - + update xhpc_tenant set tenant_name = #{tenantName,jdbcType=VARCHAR}, `domain` = #{domain,jdbcType=VARCHAR}, @@ -259,7 +259,7 @@ - + update xhpc_tenant set tenant_name = #{tenantName,jdbcType=VARCHAR}, `domain` = #{domain,jdbcType=VARCHAR}, @@ -276,7 +276,7 @@ - + update xhpc_tenant set update_user = #{updateUser,jdbcType=BIGINT}, update_time = sysdate(), @@ -285,7 +285,7 @@ - + update xhpc_tenant set station_quote = #{stationQuote,jdbcType=INTEGER}, station_pile_quote = #{stationPileQuote,jdbcType=INTEGER}, @@ -296,7 +296,7 @@ - select from xhpc_tenant @@ -304,7 +304,7 @@ - select from xhpc_tenant diff --git a/xhpc-modules/pom.xml b/xhpc-modules/pom.xml index 1c0579c5..24488b75 100644 --- a/xhpc-modules/pom.xml +++ b/xhpc-modules/pom.xml @@ -17,13 +17,11 @@ xhpc-payment xhpc-order xhpc-wxma - xhpc-invoice xhpc-tradebill xhpc-message-board xhpc-card xhpc-data-big-screen xhpc-workorder - xhpc-tenant xhpc-activity xhpc-log xhpc-clearing diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/TenantService.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/TenantService.java index badc2d27..35a95df3 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/TenantService.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/TenantService.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @author yuyang * @date 2022/3/17 15:01 */ -@FeignClient(contextId = "tenantService", value = ServiceNameConstants.XHPC_TENANT, fallbackFactory = TenantFallbackFactory.class) +@FeignClient(contextId = "tenantService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = TenantFallbackFactory.class) public interface TenantService { @GetMapping("/tenant/getTenantIdTime") diff --git a/xhpc-modules/xhpc-invoice/pom.xml b/xhpc-modules/xhpc-invoice/pom.xml deleted file mode 100644 index 2cae6d59..00000000 --- a/xhpc-modules/xhpc-invoice/pom.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - xhpc-modules - com.ruoyi - 3.0.0 - - 4.0.0 - - xhpc-invoice - - - 发票服务 - - - - 8 - 8 - - - - - - - com.sun.mail - javax.mail - 1.6.2 - - - - - junit - junit - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - mysql - mysql-connector-java - - - - - com.ruoyi - ruoyi-common-datasource - - - - - com.ruoyi - ruoyi-common-datascope - - - - - com.ruoyi - ruoyi-common-log - - - - - com.ruoyi - ruoyi-common-swagger - - - com.ruoyi - ruoyi-common-core - - - com.squareup.okhttp3 - okhttp - - - com.ruoyi - xhpc-common - 3.0.0 - compile - - - com.aliyun.oss - aliyun-sdk-oss - 3.10.2 - compile - - - - - ${project.artifactId} - - - src/main/resources - - - src/main/java - - **/*.xml - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.4.0 - - - - repackage - - - - - - - - \ No newline at end of file diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/XhpcInvoiceApplication.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/XhpcInvoiceApplication.java deleted file mode 100644 index f88706bd..00000000 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/XhpcInvoiceApplication.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.xhpc; - -import com.xhpc.common.security.annotation.EnableCustomConfig; -import com.xhpc.common.security.annotation.EnableRyFeignClients; -import com.xhpc.common.swagger.annotation.EnableCustomSwagger2; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author WH - * @date 2021/12/7 14:55 - * @since version-1.0 - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableRyFeignClients -@SpringBootApplication -@MapperScan("com.xhpc.invoice.mapper") -public class XhpcInvoiceApplication { - - public static void main(String[] args) { - - SpringApplication.run(XhpcInvoiceApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 发票模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); - } - -} diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcOperatorMapper.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcOperatorMapper.java deleted file mode 100644 index a814dcc5..00000000 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcOperatorMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.xhpc.invoice.mapper; - -import org.apache.ibatis.annotations.Param; - -import java.util.Map; - -/** - * 运营商信息 数据层 - * - * @author ruoyi - */ -public interface XhpcOperatorMapper { - - /** - * 查询运营商详情 - * - * @param operatorId 运营商id - * @return 结果 - */ - Map info(@Param("operatorId") Long operatorId); - -} diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/pojo/XhpcOperator.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/pojo/XhpcOperator.java deleted file mode 100644 index 88c92569..00000000 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/pojo/XhpcOperator.java +++ /dev/null @@ -1,408 +0,0 @@ -package com.xhpc.invoice.pojo; - -import com.xhpc.common.core.web.domain.BaseEntity; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -/** - * 运营商表 xhpc_operator - * - * @author ruoyi - */ -public class XhpcOperator extends BaseEntity { - - /** - * 运营商id - */ - private Long operatorId; - - /** - * 名称 - */ - @NotBlank(message = "运营商名称不能为空") - @Length(max = 12, message = "运营商名称不能超过12位") - private String name; - - /** - * 联系人 - */ - @NotBlank(message = "联系人不能为空") - @Length(max = 12, message = "联系人不能超过12位") - private String contactName; - - /** - * 联系人电话 - */ - @NotBlank(message = "联系人电话不能为空") - private String contactPhone; - - /** - * 手机号(账号) - */ - @NotBlank(message = "手机号不能为空") - @Length(max = 11, message = "手机号不能超过11位") - private String phone; - - /** - * 运营商属性 - */ - @NotNull(message = "运营商属性不能为空") - private Integer attribute; - - - /** - * 税号 - */ - @NotNull(message = "税号不能为空") - @Length(max = 50, message = "税号不能超过50位") - private String dutyParagraph; - - - /** - * 开户行 - */ - @NotBlank(message = "开户行不能为空") - @Length(max = 20, message = "开户行电话不能超过20位") - private String openBank; - - /** - * 卡号 - */ - @NotNull(message = "卡号不能为空") - @Length(max = 20, message = "卡号不能超过20位") - private String cardNumber; - - /** - * 地址code - */ - @NotBlank(message = "地址不能为空") - private String areaCode; - - /** - * 地址 - */ - @NotBlank(message = "地址不能为空") - @Length(max = 50, message = "地址不能超过50位") - private String address; - - /** - * 详细地址 - */ - @NotBlank(message = "详细地址不能为空") - @Length(max = 50, message = "详细地址不能超过50位") - private String detailedAddress; - - /** - * 经度 - */ - @NotNull(message = "经度不能为空") - private String longitude; - - /** - * 纬度 - */ - @NotBlank(message = "纬度不能为空") - private String latitude; - - /** - * 邮箱 - */ - @NotBlank(message = "邮箱不能为空") - @Length(max = 50, message = "邮箱不能超过50位") - private String email; - - /** - * 提成类型（0总金额提成 1服务费提成） - */ - @NotNull(message = "提成类型不能为空") - private Integer commissionType; - - /** - * 平台提成 - */ - @NotNull(message = "平台提成不能为空") - private Double platformCommissionRate; - - /** - * 运维提成 - */ - @NotNull(message = "运维提成不能为空") - private Double maintenanceCommissionRate; - - /** - * 营业执照id - */ - @NotBlank(message = "营业执照不能为空") - private String businessLicenseId; - - /** - * 提现时间（tn） - */ - @NotNull(message = "提现时间不能为空") - private Integer withdrawalTime; - - /** - * 设置充电终止的soc - */ - @NotBlank(message = "充电终止的soc不能为空") - @Length(max = 10, message = "充电终止的soc不能超过10位") - private String soc; - - /** - * 状态（0正常 1停用） - */ - private Integer status; - - /** - * 删除标志（0代表存在 2代表删除） - */ - private Integer delFlag; - - /** - * 对接第三方平台及监管平台的operatorId - */ - private String operatorIdEvcs; - - public String getOperatorIdEvcs() { - - return operatorIdEvcs; - } - - public void setOperatorIdEvcs(String operatorIdEvcs) { - - this.operatorIdEvcs = operatorIdEvcs; - } - - public Long getOperatorId() { - - return operatorId; - } - - public void setOperatorId(Long operatorId) { - - this.operatorId = operatorId; - } - - public String getName() { - - return name; - } - - public void setName(String name) { - - this.name = name; - } - - public String getContactName() { - - return contactName; - } - - public void setContactName(String contactName) { - - this.contactName = contactName; - } - - public String getContactPhone() { - - return contactPhone; - } - - public void setContactPhone(String contactPhone) { - - this.contactPhone = contactPhone; - } - - public String getPhone() { - - return phone; - } - - public void setPhone(String phone) { - - this.phone = phone; - } - - public Integer getAttribute() { - - return attribute; - } - - public void setAttribute(Integer attribute) { - - this.attribute = attribute; - } - - public String getAreaCode() { - - return areaCode; - } - - public void setAreaCode(String areaCode) { - - this.areaCode = areaCode; - } - - public String getAddress() { - - return address; - } - - public void setAddress(String address) { - - this.address = address; - } - - public String getLongitude() { - - return longitude; - } - - public void setLongitude(String longitude) { - - this.longitude = longitude; - } - - public String getLatitude() { - - return latitude; - } - - public void setLatitude(String latitude) { - - this.latitude = latitude; - } - - public String getEmail() { - - return email; - } - - public void setEmail(String email) { - - this.email = email; - } - - public Integer getCommissionType() { - - return commissionType; - } - - public void setCommissionType(Integer commissionType) { - - this.commissionType = commissionType; - } - - public Double getPlatformCommissionRate() { - - return platformCommissionRate; - } - - public void setPlatformCommissionRate(Double platformCommissionRate) { - - this.platformCommissionRate = platformCommissionRate; - } - - public Double getMaintenanceCommissionRate() { - - return maintenanceCommissionRate; - } - - public void setMaintenanceCommissionRate(Double maintenanceCommissionRate) { - - this.maintenanceCommissionRate = maintenanceCommissionRate; - } - - public String getBusinessLicenseId() { - - return businessLicenseId; - } - - public void setBusinessLicenseId(String businessLicenseId) { - - this.businessLicenseId = businessLicenseId; - } - - public Integer getWithdrawalTime() { - - return withdrawalTime; - } - - public void setWithdrawalTime(Integer withdrawalTime) { - - this.withdrawalTime = withdrawalTime; - } - - public String getSoc() { - - return soc; - } - - public void setSoc(String soc) { - - this.soc = soc; - } - - public Integer getStatus() { - - return status; - } - - public void setStatus(Integer status) { - - this.status = status; - } - - public Integer getDelFlag() { - - return delFlag; - } - - public void setDelFlag(Integer delFlag) { - - this.delFlag = delFlag; - } - - public String getOpenBank() { - - return openBank; - } - - public void setOpenBank(String openBank) { - - this.openBank = openBank; - } - - public String getCardNumber() { - - return cardNumber; - } - - public void setCardNumber(String cardNumber) { - - this.cardNumber = cardNumber; - } - - public String getDutyParagraph() { - - return dutyParagraph; - } - - public void setDutyParagraph(String dutyParagraph) { - - this.dutyParagraph = dutyParagraph; - } - - public String getDetailedAddress() { - - return detailedAddress; - } - - public void setDetailedAddress(String detailedAddress) { - - this.detailedAddress = detailedAddress; - } - -} diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/banner.txt b/xhpc-modules/xhpc-invoice/src/main/resources/banner.txt deleted file mode 100644 index 27cacb9c..00000000 --- a/xhpc-modules/xhpc-invoice/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ __ _ _ - (_) / _|(_)| | - _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___ -| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \ -| | | |_| || (_) || |_| || | | | | || || __/ -|_| \__,_| \___/ \__, ||_| |_| |_||_| \___| - __/ | - |___/ \ No newline at end of file diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml deleted file mode 100644 index f02173a9..00000000 --- a/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Tomcat -server: - port: 9804 - -# Spring -spring: - application: - # 应用名称 - name: xhpc-invoice - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 172.31.183.135:8848 - config: - # 配置中心地址 - server-addr: 172.31.183.135:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - -#oss默认配置 -oss: - enabled: true - name: qiniu - tenant-mode: true - endpoint: oss-accelerate.aliyuncs.com - access-key: LTAI5tBWjnuQGxGicnThwMF1 - secret-key: b0WNtFYtWyTEkZzcr2WOAPoZg6w2Xu - bucket-name: xhpc-bucket1 - -#文件路径 -file: - aliyunPath: invoicePdf/ - serverStoreDisposableFileLocation: /www/wwwroot/xhpc.scxhua.com/disposableFiles/ -# serverStoreDisposableFileLocation: C:\\www\\wwwroot\\xhpc.scxhua.com\\disposableFiles\\ \ No newline at end of file diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/logback.xml b/xhpc-modules/xhpc-invoice/src/main/resources/logback.xml deleted file mode 100644 index ab865c63..00000000 --- a/xhpc-modules/xhpc-invoice/src/main/resources/logback.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcOperatorMapper.xml deleted file mode 100644 index 0b82fb81..00000000 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcOperatorMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - xo - . - operator_id - operatorId, xo.name, xo.contact_name contactName, xo.contact_phone contactPhone, - xo.phone, xo.attribute,xo.open_bank openBank,xo.card_number cardNumber, xo.area_code areaCode, xo.address, - xo.detailed_address detailedAddress, xo.duty_paragraph dutyParagraph, - xo.longitude, xo.latitude, xo.email, xo.commission_type commissionType, - xo.platform_commission_rate platformCommissionRate, - xo.maintenance_commission_rate maintenanceCommissionRate, - xo.business_license_id businessLicenseId, xo.withdrawal_time withdrawalTime, xo.soc, - xo.status, xo.del_flag delFlag, xo.create_time createTime, - xo.create_by createBy, xo.update_time updateTime, xo.update_by updateBy, xo.remark, - - - - - diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java index 7ce9617c..70b81d4f 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java @@ -135,7 +135,7 @@ public class XhpcHistoryOrderController extends BaseController { * 日期统计\场站统计\终端统计 */ @GetMapping("/test1") - @Scheduled(cron = "0 0/2 * * * ?") +// @Scheduled(cron = "0 0/2 * * * ?") public void test1(){ add(3000,1); } @@ -425,7 +425,7 @@ public class XhpcHistoryOrderController extends BaseController { * 小时统计 */ @GetMapping("/test") - @Scheduled(cron = "0 0/2 * * * ?") +// @Scheduled(cron = "0 0/2 * * * ?") public void test(){ logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); //小时统计 @@ -875,7 +875,7 @@ public class XhpcHistoryOrderController extends BaseController { * 24小时异常订单自动结算 */ @GetMapping("/test4") - @Scheduled(cron = "0 0/5 * * * ?") +// @Scheduled(cron = "0 0/5 * * * ?") public void test4(){ //获取异常的订单 24小时之外的异常订单 List xhpcChargeOrderList= chargeOrderService.getXhpcChargeOrderStatus(2, 0); @@ -930,7 +930,7 @@ public class XhpcHistoryOrderController extends BaseController { * @param */ @GetMapping("/test5") - @Scheduled(cron = "0 0/5 * * * ?") +// @Scheduled(cron = "0 0/5 * * * ?") public void test5(){ logger.info(">>>>>>>>>>>>>>>>>>>>>>>标记异常大于创建4小时，标记为异常>>>>>>>>>>>>>>>>>>>>>"); chargeOrderService.updateStatus(); diff --git a/xhpc-modules/xhpc-tenant/.gitignore b/xhpc-modules/xhpc-tenant/.gitignore deleted file mode 100644 index 54283dd4..00000000 --- a/xhpc-modules/xhpc-tenant/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -HELP.md -target/ -.mvn/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea/ -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/xhpc-modules/xhpc-tenant/pom.xml b/xhpc-modules/xhpc-tenant/pom.xml deleted file mode 100644 index 6a7617f0..00000000 --- a/xhpc-modules/xhpc-tenant/pom.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - com.ruoyi - xhpc-modules - 3.0.0 - - 4.0.0 - - xhpc-tenant - - - 租户服务 - - - 8 - 8 - - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - - - org.mybatis - mybatis - 3.5.6 - - - com.github.pagehelper - pagehelper-spring-boot-starter - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - org.springframework.boot - spring-boot-starter-actuator - - - - org.springframework.boot - spring-boot-starter-web - - - - - mysql - mysql-connector-java - - - - - com.ruoyi - ruoyi-common-datasource - - - - - com.ruoyi - ruoyi-common-core - - - - com.ruoyi - xhpc-common - 3.0.0 - compile - - - - org.apache.ant - ant - 1.10.12 - - - com.aliyun.oss - aliyun-sdk-oss - 3.10.2 - compile - - - com.ruoyi - ruoyi-common-log - - - - - - ${project.artifactId} - - - src/main/resources - - - src/main/java - - **/*.xml - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.4.0 - - - - repackage - - - - - - - - diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/XhpcTenantApplication.java b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/XhpcTenantApplication.java deleted file mode 100644 index e229ba7c..00000000 --- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/XhpcTenantApplication.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.xhpc; - -import com.xhpc.common.security.annotation.EnableCustomConfig; -import com.xhpc.common.security.annotation.EnableRyFeignClients; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.scheduling.annotation.EnableScheduling; - - -@EnableConfigurationProperties -@ConfigurationPropertiesScan(basePackages = {"com.xhpc.tenant.config"}) -@EnableCustomConfig -@EnableRyFeignClients -@EnableFeignClients -@SpringBootApplication -@EnableScheduling -@MapperScan("com.xhpc.tenant.mapper") -public class XhpcTenantApplication { - - public static void main(String[] args) { - - SpringApplication.run(XhpcTenantApplication.class, args); - } -} diff --git a/xhpc-modules/xhpc-tenant/src/main/resources/banner.txt b/xhpc-modules/xhpc-tenant/src/main/resources/banner.txt deleted file mode 100644 index be49df70..00000000 --- a/xhpc-modules/xhpc-tenant/src/main/resources/banner.txt +++ /dev/null @@ -1,9 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - - ,--. -,--. ,--. | ,---. ,---. ,---. - \ `' / | .-. | | .-. | | .--' - / /. \ | | | | | '-' ' \ `--. -'--' '--' `--' `--' | |-' `---' - `--' diff --git a/xhpc-modules/xhpc-tenant/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-tenant/src/main/resources/bootstrap.yml deleted file mode 100644 index 3847197a..00000000 --- a/xhpc-modules/xhpc-tenant/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,37 +0,0 @@ - -# Tomcat -server: - port: 8911 - -# Spring -spring: - application: - # 应用名称 - name: xhpc-tenant - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 172.31.183.135:8848 - config: - # 配置中心地址 - server-addr: 172.31.183.135:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - root: info - com.xhpc.tenant.mapper: debug - - file: - path: "d:\\logs" - - pattern: - console: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n' - file: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n' diff --git a/xhpc-modules/xhpc-tenant/src/main/resources/logback.xml b/xhpc-modules/xhpc-tenant/src/main/resources/logback.xml deleted file mode 100644 index 4cb51d10..00000000 --- a/xhpc-modules/xhpc-tenant/src/main/resources/logback.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/xhpc-modules/xhpc-user/.mvn/wrapper/MavenWrapperDownloader.java b/xhpc-modules/xhpc-user/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index a45eb6ba..00000000 --- a/xhpc-modules/xhpc-user/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2007-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if (mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if (mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if (!outputFile.getParentFile().exists()) { - if (!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/xhpc-modules/xhpc-user/.mvn/wrapper/maven-wrapper.jar b/xhpc-modules/xhpc-user/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 2cc7d4a5..00000000 Binary files a/xhpc-modules/xhpc-user/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/xhpc-modules/xhpc-user/.mvn/wrapper/maven-wrapper.properties b/xhpc-modules/xhpc-user/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index ffdc10e5..00000000 --- a/xhpc-modules/xhpc-user/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/xhpc-modules/xhpc-user/mvnw b/xhpc-modules/xhpc-user/mvnw deleted file mode 100644 index a16b5431..00000000 --- a/xhpc-modules/xhpc-user/mvnw +++ /dev/null @@ -1,310 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/xhpc-modules/xhpc-user/mvnw.cmd b/xhpc-modules/xhpc-user/mvnw.cmd deleted file mode 100644 index c8d43372..00000000 --- a/xhpc-modules/xhpc-user/mvnw.cmd +++ /dev/null @@ -1,182 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - -FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/xhpc-modules/xhpc-user/pom.xml b/xhpc-modules/xhpc-user/pom.xml index 234db4e5..595a9be6 100644 --- a/xhpc-modules/xhpc-user/pom.xml +++ b/xhpc-modules/xhpc-user/pom.xml @@ -92,6 +92,12 @@ ruoyi-common-log + + com.aliyun.oss + aliyun-sdk-oss + 3.10.2 + compile + diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/DaoAspect.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/DaoAspect.java similarity index 99% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/DaoAspect.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/DaoAspect.java index 8dfe8aaf..f97b804b 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/DaoAspect.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/DaoAspect.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.aspect; +package com.xhpc.user; import com.xhpc.common.core.constant.CacheConstants; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/api/XhpcInvoiceApiController.java similarity index 97% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/api/XhpcInvoiceApiController.java index 01555a4e..cae51518 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/api/XhpcInvoiceApiController.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.api; +package com.xhpc.user.api; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; @@ -8,8 +8,8 @@ import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.DateUtil; import com.xhpc.common.util.UserTypeUtil; -import com.xhpc.invoice.domain.*; -import com.xhpc.invoice.service.XhpcInvoiceService; +import com.xhpc.user.domain.*; +import com.xhpc.user.service.XhpcInvoiceService; import com.xhpc.system.api.model.LoginUser; import org.springframework.web.bind.annotation.*; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/InvoiceMapHistoryOrderStatusConst.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/constant/InvoiceMapHistoryOrderStatusConst.java similarity index 92% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/InvoiceMapHistoryOrderStatusConst.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/constant/InvoiceMapHistoryOrderStatusConst.java index 185c5333..f7e79138 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/InvoiceMapHistoryOrderStatusConst.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/constant/InvoiceMapHistoryOrderStatusConst.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.constant; +package com.xhpc.user.constant; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/InvoiceStatusConst.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/constant/InvoiceStatusConst.java similarity index 93% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/InvoiceStatusConst.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/constant/InvoiceStatusConst.java index 111f5272..18786c5b 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/InvoiceStatusConst.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/constant/InvoiceStatusConst.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.constant; +package com.xhpc.user.constant; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/IsReadStatusConst.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/constant/IsReadStatusConst.java similarity index 90% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/IsReadStatusConst.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/constant/IsReadStatusConst.java index 037628c9..c672cd38 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/IsReadStatusConst.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/constant/IsReadStatusConst.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.constant; +package com.xhpc.user.constant; /** * 用户是否已经阅读了发票的状态常量类 diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInvoiceController.java similarity index 94% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInvoiceController.java index fee1fed9..1f23b222 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInvoiceController.java @@ -1,17 +1,15 @@ -package com.xhpc.invoice.controller; +package com.xhpc.user.controller; import com.aliyun.oss.OSSClient; import com.xhpc.common.core.utils.DateUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; -import com.xhpc.common.log.annotation.Log; -import com.xhpc.common.log.enums.BusinessType; -import com.xhpc.invoice.constant.InvoiceStatusConst; -import com.xhpc.invoice.domain.AllInvoiceOrdersRequest; -import com.xhpc.invoice.domain.AllInvoiceOrdersResponse; -import com.xhpc.invoice.domain.InvoiceToUserRequest; -import com.xhpc.invoice.domain.SpecificInvoiceWrap; -import com.xhpc.invoice.service.XhpcInvoiceService; +import com.xhpc.user.constant.InvoiceStatusConst; +import com.xhpc.user.domain.AllInvoiceOrdersRequest; +import com.xhpc.user.domain.AllInvoiceOrdersResponse; +import com.xhpc.user.domain.InvoiceToUserRequest; +import com.xhpc.user.domain.SpecificInvoiceWrap; +import com.xhpc.user.service.XhpcInvoiceService; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/AllInvoiceOrdersRequest.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/AllInvoiceOrdersRequest.java similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/AllInvoiceOrdersRequest.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/AllInvoiceOrdersRequest.java index c178970b..7404920e 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/AllInvoiceOrdersRequest.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/AllInvoiceOrdersRequest.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/AllInvoiceOrdersResponse.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/AllInvoiceOrdersResponse.java similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/AllInvoiceOrdersResponse.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/AllInvoiceOrdersResponse.java index ebeeffe6..16b2ec54 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/AllInvoiceOrdersResponse.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/AllInvoiceOrdersResponse.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/ExcelInvoiceRow.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/ExcelInvoiceRow.java similarity index 97% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/ExcelInvoiceRow.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/ExcelInvoiceRow.java index 6035bedf..be035a51 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/ExcelInvoiceRow.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/ExcelInvoiceRow.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsRequest.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceHistoryRecordsRequest.java similarity index 94% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsRequest.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceHistoryRecordsRequest.java index bf436a30..380292a8 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsRequest.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceHistoryRecordsRequest.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsResponse.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceHistoryRecordsResponse.java similarity index 96% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsResponse.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceHistoryRecordsResponse.java index a8c47abb..8cb4f2cb 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsResponse.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceHistoryRecordsResponse.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceTitleResponse.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceTitleResponse.java similarity index 95% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceTitleResponse.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceTitleResponse.java index 5853a07c..63081b1e 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceTitleResponse.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceTitleResponse.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceToUserRequest.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceToUserRequest.java similarity index 95% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceToUserRequest.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceToUserRequest.java index d906ca51..14ec602f 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceToUserRequest.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoiceToUserRequest.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoicedOrderResponse.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoicedOrderResponse.java similarity index 97% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoicedOrderResponse.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoicedOrderResponse.java index 09115688..be832b15 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoicedOrderResponse.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoicedOrderResponse.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoicedOrdersRequest.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoicedOrdersRequest.java similarity index 96% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoicedOrdersRequest.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoicedOrdersRequest.java index 61959a1d..43e454ef 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoicedOrdersRequest.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/InvoicedOrdersRequest.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/SaveInvoiceInfoRequest.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/SaveInvoiceInfoRequest.java similarity index 97% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/SaveInvoiceInfoRequest.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/SaveInvoiceInfoRequest.java index 6cd389be..42dbac4a 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/SaveInvoiceInfoRequest.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/SaveInvoiceInfoRequest.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/SpecificInvoiceWrap.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/SpecificInvoiceWrap.java similarity index 99% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/SpecificInvoiceWrap.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/SpecificInvoiceWrap.java index c87fc1a4..6f6d9ac3 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/SpecificInvoiceWrap.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/SpecificInvoiceWrap.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/SpecificInvoicedResponse.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/SpecificInvoicedResponse.java similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/SpecificInvoicedResponse.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/SpecificInvoicedResponse.java index 1e54c194..bcc1c05c 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/SpecificInvoicedResponse.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/SpecificInvoicedResponse.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/TitleResponse.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/TitleResponse.java similarity index 97% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/TitleResponse.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/TitleResponse.java index 41a02b6b..33526587 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/TitleResponse.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/TitleResponse.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.domain; +package com.xhpc.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/SysUserMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/SysUserMapper.java similarity index 91% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/SysUserMapper.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/SysUserMapper.java index 886d1287..ea43d09c 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/SysUserMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/SysUserMapper.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.mapper; +package com.xhpc.user.mapper; import com.xhpc.system.api.domain.SysUser; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcChargingStationMapper.java similarity index 91% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcChargingStationMapper.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcChargingStationMapper.java index abf61f0e..110c4cda 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcChargingStationMapper.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.mapper; +package com.xhpc.user.mapper; import com.xhpc.common.domain.XhpcChargingStation; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcHistoryOrderMapper.java similarity index 94% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcHistoryOrderMapper.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcHistoryOrderMapper.java index 31958dce..f9d3233d 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcHistoryOrderMapper.java @@ -1,6 +1,6 @@ -package com.xhpc.invoice.mapper; +package com.xhpc.user.mapper; -import com.xhpc.invoice.domain.InvoicedOrdersRequest; +import com.xhpc.user.domain.InvoicedOrdersRequest; import com.xhpc.order.domain.XhpcHistoryOrder; import org.apache.ibatis.annotations.Param; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcInvoiceMapHistoryOrderMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcInvoiceMapHistoryOrderMapper.java similarity index 92% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcInvoiceMapHistoryOrderMapper.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcInvoiceMapHistoryOrderMapper.java index 500bbfae..51b94fd7 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcInvoiceMapHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcInvoiceMapHistoryOrderMapper.java @@ -1,8 +1,8 @@ -package com.xhpc.invoice.mapper; +package com.xhpc.user.mapper; -import com.xhpc.invoice.domain.InvoiceToUserRequest; -import com.xhpc.invoice.domain.InvoicedOrdersRequest; -import com.xhpc.invoice.pojo.XhpcInvoiceMapHistoryOrder; +import com.xhpc.user.domain.InvoiceToUserRequest; +import com.xhpc.user.domain.InvoicedOrdersRequest; +import com.xhpc.user.pojo.XhpcInvoiceMapHistoryOrder; import java.util.List; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcInvoiceMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcInvoiceMapper.java similarity index 94% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcInvoiceMapper.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcInvoiceMapper.java index 79d1bcd1..49a72f02 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/mapper/XhpcInvoiceMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcInvoiceMapper.java @@ -1,10 +1,10 @@ -package com.xhpc.invoice.mapper; +package com.xhpc.user.mapper; -import com.xhpc.invoice.domain.AllInvoiceOrdersRequest; -import com.xhpc.invoice.domain.ExcelInvoiceRow; -import com.xhpc.invoice.domain.InvoiceHistoryRecordsRequest; -import com.xhpc.invoice.domain.InvoiceToUserRequest; -import com.xhpc.invoice.pojo.XhpcInvoice; +import com.xhpc.user.domain.AllInvoiceOrdersRequest; +import com.xhpc.user.domain.ExcelInvoiceRow; +import com.xhpc.user.domain.InvoiceHistoryRecordsRequest; +import com.xhpc.user.domain.InvoiceToUserRequest; +import com.xhpc.user.pojo.XhpcInvoice; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/pojo/XhpcInvoice.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/pojo/XhpcInvoice.java similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/pojo/XhpcInvoice.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/pojo/XhpcInvoice.java index 26450ac0..9e6bb761 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/pojo/XhpcInvoice.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/pojo/XhpcInvoice.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.pojo; +package com.xhpc.user.pojo; import lombok.Data; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/pojo/XhpcInvoiceMapHistoryOrder.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/pojo/XhpcInvoiceMapHistoryOrder.java similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/pojo/XhpcInvoiceMapHistoryOrder.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/pojo/XhpcInvoiceMapHistoryOrder.java index 232887b3..513d6413 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/pojo/XhpcInvoiceMapHistoryOrder.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/pojo/XhpcInvoiceMapHistoryOrder.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice.pojo; +package com.xhpc.user.pojo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/XhpcInvoiceService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/XhpcInvoiceService.java similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/XhpcInvoiceService.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/XhpcInvoiceService.java index ff392278..80aff9a4 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/XhpcInvoiceService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/XhpcInvoiceService.java @@ -1,6 +1,6 @@ -package com.xhpc.invoice.service; +package com.xhpc.user.service; -import com.xhpc.invoice.domain.*; +import com.xhpc.user.domain.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java rename to xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java index 78205829..0450cbb0 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java @@ -1,7 +1,5 @@ -package com.xhpc.invoice.service.impl; +package com.xhpc.user.service.impl; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.extra.mail.MailAccount; import cn.hutool.extra.mail.MailUtil; import cn.hutool.http.HttpUtil; import cn.hutool.poi.excel.ExcelUtil; @@ -12,16 +10,16 @@ import com.xhpc.common.domain.XhpcChargingStation; import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.DateUtil; -import com.xhpc.invoice.constant.InvoiceMapHistoryOrderStatusConst; -import com.xhpc.invoice.constant.InvoiceStatusConst; -import com.xhpc.invoice.constant.IsReadStatusConst; -import com.xhpc.invoice.domain.*; -import com.xhpc.invoice.domain.InvoicedOrderResponse.ItemsDTO; -import com.xhpc.invoice.domain.InvoicedOrderResponse.ItemsDTO.OrderDatasDTO; -import com.xhpc.invoice.mapper.*; -import com.xhpc.invoice.pojo.XhpcInvoice; -import com.xhpc.invoice.pojo.XhpcInvoiceMapHistoryOrder; -import com.xhpc.invoice.service.XhpcInvoiceService; +import com.xhpc.user.constant.InvoiceMapHistoryOrderStatusConst; +import com.xhpc.user.constant.InvoiceStatusConst; +import com.xhpc.user.constant.IsReadStatusConst; +import com.xhpc.user.domain.*; +import com.xhpc.user.domain.InvoicedOrderResponse.ItemsDTO; +import com.xhpc.user.domain.InvoicedOrderResponse.ItemsDTO.OrderDatasDTO; +import com.xhpc.user.mapper.*; +import com.xhpc.user.pojo.XhpcInvoice; +import com.xhpc.user.pojo.XhpcInvoiceMapHistoryOrder; +import com.xhpc.user.service.XhpcInvoiceService; import com.xhpc.order.domain.XhpcHistoryOrder; import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.model.LoginUser; diff --git a/xhpc-modules/xhpc-user/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-user/src/main/resources/bootstrap.yml index c190803d..e5970990 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-user/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.31.183.135:8848 + server-addr: 127.0.0.1:8848 config: # 配置中心地址 - server-addr: 172.31.183.135:8848 + server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -40,3 +40,19 @@ CERTPATH: "/www/wwwroot/scxhua.cn/xhpc-user/appCertPublicKey.crt" PUBLICCERTPATH: "/www/wwwroot/scxhua.cn/xhpc-user/alipayCertPublicKey_RSA2.crt" #支付宝根证书路径 ROOTCRETPATH: "/www/wwwroot/scxhua.cn/xhpc-user/alipayRootCert.crt" + + +#oss默认配置 +oss: + enabled: true + name: qiniu + tenant-mode: true + endpoint: oss-accelerate.aliyuncs.com + access-key: LTAI5tBWjnuQGxGicnThwMF1 + secret-key: b0WNtFYtWyTEkZzcr2WOAPoZg6w2Xu + bucket-name: xhpc-bucket1 + +#文件路径 +file: + aliyunPath: invoicePdf/ + serverStoreDisposableFileLocation: /www/wwwroot/xhpc.scxhua.com/disposableFiles/ \ No newline at end of file diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/config/mail.setting b/xhpc-modules/xhpc-user/src/main/resources/config/mail.setting similarity index 100% rename from xhpc-modules/xhpc-invoice/src/main/resources/config/mail.setting rename to xhpc-modules/xhpc-user/src/main/resources/config/mail.setting diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/SysUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/SysUserMapper.xml similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/resources/mapper/SysUserMapper.xml rename to xhpc-modules/xhpc-user/src/main/resources/mapper/SysUserMapper.xml index 36ab2470..9943d6f0 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/SysUserMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcChargingStationMapper.xml similarity index 97% rename from xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcChargingStationMapper.xml rename to xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcChargingStationMapper.xml index 7db564cb..cecc907c 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcHistoryOrderMapper.xml similarity index 99% rename from xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcHistoryOrderMapper.xml rename to xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 6468ddea..4a8226d9 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml similarity index 95% rename from xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml rename to xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml index d89ce958..734426b5 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -39,7 +39,7 @@ `del_flag` - + insert into xhpc_invoice_map_history_order (invoice_id, history_order_id, history_user_id, history_user_type, hisotry_serial_number, power_price_total, service_price_total, promotion_discount, history_act_price, @@ -54,7 +54,7 @@ #{chargingStationId,jdbcType=BIGINT}, #{terminalId,jdbcType=BIGINT}, #{delFlag,jdbcType=INTEGER}) - + insert into xhpc_invoice_map_history_order @@ -193,7 +193,7 @@ AND history_user_id = #{userId} AND history_user_type = #{userType}; - SELECT FROM diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInvoiceMapper.xml similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml rename to xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInvoiceMapper.xml index f9a48016..18524555 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInvoiceMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -208,7 +208,7 @@ AND creator_id = #{creatorId} AND creator_type = #{creatorType} - SELECT case i.invoice_type when 0 then '普票' when 1 then '专票' end as invoiceType, i.receive_email as receiveEmail, case i.title_type when 0 THEN '企业' ELSE '个人/非企业' END as titleType, @@ -256,7 +256,7 @@ from xhpc_invoice where invoice_id = #{invoiceId,jdbcType=BIGINT} - insert into xhpc_invoice (receive_email, title_type, title_content, duty_number, invoice_content, invoice_money, @@ -279,7 +279,7 @@ #{tenantId,jdbcType=VARCHAR}) + parameterType="com.xhpc.user.pojo.XhpcInvoice" useGeneratedKeys="true"> insert into xhpc_invoice @@ -448,7 +448,7 @@ - insert into xhpc_invoice @@ -618,7 +618,7 @@ - + update xhpc_invoice @@ -702,7 +702,7 @@ where invoice_id = #{invoiceId,jdbcType=BIGINT} - + update xhpc_invoice set receive_email = #{receiveEmail,jdbcType=VARCHAR}, title_type = #{titleType,jdbcType=INTEGER}, diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml index da47a950..bde2e8c7 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml @@ -381,4 +381,33 @@ delete from sys_role where role_name = #{roleName} + + + + + + + + + + + + + + + + + + + + + + + + + + + + +