和并tenant项目到system项目;合并invoice项目到user项目
This commit is contained in:
panshuling321
parent
a7111aa1cf
commit
a6f8dacd6f
@ -5,6 +5,9 @@ import com.xhpc.common.security.annotation.EnableRyFeignClients;
|
|||||||
import com.xhpc.common.swagger.annotation.EnableCustomSwagger2;
|
import com.xhpc.common.swagger.annotation.EnableCustomSwagger2;
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
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
|
@EnableCustomSwagger2
|
||||||
@EnableRyFeignClients
|
@EnableRyFeignClients
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
|
@EnableScheduling
|
||||||
|
@EnableConfigurationProperties
|
||||||
|
@ConfigurationPropertiesScan(basePackages = {"com.xhpc.system.config"})
|
||||||
public class RuoYiSystemApplication
|
public class RuoYiSystemApplication
|
||||||
{
|
{
|
||||||
public static void main(String[] args)
|
public static void main(String[] args)
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.tenant.config;
|
package com.xhpc.system.config;
|
||||||
|
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.tenant.controller;
|
package com.xhpc.system.controller;
|
||||||
|
|
||||||
|
|
||||||
import com.xhpc.common.core.domain.R;
|
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.common.util.UserTypeUtil;
|
||||||
import com.xhpc.system.api.domain.SysUser;
|
import com.xhpc.system.api.domain.SysUser;
|
||||||
import com.xhpc.system.api.model.LoginUser;
|
import com.xhpc.system.api.model.LoginUser;
|
||||||
import com.xhpc.tenant.domain.XhpcTenantDomain;
|
import com.xhpc.system.domain.XhpcTenantDomain;
|
||||||
import com.xhpc.tenant.service.XhpcTenantService;
|
import com.xhpc.system.service.XhpcTenantService;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.tenant.domain;
|
package com.xhpc.system.domain;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@ -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 org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -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.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -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.exception.CustomException;
|
||||||
import com.xhpc.common.core.utils.StringUtils;
|
import com.xhpc.common.core.utils.StringUtils;
|
||||||
import com.xhpc.tenant.domain.XhpcTenantDomain;
|
import com.xhpc.system.domain.XhpcTenantDomain;
|
||||||
import com.xhpc.tenant.mapper.XhpcTenantMapper;
|
import com.xhpc.system.mapper.XhpcTenantMapper;
|
||||||
import com.xhpc.tenant.service.XhpcTenantService;
|
import com.xhpc.system.service.XhpcTenantService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
@ -1,10 +1,10 @@
|
|||||||
package com.xhpc.tenant.task;
|
package com.xhpc.system.task;
|
||||||
|
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
import com.xhpc.common.api.SmsService;
|
import com.xhpc.common.api.SmsService;
|
||||||
import com.xhpc.common.core.utils.StringUtils;
|
import com.xhpc.common.core.utils.StringUtils;
|
||||||
import com.xhpc.tenant.domain.XhpcTenantDomain;
|
import com.xhpc.system.domain.XhpcTenantDomain;
|
||||||
import com.xhpc.tenant.mapper.XhpcTenantMapper;
|
import com.xhpc.system.mapper.XhpcTenantMapper;
|
||||||
import org.springframework.scheduling.annotation.Scheduled;
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.tenant.utils;
|
package com.xhpc.system.utils;
|
||||||
|
|
||||||
import cn.hutool.http.HttpUtil;
|
import cn.hutool.http.HttpUtil;
|
||||||
import com.xhpc.common.core.utils.StringUtils;
|
import com.xhpc.common.core.utils.StringUtils;
|
||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.xhpc.tenant.mapper.XhpcTenantMapper">
|
<mapper namespace="com.xhpc.system.mapper.XhpcTenantMapper">
|
||||||
<resultMap id="BaseResultMap" type="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<resultMap id="BaseResultMap" type="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
<id column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
|
<id column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
|
||||||
<result column="tenant_name" jdbcType="VARCHAR" property="tenantName" />
|
<result column="tenant_name" jdbcType="VARCHAR" property="tenantName" />
|
||||||
<result column="domain" jdbcType="VARCHAR" property="domain" />
|
<result column="domain" jdbcType="VARCHAR" property="domain" />
|
||||||
@ -37,7 +37,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
<select id="getList" resultType="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<select id="getList" resultType="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from xhpc_tenant where is_deleted=0
|
from xhpc_tenant where is_deleted=0
|
||||||
@ -62,14 +62,14 @@
|
|||||||
where tenant_id = #{tenantId,jdbcType=VARCHAR}
|
where tenant_id = #{tenantId,jdbcType=VARCHAR}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectByName" resultType="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<select id="selectByName" resultType="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from xhpc_tenant
|
from xhpc_tenant
|
||||||
where tenant_name = #{tenantName,jdbcType=VARCHAR}
|
where tenant_name = #{tenantName,jdbcType=VARCHAR}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectByPkOrName" resultType="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<select id="selectByPkOrName" resultType="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from xhpc_tenant
|
from xhpc_tenant
|
||||||
@ -86,7 +86,7 @@
|
|||||||
where tenant_id = #{tenantId,jdbcType=VARCHAR}
|
where tenant_id = #{tenantId,jdbcType=VARCHAR}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<insert id="insert" keyColumn="tenant_id" keyProperty="tenantId" parameterType="com.xhpc.tenant.domain.XhpcTenantDomain" useGeneratedKeys="true">
|
<insert id="insert" keyColumn="tenant_id" keyProperty="tenantId" parameterType="com.xhpc.system.domain.XhpcTenantDomain" useGeneratedKeys="true">
|
||||||
insert into xhpc_tenant (tenant_id, tenant_name, `domain`, background_url,
|
insert into xhpc_tenant (tenant_id, tenant_name, `domain`, background_url,
|
||||||
linkman, contact_number, address,
|
linkman, contact_number, address,
|
||||||
station_quote, station_pile_quote, expire_time,
|
station_quote, station_pile_quote, expire_time,
|
||||||
@ -100,7 +100,7 @@
|
|||||||
#{updateUser,jdbcType=BIGINT}, sysdate(), #{status,jdbcType=INTEGER},
|
#{updateUser,jdbcType=BIGINT}, sysdate(), #{status,jdbcType=INTEGER},
|
||||||
0)
|
0)
|
||||||
</insert>
|
</insert>
|
||||||
<insert id="insertSelective" keyColumn="tenant_id" keyProperty="tenantId" parameterType="com.xhpc.tenant.domain.XhpcTenantDomain" useGeneratedKeys="true">
|
<insert id="insertSelective" keyColumn="tenant_id" keyProperty="tenantId" parameterType="com.xhpc.system.domain.XhpcTenantDomain" useGeneratedKeys="true">
|
||||||
insert into xhpc_tenant
|
insert into xhpc_tenant
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="tenantId != null and tenantId !=''">
|
<if test="tenantId != null and tenantId !=''">
|
||||||
@ -197,7 +197,7 @@
|
|||||||
0
|
0
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
update xhpc_tenant
|
update xhpc_tenant
|
||||||
<set>
|
<set>
|
||||||
<if test="tenantName != null">
|
<if test="tenantName != null">
|
||||||
@ -240,7 +240,7 @@
|
|||||||
</set>
|
</set>
|
||||||
where tenant_id = #{tenantId,jdbcType=VARCHAR}
|
where tenant_id = #{tenantId,jdbcType=VARCHAR}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<update id="updateByPrimaryKey" parameterType="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
update xhpc_tenant
|
update xhpc_tenant
|
||||||
set tenant_name = #{tenantName,jdbcType=VARCHAR},
|
set tenant_name = #{tenantName,jdbcType=VARCHAR},
|
||||||
`domain` = #{domain,jdbcType=VARCHAR},
|
`domain` = #{domain,jdbcType=VARCHAR},
|
||||||
@ -259,7 +259,7 @@
|
|||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
|
||||||
<update id="updateInfoByPrimaryKey" parameterType="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<update id="updateInfoByPrimaryKey" parameterType="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
update xhpc_tenant
|
update xhpc_tenant
|
||||||
set tenant_name = #{tenantName,jdbcType=VARCHAR},
|
set tenant_name = #{tenantName,jdbcType=VARCHAR},
|
||||||
`domain` = #{domain,jdbcType=VARCHAR},
|
`domain` = #{domain,jdbcType=VARCHAR},
|
||||||
@ -276,7 +276,7 @@
|
|||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
|
||||||
<update id="updateStatusByPrimaryKey" parameterType="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<update id="updateStatusByPrimaryKey" parameterType="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
update xhpc_tenant
|
update xhpc_tenant
|
||||||
set update_user = #{updateUser,jdbcType=BIGINT},
|
set update_user = #{updateUser,jdbcType=BIGINT},
|
||||||
update_time = sysdate(),
|
update_time = sysdate(),
|
||||||
@ -285,7 +285,7 @@
|
|||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
|
||||||
<update id="updateTenantConfigByPrimaryKey" parameterType="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<update id="updateTenantConfigByPrimaryKey" parameterType="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
update xhpc_tenant
|
update xhpc_tenant
|
||||||
set station_quote = #{stationQuote,jdbcType=INTEGER},
|
set station_quote = #{stationQuote,jdbcType=INTEGER},
|
||||||
station_pile_quote = #{stationPileQuote,jdbcType=INTEGER},
|
station_pile_quote = #{stationPileQuote,jdbcType=INTEGER},
|
||||||
@ -296,7 +296,7 @@
|
|||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
|
||||||
<select id="selectExpiredList" resultType="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<select id="selectExpiredList" resultType="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from xhpc_tenant
|
from xhpc_tenant
|
||||||
@ -304,7 +304,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
<select id="selectExpiringList" resultType="com.xhpc.tenant.domain.XhpcTenantDomain">
|
<select id="selectExpiringList" resultType="com.xhpc.system.domain.XhpcTenantDomain">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from xhpc_tenant
|
from xhpc_tenant
|
||||||
@ -17,13 +17,11 @@
|
|||||||
<module>xhpc-payment</module>
|
<module>xhpc-payment</module>
|
||||||
<module>xhpc-order</module>
|
<module>xhpc-order</module>
|
||||||
<module>xhpc-wxma</module>
|
<module>xhpc-wxma</module>
|
||||||
<module>xhpc-invoice</module>
|
|
||||||
<module>xhpc-tradebill</module>
|
<module>xhpc-tradebill</module>
|
||||||
<module>xhpc-message-board</module>
|
<module>xhpc-message-board</module>
|
||||||
<module>xhpc-card</module>
|
<module>xhpc-card</module>
|
||||||
<module>xhpc-data-big-screen</module>
|
<module>xhpc-data-big-screen</module>
|
||||||
<module>xhpc-workorder</module>
|
<module>xhpc-workorder</module>
|
||||||
<module>xhpc-tenant</module>
|
|
||||||
<module>xhpc-activity</module>
|
<module>xhpc-activity</module>
|
||||||
<module>xhpc-log</module>
|
<module>xhpc-log</module>
|
||||||
<module>xhpc-clearing</module>
|
<module>xhpc-clearing</module>
|
||||||
|
|||||||
@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|||||||
* @author yuyang
|
* @author yuyang
|
||||||
* @date 2022/3/17 15:01
|
* @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 {
|
public interface TenantService {
|
||||||
|
|
||||||
@GetMapping("/tenant/getTenantIdTime")
|
@GetMapping("/tenant/getTenantIdTime")
|
||||||
|
|||||||
@ -1,149 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>xhpc-modules</artifactId>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<version>3.0.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<artifactId>xhpc-invoice</artifactId>
|
|
||||||
|
|
||||||
<description>
|
|
||||||
发票服务
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.source>8</maven.compiler.source>
|
|
||||||
<maven.compiler.target>8</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<!--发送邮件依赖-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.sun.mail</groupId>
|
|
||||||
<artifactId>javax.mail</artifactId>
|
|
||||||
<version>1.6.2</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--单元测试依赖-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>junit</groupId>
|
|
||||||
<artifactId>junit</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos Config -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Sentinel -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringBoot Actuator -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Swagger UI -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.springfox</groupId>
|
|
||||||
<artifactId>springfox-swagger-ui</artifactId>
|
|
||||||
<version>${swagger.fox.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Mysql Connector -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>mysql</groupId>
|
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Common DataSource -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-datasource</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Common DataScope -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-datascope</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Common Log -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-log</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Common Swagger -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-swagger</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-core</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.squareup.okhttp3</groupId>
|
|
||||||
<artifactId>okhttp</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>xhpc-common</artifactId>
|
|
||||||
<version>3.0.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.aliyun.oss</groupId>
|
|
||||||
<artifactId>aliyun-sdk-oss</artifactId>
|
|
||||||
<version>3.10.2</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
<build>
|
|
||||||
<finalName>${project.artifactId}</finalName>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/resources</directory>
|
|
||||||
</resource>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/java</directory>
|
|
||||||
<includes>
|
|
||||||
<include>**/*.xml</include>
|
|
||||||
</includes>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
<version>2.4.0</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>repackage</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -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" +
|
|
||||||
" ''-' `'-' `-..-' ");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -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<String, Object> info(@Param("operatorId") Long operatorId);
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -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;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
Spring Boot Version: ${spring-boot.version}
|
|
||||||
Spring Application Name: ${spring.application.name}
|
|
||||||
_ __ _ _
|
|
||||||
(_) / _|(_)| |
|
|
||||||
_ __ _ _ ___ _ _ _ ______ | |_ _ | | ___
|
|
||||||
| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \
|
|
||||||
| | | |_| || (_) || |_| || | | | | || || __/
|
|
||||||
|_| \__,_| \___/ \__, ||_| |_| |_||_| \___|
|
|
||||||
__/ |
|
|
||||||
|___/
|
|
||||||
@ -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\\
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<configuration scan="true" scanPeriod="60 seconds" debug="false">
|
|
||||||
<!-- 日志存放路径 -->
|
|
||||||
<property name="log.path" value="logs/xhpc-invoice"/>
|
|
||||||
<!-- 日志输出格式 -->
|
|
||||||
<property name="log.pattern"
|
|
||||||
value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
|
|
||||||
|
|
||||||
<!-- 控制台输出 -->
|
|
||||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 系统日志输出 -->
|
|
||||||
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/info.log</file>
|
|
||||||
<!-- 循环政策：基于时间创建日志文件 -->
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 日志文件名格式 -->
|
|
||||||
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
|
||||||
<!-- 过滤的级别 -->
|
|
||||||
<level>INFO</level>
|
|
||||||
<!-- 匹配时的操作：接收（记录） -->
|
|
||||||
<onMatch>ACCEPT</onMatch>
|
|
||||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
|
||||||
<onMismatch>DENY</onMismatch>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/error.log</file>
|
|
||||||
<!-- 循环政策：基于时间创建日志文件 -->
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 日志文件名格式 -->
|
|
||||||
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
|
||||||
<!-- 过滤的级别 -->
|
|
||||||
<level>ERROR</level>
|
|
||||||
<!-- 匹配时的操作：接收（记录） -->
|
|
||||||
<onMatch>ACCEPT</onMatch>
|
|
||||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
|
||||||
<onMismatch>DENY</onMismatch>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 系统模块日志级别控制 -->
|
|
||||||
<logger name="com.xhpc" level="info"/>
|
|
||||||
<!-- Spring日志级别控制 -->
|
|
||||||
<logger name="org.springframework" level="warn"/>
|
|
||||||
|
|
||||||
<root level="info">
|
|
||||||
<appender-ref ref="console"/>
|
|
||||||
</root>
|
|
||||||
|
|
||||||
<!--系统操作日志-->
|
|
||||||
<root level="info">
|
|
||||||
<appender-ref ref="file_info"/>
|
|
||||||
<appender-ref ref="file_error"/>
|
|
||||||
</root>
|
|
||||||
</configuration>
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<!DOCTYPE mapper
|
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
||||||
<mapper namespace="com.xhpc.invoice.mapper.XhpcOperatorMapper">
|
|
||||||
|
|
||||||
<resultMap type="com.xhpc.invoice.pojo.XhpcOperator" id="XhpcOperatorResult">
|
|
||||||
<result column="operator_id" property="operatorId"/>
|
|
||||||
<result column="name" property="name"/>
|
|
||||||
<result column="contact_name" property="contactName"/>
|
|
||||||
<result column="contact_phone" property="contactPhone"/>
|
|
||||||
<result column="phone" property="phone"/>
|
|
||||||
<result column="attribute" property="attribute"/>
|
|
||||||
<result column="duty_paragraph" property="dutyParagraph"/>
|
|
||||||
<result column="open_bank" property="openBank"/>
|
|
||||||
<result column="card_number" property="cardNumber"/>
|
|
||||||
<result column="area_code" property="areaCode"/>
|
|
||||||
<result column="address" property="address"/>
|
|
||||||
<result column="detailed_address" property="detailedAddress"/>
|
|
||||||
<result column="longitude" property="longitude"/>
|
|
||||||
<result column="latitude" property="latitude"/>
|
|
||||||
<result column="email" property="email"/>
|
|
||||||
<result column="commission_type" property="commissionType"/>
|
|
||||||
<result column="platform_commission_rate" property="platformCommissionRate"/>
|
|
||||||
<result column="maintenance_commission_rate" property="maintenanceCommissionRate"/>
|
|
||||||
<result column="business_license_id" property="businessLicenseId"/>
|
|
||||||
<result column="withdrawal_time" property="withdrawalTime"/>
|
|
||||||
<result column="soc" property="soc"/>
|
|
||||||
<result column="status" property="status"/>
|
|
||||||
<result column="del_flag" property="delFlag"/>
|
|
||||||
<result column="create_time" property="createTime"/>
|
|
||||||
<result column="create_by" property="createBy"/>
|
|
||||||
<result column="update_time" property="updateTime"/>
|
|
||||||
<result column="update_by" property="updateBy"/>
|
|
||||||
<result column="remark" property="remark"/>
|
|
||||||
<result column="operator_id_evcs" property="operatorIdEvcs"/>
|
|
||||||
</resultMap>
|
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
|
||||||
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,
|
|
||||||
</sql>
|
|
||||||
|
|
||||||
<select id="info" parameterType="java.lang.Long" resultType="java.util.Map">
|
|
||||||
select
|
|
||||||
<include refid="Base_Column_List"/>
|
|
||||||
xo.operator_id_evcs operatorIdEvcs,
|
|
||||||
xdb.dict_value attributenName,`xa`.merger_name mergerName,
|
|
||||||
GROUP_CONCAT(DISTINCT xi.`url` ORDER BY xi.create_time DESC separator ',') businessLicenseUrl
|
|
||||||
from xhpc_operator `xo`
|
|
||||||
LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'operator_attribute' and xdb.dict_key = xo.attribute
|
|
||||||
LEFT JOIN xhpc_area `xa` on `xa`.`code` = xo.area_code
|
|
||||||
LEFT JOIN xhpc_img xi on FIND_IN_SET(xi.img_id,xo.business_license_id )
|
|
||||||
where xo.del_flag = 0 and xo.operator_id = #{operatorId}
|
|
||||||
</select>
|
|
||||||
|
|
||||||
</mapper>
|
|
||||||
@ -135,7 +135,7 @@ public class XhpcHistoryOrderController extends BaseController {
|
|||||||
* 日期统计\场站统计\终端统计
|
* 日期统计\场站统计\终端统计
|
||||||
*/
|
*/
|
||||||
@GetMapping("/test1")
|
@GetMapping("/test1")
|
||||||
@Scheduled(cron = "0 0/2 * * * ?")
|
// @Scheduled(cron = "0 0/2 * * * ?")
|
||||||
public void test1(){
|
public void test1(){
|
||||||
add(3000,1);
|
add(3000,1);
|
||||||
}
|
}
|
||||||
@ -425,7 +425,7 @@ public class XhpcHistoryOrderController extends BaseController {
|
|||||||
* 小时统计
|
* 小时统计
|
||||||
*/
|
*/
|
||||||
@GetMapping("/test")
|
@GetMapping("/test")
|
||||||
@Scheduled(cron = "0 0/2 * * * ?")
|
// @Scheduled(cron = "0 0/2 * * * ?")
|
||||||
public void test(){
|
public void test(){
|
||||||
logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>");
|
logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>");
|
||||||
//小时统计
|
//小时统计
|
||||||
@ -875,7 +875,7 @@ public class XhpcHistoryOrderController extends BaseController {
|
|||||||
* 24小时异常订单自动结算
|
* 24小时异常订单自动结算
|
||||||
*/
|
*/
|
||||||
@GetMapping("/test4")
|
@GetMapping("/test4")
|
||||||
@Scheduled(cron = "0 0/5 * * * ?")
|
// @Scheduled(cron = "0 0/5 * * * ?")
|
||||||
public void test4(){
|
public void test4(){
|
||||||
//获取异常的订单 24小时之外的异常订单
|
//获取异常的订单 24小时之外的异常订单
|
||||||
List<XhpcChargeOrder> xhpcChargeOrderList= chargeOrderService.getXhpcChargeOrderStatus(2, 0);
|
List<XhpcChargeOrder> xhpcChargeOrderList= chargeOrderService.getXhpcChargeOrderStatus(2, 0);
|
||||||
@ -930,7 +930,7 @@ public class XhpcHistoryOrderController extends BaseController {
|
|||||||
* @param
|
* @param
|
||||||
*/
|
*/
|
||||||
@GetMapping("/test5")
|
@GetMapping("/test5")
|
||||||
@Scheduled(cron = "0 0/5 * * * ?")
|
// @Scheduled(cron = "0 0/5 * * * ?")
|
||||||
public void test5(){
|
public void test5(){
|
||||||
logger.info(">>>>>>>>>>>>>>>>>>>>>>>标记异常大于创建4小时，标记为异常>>>>>>>>>>>>>>>>>>>>>");
|
logger.info(">>>>>>>>>>>>>>>>>>>>>>>标记异常大于创建4小时，标记为异常>>>>>>>>>>>>>>>>>>>>>");
|
||||||
chargeOrderService.updateStatus();
|
chargeOrderService.updateStatus();
|
||||||
|
|||||||
35
xhpc-modules/xhpc-tenant/.gitignore
vendored
35
xhpc-modules/xhpc-tenant/.gitignore
vendored
@ -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/
|
|
||||||
@ -1,136 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>xhpc-modules</artifactId>
|
|
||||||
<version>3.0.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<artifactId>xhpc-tenant</artifactId>
|
|
||||||
|
|
||||||
<description>
|
|
||||||
租户服务
|
|
||||||
</description>
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.source>8</maven.compiler.source>
|
|
||||||
<maven.compiler.target>8</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mybatis.spring.boot</groupId>
|
|
||||||
<artifactId>mybatis-spring-boot-starter</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mybatis</groupId>
|
|
||||||
<artifactId>mybatis</artifactId>
|
|
||||||
<version>3.5.6</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.pagehelper</groupId>
|
|
||||||
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos Config -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Sentinel -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Mysql Connector -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>mysql</groupId>
|
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Common DataSource -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-datasource</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Common Core -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-core</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>xhpc-common</artifactId>
|
|
||||||
<version>3.0.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.ant</groupId>
|
|
||||||
<artifactId>ant</artifactId>
|
|
||||||
<version>1.10.12</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.aliyun.oss</groupId>
|
|
||||||
<artifactId>aliyun-sdk-oss</artifactId>
|
|
||||||
<version>3.10.2</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-log</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<finalName>${project.artifactId}</finalName>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/resources</directory>
|
|
||||||
</resource>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/java</directory>
|
|
||||||
<includes>
|
|
||||||
<include>**/*.xml</include>
|
|
||||||
</includes>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
<version>2.4.0</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>repackage</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
Spring Boot Version: ${spring-boot.version}
|
|
||||||
Spring Application Name: ${spring.application.name}
|
|
||||||
|
|
||||||
,--.
|
|
||||||
,--. ,--. | ,---. ,---. ,---.
|
|
||||||
\ `' / | .-. | | .-. | | .--'
|
|
||||||
/ /. \ | | | | | '-' ' \ `--.
|
|
||||||
'--' '--' `--' `--' | |-' `---'
|
|
||||||
`--'
|
|
||||||
@ -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'
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<configuration scan="true" scanPeriod="60 seconds" debug="false">
|
|
||||||
<!-- 日志存放路径 -->
|
|
||||||
<property name="log.path" value="logs/xhpc-tenant"/>
|
|
||||||
<!-- 日志输出格式 -->
|
|
||||||
<property name="log.pattern"
|
|
||||||
value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
|
|
||||||
|
|
||||||
<!-- 控制台输出 -->
|
|
||||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 系统日志输出 -->
|
|
||||||
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/info.log</file>
|
|
||||||
<!-- 循环政策：基于时间创建日志文件 -->
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 日志文件名格式 -->
|
|
||||||
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
|
||||||
<!-- 过滤的级别 -->
|
|
||||||
<level>INFO</level>
|
|
||||||
<!-- 匹配时的操作：接收（记录） -->
|
|
||||||
<onMatch>ACCEPT</onMatch>
|
|
||||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
|
||||||
<onMismatch>DENY</onMismatch>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/error.log</file>
|
|
||||||
<!-- 循环政策：基于时间创建日志文件 -->
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 日志文件名格式 -->
|
|
||||||
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
|
||||||
<!-- 过滤的级别 -->
|
|
||||||
<level>ERROR</level>
|
|
||||||
<!-- 匹配时的操作：接收（记录） -->
|
|
||||||
<onMatch>ACCEPT</onMatch>
|
|
||||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
|
||||||
<onMismatch>DENY</onMismatch>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 系统模块日志级别控制 -->
|
|
||||||
<logger name="com.xhpc" level="info"/>
|
|
||||||
<!-- Spring日志级别控制 -->
|
|
||||||
<logger name="org.springframework" level="warn"/>
|
|
||||||
|
|
||||||
<root level="info">
|
|
||||||
<appender-ref ref="console"/>
|
|
||||||
</root>
|
|
||||||
|
|
||||||
<!--系统操作日志-->
|
|
||||||
<root level="info">
|
|
||||||
<appender-ref ref="file_info"/>
|
|
||||||
<appender-ref ref="file_error"/>
|
|
||||||
</root>
|
|
||||||
</configuration>
|
|
||||||
@ -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();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Binary file not shown.
@ -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
|
|
||||||
310
xhpc-modules/xhpc-user/mvnw
vendored
310
xhpc-modules/xhpc-user/mvnw
vendored
@ -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 "$@"
|
|
||||||
182
xhpc-modules/xhpc-user/mvnw.cmd
vendored
182
xhpc-modules/xhpc-user/mvnw.cmd
vendored
@ -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%
|
|
||||||
@ -92,6 +92,12 @@
|
|||||||
<artifactId>ruoyi-common-log</artifactId>
|
<artifactId>ruoyi-common-log</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.aliyun.oss</groupId>
|
||||||
|
<artifactId>aliyun-sdk-oss</artifactId>
|
||||||
|
<version>3.10.2</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.aspect;
|
package com.xhpc.user;
|
||||||
|
|
||||||
|
|
||||||
import com.xhpc.common.core.constant.CacheConstants;
|
import com.xhpc.common.core.constant.CacheConstants;
|
||||||
@ -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.controller.BaseController;
|
||||||
import com.xhpc.common.core.web.domain.AjaxResult;
|
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.security.service.TokenService;
|
||||||
import com.xhpc.common.util.DateUtil;
|
import com.xhpc.common.util.DateUtil;
|
||||||
import com.xhpc.common.util.UserTypeUtil;
|
import com.xhpc.common.util.UserTypeUtil;
|
||||||
import com.xhpc.invoice.domain.*;
|
import com.xhpc.user.domain.*;
|
||||||
import com.xhpc.invoice.service.XhpcInvoiceService;
|
import com.xhpc.user.service.XhpcInvoiceService;
|
||||||
import com.xhpc.system.api.model.LoginUser;
|
import com.xhpc.system.api.model.LoginUser;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.constant;
|
package com.xhpc.user.constant;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.constant;
|
package com.xhpc.user.constant;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.constant;
|
package com.xhpc.user.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户是否已经阅读了发票的状态常量类
|
* 用户是否已经阅读了发票的状态常量类
|
||||||
@ -1,17 +1,15 @@
|
|||||||
package com.xhpc.invoice.controller;
|
package com.xhpc.user.controller;
|
||||||
|
|
||||||
import com.aliyun.oss.OSSClient;
|
import com.aliyun.oss.OSSClient;
|
||||||
import com.xhpc.common.core.utils.DateUtils;
|
import com.xhpc.common.core.utils.DateUtils;
|
||||||
import com.xhpc.common.core.web.controller.BaseController;
|
import com.xhpc.common.core.web.controller.BaseController;
|
||||||
import com.xhpc.common.core.web.domain.AjaxResult;
|
import com.xhpc.common.core.web.domain.AjaxResult;
|
||||||
import com.xhpc.common.log.annotation.Log;
|
import com.xhpc.user.constant.InvoiceStatusConst;
|
||||||
import com.xhpc.common.log.enums.BusinessType;
|
import com.xhpc.user.domain.AllInvoiceOrdersRequest;
|
||||||
import com.xhpc.invoice.constant.InvoiceStatusConst;
|
import com.xhpc.user.domain.AllInvoiceOrdersResponse;
|
||||||
import com.xhpc.invoice.domain.AllInvoiceOrdersRequest;
|
import com.xhpc.user.domain.InvoiceToUserRequest;
|
||||||
import com.xhpc.invoice.domain.AllInvoiceOrdersResponse;
|
import com.xhpc.user.domain.SpecificInvoiceWrap;
|
||||||
import com.xhpc.invoice.domain.InvoiceToUserRequest;
|
import com.xhpc.user.service.XhpcInvoiceService;
|
||||||
import com.xhpc.invoice.domain.SpecificInvoiceWrap;
|
|
||||||
import com.xhpc.invoice.service.XhpcInvoiceService;
|
|
||||||
import org.springframework.core.env.Environment;
|
import org.springframework.core.env.Environment;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.domain;
|
package com.xhpc.user.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.mapper;
|
package com.xhpc.user.mapper;
|
||||||
|
|
||||||
import com.xhpc.system.api.domain.SysUser;
|
import com.xhpc.system.api.domain.SysUser;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.mapper;
|
package com.xhpc.user.mapper;
|
||||||
|
|
||||||
import com.xhpc.common.domain.XhpcChargingStation;
|
import com.xhpc.common.domain.XhpcChargingStation;
|
||||||
|
|
||||||
@ -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 com.xhpc.order.domain.XhpcHistoryOrder;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
@ -1,8 +1,8 @@
|
|||||||
package com.xhpc.invoice.mapper;
|
package com.xhpc.user.mapper;
|
||||||
|
|
||||||
import com.xhpc.invoice.domain.InvoiceToUserRequest;
|
import com.xhpc.user.domain.InvoiceToUserRequest;
|
||||||
import com.xhpc.invoice.domain.InvoicedOrdersRequest;
|
import com.xhpc.user.domain.InvoicedOrdersRequest;
|
||||||
import com.xhpc.invoice.pojo.XhpcInvoiceMapHistoryOrder;
|
import com.xhpc.user.pojo.XhpcInvoiceMapHistoryOrder;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -1,10 +1,10 @@
|
|||||||
package com.xhpc.invoice.mapper;
|
package com.xhpc.user.mapper;
|
||||||
|
|
||||||
import com.xhpc.invoice.domain.AllInvoiceOrdersRequest;
|
import com.xhpc.user.domain.AllInvoiceOrdersRequest;
|
||||||
import com.xhpc.invoice.domain.ExcelInvoiceRow;
|
import com.xhpc.user.domain.ExcelInvoiceRow;
|
||||||
import com.xhpc.invoice.domain.InvoiceHistoryRecordsRequest;
|
import com.xhpc.user.domain.InvoiceHistoryRecordsRequest;
|
||||||
import com.xhpc.invoice.domain.InvoiceToUserRequest;
|
import com.xhpc.user.domain.InvoiceToUserRequest;
|
||||||
import com.xhpc.invoice.pojo.XhpcInvoice;
|
import com.xhpc.user.pojo.XhpcInvoice;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.pojo;
|
package com.xhpc.user.pojo;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.xhpc.invoice.pojo;
|
package com.xhpc.user.pojo;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
@ -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 javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -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.extra.mail.MailUtil;
|
||||||
import cn.hutool.http.HttpUtil;
|
import cn.hutool.http.HttpUtil;
|
||||||
import cn.hutool.poi.excel.ExcelUtil;
|
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.redis.service.RedisService;
|
||||||
import com.xhpc.common.security.service.TokenService;
|
import com.xhpc.common.security.service.TokenService;
|
||||||
import com.xhpc.common.util.DateUtil;
|
import com.xhpc.common.util.DateUtil;
|
||||||
import com.xhpc.invoice.constant.InvoiceMapHistoryOrderStatusConst;
|
import com.xhpc.user.constant.InvoiceMapHistoryOrderStatusConst;
|
||||||
import com.xhpc.invoice.constant.InvoiceStatusConst;
|
import com.xhpc.user.constant.InvoiceStatusConst;
|
||||||
import com.xhpc.invoice.constant.IsReadStatusConst;
|
import com.xhpc.user.constant.IsReadStatusConst;
|
||||||
import com.xhpc.invoice.domain.*;
|
import com.xhpc.user.domain.*;
|
||||||
import com.xhpc.invoice.domain.InvoicedOrderResponse.ItemsDTO;
|
import com.xhpc.user.domain.InvoicedOrderResponse.ItemsDTO;
|
||||||
import com.xhpc.invoice.domain.InvoicedOrderResponse.ItemsDTO.OrderDatasDTO;
|
import com.xhpc.user.domain.InvoicedOrderResponse.ItemsDTO.OrderDatasDTO;
|
||||||
import com.xhpc.invoice.mapper.*;
|
import com.xhpc.user.mapper.*;
|
||||||
import com.xhpc.invoice.pojo.XhpcInvoice;
|
import com.xhpc.user.pojo.XhpcInvoice;
|
||||||
import com.xhpc.invoice.pojo.XhpcInvoiceMapHistoryOrder;
|
import com.xhpc.user.pojo.XhpcInvoiceMapHistoryOrder;
|
||||||
import com.xhpc.invoice.service.XhpcInvoiceService;
|
import com.xhpc.user.service.XhpcInvoiceService;
|
||||||
import com.xhpc.order.domain.XhpcHistoryOrder;
|
import com.xhpc.order.domain.XhpcHistoryOrder;
|
||||||
import com.xhpc.system.api.domain.SysUser;
|
import com.xhpc.system.api.domain.SysUser;
|
||||||
import com.xhpc.system.api.model.LoginUser;
|
import com.xhpc.system.api.model.LoginUser;
|
||||||
@ -14,10 +14,10 @@ spring:
|
|||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
# 服务注册地址
|
# 服务注册地址
|
||||||
server-addr: 172.31.183.135:8848
|
server-addr: 127.0.0.1:8848
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: 172.31.183.135:8848
|
server-addr: 127.0.0.1:8848
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
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"
|
PUBLICCERTPATH: "/www/wwwroot/scxhua.cn/xhpc-user/alipayCertPublicKey_RSA2.crt"
|
||||||
#支付宝根证书路径
|
#支付宝根证书路径
|
||||||
ROOTCRETPATH: "/www/wwwroot/scxhua.cn/xhpc-user/alipayRootCert.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/
|
||||||
@ -2,7 +2,7 @@
|
|||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.xhpc.invoice.mapper.SysUserMapper">
|
<mapper namespace="com.xhpc.user.mapper.SysUserMapper">
|
||||||
|
|
||||||
<resultMap id="SysUserResult" type="com.xhpc.system.api.domain.SysUser">
|
<resultMap id="SysUserResult" type="com.xhpc.system.api.domain.SysUser">
|
||||||
<result column="user_id" property="userId"/>
|
<result column="user_id" property="userId"/>
|
||||||
@ -2,7 +2,7 @@
|
|||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.xhpc.invoice.mapper.XhpcChargingStationMapper">
|
<mapper namespace="com.xhpc.user.mapper.XhpcChargingStationMapper">
|
||||||
|
|
||||||
<resultMap id="BaseResultMap" type="com.xhpc.common.domain.XhpcChargingStation">
|
<resultMap id="BaseResultMap" type="com.xhpc.common.domain.XhpcChargingStation">
|
||||||
<result property="chargingStationId" column="charging_station_id"/>
|
<result property="chargingStationId" column="charging_station_id"/>
|
||||||
@ -2,7 +2,7 @@
|
|||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.xhpc.invoice.mapper.XhpcHistoryOrderMapper">
|
<mapper namespace="com.xhpc.user.mapper.XhpcHistoryOrderMapper">
|
||||||
|
|
||||||
<resultMap type="com.xhpc.order.domain.XhpcHistoryOrder" id="XhpcHistoryOrderResult">
|
<resultMap type="com.xhpc.order.domain.XhpcHistoryOrder" id="XhpcHistoryOrderResult">
|
||||||
<id column="history_order_id" jdbcType="BIGINT" property="historyOrderId"/>
|
<id column="history_order_id" jdbcType="BIGINT" property="historyOrderId"/>
|
||||||
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<!--suppress ALL -->
|
<!--suppress ALL -->
|
||||||
<mapper namespace="com.xhpc.invoice.mapper.XhpcInvoiceMapHistoryOrderMapper">
|
<mapper namespace="com.xhpc.user.mapper.XhpcInvoiceMapHistoryOrderMapper">
|
||||||
<resultMap id="BaseResultMap" type="com.xhpc.invoice.pojo.XhpcInvoiceMapHistoryOrder">
|
<resultMap id="BaseResultMap" type="com.xhpc.user.pojo.XhpcInvoiceMapHistoryOrder">
|
||||||
<result column="invoice_id" jdbcType="BIGINT" property="invoiceId"/>
|
<result column="invoice_id" jdbcType="BIGINT" property="invoiceId"/>
|
||||||
<result column="history_order_id" jdbcType="BIGINT" property="historyOrderId"/>
|
<result column="history_order_id" jdbcType="BIGINT" property="historyOrderId"/>
|
||||||
<result column="history_user_id" jdbcType="BIGINT" property="historyUserId"/>
|
<result column="history_user_id" jdbcType="BIGINT" property="historyUserId"/>
|
||||||
@ -39,7 +39,7 @@
|
|||||||
`del_flag`
|
`del_flag`
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<insert id="insert" parameterType="com.xhpc.invoice.pojo.XhpcInvoiceMapHistoryOrder">
|
<insert id="insert" parameterType="com.xhpc.user.pojo.XhpcInvoiceMapHistoryOrder">
|
||||||
insert into xhpc_invoice_map_history_order (invoice_id, history_order_id, history_user_id,
|
insert into xhpc_invoice_map_history_order (invoice_id, history_order_id, history_user_id,
|
||||||
history_user_type, hisotry_serial_number, power_price_total,
|
history_user_type, hisotry_serial_number, power_price_total,
|
||||||
service_price_total, promotion_discount, history_act_price,
|
service_price_total, promotion_discount, history_act_price,
|
||||||
@ -54,7 +54,7 @@
|
|||||||
#{chargingStationId,jdbcType=BIGINT},
|
#{chargingStationId,jdbcType=BIGINT},
|
||||||
#{terminalId,jdbcType=BIGINT}, #{delFlag,jdbcType=INTEGER})
|
#{terminalId,jdbcType=BIGINT}, #{delFlag,jdbcType=INTEGER})
|
||||||
</insert>
|
</insert>
|
||||||
<insert id="insertSelective" parameterType="com.xhpc.invoice.pojo.XhpcInvoiceMapHistoryOrder">
|
<insert id="insertSelective" parameterType="com.xhpc.user.pojo.XhpcInvoiceMapHistoryOrder">
|
||||||
insert into xhpc_invoice_map_history_order
|
insert into xhpc_invoice_map_history_order
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="invoiceId != null">
|
<if test="invoiceId != null">
|
||||||
@ -193,7 +193,7 @@
|
|||||||
AND history_user_id = #{userId}
|
AND history_user_id = #{userId}
|
||||||
AND history_user_type = #{userType};
|
AND history_user_type = #{userType};
|
||||||
</select>
|
</select>
|
||||||
<select id="getLockedOnesByHistoryOrderId" resultType="com.xhpc.invoice.pojo.XhpcInvoiceMapHistoryOrder">
|
<select id="getLockedOnesByHistoryOrderId" resultType="com.xhpc.user.pojo.XhpcInvoiceMapHistoryOrder">
|
||||||
SELECT
|
SELECT
|
||||||
<include refid="Base_Column_List"/>
|
<include refid="Base_Column_List"/>
|
||||||
FROM
|
FROM
|
||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.xhpc.invoice.mapper.XhpcInvoiceMapper">
|
<mapper namespace="com.xhpc.user.mapper.XhpcInvoiceMapper">
|
||||||
<resultMap id="BaseResultMap" type="com.xhpc.invoice.pojo.XhpcInvoice">
|
<resultMap id="BaseResultMap" type="com.xhpc.user.pojo.XhpcInvoice">
|
||||||
<id column="invoice_id" jdbcType="BIGINT" property="invoiceId"/>
|
<id column="invoice_id" jdbcType="BIGINT" property="invoiceId"/>
|
||||||
<result column="invoice_type" jdbcType="INTEGER" property="invoiceType"/>
|
<result column="invoice_type" jdbcType="INTEGER" property="invoiceType"/>
|
||||||
<result column="receive_email" jdbcType="VARCHAR" property="receiveEmail"/>
|
<result column="receive_email" jdbcType="VARCHAR" property="receiveEmail"/>
|
||||||
@ -208,7 +208,7 @@
|
|||||||
AND creator_id = #{creatorId}
|
AND creator_id = #{creatorId}
|
||||||
AND creator_type = #{creatorType}
|
AND creator_type = #{creatorType}
|
||||||
</select>
|
</select>
|
||||||
<select id="selectExcelInvoiceById" resultType="com.xhpc.invoice.domain.ExcelInvoiceRow">
|
<select id="selectExcelInvoiceById" resultType="com.xhpc.user.domain.ExcelInvoiceRow">
|
||||||
SELECT case i.invoice_type when 0 then '普票' when 1 then '专票' end as invoiceType,
|
SELECT case i.invoice_type when 0 then '普票' when 1 then '专票' end as invoiceType,
|
||||||
i.receive_email as receiveEmail,
|
i.receive_email as receiveEmail,
|
||||||
case i.title_type when 0 THEN '企业' ELSE '个人/非企业' END as titleType,
|
case i.title_type when 0 THEN '企业' ELSE '个人/非企业' END as titleType,
|
||||||
@ -256,7 +256,7 @@
|
|||||||
from xhpc_invoice
|
from xhpc_invoice
|
||||||
where invoice_id = #{invoiceId,jdbcType=BIGINT}
|
where invoice_id = #{invoiceId,jdbcType=BIGINT}
|
||||||
</delete>
|
</delete>
|
||||||
<insert id="insert" keyColumn="invoice_id" keyProperty="invoiceId" parameterType="com.xhpc.invoice.pojo.XhpcInvoice"
|
<insert id="insert" keyColumn="invoice_id" keyProperty="invoiceId" parameterType="com.xhpc.user.pojo.XhpcInvoice"
|
||||||
useGeneratedKeys="true">
|
useGeneratedKeys="true">
|
||||||
insert into xhpc_invoice (receive_email, title_type, title_content,
|
insert into xhpc_invoice (receive_email, title_type, title_content,
|
||||||
duty_number, invoice_content, invoice_money,
|
duty_number, invoice_content, invoice_money,
|
||||||
@ -279,7 +279,7 @@
|
|||||||
#{tenantId,jdbcType=VARCHAR})
|
#{tenantId,jdbcType=VARCHAR})
|
||||||
</insert>
|
</insert>
|
||||||
<insert id="insertSelective" keyColumn="invoice_id" keyProperty="invoiceId"
|
<insert id="insertSelective" keyColumn="invoice_id" keyProperty="invoiceId"
|
||||||
parameterType="com.xhpc.invoice.pojo.XhpcInvoice" useGeneratedKeys="true">
|
parameterType="com.xhpc.user.pojo.XhpcInvoice" useGeneratedKeys="true">
|
||||||
insert into xhpc_invoice
|
insert into xhpc_invoice
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="receiveEmail != null">
|
<if test="receiveEmail != null">
|
||||||
@ -448,7 +448,7 @@
|
|||||||
</if>
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
<insert id="insertSelectiveAndReturnId" parameterType="com.xhpc.invoice.pojo.XhpcInvoice"
|
<insert id="insertSelectiveAndReturnId" parameterType="com.xhpc.user.pojo.XhpcInvoice"
|
||||||
keyProperty="invoiceId" useGeneratedKeys="true">
|
keyProperty="invoiceId" useGeneratedKeys="true">
|
||||||
insert into xhpc_invoice
|
insert into xhpc_invoice
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
@ -618,7 +618,7 @@
|
|||||||
</if>
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.invoice.pojo.XhpcInvoice">
|
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.user.pojo.XhpcInvoice">
|
||||||
update xhpc_invoice
|
update xhpc_invoice
|
||||||
<set>
|
<set>
|
||||||
<if test="receiveEmail != null">
|
<if test="receiveEmail != null">
|
||||||
@ -702,7 +702,7 @@
|
|||||||
</set>
|
</set>
|
||||||
where invoice_id = #{invoiceId,jdbcType=BIGINT}
|
where invoice_id = #{invoiceId,jdbcType=BIGINT}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.invoice.pojo.XhpcInvoice">
|
<update id="updateByPrimaryKey" parameterType="com.xhpc.user.pojo.XhpcInvoice">
|
||||||
update xhpc_invoice
|
update xhpc_invoice
|
||||||
set receive_email = #{receiveEmail,jdbcType=VARCHAR},
|
set receive_email = #{receiveEmail,jdbcType=VARCHAR},
|
||||||
title_type = #{titleType,jdbcType=INTEGER},
|
title_type = #{titleType,jdbcType=INTEGER},
|
||||||
@ -381,4 +381,33 @@
|
|||||||
delete from sys_role
|
delete from sys_role
|
||||||
where role_name = #{roleName}
|
where role_name = #{roleName}
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- <sql id="Base_Column_List">-->
|
||||||
|
<!-- 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,-->
|
||||||
|
<!-- </sql>-->
|
||||||
|
|
||||||
|
<!-- <select id="info" parameterType="java.lang.Long" resultType="java.util.Map">-->
|
||||||
|
<!-- select-->
|
||||||
|
<!-- <include refid="Base_Column_List"/>-->
|
||||||
|
<!-- xo.operator_id_evcs operatorIdEvcs,-->
|
||||||
|
<!-- xdb.dict_value attributenName,`xa`.merger_name mergerName,-->
|
||||||
|
<!-- GROUP_CONCAT(DISTINCT xi.`url` ORDER BY xi.create_time DESC separator ',') businessLicenseUrl-->
|
||||||
|
<!-- from xhpc_operator `xo`-->
|
||||||
|
<!-- LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'operator_attribute' and xdb.dict_key = xo.attribute-->
|
||||||
|
<!-- LEFT JOIN xhpc_area `xa` on `xa`.`code` = xo.area_code-->
|
||||||
|
<!-- LEFT JOIN xhpc_img xi on FIND_IN_SET(xi.img_id,xo.business_license_id )-->
|
||||||
|
<!-- where xo.del_flag = 0 and xo.operator_id = #{operatorId}-->
|
||||||
|
<!-- </select>-->
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user