feat: 启动了

poyee-app/src/main/java/com/tzy/app/mq/AppUserBaseVonsumer.java

@@ -1,93 +0,0 @@
-package com.tzy.app.mq;
-
-import com.rabbitmq.client.Channel;
-import com.tzy.app.service.AppUserBaseService;
-import com.tzy.common.constant.MqConstans;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-
-/**
- * app 服务消费者
- */
-@Slf4j
-@Component
-public class AppUserBaseVonsumer {
-    @Autowired
-    private AppUserBaseService applicationService;
-    /**
-     * 回调前置消费
-     * @param data
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare=@Queue(MqConstans.QUEUE_USER_REALNESS_PASS))
-    public void userRealnessPassNotice(String data, Channel channel, Message message) throws IOException {
-        userRealnessPass(data, channel, message);
-    }
-    /**
-     * 用户认证通过
-     * @param param
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    private void userRealnessPass(String param, Channel channel, Message message) throws IOException {
-        log.info("MQ 用户认证通过>用户信息》{}", param);
-        if(StringUtils.isNotBlank(param)){
-            //整理用户信息
-            try {
-                applicationService.userRealnessPass(param);
-                channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-            }catch (Exception e){
-                log.error("整理用户信息失败>1 ",e);
-                return ;
-            }
-        }
-        channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-    }
-
-    /**
-     * 取消用户实名认证-前置消费
-     * @param data
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare=@Queue(MqConstans.QUEUE_USER_CANCEL_VERIFY))
-    public void queueUserCancelVerifyNotice(String data, Channel channel, Message message) throws IOException {
-        queueUserCancelVerify(data, channel, message);
-    }
-
-    /**
-     * 取消用户实名认证
-     * @param data
-     * @param channel
-     * @param message
-     */
-    private void queueUserCancelVerify(String data, Channel channel, Message message) throws IOException {
-        log.info("MQ 取消用户实名认证>用户信息》{}", data);
-        if(StringUtils.isNotBlank(data)){
-            //整理用户信息
-            try {
-                applicationService.cancelUserVerify(data);
-                channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-            }catch (Exception e){
-                log.error("整理用户信息失败>1 ",e);
-                return ;
-            }
-        }
-        channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-    }
-
-}

poyee-partner/pom.xml

@@ -1,229 +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>tzy</artifactId>
-        <groupId>com.tzy</groupId>
-        <version>4.5.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <artifactId>poyee-partner</artifactId>
-
-    <description>
-        partner服务
-    </description>
-    <name>partner服务</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security.oauth.boot</groupId>
-            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
-            <version>2.1.3.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.janino</groupId>
-            <artifactId>janino</artifactId>
-            <version>3.0.12</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sndyuk</groupId>
-            <artifactId>logback-more-appenders</artifactId>
-            <version>1.8.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.fluentd</groupId>
-            <artifactId>fluent-logger</artifactId>
-            <version>0.3.4</version>
-        </dependency>
-        <!-- SpringBoot集成thymeleaf模板 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-
-        <!-- spring-boot-devtools -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
-        </dependency>
-
-        <!-- swagger2-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-        </dependency>
-
-        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.21</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
-
-        <!-- swagger2-UI-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-        </dependency>
-
-        <!-- Mysql驱动包 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-		<dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-        </dependency>
-        <!-- 核心模块-->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>tzy-framework</artifactId>
-        </dependency>
-
-        <!-- 定时任务-->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>tzy-quartz</artifactId>
-        </dependency>
-
-        <!-- 代码生成-->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>tzy-generator</artifactId>
-        </dependency>
-        
-         <!-- 基础模块-->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>tzy-base</artifactId>
-        </dependency>
-        
-        <!-- 接口模块-->
-<!--        <dependency>-->
-<!--            <groupId>com.tzy</groupId>-->
-<!--            <artifactId>tzy-api</artifactId>-->
-<!--        </dependency>-->
-
-        <!-- 拼团 -->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>tzy-sportcard</artifactId>
-        </dependency>
-
-        <!-- 商品模块 -->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>poyee-goods</artifactId>
-        </dependency>
-        <!-- 优惠券模块 -->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>poyee-coupon</artifactId>
-        </dependency>
-        <!--直播模块-->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>poyee-living</artifactId>
-        </dependency>
-        <!--商家管理模块-->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>poyee-merchant</artifactId>
-        </dependency>
-        <!--附件管理模块-->
-<!--        <dependency>-->
-<!--            <groupId>com.tzy</groupId>-->
-<!--            <artifactId>poyee-enclosure</artifactId>-->
-<!--        </dependency>-->
-        <!--活动管理模块-->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>poyee-activity</artifactId>
-        </dependency>
-        <!--支付管理模块-->
-        <!--<dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>poyee-pay</artifactId>
-        </dependency>-->
-        <!--支付管理模块-->
-        <dependency>
-            <groupId>com.tzy</groupId>
-            <artifactId>poyee-dashboard</artifactId>
-        </dependency>
-
-		<!-- 多模块排除内置tomcat -->
-		<dependency>
-		    <groupId>org.springframework.boot</groupId>
-		    <artifactId>spring-boot-starter-web</artifactId>
-		    <exclusions>
-		        <exclusion>
-		            <groupId>org.springframework.boot</groupId>
-		            <artifactId>spring-boot-starter-tomcat</artifactId>
-		        </exclusion>
-		    </exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-tomcat</artifactId>
-			<scope>provided</scope>
-		</dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>RELEASE</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.1.1.RELEASE</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                    <includeSystemScope>true</includeSystemScope>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>   
-                <groupId>org.apache.maven.plugins</groupId>   
-                <artifactId>maven-war-plugin</artifactId>   
-                <version>3.0.0</version>   
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>   
-           </plugin>   
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-    </build>
-
-</project>

poyee-partner/src/main/java/com/tzy/PartnerApplication.java

@@ -1,27 +0,0 @@
-package com.tzy;
-
-import com.dtflys.forest.springboot.annotation.ForestScan;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-
-/**
- * 启动程序
- * 
- * @author tzy
- */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class,SecurityAutoConfiguration.class},scanBasePackages = "com.tzy")
-@EnableAsync
-@ForestScan(basePackages = "com.tzy.common.utils.http.forest")
-@Slf4j
-public class PartnerApplication {
-    public static void main(String[] args) {
-        // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(PartnerApplication.class, args);
-        log.info("(♥◠‿◠)ﾉﾞ 启动成功   ლ(´ڡ`ლ)ﾞ");
-    }
-}

poyee-partner/src/main/java/com/tzy/TzyServletInitializer.java

@@ -1,18 +0,0 @@
-package com.tzy;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-/**
- * web容器中进行部署
- * 
- * @author tzy
- */
-public class TzyServletInitializer extends SpringBootServletInitializer
-{
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
-    {
-        return application.sources(PartnerApplication.class);
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/app/AppUserController.java

@@ -1,98 +0,0 @@
-package com.tzy.web.controller.app;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.tzy.app.service.IAppBaseUserService;
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.AjaxResult;
-import com.tzy.common.core.domain.entity.SysUser;
-import com.tzy.common.dto.PushMsgDTO;
-import com.tzy.common.utils.ShiroUtils;
-import com.tzy.common.utils.StringUtils;
-import com.tzy.sportcard.api.service.AsyncAppService;
-import com.tzy.sportcard.message.domain.AppMsgRecord;
-import com.tzy.sportcard.message.service.IAppMsgRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @author by po'yi
- * @Classname AppUserController
- * @Description app用户
- * @Date 2022/1/10 10:28
- */
-@Api("消息管理")
-@RestController()
-@RequestMapping("/msg")
-public class AppUserController extends BaseController {
-	@Autowired
-	private IAppBaseUserService appBaseUserService;
-	@Autowired
-	@Lazy
-	private AsyncAppService asyncAppService;
-	@Autowired
-	private IAppMsgRecordService appMsgRecordService;
-
-	@PostMapping("/pushMsg")
-	@ApiOperation("pushMsg")
-	public AjaxResult pushMsg(@RequestBody PushMsgDTO pushMsgDTO) throws Exception {
-		if (pushMsgDTO.getMessage() == null || StringUtils.isEmpty(pushMsgDTO.getMessage().getTitle()) || StringUtils.isEmpty(pushMsgDTO.getMessage().getMsg())) {
-			return AjaxResult.error("消息为空!");
-		}
-		asyncAppService.pushMsg(pushMsgDTO);
-		return AjaxResult.success("推送成功!");
-	}
-
-	@PostMapping("/pushGroupMsg")
-	@ApiOperation("pushGroupMsg")
-	public AjaxResult pushGroupMsg(@RequestBody PushMsgDTO pushMsgDTO) throws Exception {
-		if (pushMsgDTO.getMessage() == null || StringUtils.isEmpty(pushMsgDTO.getMessage().getTitle()) || StringUtils.isEmpty(pushMsgDTO.getMessage().getMsg())) {
-			return AjaxResult.error("消息为空!");
-		}
-		appMsgRecordService.pushGroupMsgByMerchant(pushMsgDTO);
-		return AjaxResult.success("申请成功!");
-	}
-
-	@PostMapping("/checkMsg")
-	@ApiOperation("checkMsg")
-	public AjaxResult checkMsg(@RequestBody AppMsgRecord appMsgRecord) throws Exception {
-		if(appMsgRecord.getId()==null||appMsgRecord.getStatus()==null){
-			return AjaxResult.error("参数为空!");
-		}
-		SysUser user = ShiroUtils.getSysUser();
-		if(!user.isAdmin()){
-			return AjaxResult.error("权限不足!");
-		}
-		appMsgRecordService.checkMsg(appMsgRecord);
-		return AjaxResult.success("审核成功!");
-	}
-
-	//@PostMapping("/getAppUser")
-	//public AjaxResult getAppUser(@RequestBody AppBaseUser user) {
-	//	int page = user.getPage()==null?1:user.getPage();
-	//	int rows = user.getRows()==null?10:user.getRows();
-	//	PageHelper.startPage(page, rows);
-	//	List<AppBaseUser> appBaseUsers = appBaseUserService.selectAppBaseUserList(user);
-	//	PageInfo pageInfo=new PageInfo(appBaseUsers);
-	//	return AjaxResult.success(pageInfo);
-	//}
-
-	@PostMapping("/list")
-	@ApiOperation("list")
-	public AjaxResult list(@RequestBody AppMsgRecord appMsgRecord) {
-		int page = appMsgRecord.getPage() == null ? 1 : appMsgRecord.getPage();
-		int rows = appMsgRecord.getRows() == null ? 10 : appMsgRecord.getRows();
-		PageHelper.startPage(page, rows);
-		List<AppMsgRecord> list = appMsgRecordService.selectAppMsgRecordList(appMsgRecord);
-		PageInfo pageInfo = new PageInfo(list);
-		return AjaxResult.success(pageInfo);
-	}
-}

poyee-partner/src/main/java/com/tzy/web/controller/demo/domain/CustomerModel.java

@@ -1,116 +0,0 @@
-package com.tzy.web.controller.demo.domain;
-
-import java.util.List;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 客户测试信息
- * 
- * @author zheng
- */
-public class CustomerModel
-{
-    /**
-     * 客户姓名
-     */
-    private String name;
-
-    /**
-     * 客户手机
-     */
-    private String phonenumber;
-
-    /**
-     * 客户性别
-     */
-    private String sex;
-
-    /**
-     * 客户生日
-     */
-    private String birthday;
-
-    /**
-     * 客户描述
-     */
-    private String remark;
-
-    /**
-     * 商品信息
-     */
-    private List<GoodsModel> goods;
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getPhonenumber()
-    {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber)
-    {
-        this.phonenumber = phonenumber;
-    }
-
-
-    public String getSex()
-    {
-        return sex;
-    }
-
-    public void setSex(String sex)
-    {
-        this.sex = sex;
-    }
-
-    public String getBirthday()
-    {
-        return birthday;
-    }
-
-    public void setBirthday(String birthday)
-    {
-        this.birthday = birthday;
-    }
-
-    public String getRemark()
-    {
-        return remark;
-    }
-
-    public void setRemark(String remark)
-    {
-        this.remark = remark;
-    }
-
-    public List<GoodsModel> getGoods()
-    {
-        return goods;
-    }
-
-    public void setGoods(List<GoodsModel> goods)
-    {
-        this.goods = goods;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("name", getName())
-            .append("phonenumber", getPhonenumber())
-            .append("sex", getSex())
-            .append("birthday", getBirthday())
-            .append("goods", getGoods())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/demo/domain/GoodsModel.java

@@ -1,99 +0,0 @@
-package com.tzy.web.controller.demo.domain;
-
-import java.util.Date;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 商品测试信息
- * 
- * @author zheng
- */
-public class GoodsModel
-{
-    /**
-     * 商品名称
-     */
-    private String name;
-
-    /**
-     * 商品重量
-     */
-    private Integer weight;
-
-    /**
-     * 商品价格
-     */
-    private Double price;
-    
-    /**
-     * 商品日期
-     */
-    private Date date;
-
-    /**
-     * 商品种类
-     */
-    private String type;
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public Integer getWeight()
-    {
-        return weight;
-    }
-
-    public void setWeight(Integer weight)
-    {
-        this.weight = weight;
-    }
-
-    public Double getPrice()
-    {
-        return price;
-    }
-
-    public void setPrice(Double price)
-    {
-        this.price = price;
-    }
-
-    public Date getDate()
-    {
-        return date;
-    }
-
-    public void setDate(Date date)
-    {
-        this.date = date;
-    }
-
-    public String getType()
-    {
-        return type;
-    }
-
-    public void setType(String type)
-    {
-        this.type = type;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("name", getName())
-            .append("weight", getWeight())
-            .append("price", getPrice())
-            .append("date", getDate())
-            .append("type", getType())
-            .toString();
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/demo/domain/UserOperateModel.java

@@ -1,149 +0,0 @@
-package com.tzy.web.controller.demo.domain;
-
-import java.util.Date;
-import com.tzy.common.annotation.Excel;
-import com.tzy.common.annotation.Excel.Type;
-import com.tzy.common.core.domain.BaseEntity;
-import com.tzy.common.utils.DateUtils;
-
-public class UserOperateModel extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    private int userId;
-
-    @Excel(name = "用户编号")
-    private String userCode;
-
-    @Excel(name = "用户姓名")
-    private String userName;
-
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
-    private String userSex;
-
-    @Excel(name = "用户手机")
-    private String userPhone;
-
-    @Excel(name = "用户邮箱")
-    private String userEmail;
-
-    @Excel(name = "用户余额")
-    private double userBalance;
-
-    @Excel(name = "用户状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
-    private Date createTime;
-
-    public UserOperateModel()
-    {
-
-    }
-
-    public UserOperateModel(int userId, String userCode, String userName, String userSex, String userPhone,
-            String userEmail, double userBalance, String status)
-    {
-        this.userId = userId;
-        this.userCode = userCode;
-        this.userName = userName;
-        this.userSex = userSex;
-        this.userPhone = userPhone;
-        this.userEmail = userEmail;
-        this.userBalance = userBalance;
-        this.status = status;
-        this.createTime = DateUtils.getNowDate();
-    }
-
-    public int getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(int userId)
-    {
-        this.userId = userId;
-    }
-
-    public String getUserCode()
-    {
-        return userCode;
-    }
-
-    public void setUserCode(String userCode)
-    {
-        this.userCode = userCode;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getUserSex()
-    {
-        return userSex;
-    }
-
-    public void setUserSex(String userSex)
-    {
-        this.userSex = userSex;
-    }
-
-    public String getUserPhone()
-    {
-        return userPhone;
-    }
-
-    public void setUserPhone(String userPhone)
-    {
-        this.userPhone = userPhone;
-    }
-
-    public String getUserEmail()
-    {
-        return userEmail;
-    }
-
-    public void setUserEmail(String userEmail)
-    {
-        this.userEmail = userEmail;
-    }
-
-    public double getUserBalance()
-    {
-        return userBalance;
-    }
-
-    public void setUserBalance(double userBalance)
-    {
-        this.userBalance = userBalance;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    @Override
-    public Date getCreateTime()
-    {
-        return createTime;
-    }
-
-    @Override
-    public void setCreateTime(Date createTime)
-    {
-        this.createTime = createTime;
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysCaptchaController.java

@@ -1,92 +0,0 @@
-package com.tzy.web.controller.system;
-
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-import com.google.code.kaptcha.Constants;
-import com.google.code.kaptcha.Producer;
-import com.tzy.common.core.controller.BaseController;
-
-/**
- * 图片验证码（支持算术形式）
- * 
- * @author zheng
- */
-@Controller
-@RequestMapping("/captcha")
-public class SysCaptchaController extends BaseController
-{
-    @Resource(name = "captchaProducer")
-    private Producer captchaProducer;
-
-    @Resource(name = "captchaProducerMath")
-    private Producer captchaProducerMath;
-
-    /**
-     * 验证码生成
-     */
-    @GetMapping(value = "/captchaImage")
-    public ModelAndView getKaptchaImage(HttpServletRequest request, HttpServletResponse response)
-    {
-        ServletOutputStream out = null;
-        try
-        {
-            HttpSession session = request.getSession();
-            response.setDateHeader("Expires", 0);
-            response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
-            response.addHeader("Cache-Control", "post-check=0, pre-check=0");
-            response.setHeader("Pragma", "no-cache");
-            response.setContentType("image/jpeg");
-
-            String type = request.getParameter("type");
-            String capStr = null;
-            String code = null;
-            BufferedImage bi = null;
-            if ("math".equals(type))
-            {
-                String capText = captchaProducerMath.createText();
-                capStr = capText.substring(0, capText.lastIndexOf("@"));
-                code = capText.substring(capText.lastIndexOf("@") + 1);
-                bi = captchaProducerMath.createImage(capStr);
-            }
-            else if ("char".equals(type))
-            {
-                capStr = code = captchaProducer.createText();
-                bi = captchaProducer.createImage(capStr);
-            }
-            session.setAttribute(Constants.KAPTCHA_SESSION_KEY, code);
-            out = response.getOutputStream();
-            ImageIO.write(bi, "jpg", out);
-            out.flush();
-
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        finally
-        {
-            try
-            {
-                if (out != null)
-                {
-                    out.close();
-                }
-            }
-            catch (IOException e)
-            {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysConfigController.java

@@ -1,158 +0,0 @@
-package com.tzy.web.controller.system;
-
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.tzy.common.annotation.Log;
-import com.tzy.common.constant.UserConstants;
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.AjaxResult;
-import com.tzy.common.core.domain.MsgResult;
-import com.tzy.common.core.page.TableDataInfo;
-import com.tzy.common.enums.BusinessType;
-import com.tzy.common.utils.ShiroUtils;
-import com.tzy.common.utils.poi.ExcelUtil;
-import com.tzy.system.domain.SysConfig;
-import com.tzy.system.service.ISysConfigService;
-
-/**
- * 参数配置 信息操作处理
- * 
- * @author zheng
- */
-@Controller
-@RequestMapping("/system/config")
-public class SysConfigController extends BaseController
-{
-    private String prefix = "system/config";
-
-    @Autowired
-    private ISysConfigService configService;
-
-    @RequiresPermissions("system:config:view")
-    @GetMapping()
-    public String config()
-    {
-        return prefix + "/config";
-    }
-
-    /**
-     * 查询参数配置列表
-     */
-    @RequiresPermissions("system:config:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(SysConfig config)
-    {
-        startPage();
-        List<SysConfig> list = configService.selectConfigList(config);
-        return getDataTable(list);
-    }
-
-    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @RequiresPermissions("system:config:export")
-    @PostMapping("/export")
-    @ResponseBody
-    public MsgResult export(SysConfig config)
-    {
-        List<SysConfig> list = configService.selectConfigList(config);
-        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
-        return util.exportExcel(list, "参数数据");
-    }
-
-    /**
-     * 新增参数配置
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存参数配置
-     */
-    @RequiresPermissions("system:config:add")
-    @Log(title = "参数管理", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(@Validated SysConfig config)
-    {
-        if (UserConstants.CONFIG_KEY_NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
-        {
-            return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
-        }
-        config.setCreateBy(ShiroUtils.getLoginName());
-        return toAjax(configService.insertConfig(config));
-    }
-
-    /**
-     * 修改参数配置
-     */
-    @GetMapping("/edit/{configId}")
-    public String edit(@PathVariable("configId") Long configId, ModelMap mmap)
-    {
-        mmap.put("config", configService.selectConfigById(configId));
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存参数配置
-     */
-    @RequiresPermissions("system:config:edit")
-    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(@Validated SysConfig config)
-    {
-        if (UserConstants.CONFIG_KEY_NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
-        {
-            return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
-        }
-        config.setUpdateBy(ShiroUtils.getLoginName());
-        return toAjax(configService.updateConfig(config));
-    }
-
-    /**
-     * 删除参数配置
-     */
-    @RequiresPermissions("system:config:remove")
-    @Log(title = "参数管理", businessType = BusinessType.DELETE)
-    @PostMapping("/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        return toAjax(configService.deleteConfigByIds(ids));
-    }
-
-    /**
-     * 清空缓存
-     */
-    @RequiresPermissions("system:config:remove")
-    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
-    @GetMapping("/clearCache")
-    @ResponseBody
-    public AjaxResult clearCache()
-    {
-        configService.clearCache();
-        return success();
-    }
-
-    /**
-     * 校验参数键名
-     */
-    @PostMapping("/checkConfigKeyUnique")
-    @ResponseBody
-    public String checkConfigKeyUnique(SysConfig config)
-    {
-        return configService.checkConfigKeyUnique(config);
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysDictDataController.java

@@ -1,282 +0,0 @@
-package com.tzy.web.controller.system;
-
-import com.alibaba.fastjson.JSON;
-import com.tzy.common.annotation.Log;
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.MsgResult;
-import com.tzy.common.core.domain.entity.SysDictData;
-import com.tzy.common.core.page.TableDataInfo;
-import com.tzy.common.enums.BusinessType;
-import com.tzy.common.utils.ShiroUtils;
-import com.tzy.common.utils.poi.ExcelUtil;
-import com.tzy.framework.datasource.DBChangeService;
-import com.tzy.framework.datasource.DynamicDataSourceContextHolder;
-import com.tzy.framework.util.SysUtils;
-import com.tzy.system.service.ISysDictDataService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 数据字典信息
- *
- * @author zheng
- */
-@Controller
-@RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
-{
-    private String prefix = "system/dict/data";
-
-    @Autowired
-    private ISysDictDataService dictDataService;
-
-    @Autowired
-    private DBChangeService dbChangeService;
-
-    @Autowired
-    private SysUtils SysUtils;
-
-    /**
-     * 平台管理
-     * @return
-     */
-    @RequiresPermissions("system:dict:view")
-    @GetMapping()
-    public String dictData()
-    {
-        return prefix + "/data_list";
-    }
-
-
-    /**
-     * 用户管理 通用字典
-     * @return
-     */
-    @GetMapping("/local")
-    public String localData()
-    {
-        return prefix + "/data_local_list";
-    }
-
-    @PostMapping("/list")
-    @RequiresPermissions("system:dict:list")
-    @ResponseBody
-    public TableDataInfo list(SysDictData dictData)
-    {
-        startPage();
-        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-        return getDataTable(list);
-    }
-    //获取字典数据
-    @GetMapping("/GetDictDataList")
-    @ResponseBody
-    public String GetDictDataByType(SysDictData dictData,@RequestParam("dictType") String dictType)
-    {
-        dictData.setDictType(dictType);
-        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-        return JSON.toJSONString(list);
-    }
-
-    //获取本地字典数据
-    @GetMapping("/GetLocationDictDataList")
-    @ResponseBody
-    public String GetLocationDictDataByType(SysDictData dictData,@RequestParam("dictType") String dictType)
-    {
-        try {
-            dbChangeService.userDb();
-            dictData.setDictType(dictType);
-            List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-            return JSON.toJSONString(list);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "";
-        } finally {
-            DynamicDataSourceContextHolder.clearDataSource();
-        }
-    }
-
-    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-    @RequiresPermissions("system:dict:export")
-    @PostMapping("/export")
-    @ResponseBody
-    public MsgResult export(SysDictData dictData)
-    {
-        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
-        return util.exportExcel(list, "字典数据");
-    }
-
-    /**
-     * 新增字典类型
-     */
-    @GetMapping("/add/{dictType}")
-    public String add(@PathVariable("dictType") String dictType, ModelMap mmap)
-    {
-        mmap.put("dictType", dictType);
-        return prefix + "/add_data";
-    }
-
-    /**
-     * 新增本地字典类型
-     */
-    @GetMapping("/addLocation/{dictType}")
-    public String addLocation(@PathVariable("dictType") String dictType, ModelMap mmap)
-    {
-        mmap.put("dictType", dictType);
-        return prefix + "/add_location_data";
-    }
-
-    /**
-     * 新增保存字典类型
-     */
-    @Log(title = "字典数据", businessType = BusinessType.INSERT)
-    @RequiresPermissions("system:dict:add")
-    @PostMapping("/addSave")
-    @ResponseBody
-    public MsgResult addSave(@Validated SysDictData dict)
-    {
-        dict.setCreateBy(ShiroUtils.getLoginName());
-        return toReturn(dictDataService.insertDictData(dict));
-    }
-
-
-    /**
-     * 新增本地保存字典类型
-     */
-    @PostMapping("/addLocationSave")
-    @ResponseBody
-    public MsgResult addLocationSave(@Validated SysDictData dict)
-    {
-        try {
-            dbChangeService.userDb();
-
-            dict.setCreateBy(ShiroUtils.getLoginName());
-            return toReturn(dictDataService.insertDictData(dict));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return toReturn(-1);
-        } finally {
-            DynamicDataSourceContextHolder.clearDataSource();
-        }
-    }
-
-    /**
-     * 修改字典类型
-     */
-    @GetMapping("/edit/{dictCode}")
-    public String edit(@PathVariable("dictCode") Long dictCode, ModelMap mmap)
-    {
-        mmap.put("dict", dictDataService.selectDictDataById(dictCode));
-        return prefix + "/edit_data";
-    }
-
-
-
-    /**
-     * 本地修改字典类型
-     */
-    @GetMapping("/editLocation/{dictCode}")
-    public String editLocation(@PathVariable("dictCode") Long dictCode, ModelMap mmap)
-    {
-        try {
-            dbChangeService.userDb();
-            mmap.put("dict", dictDataService.selectDictDataById(dictCode));
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            DynamicDataSourceContextHolder.clearDataSource();
-        }
-        return prefix + "/edit_location_data";
-    }
-
-
-    /**
-     * 修改保存字典类型
-     */
-    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
-    @RequiresPermissions("system:dict:edit")
-    @PostMapping("/editSave")
-    @ResponseBody
-    public MsgResult editSave(@Validated SysDictData dict)
-    {
-        try
-        {
-            dict.setUpdateBy(ShiroUtils.getLoginName());
-            return toReturn(dictDataService.updateDictData(dict));
-        }
-        catch(Exception ex) {
-            return toReturn(-1,ex.getMessage());
-        }
-    }
-
-
-    /**
-     * 本地修改保存字典类型
-     */
-    @PostMapping("/editLocationSave")
-    @ResponseBody
-    public MsgResult editLocationSave(@Validated SysDictData dict)
-    {
-        try
-        {
-            dict.setUpdateBy(ShiroUtils.getLoginName());
-            dbChangeService.userDb();
-            return toReturn(dictDataService.updateDictData(dict));
-        }
-        catch(Exception ex) {
-            return toReturn(-1,ex.getMessage());
-        }finally {
-            DynamicDataSourceContextHolder.clearDataSource();
-        }
-    }
-
-
-    @Log(title = "字典数据", businessType = BusinessType.DELETE)
-    @RequiresPermissions("system:dict:remove")
-    @PostMapping("/remove")
-    @ResponseBody
-    public MsgResult remove(String keyValue)
-    {
-
-        try
-        {
-            return toReturn(dictDataService.deleteDictDataById(keyValue));
-        }
-        catch (Exception ex) {
-            return toReturn(-1,ex.getMessage());
-        }
-    }
-
-    /**
-     * 本地移除
-     * @param keyValue
-     * @return
-     */
-    @PostMapping("/removeLocation")
-    @ResponseBody
-    public MsgResult removeLocation(String keyValue)
-    {
-        try {
-            dbChangeService.userDb();
-            try
-            {
-                return toReturn(dictDataService.deleteDictDataById(keyValue));
-            }
-            catch (Exception ex) {
-                return toReturn(-1,ex.getMessage());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-
-            return toReturn(-1);
-        } finally {
-            DynamicDataSourceContextHolder.clearDataSource();
-        }
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysDictTypeController.java

@@ -1,380 +0,0 @@
-package com.tzy.web.controller.system;
-
-import com.alibaba.fastjson.JSON;
-import com.tzy.common.annotation.Log;
-import com.tzy.common.constant.UserConstants;
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.AjaxResult;
-import com.tzy.common.core.domain.MsgResult;
-import com.tzy.common.core.domain.Ztree;
-import com.tzy.common.core.domain.entity.SysDictData;
-import com.tzy.common.core.domain.entity.SysDictType;
-import com.tzy.common.core.page.TableDataInfo;
-import com.tzy.common.enums.BusinessType;
-import com.tzy.common.utils.ShiroUtils;
-import com.tzy.common.utils.poi.ExcelUtil;
-import com.tzy.framework.datasource.DBChangeService;
-import com.tzy.framework.datasource.DynamicDataSourceContextHolder;
-import com.tzy.framework.util.SysUtils;
-import com.tzy.system.service.ISysDictTypeService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 数据字典信息
- *
- * @author zheng
- */
-@Controller
-@RequestMapping("/system/dict")
-public class SysDictTypeController extends BaseController {
-    private String prefix = "system/dict/type";
-
-    @Autowired
-    private ISysDictTypeService dictTypeService;
-
-    @Autowired
-    private DBChangeService dbChangeService;
-
-    @Autowired
-    private SysUtils SysUtils;
-
-    @RequiresPermissions("system:dict:view")
-    @GetMapping()
-    public String dictType() {
-        return prefix + "/type_list";
-    }
-
-
-    @GetMapping("/local")
-    public String dictLocationType() {
-        return prefix + "/type_location_list";
-    }
-
-    /**
-     * 加载本地类型
-     *
-     * @param dictType
-     * @return
-     */
-    @GetMapping("/listLocation")
-    @ResponseBody
-    public TableDataInfo listLocation(SysDictType dictType) {
-        try {
-            startPage();
-            String where = " and branch_no='" + ShiroUtils.getLoginBranchNo() + "'";
-            dbChangeService.userDb();
-            dictType.setColumnsearch(where);
-            List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-            return getDataTable(list);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new TableDataInfo();
-        } finally {
-            DynamicDataSourceContextHolder.clearDataSource();
-        }
-    }
-
-    @GetMapping("/list")
-    @RequiresPermissions("system:dict:list")
-    @ResponseBody
-    public TableDataInfo list(SysDictType dictType) {
-        startPage();
-        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-        return getDataTable(list);
-    }
-
-
-    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
-    @RequiresPermissions("system:dict:export")
-    @PostMapping("/export")
-    @ResponseBody
-    public MsgResult export(SysDictType dictType) {
-
-        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
-        return util.exportExcel(list, "字典类型");
-    }
-
-    /**
-     * 新增字典类型
-     */
-    @GetMapping("/add")
-    public String add() {
-        return prefix + "/add_type";
-    }
-
-
-    /**
-     * 新增本地字典类型
-     */
-    @GetMapping("/addLocation")
-    public String addLocation() {
-        return prefix + "/add_location_type";
-    }
-
-    /**
-     * 新增保存字典类型
-     */
-    @Log(title = "字典类型", businessType = BusinessType.INSERT)
-    @RequiresPermissions("system:dict:add")
-    @PostMapping("/addSave")
-    @ResponseBody
-    public MsgResult addSave(@Validated SysDictType dict) {
-        if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-            return errorMsg("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
-        }
-        dict.setCreateBy(ShiroUtils.getLoginName());
-        return toReturn(dictTypeService.insertDictType(dict));
-    }
-
-
-    /**
-     * 新增本地保存字典类型
-     */
-    @PostMapping("/addLocatinSave")
-    @ResponseBody
-    public MsgResult addLocatinSave(@Validated SysDictType dict) {
-        if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-            return errorMsg("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
-        }
-        dict.setCreateBy(ShiroUtils.getLoginName());
-        dict.setBranchNo(ShiroUtils.getLoginBranchNo());
-        try {
-            dbChangeService.userDb();
-            return toReturn(dictTypeService.insertDictType(dict));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return toReturn(-1);
-        } finally {
-            DynamicDataSourceContextHolder.clearDataSource();
-        }
-    }
-
-
-    /**
-     * 修改字典类型
-     */
-    @GetMapping("/edit/{dictId}")
-    public String edit(@PathVariable("dictId") Long dictId, ModelMap mmap) {
-        mmap.put("dict", dictTypeService.selectDictTypeById(dictId));
-        return prefix + "/edit_type";
-    }
-
-
-    /**
-     * 修改本地字典类型
-     */
-    @GetMapping("/editLocation/{dictId}")
-    public String editLocation(@PathVariable("dictId") Long dictId, ModelMap mmap) {
-        mmap.put("dict", dictTypeService.selectDictTypeById(dictId));
-        return prefix + "/edit_location_type";
-    }
-
-    /**
-     * 修改保存字典类型
-     */
-    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
-    @RequiresPermissions("system:dict:edit")
-    @PostMapping("/editSave")
-    @ResponseBody
-    public MsgResult editSave(@Validated SysDictType dict) {
-        if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-            return errorMsg("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
-        }
-        dict.setUpdateBy(ShiroUtils.getLoginName());
-        return toReturn(dictTypeService.updateDictType(dict));
-    }
-
-    @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @RequiresPermissions("system:dict:remove")
-    @PostMapping("/remove")
-    @ResponseBody
-    public MsgResult remove(String keyValue) {
-        try {
-            int i = dictTypeService.deleteDictTypeByIds(keyValue);
-            return toReturn(i);
-        } catch (Exception ex) {
-            return toReturn(-1, ex.getMessage());
-        }
-    }
-
-
-    @PostMapping("/removeLocation")
-    @ResponseBody
-    public MsgResult removeLocation(String keyValue) {
-        try {
-            dbChangeService.userDb();
-            int i = dictTypeService.deleteDictTypeByIds(keyValue);
-            return toReturn(i);
-        } catch (Exception ex) {
-            return toReturn(-1, ex.getMessage());
-        } finally {
-            DynamicDataSourceContextHolder.clearDataSource();
-        }
-    }
-
-
-    /**
-     * 清空缓存
-     */
-    @RequiresPermissions("system:dict:remove")
-    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
-    @GetMapping("/clearCache")
-    @ResponseBody
-    public AjaxResult clearCache() {
-        dictTypeService.clearCache();
-        return success();
-    }
-
-    /**
-     * 查询字典详细
-     */
-    @RequiresPermissions("system:dict:list")
-    @GetMapping("/detail/{dictId}")
-    public String detail(@PathVariable("dictId") Long dictId, ModelMap mmap) {
-        mmap.put("dict", dictTypeService.selectDictTypeById(dictId));
-        mmap.put("dictList", dictTypeService.selectDictTypeAll());
-        return "system/dict/data/data";
-    }
-
-    /**
-     * 校验字典类型
-     */
-    @PostMapping("/checkDictTypeUnique")
-    @ResponseBody
-    public String checkDictTypeUnique(SysDictType dictType) {
-        return dictTypeService.checkDictTypeUnique(dictType);
-    }
-
-    /**
-     * 选择字典树
-     */
-    @GetMapping("/selectDictTree/{columnId}/{dictType}")
-    public String selectDeptTree(@PathVariable("columnId") Long columnId, @PathVariable("dictType") String dictType,
-                                 ModelMap mmap) {
-        mmap.put("columnId", columnId);
-        mmap.put("dict", dictTypeService.selectDictTypeByType(dictType));
-        return prefix + "/tree";
-    }
-
-    /**
-     * 加载字典列表树
-     */
-    @GetMapping("/treeData")
-    @ResponseBody
-    public List<Ztree> treeData() {
-        List<Ztree> ztrees = dictTypeService.selectDictTree(new SysDictType());
-        return ztrees;
-    }
-
-    @GetMapping("/GetItemDropdownList")
-    @ResponseBody
-    public String GetItemDropdownList(String keyword) {
-        Map<String, Object> reponse = new HashMap<String, Object>();
-
-        ArrayList<Map<String, Object>> dictDataList = new ArrayList<Map<String, Object>>();
-        List<SysDictData> list = dictTypeService.selectDictDataByType(keyword);
-        for (SysDictData dictData : list) {
-            Map<String, Object> result = new HashMap<String, Object>();
-            result.put("detail_no", dictData.getDictCode());
-            result.put("detail_name", dictData.getDictLabel());
-            dictDataList.add(result);
-        }
-
-        reponse.put("message", "");
-        reponse.put("value", dictDataList);
-        reponse.put("code", 200);
-        reponse.put("redirect", "");
-        return JSON.toJSONString(reponse);
-    }
-
-
-    /**
-     * 本地 基础信息下拉选择
-     *
-     * @param keyword
-     * @return
-     */
-    @GetMapping("/GetItemLocationDropdownList")
-    @ResponseBody
-    public String GetItemLocationDropdownList(String item_id, @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "limit", required = false) String limitStr) {
-        Map<String, Object> reponse = new HashMap<String, Object>();
-
-        String where = " and dict_type='" + item_id + "'";
-        int limit = 6;
-        if (limitStr != null && limitStr != "")
-            limit = Integer.parseInt(limitStr);
-
-        if (keyword != null && keyword != "")
-            where += " and (dict_value like '%" + keyword + "%' or dict_label like'%" + keyword + "%') ";
-        where += "  order by dict_sort asc limit " + limit;
-
-        ArrayList<Map<String, Object>> dictDataList = new ArrayList<Map<String, Object>>();
-        try {
-            dbChangeService.userDb();
-            List<SysDictData> list = dictTypeService.selectLocationiDictDataByType(where);
-
-            if (list.size() > 0)
-                for (SysDictData dictData : list) {
-                    Map<String, Object> result = new HashMap<String, Object>();
-                    result.put("detail_no", dictData.getDictCode());
-                    result.put("detail_value", dictData.getDictValue());
-                    result.put("detail_label", dictData.getDictLabel());
-                    result.put("detail_remark", dictData.getRemark());
-                    dictDataList.add(result);
-                }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            DynamicDataSourceContextHolder.clearDataSource();
-        }
-
-        reponse.put("message", "");
-        reponse.put("value", dictDataList);
-        reponse.put("code", 200);
-        reponse.put("redirect", "");
-        return JSON.toJSONString(reponse);
-    }
-
-    /**
-     * 字典类型树
-     */
-    @GetMapping("/DictTypeTreeJson")
-    @ResponseBody
-    public String getDictTypeTreeJson() {
-        return dictTypeService.getDictTypeTree(new SysDictType());
-
-    }
-
-    /**
-     * 本地字典类型树
-     */
-    @GetMapping("/DictTypeLocationTreeJson")
-    @ResponseBody
-    public String getDictLocationTypeTreeJson() {
-        try {
-            dbChangeService.userDb();
-            SysDictType sysDictType = new SysDictType();
-            String where = " and branch_no='" + ShiroUtils.getSysUser().getBranchNo() + "'";
-            sysDictType.setColumnsearch(where);
-            return dictTypeService.getDictTypeTree(sysDictType);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "";
-        } finally {
-            DynamicDataSourceContextHolder.clearDataSource();
-        }
-
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysExportController.java

@@ -1,97 +0,0 @@
-package com.tzy.web.controller.system;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.tzy.common.utils.ShiroUtils;
-import com.tzy.common.utils.StringUtils;
-import com.tzy.common.utils.poi.ExportUtil;
-import com.tzy.system.domain.SysColumn;
-import com.tzy.system.service.ISysColumnService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.MsgResult;
-import com.tzy.system.service.ISysGridService;
-
-/**
- * Excel导出Controller
- * 
- * @author zheng
- * @date 2020-12-09
- */
-@Controller
-@RequestMapping("/system/export")
-public class SysExportController extends BaseController {
-
-	private String prefix = "system/export";
-	@Autowired
-    private ISysGridService sysGridService;
-	@Autowired
-	private ISysColumnService sysColumnService;
-	
-	@GetMapping()
-    public String export()
-    {
-        return prefix + "/excelExport";
-    }
-	@GetMapping("/GetExportJsonList")
-	public String GetExportJsonList(@PathVariable("TableName") String TableName)
-	{
-		return "";
-	}
-	
-	@PostMapping("/exportExcel")
-	@ResponseBody
-	public MsgResult exportExcel(@RequestParam(required = false) Map<String, Object> params,HttpServletRequest request) {
-
-		try
-		{
-			String title=params.containsKey("title") ? params.get("title").toString() : "";
-			String exportField=params.containsKey("exportField") ? params.get("exportField").toString() : "";
-			String fieldLabel=params.containsKey("fieldLabel") ? params.get("fieldLabel").toString() : "";
-			//String columnJson=params.containsKey("columnJson") ? params.get("columnJson").toString() : "";
-			String rowJson = params.containsKey("rowJson") ? params.get("rowJson").toString() : "";
-			String gridId=params.containsKey("gridId") ? params.get("gridId").toString() : "";
-			String custNo= ShiroUtils.getLoginCustNo();
-
-			List<SysColumn> columnList = sysColumnService.selectSysColumnListByGridId(custNo,gridId);//JSONArray.parseArray(columnJson, Map.class);
-			String  columnJson  =  JSONArray.toJSONString(columnList);
-			List<Map<String,String>> columnMapList = JSONArray.parseObject(columnJson,List.class);
-			String[] fields=exportField.split(",");
-			String[] labels=fieldLabel.split(",");
-
-			List<Map> fieldList=new ArrayList<>();
-
-			for(String field : fields){
-				List<Map> findList=columnMapList.stream().filter(s-> StringUtils.toCamelCase(s.get("columnCode")).equals(field)).collect(Collectors.toList());
-				if (findList.size()>0) {
-					fieldList.add(findList.get(0));
-				}
-			}
-
-			List<Map> list= JSONArray.parseArray(rowJson, Map.class);
-			ExportUtil<Map> util = new ExportUtil<Map>(Map.class);
-
-			return util.exportExcel(list, title,fieldList);
-		}
-		catch (Exception ex){
-			ex.printStackTrace();
-		}
-		return toReturn(-1,"导出失败");
-
-	}
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysHomeController.java

@@ -1,177 +0,0 @@
-package com.tzy.web.controller.system;
-
-import com.tzy.common.config.Global;
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.AjaxResult;
-import com.tzy.common.core.domain.entity.SysMenu;
-import com.tzy.common.core.domain.entity.SysRole;
-import com.tzy.common.core.domain.entity.SysUser;
-import com.tzy.common.utils.ServletUtils;
-import com.tzy.common.utils.ShiroUtils;
-import com.tzy.common.utils.StringUtils;
-import com.tzy.dashboard.dto.ViewPayByDayDto;
-import com.tzy.dashboard.service.DashboardCensusService;
-import com.tzy.system.service.ISysConfigService;
-import com.tzy.system.service.ISysMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Description;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * MS首页 业务处理
- * 
- * @author zheng
- */
-@Controller
-public class SysHomeController extends BaseController{
-	@Autowired
-    private ISysMenuService menuService;
-
-    @Autowired
-    private ISysConfigService configService;
-    @Autowired
-    private DashboardCensusService dashboardCensusService;
-
-    @Value("${tzy.app-version:dev}")
-    private String appVersion;
-    @Value("${tzy.host:m2-dev.hobbystocks.cn}")
-    private String host;
-    @Value("${server.port:80}")
-    private String port;
-
-    // 系统首页
-    @GetMapping("/index")
-    public String index(ModelMap mmap)
-    {
-    	String custNo = ShiroUtils.getLoginCustNo();
-        // 取身份信息
-    	SysUser user = ShiroUtils.getSysUser();
-        user.setFasAuth(null);
-        // 根据用户id取出菜单
-        List<SysMenu> menus = menuService.selectMenusByUser(user);
-        mmap.put("menus", menus);
-        mmap.put("user", user);
-        if("prod".equals(appVersion)) {
-            mmap.put("wsUrl", "wss://" + host + "/websocket");
-        }else if("test".equals(appVersion)){
-            mmap.put("wsUrl", "ws://" + host + ":" + port + "/websocket");
-        }else{
-            mmap.put("wsUrl", "wss://" + host + "/websocket");
-        }
-        mmap.put("sideTheme", configService.selectConfigByKey("sys.index.sideTheme"));
-        mmap.put("skinName", configService.selectConfigByKey("sys.index.skinName"));
-        mmap.put("copyrightYear", Global.getCopyrightYear());
-        mmap.put("demoEnabled", Global.isDemoEnabled());
-        
-        return "home/admin_pretty";
-    }
-    @GetMapping("/desktop")
-    public String desktop(ModelMap mmap)
-    {
-        // 取身份信息
-        SysUser user = ShiroUtils.getSysUser();
-        List<SysRole> roles = user.getRoles();
-        boolean auth = false;
-        Set<SysRole> admin = roles.stream().filter(SysRole -> SysRole.getRoleKey().equals("admin")).collect(Collectors.toSet());
-        if(null != admin && admin.size() > 0){
-            auth= true;
-        }
-        //查询订单等统计
-//        DashboardCensus desktop = dashboardCensusService.desktop();
-        mmap.put("desktop",new ViewPayByDayDto());
-        mmap.put("auth",auth);
-        mmap.put("super",user.isAdmin());
-        return "mian/main_v1";
-    }
-
-    @ResponseBody
-    @RequestMapping(value = "/todayDesktop",method = RequestMethod.POST)
-    public AjaxResult todayDesktop(){
-        ViewPayByDayDto viewPayByDayDto = dashboardCensusService.selectTodayPay();
-        if(null == viewPayByDayDto){
-            viewPayByDayDto = new ViewPayByDayDto();
-        }
-        return AjaxResult.success(viewPayByDayDto);
-    }
-
-    @Description("")
-    @ResponseBody
-    @RequestMapping(value = "/clientdata")
-    public Map<String, Object> clientData() {
-    	// 取身份信息
-        SysUser user = ShiroUtils.getSysUser();
-        user.setFasData(null);
-        // 根据用户id取出菜单
-        List<SysMenu> menus = menuService.selectMenusByUser(user);
-        Set<String> strMenus = menuService.selectPermsByUserId(user.getUserId());
-        Map<String, Object> result = new HashMap<String, Object>();
-        // 被踢出后重定向到的地址；
-        if (StringUtils.isNotEmpty(getUrl())) {
-            menus = new ArrayList<>();
-        }
-        result.put("authorizeMenu", menus);
-    	result.put("menus", strMenus);
-    	result.put("shortcutMenu","[]");
-    	result.put("default_value",new ArrayList<Object>());
-    	result.put("login_user_data",user);
-    	result.put("statusCode",  "200");
-        result.put("message", "获取成功");
-    	return result;
-    }
-
-    /**
-     * 自定义在线用户处理过滤器
-     */
-    public String getUrl()
-    {
-        String url = "";
-        try {
-            HttpServletRequest request = ServletUtils.getRequest();
-            Boolean aBoolean = checkManager(request);
-            if (null != request && (null == aBoolean || !aBoolean)) {
-                if ("dev".equals(appVersion)) {
-                    url = "https://partner-dev.hobbystocks.cn/html/admin/index.html#/login";
-                }else{
-                    url = "https://partner.hobbystocks.cn/html/admin/index.html#/login";
-                }
-            }
-        }catch (Exception e){
-
-        }
-        return url;
-    }
-
-    private Boolean checkManager( HttpServletRequest request) {
-        //默认从请求头中获得token
-        SysUser user = ShiroUtils.getSysUser();
-        if(null != user){
-            if(user.isAdmin()){
-                return true;
-            }
-            //取得当前登陆用户的信息
-            List<SysRole> roles = user.getRoles();
-            if (null != roles && roles.size() > 0) {
-                Set<SysRole> shipping = roles.stream().filter(SysRole -> SysRole.getRoleKey().equals("shipping")).collect(Collectors.toSet());
-                if (null != shipping && shipping.size() > 0) {
-                    return false;
-                }else{
-                    return true;
-                }
-            }else{
-                return true;
-            }
-        }
-        return null;
-    }
-
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysIndexController.java

@@ -1,120 +0,0 @@
-package com.tzy.web.controller.system;
-
-import com.tzy.common.config.Global;
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.entity.SysMenu;
-import com.tzy.common.core.domain.entity.SysUser;
-import com.tzy.common.core.text.Convert;
-import com.tzy.common.utils.*;
-import com.tzy.system.service.ISysConfigService;
-import com.tzy.system.service.ISysMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 首页 业务处理
- * 
- * @author zheng
- */
-@Controller
-public class SysIndexController extends BaseController
-{
-    @Autowired
-    private ISysMenuService menuService;
-
-    @Autowired
-    private ISysConfigService configService;
-
-    // 系统首页
-    @GetMapping("/index2")
-    public String index(ModelMap mmap)
-    {
-        // 取身份信息
-        SysUser user = ShiroUtils.getSysUser();
-        user.setFasData(null);
-        // 根据用户id取出菜单
-        List<SysMenu> menus = menuService.selectMenusByUser(user);
-        mmap.put("menus", menus);
-        mmap.put("user", user);
-        mmap.put("sideTheme", configService.selectConfigByKey("sys.index.sideTheme"));
-        mmap.put("skinName", configService.selectConfigByKey("sys.index.skinName"));
-        mmap.put("ignoreFooter", configService.selectConfigByKey("sys.index.ignoreFooter"));
-        mmap.put("copyrightYear", Global.getCopyrightYear());
-        mmap.put("demoEnabled", Global.isDemoEnabled());
-//        mmap.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
-//        mmap.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
-
-        // 菜单导航显示风格
-        String menuStyle = configService.selectConfigByKey("sys.index.menuStyle");
-        // 移动端，默认使左侧导航菜单，否则取默认配置
-        String indexStyle = ServletUtils.checkAgentIsMobile(ServletUtils.getRequest().getHeader("User-Agent")) ? "index" : menuStyle;
-
-        // 优先Cookie配置导航菜单
-        Cookie[] cookies = ServletUtils.getRequest().getCookies();
-        for (Cookie cookie : cookies)
-        {
-            if (StringUtils.isNotEmpty(cookie.getName()) && "nav-style".equalsIgnoreCase(cookie.getName()))
-            {
-                indexStyle = cookie.getValue();
-                break;
-            }
-        }
-        String webIndex = "topnav".equalsIgnoreCase(indexStyle) ? "index-topnav" : "index";
-        return webIndex;
-    }
-
-    // 切换主题
-    @GetMapping("/system/switchSkin")
-    public String switchSkin()
-    {
-        return "skin";
-    }
-
-    // 切换菜单
-    @GetMapping("/system/menuStyle/{style}")
-    public void menuStyle(@PathVariable String style, HttpServletResponse response)
-    {
-        CookieUtils.setCookie(response, "nav-style", style);
-    }
-
-    // 系统介绍
-    @GetMapping("/system/main")
-    public String main(ModelMap mmap)
-    {
-        mmap.put("version", Global.getVersion());
-        return "mian/main_v1";
-    }
-
-    // 检查初始密码是否提醒修改
-    public boolean initPasswordIsModify(Date pwdUpdateDate)
-    {
-    	return false;
-//        int initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify"));
-//        return initPasswordModify == 1 && pwdUpdateDate == null;
-    }
-
-    // 检查密码是否过期
-    public boolean passwordIsExpiration(Date pwdUpdateDate)
-    {
-        int passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays"));
-        if (passwordValidateDays > 0)
-        {
-            if (StringUtils.isNull(pwdUpdateDate))
-            {
-                // 如果从未修改过初始密码，直接提醒过期
-                return true;
-            }
-            Date nowDate = DateUtils.getNowDate();
-            return DateUtils.differentDaysByMillisecond(nowDate, pwdUpdateDate) > passwordValidateDays;
-        }
-        return false;
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysLoginController.java

@@ -1,144 +0,0 @@
-package com.tzy.web.controller.system;
-
-import com.tzy.common.constant.Constants;
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.AjaxResult;
-import com.tzy.common.core.domain.entity.SysUser;
-import com.tzy.common.utils.CookieUtils;
-import com.tzy.common.utils.ServletUtils;
-import com.tzy.common.utils.ShiroUtils;
-import com.tzy.common.utils.StringUtils;
-import com.tzy.framework.shiro.realm.LoginParam;
-import com.tzy.framework.util.RedisUtils;
-import com.tzy.merchant.domain.MerchantInfo;
-import com.tzy.merchant.service.MerchantInfoService;
-import com.tzy.system.service.ISysUserService;
-import com.warrenstrange.googleauth.GoogleAuthenticator;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.shiro.subject.Subject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 登录验证
- * 
- * @author zheng
- */
-@Controller
-@Slf4j
-public class SysLoginController extends BaseController
-{
-
-    @Autowired
-    private MerchantInfoService merchantApiService;
-    @Autowired
-    private RedisUtils redisUtils;
-    @Autowired
-    private ISysUserService sysUserService;
-    @Autowired
-    private GoogleAuthenticator gAuth;
-
-    @GetMapping("/login")
-    public String login(HttpServletRequest request, HttpServletResponse response)
-    {
-        // 如果是Ajax请求，返回Json字符串。
-        if (ServletUtils.isAjaxRequest(request))
-        {
-            return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");
-        }
-        return "login";
-    }
-
-    @PostMapping("/login")
-    @ResponseBody
-    public AjaxResult ajaxLogin(String username, String password, boolean rememberMe,String validateCode)
-    {
-        if(StringUtils.isNotEmpty(validateCode) && validateCode.length() != 6){
-            return AjaxResult.error("验证失败，请输入6位动态码！");
-        }
-        //判断用户是否绑定动态令牌
-        int i = sysUserService.checkFasAuthByLoginName(username);
-        if( 1 ==  i && StringUtils.isNotEmpty(validateCode)){
-            boolean b = gAuth.authorizeUser(username, Integer.parseInt(validateCode));
-            if(!b){
-                return AjaxResult.error("验证失败，请重试！").put("fasAuth",1);
-            }
-        }else if(1 == i && StringUtils.isEmpty(validateCode)){
-            return AjaxResult.error("请进行动态令牌验证").put("fasAuth",1);
-        }
-        UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
-        return login(token);
-    }
-
-    @PostMapping("/tokenLogin")
-    @ResponseBody
-    public AjaxResult tokenLogin(@RequestBody LoginParam param) {
-        UsernamePasswordToken token = new UsernamePasswordToken(param.getUsername(), param.getPassword());
-        return login(token);
-    }
-
-    @GetMapping("/tokenLogout")
-    @ResponseBody
-    public AjaxResult tokenLoginOut(HttpServletRequest request,HttpServletResponse response) {
-        SysUser sysUser = ShiroUtils.getSysUser();
-        ShiroUtils.logout();
-        redisUtils.del( Constants.AUTHENTICATION_SESSION_USER + sysUser.getUserId());
-        CookieUtils.delCookie(request, response,Constants.JSESSIONID);
-        CookieUtils.delCookie(request, response,Constants.SESSION);
-        return AjaxResult.success("OK");
-    }
-
-    @RequestMapping("/getUserInfo")
-    @ResponseBody
-    public AjaxResult getUserInfo(HttpServletRequest request) {
-        SysUser sysUser = ShiroUtils.getSysUser();
-        MerchantInfo merchantInfo = merchantApiService.selectByLoginId(sysUser.getUserId());
-        Map<String, Object> data = new HashMap<>(2);
-        sysUser.setFasData(null);
-        data.put("user",sysUser);
-        data.put("merchantInfo",merchantInfo);
-        return  AjaxResult.success("OK", data);
-    }
-
-    private AjaxResult login(UsernamePasswordToken token) {
-        Subject subject = SecurityUtils.getSubject();
-        try {
-            subject.login(token);
-            return AjaxResult.success("登陆成功",subject.getSession().getId().toString());
-        } catch (AuthenticationException e) {
-            String msg = "用户或密码错误";
-            if (StringUtils.isNotEmpty(e.getMessage())) {
-                msg = e.getMessage();
-            }
-            return error(msg);
-        }
-    }
-
-    @GetMapping("/unauth")
-    public String unauth()
-    {
-        return "error/unauth";
-    }
-
-    /**
-     * 验证是否绑定动态令牌
-     * @param username
-     * @return
-     */
-    @PostMapping("/checkFasAuth")
-    @ResponseBody
-    public AjaxResult checkFasAuth(String username)
-    {
-        return toAjax(sysUserService.checkFasAuthByLoginName(username));
-    }
-
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysNoticeController.java

@@ -1,183 +0,0 @@
-package com.tzy.web.controller.system;
-
-import java.util.List;
-
-import com.tzy.system.dto.SysNoticeDto;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-import com.tzy.common.annotation.Log;
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.AjaxResult;
-import com.tzy.common.core.page.TableDataInfo;
-import com.tzy.common.enums.BusinessType;
-import com.tzy.common.utils.ShiroUtils;
-import com.tzy.system.domain.SysNotice;
-import com.tzy.system.service.ISysNoticeService;
-
-/**
- * 公告 信息操作处理
- * 
- * @author zheng
- */
-@Api("系统公告")
-@Controller
-@RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController
-{
-    private String prefix = "system/notice";
-
-    @Autowired
-    private ISysNoticeService noticeService;
-
-    @RequiresPermissions("system:notice:view")
-    @GetMapping()
-    public String notice()
-    {
-        return prefix + "/notice";
-    }
-
-    /**
-     * 查询公告列表
-     */
-    @RequiresPermissions("system:notice:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(SysNotice notice)
-    {
-        startPage();
-        List<SysNoticeDto> list = noticeService.selectNoticeList(notice);
-        return getDataTable(list);
-    }
-    /**
-     * 查询公告列表
-     */
-    @ApiOperation("查询公告列表")
-    @ApiResponses({
-            @ApiResponse(code = 200, message = "公告详情", response = SysNoticeDto.class)
-    })
-    @PostMapping("/sysNotices")
-    @ResponseBody
-    public TableDataInfo sysNotices(@RequestBody SysNotice notice)
-    {
-        startPage();
-        List<SysNoticeDto> list = noticeService.selectNoticeList(notice);
-        return getDataTable(list);
-    }
-    /**
-     * 新增公告
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存公告
-     */
-    @RequiresPermissions("system:notice:add")
-    @Log(title = "通知公告", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(SysNotice notice)
-    {
-        notice.setCreateBy(ShiroUtils.getLoginName());
-        return toAjax(noticeService.insertNotice(notice));
-    }
-    /**
-     * 新增保存公告
-     */
-    @ApiOperation("新增保存公告")
-    @Log(title = "通知公告", businessType = BusinessType.INSERT)
-    @PostMapping("/addNotice")
-    @ResponseBody
-    public AjaxResult addNotice(@RequestBody SysNotice notice)
-    {
-        notice.setCreateBy(ShiroUtils.getLoginName());
-        return toAjax(noticeService.insertNotice(notice));
-    }
-
-    /**
-     * 修改公告
-     */
-    @GetMapping("/edit/{noticeId}")
-    public String edit(@PathVariable("noticeId") Long noticeId, ModelMap mmap)
-    {
-        mmap.put("notice", noticeService.selectNoticeById(noticeId));
-        return prefix + "/edit";
-    }
-    /**
-     * 公告详情
-     */
-    @ApiOperation("公告详情")
-    @ApiResponses({
-            @ApiResponse(code = 200, message = "公告详情", response = SysNoticeDto.class)
-    })
-    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
-    @PostMapping("/detail/{noticeId}")
-    @ResponseBody
-    public AjaxResult detail(@PathVariable("noticeId") Long noticeId)
-    {
-        SysNoticeDto sysNotice = noticeService.selectNoticeById(noticeId);
-        if(null != sysNotice){
-            return AjaxResult.success(sysNotice);
-        }else{
-            return toAjax(0);
-        }
-    }
-    /**
-     * 修改保存公告
-     */
-    @RequiresPermissions("system:notice:edit")
-    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(SysNotice notice)
-    {
-        notice.setUpdateBy(ShiroUtils.getLoginName());
-        return toAjax(noticeService.updateNotice(notice));
-    }
-    /**
-     * 修改保存公告
-     */
-    @ApiOperation("修改保存公告")
-    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
-    @PostMapping("/editNotice")
-    @ResponseBody
-    public AjaxResult editNotice(@RequestBody SysNotice notice)
-    {
-        notice.setUpdateBy(ShiroUtils.getLoginName());
-        return toAjax(noticeService.updateNotice(notice));
-    }
-    /**
-     * 删除公告
-     */
-    @RequiresPermissions("system:notice:remove")
-    @Log(title = "通知公告", businessType = BusinessType.DELETE)
-    @PostMapping("/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        return toAjax(noticeService.deleteNoticeByIds(ids));
-    }
-
-    /**
-     * 删除公告
-     */
-    @ApiOperation("删除公告")
-    @Log(title = "通知公告", businessType = BusinessType.DELETE)
-    @PostMapping("/del")
-    @ResponseBody
-    public AjaxResult del(@RequestBody String ids)
-    {
-        return toAjax(noticeService.deleteNoticeByIds(ids));
-    }
-
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysProfileController.java

@@ -1,177 +0,0 @@
-package com.tzy.web.controller.system;
-
-import com.tzy.common.annotation.Log;
-import com.tzy.common.config.Global;
-import com.tzy.common.constant.Constants;
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.AjaxResult;
-import com.tzy.common.core.domain.entity.SysUser;
-import com.tzy.common.enums.BusinessType;
-import com.tzy.common.utils.DateUtils;
-import com.tzy.common.utils.ShiroUtils;
-import com.tzy.common.utils.file.FileUploadUtils;
-import com.tzy.framework.shiro.service.SysPasswordService;
-import com.tzy.framework.util.RedisUtils;
-import com.tzy.system.service.ISysUserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.util.Date;
-
-/**
- * 个人信息 业务处理
- * 
- * @author zheng
- */
-@Controller
-@RequestMapping("/system/user/profile")
-public class SysProfileController extends BaseController
-{
-    private static final Logger log = LoggerFactory.getLogger(SysProfileController.class);
-
-    private String prefix = "system/user/profile";
-
-    @Autowired
-    private ISysUserService userService;
-    
-    @Autowired
-    private SysPasswordService passwordService;
-    @Resource
-    private RedisUtils redisUtils;
-
-    /**
-     * 个人信息
-     */
-    @GetMapping()
-    public String profile(ModelMap mmap)
-    {
-        SysUser user = ShiroUtils.getSysUser();
-        user.setFasData(null);
-        mmap.put("user", user);
-        mmap.put("roleGroup", userService.selectUserRoleGroup(user.getUserId()));
-        mmap.put("postGroup", userService.selectUserPostGroup(user.getUserId()));
-        return prefix + "/profile";
-    }
-
-    @GetMapping("/checkPassword")
-    @ResponseBody
-    public boolean checkPassword(String password)
-    {
-        SysUser user = ShiroUtils.getSysUser();
-        if (passwordService.matches(user, password))
-        {
-            return true;
-        }
-        return false;
-    }
-
-    @GetMapping("/resetPwd")
-    public String resetPwd(ModelMap mmap)
-    {
-        SysUser user = ShiroUtils.getSysUser();
-        mmap.put("user", userService.selectUserById(user.getUserId()));
-        return prefix + "/resetPwd";
-    }
-
-    @Log(title = "重置密码", businessType = BusinessType.UPDATE)
-    @PostMapping("/resetPwd")
-    @ResponseBody
-    public AjaxResult resetPwd(String oldPassword, String newPassword) {
-        SysUser user = ShiroUtils.getSysUser();
-        if (!passwordService.matches(user, oldPassword)) {
-            return error("修改密码失败，旧密码错误");
-        }
-        if (passwordService.matches(user, newPassword)) {
-            return error("新密码不能与旧密码相同");
-        }
-        user.setSalt(ShiroUtils.randomSalt());
-        user.setPassword(passwordService.encryptPassword(user.getLoginName(), newPassword, user.getSalt()));
-        user.setPwdUpdateDate(DateUtils.getNowDate());
-
-        if (userService.resetUserPwd(user) > 0) {
-            ShiroUtils.setSysUser(userService.selectUserById(user.getUserId()));
-            redisUtils.hset(Constants.EXPIRE_SESSION_USER_KEY,user.getLoginName(),new Date().getTime());
-            return success();
-        }
-        return error("修改密码异常，请联系管理员");
-    }
-
-    /**
-     * 修改用户
-     */
-    @GetMapping("/edit")
-    public String edit(ModelMap mmap)
-    {
-        SysUser user = ShiroUtils.getSysUser();
-        mmap.put("user", userService.selectUserById(user.getUserId()));
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改头像
-     */
-    @GetMapping("/avatar")
-    public String avatar(ModelMap mmap)
-    {
-        SysUser user = ShiroUtils.getSysUser();
-        mmap.put("user", userService.selectUserById(user.getUserId()));
-        return prefix + "/avatar";
-    }
-
-    /**
-     * 修改用户
-     */
-    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PostMapping("/update")
-    @ResponseBody
-    public AjaxResult update(SysUser user)
-    {
-        SysUser currentUser = ShiroUtils.getSysUser();
-        currentUser.setUserName(user.getUserName());
-        currentUser.setEmail(user.getEmail());
-        currentUser.setPhonenumber(user.getPhonenumber());
-        currentUser.setSex(user.getSex());
-        if (userService.updateUserInfo(currentUser) > 0)
-        {
-            ShiroUtils.setSysUser(userService.selectUserById(currentUser.getUserId()));
-            return success();
-        }
-        return error();
-    }
-
-    /**
-     * 保存头像
-     */
-    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PostMapping("/updateAvatar")
-    @ResponseBody
-    public AjaxResult updateAvatar(@RequestParam("avatarfile") MultipartFile file)
-    {
-        SysUser currentUser = ShiroUtils.getSysUser();
-        try
-        {
-            if (!file.isEmpty())
-            {
-                String avatar = FileUploadUtils.upload(Global.getAvatarPath(), file);
-                currentUser.setAvatar(avatar);
-                if (userService.updateUserInfo(currentUser) > 0)
-                {
-                    ShiroUtils.setSysUser(userService.selectUserById(currentUser.getUserId()));
-                    return success();
-                }
-            }
-            return error();
-        }
-        catch (Exception e)
-        {
-            log.error("修改头像失败！", e);
-            return error(e.getMessage());
-        }
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/system/SysUserController.java

@@ -1,448 +0,0 @@
-package com.tzy.web.controller.system;
-
-import com.tzy.common.annotation.Log;
-import com.tzy.common.constant.Constants;
-import com.tzy.common.constant.UserConstants;
-import com.tzy.common.core.controller.BaseController;
-import com.tzy.common.core.domain.AjaxResult;
-import com.tzy.common.core.domain.MsgResult;
-import com.tzy.common.core.domain.entity.SysRole;
-import com.tzy.common.core.domain.entity.SysUser;
-import com.tzy.common.core.page.TableDataInfo;
-import com.tzy.common.enums.BusinessType;
-import com.tzy.common.exception.BusinessException;
-import com.tzy.common.utils.ShiroUtils;
-import com.tzy.common.utils.StringUtils;
-import com.tzy.common.utils.poi.ExcelUtil;
-import com.tzy.framework.shiro.service.SysPasswordService;
-import com.tzy.framework.shiro.util.AuthorizationUtils;
-import com.tzy.framework.util.RedisUtils;
-import com.tzy.system.domain.UserInfoModel;
-import com.tzy.system.service.ISysPostService;
-import com.tzy.system.service.ISysRoleService;
-import com.tzy.system.service.ISysUserService;
-import com.warrenstrange.googleauth.GoogleAuthenticator;
-import com.warrenstrange.googleauth.GoogleAuthenticatorKey;
-import com.warrenstrange.googleauth.GoogleAuthenticatorQRGenerator;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 用户信息
- * 
- * @author zheng
- */
-@Controller
-@RequestMapping("/system/user")
-public class SysUserController extends BaseController
-{
-    private String prefix = "system/user";
-
-    @Autowired
-    private ISysUserService userService;
-
-    @Autowired
-    private ISysRoleService roleService;
-
-    @Autowired
-    private ISysPostService postService;
-
-    @Autowired
-    private SysPasswordService passwordService;
-
-    @Autowired
-    private GoogleAuthenticator gAuth;
-
-    @Autowired
-    private RedisUtils redisUtils;
-
-    @RequiresPermissions("system:user:view")
-    @GetMapping()
-    public String user()
-    {
-        return prefix + "/userInfos";
-    }
-
-    @GetMapping("/ExistAccount")
-    @ResponseBody
-    public String ExistAccount() {
-    	try
-    	{
-    		return "true";
-    	}
-    	catch(Exception ex ) {
-    		return "false";
-    	}
-    	finally{
-   		   //切回主数据源
-           //DynamicDataSourceContextHolder.clearDataSource();
-    	}
-    }
-    @RequiresPermissions("system:user:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(SysUser user)
-    {
-        startPage();
-        String custNo = ShiroUtils.getLoginCustNo();
-        user.setCustNo(custNo);
-        List<SysUser> list = userService.selectUserList(user);
-        return getDataTable(list);
-    }
-
-    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @RequiresPermissions("system:user:export")
-    @PostMapping("/export")
-    @ResponseBody
-    public MsgResult export(SysUser user)
-    {
-        List<SysUser> list = userService.selectUserList(user);
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-        return util.exportExcel(list, "用户数据");
-    }
-
-    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @RequiresPermissions("system:user:import")
-    @PostMapping("/importData")
-    @ResponseBody
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-        List<SysUser> userList = util.importExcel(file.getInputStream());
-        String operName = ShiroUtils.getSysUser().getLoginName();
-        String message = userService.importUser(userList, updateSupport, operName);
-        return AjaxResult.success(message);
-    }
-
-    @RequiresPermissions("system:user:view")
-    @GetMapping("/importTemplate")
-    @ResponseBody
-    public MsgResult importTemplate()
-    {
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-        return util.importTemplateExcel("用户数据");
-    }
-
-    /**
-     * 新增用户
-     */
-    @GetMapping("/add")
-    public String add(ModelMap mmap)
-    {
-        mmap.put("roles", roleService.selectRoleAll().stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        mmap.put("posts", postService.selectPostAll());
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存用户
-     */
-    @RequiresPermissions("system:user:add")
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
-    @PostMapping("/addSave")
-    @ResponseBody
-    public MsgResult addSave(@Validated SysUser user)
-    {
-    	try
-    	{
-    		//设置公司编号
-    		String custNo = ShiroUtils.getLoginCustNo();
-    		String branchNo=ShiroUtils.getLoginBranchNo();
-    		user.setCustNo(custNo);
-    		user.setBranchNo(branchNo);
-    		//设置初始密码
-    		user.setPassword("123");
-	        if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(user.getLoginName())))
-	        {
-	            return errorMsg("新增用户'" + user.getLoginName() + "'失败，登录账号已存在");
-	        }
-	        else if (StringUtils.isNotEmpty(user.getPhonenumber())
-	                && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-	        {
-	            return errorMsg("新增用户'" + user.getLoginName() + "'失败，手机号码已存在");
-	        }
-	        else if (StringUtils.isNotEmpty(user.getEmail())
-	                && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-	        {
-	            return errorMsg("新增用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
-	        }
-	        user.setSalt(ShiroUtils.randomSalt());
-	        user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
-	        user.setCreateBy(ShiroUtils.getLoginName());
-	        return toReturn(userService.insertUser(user));
-    	}
-    	catch (Exception Ex) {
-    		return errorMsg("系统异常："+Ex.getMessage());
-    	}
-    }
-
-    /**
-     * 修改用户
-     */
-    @GetMapping("/edit/{userId}")
-    public String edit(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
-    	SysUser user = ShiroUtils.getSysUser();
-        List<SysRole> roles = roleService.selectRolesByUserId(userId);
-        mmap.put("user", userService.selectUserById(userId));
-        mmap.put("roles", SysUser.isAdmin(user.getIsSuper()) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-       // mmap.put("posts", postService.selectPostsByUserId(userId));
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存用户
-     */
-    @RequiresPermissions("system:user:edit")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/editSave")
-    @ResponseBody
-    public MsgResult editSave(@Validated SysUser user)
-    {
-    	try
-    	{
-	        userService.checkUserAllowed(user);
-	        if (StringUtils.isNotEmpty(user.getPhonenumber())
-	                && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-	        {
-	            return errorMsg("修改用户'" + user.getLoginName() + "'失败，手机号码已存在");
-	        }
-	        else if (StringUtils.isNotEmpty(user.getEmail())
-	                && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-	        {
-	            return errorMsg("修改用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
-	        }
-	        user.setUpdateBy(ShiroUtils.getLoginName());
-	        AuthorizationUtils.clearAllCachedAuthorizationInfo();
-	        return toReturn(userService.updateUser(user));
-    	}
-    	catch (Exception Ex) {
-    		return errorMsg("系统异常："+Ex.getMessage());
-    	}
-    }
-
-    @RequiresPermissions("system:user:resetPwd")
-    @GetMapping("/resetPwd/{userId}")
-    public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
-        mmap.put("user", userService.selectUserById(userId));
-        return prefix + "/resetPwd";
-    }
-
-    @RequiresPermissions("system:user:resetPwd")
-    @Log(title = "重置密码", businessType = BusinessType.UPDATE)
-    @PostMapping("/resetPwd")
-    @ResponseBody
-    public MsgResult resetPwdSave(SysUser user) {
-        userService.checkUserAllowed(user);
-        user.setSalt(ShiroUtils.randomSalt());
-        user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
-        if (userService.resetUserPwd(user) > 0) {
-            redisUtils.hset(Constants.EXPIRE_SESSION_USER_KEY,user.getLoginName(),new Date().getTime());
-            if (ShiroUtils.getUserId().longValue() == user.getUserId().longValue()) {
-                ShiroUtils.setSysUser(userService.selectUserById(user.getUserId()));
-            }
-            return toReturn(1);
-        }
-        return errorMsg("密码重置失败!");
-    }
-
-    /**
-     * 进入授权角色页
-     */
-    @GetMapping("/authRole/{userId}")
-    public String authRole(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
-        SysUser user = userService.selectUserById(userId);
-        user.setFasData(null);
-        // 获取用户所属的角色列表
-        List<SysRole> roles = roleService.selectRolesByUserId(userId);
-        mmap.put("user", user);
-        mmap.put("roles", SysUser.isAdmin(user.getIsSuper()) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        return prefix + "/authRole";
-    }
-
-    /**
-     * 用户授权角色
-     */
-    @RequiresPermissions("system:user:add")
-    @Log(title = "用户管理", businessType = BusinessType.GRANT)
-    @PostMapping("/authRole/insertAuthRole")
-    @ResponseBody
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
-    {
-        userService.insertUserAuth(userId, roleIds);
-        AuthorizationUtils.clearAllCachedAuthorizationInfo();
-        return success();
-    }
-
-    @RequiresPermissions("system:user:remove")
-    @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @PostMapping("/remove")
-    @ResponseBody
-    public MsgResult remove(String ids)
-    {
-        try
-        {
-            return toReturn(userService.deleteUserByIds(ids));
-        }
-        catch (Exception e)
-        {
-            return errorMsg("系统异常："+e.getMessage());
-        }
-    }
-
-    /**
-     * 校验用户名
-     */
-    @PostMapping("/checkLoginNameUnique")
-    @ResponseBody
-    public String checkLoginNameUnique(SysUser user)
-    {
-        return userService.checkLoginNameUnique(user.getLoginName());
-    }
-
-    /**
-     * 校验手机号码
-     */
-    @PostMapping("/checkPhoneUnique")
-    @ResponseBody
-    public String checkPhoneUnique(SysUser user)
-    {
-        return userService.checkPhoneUnique(user);
-    }
-
-    /**
-     * 校验email邮箱
-     */
-    @PostMapping("/checkEmailUnique")
-    @ResponseBody
-    public String checkEmailUnique(SysUser user)
-    {
-        return userService.checkEmailUnique(user);
-    }
-
-    /**
-     * 用户状态修改
-     */
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @RequiresPermissions("system:user:edit")
-    @PostMapping("/changeStatus")
-    @ResponseBody
-    public AjaxResult changeStatus(SysUser user)
-    {
-        userService.checkUserAllowed(user);
-        return toAjax(userService.changeStatus(user));
-    }
-
-
-    /**
-     * (用户人员下拉)下拉列表的数据
-     *
-     * @return
-     */
-    @GetMapping("/GetUserDropdownList")
-    @ResponseBody
-    public HashMap<String, Object> GetReceiverDropdownList(@RequestParam Map<String, Object> params) {
-        try {
-            List userDownInfoList = new ArrayList();
-            HashMap<String, Object> reponse = new HashMap<>();
-            String keyword = params.containsKey("keyword") ? params.get("keyword").toString() : "";
-            String search = params.containsKey("search") ? params.get("search").toString() : "";
-            String branchNo = ShiroUtils.getSysUser().getBranchNo();
-            String custNo = ShiroUtils.getSysUser().getCustNo();
-            List<UserInfoModel> list = userService.selectUserDropdownList(keyword, branchNo, custNo);
-            if (!list.isEmpty()) {
-                for (int i = 0; i < list.size(); i++) {
-                    UserInfoModel userdowninfo = list.get(i);
-                    Map<String, Object> map = new LinkedHashMap();
-                    if(!search.equals("") && search.equals("user_name")){
-                        map.put("localBy", userdowninfo.getUserName());
-                        map.put("localId", userdowninfo.getUserId());
-                    }
-                    userDownInfoList.add(map);
-                }
-            }
-            reponse.put("value", userDownInfoList);
-            reponse.put("message", "");
-            reponse.put("code", 200);
-            reponse.put("redirect", "");
-            return reponse;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * 用户绑定动态码的二维码
-     * @return
-     */
-    public AjaxResult  generate(){
-        String username = ShiroUtils.getSysUser().getLoginName();
-        if(StringUtils.isEmpty(username)){
-            throw new BusinessException("请登陆!!!");
-        }
-        GoogleAuthenticatorKey key = gAuth.createCredentials(username);
-        String otpAuthURL = GoogleAuthenticatorQRGenerator.getOtpAuthTotpURL("HOBBY STOCKS", username, key);
-        return AjaxResult.success(Constants.LOGIN_SUCCESS,otpAuthURL);
-    }
-    /**
-     * 修改用户
-     */
-    @Log(title = "修改用户绑定", businessType = BusinessType.UPDATE)
-    @RequiresPermissions("system:user:edit")
-    @GetMapping("/generate/{userId}")
-    public String generate(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
-        SysUser user = userService.selectUserById(userId);
-        if(null != user && 1 == user.getFasAuth() ){
-            mmap.put("status", false);
-            mmap.put("statusMsg", "您已经绑定！");
-        }else if(null != user){
-            GoogleAuthenticatorKey key = gAuth.createCredentials(user.getLoginName());
-            String otpAuthURL = GoogleAuthenticatorQRGenerator.getOtpAuthTotpURL("HOBBY STOCKS", user.getLoginName(), key);
-            redisUtils.set("fas_auth_"+user.getLoginName(),true,30*60);//30分钟失效
-            mmap.put("status", true);
-            mmap.put("statusMsg", otpAuthURL);
-        } else {
-            mmap.put("status", false);
-            mmap.put("statusMsg", "请重新登陆后在绑定！");
-        }
-        user.setFasData(null);
-        mmap.put("user", user);
-        return prefix + "/fasAuth";
-    }
-    /**
-     * 用户验证
-     * @param userId
-     * @param code
-     * @return
-     */
-    @Log(title = "用户验证", businessType = BusinessType.UPDATE)
-    @RequiresPermissions("system:user:edit")
-    @PostMapping("/validate")
-    @ResponseBody
-    public AjaxResult validateKey(@RequestParam Long userId,@RequestParam Integer code) {
-        SysUser user = userService.selectUserById(userId);
-        logger.info("用户验证 用户信息 {} ,name {}",user,user.getLoginName());
-        boolean b = gAuth.authorizeUser(user.getLoginName(), code);
-        logger.info("用户验证 code {} ,check:{}",code,b);
-        int i = 0;
-        if(b){
-            user.setFasAuth(1);
-            i = userService.bindingOpt(user);
-        }
-        return toAjax(i);
-    }
-
-
-}

poyee-partner/src/main/java/com/tzy/web/controller/tool/HealthController.java

@@ -1,16 +0,0 @@
-package com.tzy.web.controller.tool;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/health")
-public class HealthController {
-
-    @GetMapping
-    ResponseEntity health() {
-        return ResponseEntity.ok().build();
-    }
-}

poyee-partner/src/main/java/com/tzy/web/controller/tool/SwaggerController.java

@@ -1,24 +0,0 @@
-package com.tzy.web.controller.tool;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import com.tzy.common.core.controller.BaseController;
-
-/**
- * swagger 接口
- * 
- * @author zheng
- */
-@Controller
-@RequestMapping("/tool/swagger")
-public class SwaggerController extends BaseController
-{
-    @RequiresPermissions("tool:swagger:view")
-    @GetMapping()
-    public String index()
-    {
-        return redirect("/swagger-ui.html");
-    }
-}

poyee-partner/src/main/java/com/tzy/web/core/config/SwaggerConfig.java

@@ -1,70 +0,0 @@
-package com.tzy.web.core.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import com.tzy.common.config.Global;
-import io.swagger.annotations.ApiOperation;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * Swagger2的接口配置
- *
- * @author zheng
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig
-{
-    /** 是否开启swagger */
-    @Value("${swagger.enabled:false}")
-    private boolean enabled;
-
-    /**
-     * 创建API
-     */
-    @Bean
-    public Docket createRestApi()
-    {
-        return new Docket(DocumentationType.SWAGGER_2)
-                // 是否启用Swagger
-                .enable(enabled)
-                // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
-                .apiInfo(apiInfo())
-                // 设置哪些接口暴露给Swagger展示
-                .select()
-                // 扫描所有有注解的api，用这种方式更灵活
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-                // 扫描指定包中的swagger注解
-                .apis(RequestHandlerSelectors.basePackage("com.tzy"))
-                // 扫描所有
-                .apis(RequestHandlerSelectors.any())
-                .paths(PathSelectors.any())
-                .build();
-    }
-
-    /**
-     * 添加摘要信息
-     */
-    private ApiInfo apiInfo()
-    {
-        // 用ApiInfoBuilder进行定制
-        return new ApiInfoBuilder()
-                // 设置标题
-                .title("标题：珀懿_接口文档")
-                // 描述
-                .description("描述：珀懿接口")
-                // 作者信息
-                .contact(new Contact(Global.getName(), null, null))
-                // 版本
-                .version("版本号:" + Global.getVersion())
-                .build();
-    }
-}

poyee-partner/src/main/resources/application-druid.yml

@@ -1,50 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: org.postgresql.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: ${DB_URL:jdbc:postgresql://m2-dev.hobbystocks.cn:5432/tzy_system}
-                username: ${DB_USERNAME:postgres}
-                password: ${DB_PASSWORD:123456}
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 30
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter:
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username:
-                login-password:
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true

poyee-partner/src/main/resources/application.yml

@@ -1,437 +0,0 @@
-# 项目相关配置
-tzy:
-  # 名称
-  name: TzyTms
-  # 版本
-  version: 4.5.0
-  # 版权年份
-  copyrightYear: 2019
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/tzy/uploadPath，Linux配置 /home/tzy/uploadPath）
-  profile: c:/tmp
-  # 缓存地址
-#  tmpPath: /tmp
-#  profile: F:/tomcat/card/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  #版本
-  app-version: test
-  host: localhost
-  finance-host: localhost:8081
-
-#Forest
-forest:
-  #bean-id: config0 # 在spring上下文中bean的id（默认为 forestConfiguration）
-  #backend: okhttp3 # 后端HTTP框架（默认为 okhttp3）
-  #max-connections: 1000 # 连接池最大连接数（默认为 500）
-  #max-route-connections: 500 # 每个路由的最大连接数（默认为 500）你这
-  timeout: 30000 # 请求超时时间，单位为毫秒（默认为 3000）
-  connect-timeout: 30000 # 连接超时时间，单位为毫秒（默认为 timeout）
-  read-timeout: 300000 # 数据读取超时时间，单位为毫秒（默认为 timeout）
-  #max-retry-count: 0 # 请求失败后重试次数（默认为 0 次不重试）
-  #ssl-protocol: SSLv3 # 单向验证的HTTPS的默认SSL协议（默认为 SSLv3）
-  #logEnabled: true # 打开或关闭日志（默认为 true）
-  #log-request: true # 打开/关闭Forest请求日志（默认为 true）
-  #log-response-status: true # 打开/关闭Forest响应状态日志（默认为 true）
-  #log-response-content: true # 打开/关闭Forest响应内容日志（默认为 false）
-
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为80
-  port: 8090
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # tomcat最大线程数，默认为200
-    max-threads: 800
-    # Tomcat启动初始化的线程数，默认值25
-    min-spare-threads: 30
-
-# 日志配置
-logging:
-  console.enabled: ${CONSOLE_ENABLED:true}
-  file.enabled: ${FILE_ENABLED:false}
-  level:
-    com.tzy: debug
-    org.springframework: warn
-  fluentd:
-    enabled: ${FLUENTD_ENABLED:false}
-    host: ${FLUENTD_HOST:127.0.0.1}
-    port: ${FLUENTD_PORT:24225}
-
-# 用户配置
-user:
-  password:
-    # 密码错误{maxRetryCount}次锁定10分钟
-    maxRetryCount: 5
-
-# Spring配置
-spring:
-#静态资源访问
-  resources:
-    static-locations: classpath:/static/,file:C://tmp,file:F://tomcat//card//uploadPath
-  # 模板引擎
-  thymeleaf:
-    mode: HTML
-    encoding: utf-8
-    # 禁用缓存
-    cache: false
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: static/i18n/messages
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  profiles:
-    active: druid
-  # 文件上传
-  servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  50MB
-       # 设置总上传的文件大小
-       max-request-size:  50MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
-  redis:
-      database: 1
-      host: 127.0.0.1
-    #host: hobbystock.cn
-      port: 6379
-      password: #Pass2021    # 密码（默认为空）
-      timeout: 60000  # 连接超时时长（毫秒）
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1ms    # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 5       # 连接池中的最小空闲连接
-
-  #mq
-  rabbitmq:
-    host: m2-dev.hobbystocks.cn
-    port: 5672
-    username: admin
-    password: admin
-    #确认消息已发送到交换机(Exchange)
-    publisher-confirms: true
-    #确认消息已发送到队列(Queue)
-    publisher-returns: true
-    template:
-      retry:
-        enabled: true
-      mandatory: true
-    listener:
-      simple:
-        acknowledge-mode: manual
-        #并发消费者初始化值
-        #concurrency: 10
-        #并发消费者的最大值
-        #max-concurrency: 20
-        #每个消费者每次监听时可拉取处理的消息数量
-        prefetch: 5
-      direct:
-        retry:
-          enabled: true
-          max-attempts: 1
-
-# MyBatis
-mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.tzy.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
-
-# PageHelper分页插件
-pagehelper:
-  helperDialect: postgresql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql
-
-# Shiro
-shiro:
-  user:
-    # 登录地址
-    loginUrl: /login
-    # 权限认证失败地址
-    unauthorizedUrl: /unauth
-    # 首页地址
-    indexUrl: /index
-    # 验证码开关
-    captchaEnabled: false
-    # 验证码类型 math 数组计算 char 字符
-    captchaType: math
-  cookie:
-    # 设置Cookie的域名 默认空，即当前访问的域名
-    domain:
-    # 设置cookie的有效访问路径
-    path: /
-    # 设置HttpOnly属性
-    httpOnly: true
-    # 设置Cookie的过期时间，天为单位
-    maxAge: 30
-    # 设置密钥，务必保持唯一性（生成方式，直接拷贝到main运行即可）KeyGenerator keygen = KeyGenerator.getInstance("AES"); SecretKey deskey = keygen.generateKey(); System.out.println(Base64.encodeToString(deskey.getEncoded()));
-    cipherKey: zSyK5Kp6PZAAjlT+eeNMlg==
-  session:
-    # Session超时时间，-1代表永不过期（默认30分钟）
-    expireTime: 480
-    # 同步session到数据库的周期（默认1分钟）
-    dbSyncPeriod: 1
-    # 相隔多久检查一次session的有效性，默认就是10分钟
-    validationInterval: 10
-    # 同一个用户最大会话数，比如2的意思是同一个账号允许最多同时两个人登录（默认-1不限制）
-    maxSession: 10
-    # 踢出之前登录的/之后登录的用户，默认踢出之前登录的用户
-    kickoutAfter: false
-
-# 防止XSS攻击
-xss:
-  # 过滤开关
-  enabled: true
-  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice/*
-  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*,/base/*,/api/*
-
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-
-pay:
-#微信支付
-  wxpay:
-    app:
-      appID: wx8ee47a255776f241 #wx8ee47a255776f241 #wx0cd9b8fe0a77ab34
-      appletID: wx8ee47a255776f241 #wx8ee47a255776f241 #wx0cd9b8fe0a77ab34
-      thirdAndriID: wx22a7349c29e688d4
-      mchID: 1620428472 #1612475613
-      key: f572fa0651ca50e8da327996dd349f6b #49F1947DC77ABDDEA204544FC2DB4246F2EB7A0C #123456789123456789123456789abcdd
-      #微信商户平台下载的安全证书存放路径
-      certPath: /home/tzy/wxpay/cert/apiclient_cert.p12
-      #微信支付成功的回调地址
-      payNotifyUrl: https://m2-dev.hobbystocks.cn/api/wx/paymentBack
-      refundNotifyUrl: https://m2-dev.hobbystocks.cn/api/wx/refundBack
-  alipay:
-    app:
-#      appId: 2021002181641642
-#      privateKey:
-#      alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyFERiu5uSV4UZTsA2OMp/rPVcIq2ggtLSWXMzOwwJDrZBTM1XCL+j6CbRjU9gaEbFFwPPb7Qt1AQMV6YaXh0uyDubI+53PHwDF6UgpDNAo9tQI8amMf+xyB7+w1hPZwIItc7nS5ABWvZ1nEOuj9xoAXo5MmibFYkcCu42tvmwCc0bVwDuBMHmh595QPZPf1r11qVLBTeUOOeWP6m0nZckLQJxuTDW55i76OGRyllM5VEJACv7X8gxlE3x90nwRQO6KQxRdG9UcTQKQTYEnQVDrDs8ePfJ8N1GktYBkgA6Cc1iQhA4Ttqe7y9bLpu58KrG7kZHaj4iVnZm64/TU3LkQIDAQAB
-#      privateKeyPath: /home/tzy/alipay/privatekey.txt
-      # 生产
-      appId: 2021002181669560
-      privateKey:
-      alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgCIKpTwnnPm2D1IsMlTvuCq3WBAZKm8IaUqR/IxqQAzwEVuW0+lf6Ririm4PLNcU5eZXK7w+oHqi23b7rL5htqz1K0/q/oBHEeAliCNX+zMr+6sTBN33i5yX/buvVmBPGJJg791lFdnnnELGqZf+nQrJBlOAW/aCVTga7hcf8CH/ZRDboExzf9zK5N6qcxKexsgXZRZso+d47DcAj3sF1lAcYQvTAOG+aJRcwBFFOrb3QYZI1WLOZdjq3kdhXUuVrR8HhQ68BRIvfJGX7Hwy4Ffmb9hD/ljkT1S6+jzslMp3cMbU4IlJPF0o9xxCz4KWiW0pWhwQTolNVqW3GyHG2wIDAQAB
-      privateKeyPath: /home/tzy/alipay/hs/privatekey.txt
-      #支付宝支付成功的回调地址
-      payNotifyUrl: https://m2-dev.hobbystocks.cn/api/ali/paymentBack
-      refundNotifyUrl: https://m2-dev.hobbystocks.cn/api/ali/refundBack
-    app1: #支付宝直连-备用1
-      # 生产
-      appId: 2021003126686832
-      privateKey:
-      alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl1uBO6TTbULTrIfNCErfTCSywYIJensWk7Rcsa4uMbvzQGYH/tL2rKwH+YaMeVkbZGFdVHGDn4NIzYTFjl+r0ePDreDzAntUOhH6vypHxh6MkIKszQPSAj1SR2y34WXkI2tCjmFHIhSIwpnz0le1DERa4MxgUPtfgGAPDOTEfPRW5tlNfIamPYdXOtaP7w6PBk7aq5+cW0zAsQJBIJrxOye9JCuXBUd78EyB8aBxXdgdjJ6cq0oW0jSqup5LHcZnl9xKAVzgEGnALHqmIBijArCE7+rxFtE40Vg6UqDE5bY5FqazkuZ7uoiJOg7oUcP4OqTz2MAQf8AMD/hQGw6llwIDAQAB
-      privateKeyPath: /home/tzy/alipay-2/hs/privatekey.txt
-      #支付宝支付成功的回调地址
-      payNotifyUrl: https://m2-dev.hobbystocks.cn/api/ali/paymentBack
-      refundNotifyUrl: https://m2-dev.hobbystocks.cn/api/ali/refundBack
-
-  hm:
-    app:
-      #hmPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwz9KtE1v7xRkqQ2qzsayNB5LALytAaquB9cW9v5kpwDeVOBTodOHJmvjjz5lKb4cYDIcbMloZKXs4ugBjUkuhsfdQyeQCilEWy2VROFrhUoS6WxHgZkTMmjEarOGG8AWjZersKplZY0+AKtEmB6POrbf5snKJmWq5YXPoifkwhwIDAQAB
-      hmPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCkByRMw/sL8tg38lrGi4JFXFR/jrphyyj3LYHYYnTQj3dl+w4JUysgE7cE7FxEfxMkuM3efv6HeMP0vIsYBrS7EXvVB9vm/HH7QcpvqCfUOLhe4ugaDqfKz9/2BQinieiSRy8gRnm5eadEZn42EtxnZ+s6PBPKeijrxz+JyvCR8QIDAQAB
-      publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJBww/AEqKfofkDGP+EkIKC5r4oHw93O6qFJ5QCnGgNMd5MC3q4Pyk6ImOjSj/OdRqTefRdWZUzcjlEPxMBLARa1wqKcdw4f2Wyxr+eT+VcJSQu5F8zWYjtNO+9BVwpKqJ4CXYPyZqY8fAx0urrd9opRkV0xpK3f/mlkgbgF+XvQIDAQAB
-      privateKeyPath: /home/tzy/hm/privatekey.txt
-      wxMchID: 480528577
-      app_id: 663101000155258 #663101000161207
-      format: JSON
-      version: 1.0
-      storeId: 100001
-      #河马付支付成功的回调地址
-      host:
-      payNotifyUrl: https://m2-dev.hobbystocks.cn/api/hm/paymentBack
-      refundNotifyUrl: https://m2-dev.hobbystocks.cn/api/hm/refundBack
-      returnUrl: hobbystocks:/pageB/productDetail/paySuccessTips?
-      ghStaticUrl: https://hobby-6g7xp6r63e7767bb-1309590715.tcloudbaseapp.com/jump_mp2.html
-  qm:
-    app:
-      appid: 8a81c1bd7f93c875018045cd46d3075e
-      subAppId: wx22a7349c29e688d4
-      appKey: 40f65789bd064198a36430b4c0f12732
-      mid: 89831995399APPA #89831995399APPA
-      sub_mid:
-      sub_tid:
-      tid: APPA0001 #'00000001'
-      msgSrcId: 13RZ #来源编号
-      privateKeyPath: /home/tzy/qm/qmPrivatekeyProd.txt
-      instMid: APPDEFAULT #业务类型 (APP支付)
-      payFlag: P000001 #支付标记
-      refundFlag: R000002 #退款标记
-      #回调地址
-      payNotifyUrl: https://m2-dev.hobbystocks.cn/api/qm/paymentBack
-      refundNotifyUrl: https://m2-dev.hobbystocks.cn/api/qm/refundBack
-      showUrl:  #订单展示页面
-      businessUserNo: zg000000658704 #企业用户号
-    # 全民资管
-    am:
-      ip: 180.169.95.129
-      userName: SHPYDZ_fan
-      pwd: aL1Jn$kg
-      merchantNo: SHPYDZ #商户集团编号 默认
-      businessUserNo: zg000000658704 #89831995399APPA #企业用户号  默认
-      sub_businessUserNo: 89831995399APPB #企业用户号-划付入网商户号  默认
-      upPublicKeyPath: /home/tzy/py/pyPublicKey.cer #/home/tzy/qm/am/upPublicKey.cer #商户回盘验签公钥
-      upPrivateKeyPath: /home/tzy/py/pyPrivateKey.pfx #/home/tzy/qm/am/upPrivateKey.pfx #商户加签私钥
-      upPrivateKeyPwd: 880615sandy #123456 #私钥密码
-      dwPublicKeyPath: /home/tzy/qm/am/dwPublicKey-prod.cer #商户回盘验签公钥（生产）
-    #全民h5支付
-    h5:
-      appid: 8a81c1bd7f93c875018045cd46d3075e #10037e6f66f2d0f901672aa27d690006
-      subAppId: wx22a7349c29e688d4
-      appKey: 40f65789bd064198a36430b4c0f12732 #47ace12ae3b348fe93ab46cee97c6fde
-      mid_ali: 89831995399APPG #898201612345678 #用于支付宝和云闪付
-      mid_uac: #898310173992585 #用于银联在线无卡
-      mid_wxh5: #898340149000687 #用户h5微信小程序
-      tid: APPG0001 #88880001 #'00000001'
-      msgSrcId: 13RZ #1017 #来源编号
-      privateKeyPath: /home/tzy/qm/qmPrivatekeyProd.txt
-      instMid: H5DEFAULT #业务类型 (H5支付)
-      payFlag: P000002 #支付标记
-      refundFlag: R000003 #退款标记
-      #回调地址
-      payNotifyUrl: https://m2-dev.hobbystocks.cn/api/qm/paymentBack
-      refundNotifyUrl: https://m2-dev.hobbystocks.cn/api/qm/refundBack
-      showUrl:  #订单展示页面
-    zz: #自助签约
-      accesser_id: 2d9081bc7f635d78017f6d9a7d830b15 #89831995399APPA
-      key: c05tro03bekldfmkf1msh65p
-  qm1:
-    app:
-      appid: 8a81c1bd7f93c875018045cd46d3075e
-      subAppId: wx22a7349c29e688d4
-      appKey: 40f65789bd064198a36430b4c0f12732
-      mid: 89831995399APPA #89831995399APQB #89831995399APPA
-      tid: APPA0001 #APQB0001 #'00000001'
-      sub_mid: 89831995399APPV #89831995399APQ7 #
-      sub_tid: APPV0001 #APQ70001 #
-      msgSrcId: 13RZ #来源编号
-      privateKeyPath: /home/tzy/qm/qmPrivatekeyProd.txt
-      instMid: APPDEFAULT #业务类型 (APP支付)
-      payFlag: P000001 #支付标记
-      refundFlag: R000002 #退款标记
-      #回调地址
-      payNotifyUrl: https://m2.hobbystocks.cn/py-app/api/qm/v2/paymentBack
-      refundNotifyUrl: https://m2.hobbystocks.cn/py-app/api/qm/v2/refundBack
-      showUrl:  #订单展示页面
-      businessUserNo: zg000000728010 #企业用户号
-  qm2:
-    app:
-      appid: 8a81c1bd7f93c875018045cd46d3075e
-      subAppId: wx22a7349c29e688d4
-      appKey: 40f65789bd064198a36430b4c0f12732
-      mid: 89831995399APPA #89831995399APPA #
-      tid: APPA0001 #'00000001' #
-      sub_mid: 89831995399APPW #89831995399APPA
-      sub_tid: APPW0001 #'00000001'
-      msgSrcId: 13RZ #来源编号
-      privateKeyPath: /home/tzy/qm/qmPrivatekeyProd.txt
-      instMid: APPDEFAULT #业务类型 (APP支付)
-      payFlag: P000001 #支付标记
-      refundFlag: R000002 #退款标记
-      #回调地址
-      payNotifyUrl: https://m2.hobbystocks.cn/py-app/api/qm/v2/paymentBack
-      refundNotifyUrl: https://m2.hobbystocks.cn/py-app/api/qm/v2/refundBack
-      showUrl:  #订单展示页面
-      businessUserNo: zg000000728747 #企业用户号
-
-  bf:
-    app:
-      format: JSON
-      appid: 818000802925 #814000473149 #商户在慧收钱的商户号，由慧收钱生成并下发
-      signType: RSA2
-      subMerchantNo: #门店编号
-      version: 1.0 #接口版本：1.0
-      privateKeyPath: /home/tzy/bf/bfPrivateKey.pfx
-      privatePwd: 880615sandy
-      publicKeyPath: /home/tzy/bf/bfPublicKey.cer
-      key: 7c16c26a6c5550289ab65e6a69e89ee1 #86a8eec5ae958e9948b7450439cc57e2
-      #回调页面
-      payNotifyUrl: https://m2.hobbystocks.cn/api/bf/paymentBack #后端通知地址
-      refundNotifyUrl: https://m2.hobbystocks.cn/api/bf/refundBack #后端通知地址
-      pageUrl: #前台通知地址
-  #汇付
-  hf:
-    app:
-      appid: app_db57e4cc-6324-430a-9ffc-dd836f412cb9
-      apiKey: api_live_62f4a9d5-905e-4d64-85f0-136a9c0620a5
-      apiMockKey: api_test_29708ffc-1d3f-4b24-8e7b-60073b138b9e
-      RSAPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIl2NugFoWa+HUk/xQyUx69u85pC7vbtZbtOWjD3Yqt6PnE7mT6B4GOf7lDYd4NrggzPaJ067yo8xv8GCNla+flP7KbRhbrp6h+U4L3NX32PQSvZJWjnGxUkOm+tDp3PfBPl48pf8/X7oocafn0ZGqZslNZh8/BTVJhwOi52G8i3AgMBAAECgYBPXbi/6BhTaOsh0rbj17cffHEcHQ859MFrDwcWBI+ssC0DVcTaCUTUYI/Jj+IZN+ZjnREqzs8t1N+UeRh83oE676Gl/+dQVgeQ7muugoCZ0FI7kEKsFQILSSXq0wAC7kfZJv3fVs3p9WEyjd9e90nWqO45vszAuCAijnIRV8vGeQJBALyvvgJGAGfMCqqFZdMdk9C+SEf8rjtuTezQzHOAw+kIYvyZZvmCeJRbYbZ7myoa6QaVquy52MSR2IDZyqPsQhUCQQC6gD++Gl/jhWsWejAl1VaMLq+sGQYtAp+rt5OQMAHebDnMgovoTjWXpLocDA0IPFNGuHjvsxN43J3OUOe1cC6bAkBN9D2IKuuX9pChiqNa6WlcYID0XMyO+S9wm4McZSKLcE+VFLuacfDnOinQfpjIeH21nrgTPWT1MVxFP7Wcq8tRAkEApIDhOL6s29RgK/hlJcnyyD2Z6LQ99U++JUoM1/7wdw+BP/najHMH5JWBL6IVkLEdR2EKE2wifdYjP8uvRiQIhwJABYPLM4gq099OjkyA9U0zm8bbKqFDQYdrRhmDUjUiojFw9QHlck7BcBc01PmUjg7TN5uBTWyTTJY7pOWtS7s6Ag==
-      RSAPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwN6xgd6Ad8v2hIIsQVnbt8a3JituR8o4Tc3B5WlcFR55bz4OMqrG/356Ur3cPbc2Fe8ArNd/0gZbC9q56Eb16JTkVNA/fye4SXznWxdyBPR7+guuJZHc/VW2fKH2lfZ2P3Tt0QkKZZoawYOGSMdIvO+WqK44updyax0ikK6JlNQIDAQAB
-      deviceId:
-      merchantKey: '00003489'
-      debug: true
-      prodMode: true
-      #回调
-      notify_url: https://m2.hobbystocks.cn/py-app/api/hf/paymentBack #支付通知地址
-      reverseNotifyUrl: https://m2.hobbystocks.cn/py-app/api/hf/reverseBack #撤销交易通知地址
-      refundNotifyUrl: https://m2.hobbystocks.cn/py-app/api/hf/refundBack #退款通知地址
-
-
-
-wx:
-  default_avatar: https://static.public.hobbystock.cn/applet/share/share_logo2.png
-  applet:
-    lives:
-    # 直播认证二维码
-      authUrl: https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh
-#直播配置
-living:
-  tencent:
-    key: c018bdfe07b758cb11dc10ffea7feca6 #密钥
-    secretId: AKIDsZ0A3f29zYrsc5IEsFLBk23oztWsxlIX
-    secretKey: 0jBMGtEI5csrZ2E8l9G6fy0lFRN2QXOy
-  im:
-    SDKAppID: 1400661352
-    # App 管理员帐号
-    identifier: administrator
-    secretKey: 0cfedc6714e281271fa35688f57f5a26070d5ccbd0b821d936f4e513ec4eb27b
-    host: 1309648802.vod2.myqcloud.com
-
-#手机验证码
-phone:
-    verification_code_uri: https://coresvc/api/verification/code/
-authenticate:
-    url: http://coresvc/api/auth/
-    cache_url: http://coresvc/user/{}/cache
-#服务前缀路径
-coreService:
-  baseurl: https://coresvc-dev.hobbystocks.cn
-  smsUrl: /api/reminder/live/on
-  appSmsUrl: /api/appmsg/live/on
-#物流
-express:
-  sf:
-    client_code: LSSWCkEipb #顾客编码
-    check_word: 98vtuFMv6FQabirYZ3LD0OhI1fspjc4Z #校验码
-    box_url: https://sfapi-sbox.sf-express.com/std/service #沙箱环境的地址
-    url: https://sfapi.sf-express.com/std/service #生产环境的地址
-  jd:
-    appkey: 76f41d301d75499f9a85f9603f535a26
-    appsecret: 44d5f413cebb406b867b4f5b3477b0af
-    redirect_uri: https://m-dev.hobbystocks.cn/api/home/jdAuth
-
-  resultUrl: https://m2-dev.hobbystocks.cn/expressInfo/result #运单轨迹
-  flushTokenUrl: https://m2-dev.hobbystocks.cn/expressInfo/flushToken #刷新运单token
-  threadNo: 3 #运单轨迹线程个数
-
-

poyee-partner/src/main/resources/banner.txt

@@ -1,24 +0,0 @@
-Application Version: ${tzy.version}
-Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-//                          _ooOoo_                               //
-//                         o8888888o                              //
-//                         88" . "88                              //
-//                         (| ^_^ |)                              //
-//                         O\  =  /O                              //
-//                      ____/`---'\____                           //
-//                    .'  \\|     |//  `.                         //
-//                   /  \\|||  :  |||//  \                        //
-//                  /  _||||| -:- |||||-  \                       //
-//                  |   | \\\  -  /// |   |                       //
-//                  | \_|  ''\---/''  |   |                       //
-//                  \  .-\__  `-`  ___/-. /                       //
-//                ___`. .'  /--.--\  `. . ___                     //
-//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
-//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
-//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
-//      ========`-.____`-.___\_____/___.-`____.-'========         //
-//                           `=---='                              //
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//             佛祖保佑       永不宕机      永无BUG               //
-////////////////////////////////////////////////////////////////////

poyee-partner/src/main/resources/cardGroupMsg.txt

@@ -1,26 +0,0 @@
-<p>【<b>拼团系列</b>】∶<b>{{name}}</b></p><p><br></p>
-<p>【<b>限时活动</b>】∶<b>#-#</b></p><p><br></p>
-<p>【<b>拼团配置</b>】∶<b>###</b></p><p><br></p>
-<p>【<b>拼团份数</b>】：<b>{{copies}}</b>份</p><p><br></p>
-<p>【<b>拼团费用</b>】∶ <b>{{unitPrice}}</b>元/份</p><p><br></p>
-<p>【<b>开卡时间</b>】∶拼团完成后24小时内开卡（具体拆卡时间以商家通知为准）</p><p><br></p>
-<p>【<b>开卡方式</b>】∶拼团完成后将在小程序内进行直播（由HOBBY STOCKS 提供平台/技术支持）。</p><p><br></p>
-<p>【<b>获卡方式</b>】∶开卡后1个工作日，将在 HOBBY STOCKS APP 内公布所有已开卡片对应的信息以及卡片相对应的拆卡报告，并于3个工作日内快递邮寄给所有获卡者。（快递收件信息以认购时填写信息为准）</p><p><br></p>
-<p>【<b>认购时限</b>】∶本次拼团认购时间为#DAY#天。如#DAY#天内认购人数不足，则所有款项通过系统原路退还。除此特殊情况外，其余情况均无法提供退组退款服务。</p><p><br></p><p><br></p>
-<p>【<b>购买须知</b>】</p><p><br></p>
-<p>1.商家所拆商品均为原封，上架前由商家提供原箱原盒视频，同时直播拆箱前由商家展示相关原箱原盒包装。</p><p><br></p>
-<p>2.卡片生产商在生产过程中，会存在小概率装箱失误，该特殊情况商家无法控制；商家仅为卡片搬运工，不承担相关责任。</p><p><br></p>
-<p>3.产品宣传图均为发行商官方制作，详情描述仅供参考，最终拆卡结果以箱内拆出的商品实物为准。</p><p><br></p>
-<p>4.每个系列商家都会根据官方Checklist进行拼团List的筛选，如果List中某 Ticket(T)出现问题，商家会针对此问题进行相关处理。</p><p><br></p>
-<p>【<b>拼团规则</b>】</p><p><br></p>
-<p>1.<b>HOBBY STOCKS</b> 提供平台/技术支持，入驻商家须提供商品、直播拆卡等相关售后服务。</p><p><br></p>
-<p>2.根据厂商官方所公布的Checklist，拼团方式将分为随机球员、随机球队、随机卡种等，每种方式有相对应的【拼团份数】，每一份数则对应一个随机卡密。</p><p><br></p>
-<p>3.随机方式<p><br></p>
-<p>&nbsp;&nbsp;若为即买即随，用户付款完成后，将获得对应下单份数的随机卡密。</p><p><br></p>
-<p>&nbsp;&nbsp;若为拼团完成，用户付款完成且认购满员，用户将获得对应下单份数的随机卡密。</p><p><br></p>
-<p>4.拼团完成后，商家通过小程序直播公示拆卡过程，并在直播结束后上传拆卡报告，完成后续发货工作。 中卡的用户，获得实体卡片；未中卡用户，则无实体卡片，希望各位卡迷理性消费。</p><p><br></p>
-<p>5.若超过拼团拼团的【认购时限】，或认购组数未满员，则所有款项通过系统原路返还。除此类特殊情况外，平台方不提供任何退组退款服务。</p><p><br></p>
-<p>【<b>中卡概率</b>】</p><p><br></p>
-<p>f= <b>每份卡密的中卡概率</b></p><p><br></p>
-<p>P=【<b>拼团份数</b>】</p><p><br></p>
-<p>Q=【<b>拼团配置</b>】<b>中的卡片总张数</b></p>

poyee-partner/src/main/resources/logback-fluentd.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<included>
-    <appender name="FLUENT_SYNC" class="ch.qos.logback.more.appenders.DataFluentAppender">
-        <tag>logback</tag>
-        <label>tzy-admin.${hostname}</label>
-        <remoteHost>${logging.fluentd.host}</remoteHost>
-        <port>${logging.fluentd.port}</port>
-
-        <encoder charset="UTF-8">
-            <pattern>%logger{15}:%L - %msg</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="FLUENT" class="ch.qos.logback.classic.AsyncAppender">
-        <queueSize>1000</queueSize>
-        <neverBlock>true</neverBlock>
-        <maxFlushTime>15000</maxFlushTime>
-        <includeCallerData>false</includeCallerData>
-        <appender-ref ref="FLUENT_SYNC" />
-    </appender>
-</included>

poyee-partner/src/main/resources/logback.xml

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <!-- 日志存放路径 -->
-	<property name="log.path" value="../logs" />
-    <!-- 日志输出格式 -->
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
-    <springProperty scope="context" name="logging.console.enabled" source="logging.console.enabled"/>
-    <springProperty scope="context" name="logging.file.enabled" source="logging.file.enabled"/>
-    <springProperty scope="context" name="logging.fluentd.enabled" source="logging.fluentd.enabled"/>
-    <springProperty scope="context" name="logging.fluentd.host" source="logging.fluentd.host"/>
-    <springProperty scope="context" name="logging.fluentd.port" source="logging.fluentd.port"/>
-    <define name="hostname" class="com.tzy.common.utils.CanonicalHostNamePropertyDefiner"/>
-
-    <if condition='p("logging.fluentd.enabled").equals("true")'>
-        <then>
-            <include resource="logback-fluentd.xml" />
-        </then>
-    </if>
-
-	<!-- 控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-			<charset>UTF-8</charset>
-		</encoder>
-	</appender>
-	
-	<!-- 系统日志输出 -->
-	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-			<charset>UTF-8</charset>
-		</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}/sys-error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-			<!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-			<!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-	
-	<!-- 用户访问日志输出  -->
-    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/sys-user.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 按天回滚 daily -->
-            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-	<!--系统操作日志-->
-    <root level="info">
-        <if condition='p("logging.console.enabled").equals("true")'>
-            <then>
-                <appender-ref ref="console" />
-            </then>
-        </if>
-        <if condition='p("logging.file.enabled").equals("true")'>
-            <then>
-                <appender-ref ref="file_info" />
-                <appender-ref ref="file_error" />
-            </then>
-        </if>
-        <if condition='p("logging.fluentd.enabled").equals("true")'>
-            <then>
-                <appender-ref ref="FLUENT"/>
-            </then>
-        </if>
-    </root>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.ruoyi" level="info" />
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn" />
-
-	<!--系统用户操作日志-->
-    <logger name="sys-user" level="info">
-        <if condition='p("logging.file.enabled").equals("true")'>
-            <then>
-                <appender-ref ref="sys-user"/>
-            </then>
-        </if>
-    </logger>
-</configuration> 

poyee-partner/src/main/resources/mybatis/mybatis-config.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration
-PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-	
-	<settings>
-		<setting name="cacheEnabled"             value="true"  />  <!-- 全局映射器启用缓存 -->
-		<setting name="useGeneratedKeys"         value="true"  />  <!-- 允许 JDBC 支持自动生成主键 -->
-		<setting name="defaultExecutorType"      value="REUSE" />  <!-- 配置默认的执行器 -->
-		<setting name="logImpl"                  value="SLF4J" />  <!-- 指定 MyBatis 所用日志的具体实现 -->
-		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  驼峰式命名 -->
-	</settings>
-	
-</configuration>

poyee-pay/src/main/java/com/tzy/pay/mq/PayBaseConsumer.java

@@ -17,76 +17,3 @@ import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
 
-@Slf4j
-@Component
-public class PayBaseConsumer {
-
-    @Autowired
-    private PayConfigBaseService payConfigBaseService;
-    @Autowired
-    private IPyPayComplaintRecordService pyPayComplaintRecordService;
-    /**
-     * 回调前置消费
-     * @param data
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare=@Queue(MqConstans.REFUND_INSUFFICIENT_POSITION_NOTICE))
-    public void expressPriceCallBack(String data, Channel channel, Message message) throws IOException {
-        refundInsufficientPosition(data, channel, message);
-    }
-
-    /**
-     * 监听退款头寸不足
-     * @param param
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    private void refundInsufficientPosition(String param, Channel channel, Message message) throws IOException {
-        try {
-            JSONObject jsonObject = JSONObject.parseObject(param);
-            if(!CollectionUtils.isEmpty(jsonObject)){
-                //监听退款头寸不足
-                payConfigBaseService.refundInsufficientPosition(jsonObject);
-            }
-        } catch (Exception e) {
-            log.error("监听退款头寸不足,{}", param, e);
-        }
-        channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-    }
-
-    /**
-     * 回调前置消费
-     * @param data
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare=@Queue(MqConstans.ALIPAY_COMPLAIN_PROCESS_NOTICE))
-    public void alipayComplainProcessNotice(String data, Channel channel, Message message) throws IOException {
-        alipayComplainProcessPosition(data, channel, message);
-    }
-
-    /**
-     * 支付宝申诉通知
-     * @param param
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    private void alipayComplainProcessPosition(String param, Channel channel, Message message) throws IOException {
-        try {
-            if(StringUtils.isNotBlank(param)){
-                //监听支付宝申诉通知
-                pyPayComplaintRecordService.alipayComplainProcessPosition(param);
-            }
-        } catch (Exception e) {
-            log.error("支付宝申诉通知,{}", param, e);
-        }
-        channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-    }
-}

tzy-admin/src/main/java/com/tzy/mq/AutoAddActConsumer.java

@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.io.IOException;
 
-
+/*
 @Slf4j
 @Component
 public class AutoAddActConsumer {
@@ -43,4 +43,4 @@ public class AutoAddActConsumer {
 
 
 
-}
+}*/

tzy-admin/src/main/java/com/tzy/mq/OrderRefundConsumer.java

@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.io.IOException;
 
-
+/*
 @Slf4j
 @Component
 public class OrderRefundConsumer {
@@ -67,4 +67,4 @@ public class OrderRefundConsumer {
 		return false;
 	}
 
-}
+}*/

tzy-admin/src/main/java/com/tzy/mq/TestMqConsumer.java

@@ -1,40 +0,0 @@
-package com.tzy.mq;
-
-import com.rabbitmq.client.Channel;
-import com.tzy.app.dto.mq.TestParam;
-import com.tzy.common.constant.MqConstans;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-
-
-@Slf4j
-//@Component
-public class TestMqConsumer {
-
-    private int i=0;
-
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare=@Queue(MqConstans.TEST_QUEUE))
-    public void testMqConsumer(TestParam data, Channel channel, Message message) throws IOException {
-        try {
-            //消息确认
-            i++;
-            if(i%2==0){
-                //int k=1/0;
-            }
-            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-            log.info("111收到消息:{}",data.toString());
-        } catch (Exception e) {
-            //失败后消息被确认
-            channel.basicReject(message.getMessageProperties().getDeliveryTag(), true);
-            log.error("mq接收消息失败",e);
-        }
-    }
-
-}

tzy-admin/src/main/java/com/tzy/web/controller/tool/TestController.java

@@ -190,15 +190,6 @@ public class TestController extends BaseController
         return AjaxResult.success(i);
     }
 
-    @ApiOperation("mq")
-    @GetMapping("/testMq")
-    public OutDTO testMq() {
-        checkDevEnv();
-        sendMsg();
-        return OutDTO.ok();
-
-    }
-
     public void sendMsg() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         System.out.println("消息发送时间：" + sdf.format(new Date()));

tzy-admin/src/main/resources/application-druid.yml

@@ -17,7 +17,7 @@ spring:
 #                url: jdbc:postgresql://192.168.17.128:5432/tzy_system
 #                username: postgres
 #                password: postgres
-                url: jdbc:postgresql://192.168.50.10:5432/tzy_system
+                url: jdbc:postgresql://192.168.50.8:5432/ahx_app
                 username: postgres
                 password: 123456
                 #prod

tzy-admin/src/main/resources/application.yml

@@ -111,10 +111,9 @@ spring:
       enabled: false
   redis:
       database: 1
-      host: 127.0.0.1
-    #host: hobbystock.cn
+      host: 192.168.50.8
       port: 6379
-      password: #Pass2021    # 密码（默认为空）
+      password: Pass2010    # 密码（默认为空）
       timeout: 60000  # 连接超时时长（毫秒）
       pool:
         max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
@@ -122,58 +121,6 @@ spring:
         max-idle: 10      # 连接池中的最大空闲连接
         min-idle: 5       # 连接池中的最小空闲连接
 
-  #mq
-  rabbitmq:
-    host: 192.168.50.10
-    port: 5672
-    username: admin
-    password: admin
-    #确认消息已发送到交换机(Exchange)
-    publisher-confirms: true
-    #确认消息已发送到队列(Queue)
-    publisher-returns: true
-    template:
-      retry:
-        enabled: true
-      mandatory: true
-    listener:
-      simple:
-        acknowledge-mode: manual
-        #并发消费者初始化值
-        #concurrency: 10
-        #并发消费者的最大值
-        #max-concurrency: 20
-        #每个消费者每次监听时可拉取处理的消息数量
-        prefetch: 5
-      direct:
-        retry:
-          enabled: true
-          max-attempts: 1
-  flyway:
-    # 是否启用flyway
-    enabled: true
-    # 指定表
-    table: flyway_schema_history_admin
-    # 禁止清理数据库表
-    clean-disabled: true
-    # 编码格式，默认UTF-8
-    encoding: UTF-8
-    # 迁移sql脚本文件存放路径，默认db/migration
-    locations: classpath:db/migration
-    # 迁移sql脚本文件名称的前缀，默认V
-    sql-migration-prefix: V
-    # 迁移sql脚本文件名称的分隔符，默认2个下划线__
-    sql-migration-separator: _
-    # 迁移sql脚本文件名称的后缀
-    sql-migration-suffixes: .sql
-    # 迁移时是否进行校验，默认true
-    validate-on-migrate: true
-    # 当迁移发现数据库非空且存在没有元数据的表时，自动执行基准迁移，新建schema_version表
-    baseline-on-migrate: true
-    url: ${DB_URL:jdbc:postgresql://192.168.50.10:5432/tzy_system}
-    user: ${DB_USERNAME:postgres}
-    password: ${DB_PASSWORD:123456}
-
 # MyBatis
 mybatis:
     # 搜索指定包别名

tzy-admin/src/main/resources/db/migration/V1.1_app_test_data_edit.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."test_data"
-  ADD COLUMN "update_user" varchar(255);

tzy-admin/src/main/resources/db/migration/V1.2_app_live_lucky_bag_create.sql

@@ -1,65 +0,0 @@
-DROP TABLE IF EXISTS "app_live_lucky_bag";
-CREATE TABLE "app_live_lucky_bag" (
-   "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-       INCREMENT 1
-       MINVALUE  1
-       MAXVALUE 2147483647
-       START 1
-       ),
-   "live_id" int4,
-   "prize_id" int4,
-   "prize_type" int2,
-   "winner" int2,
-   "create_time" timestamp(6),
-   "party_scope" int2,
-   "party_pwd" varchar(255) COLLATE "pg_catalog"."default",
-   "review_status" int2 DEFAULT 0,
-   "publish_status" int2 DEFAULT 0,
-   "count_down" int2 DEFAULT 1,
-   "lottery_time" timestamp(6),
-   "lottery_result" int2 DEFAULT 0,
-   "prize_name" varchar(255) COLLATE "pg_catalog"."default",
-   "prize_img" varchar(255) COLLATE "pg_catalog"."default",
-   "merchant_id" int4,
-   "merchant_name" varchar(255) COLLATE "pg_catalog"."default",
-   "merchant_avatar" varchar(255) COLLATE "pg_catalog"."default",
-   CONSTRAINT "app_live_lucky_bag_pkey" PRIMARY KEY ("id")
-)
-;
-
-
-COMMENT ON COLUMN "app_live_lucky_bag"."live_id" IS '直播间ID';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."prize_id" IS '福袋奖品ID';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."prize_type" IS '福袋奖品类型：0.优惠券 1.商品';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."winner" IS '可中奖人数';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."create_time" IS '创建时间';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."party_scope" IS '参与范围：（0所有人、1仅已关注）';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."party_pwd" IS '参与口令';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."review_status" IS '审核状态：0.未审核 1.已审核';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."publish_status" IS '上架状态：0.下架 1.上架';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."count_down" IS '倒计时（分钟）';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."lottery_time" IS '开奖时间';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."lottery_result" IS '开奖结果：0.未开奖 1.已开奖';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."prize_name" IS '奖品名称';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."prize_img" IS '奖品图片';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."merchant_id" IS '商家ID';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."merchant_name" IS '商家名称';
-
-COMMENT ON COLUMN "app_live_lucky_bag"."merchant_avatar" IS '商家头像';
-
-COMMENT ON TABLE "app_live_lucky_bag" IS '直播间福袋表';

tzy-admin/src/main/resources/db/migration/V1.3_app_live_lucky_bag_record_create.sql

@@ -1,38 +0,0 @@
-DROP TABLE IF EXISTS "app_live_lucky_bag_record";
-CREATE TABLE "app_live_lucky_bag_record" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-      INCREMENT 1
-      MINVALUE  1
-      MAXVALUE 2147483647
-      START 1
-      ),
-  "bag_id" int4,
-  "prize_id" int4,
-  "user_id" int4,
-  "nickname" varchar(255) COLLATE "pg_catalog"."default",
-  "avatar" varchar(255) COLLATE "pg_catalog"."default",
-  "ref_order_id" int4,
-  "party_result" int2,
-  "party_time" timestamp(6),
-  CONSTRAINT "app_live_lucky_bag_record_pkey" PRIMARY KEY ("id")
-)
-;
-
-
-COMMENT ON COLUMN "app_live_lucky_bag_record"."bag_id" IS '福袋ID';
-
-COMMENT ON COLUMN "app_live_lucky_bag_record"."prize_id" IS '福袋奖品ID';
-
-COMMENT ON COLUMN "app_live_lucky_bag_record"."user_id" IS '用户id';
-
-COMMENT ON COLUMN "app_live_lucky_bag_record"."nickname" IS '用户昵称';
-
-COMMENT ON COLUMN "app_live_lucky_bag_record"."avatar" IS '用户头像';
-
-COMMENT ON COLUMN "app_live_lucky_bag_record"."ref_order_id" IS '奖品订单id';
-
-COMMENT ON COLUMN "app_live_lucky_bag_record"."party_result" IS '用户参与结果： 0未中奖 1已中奖';
-
-COMMENT ON COLUMN "app_live_lucky_bag_record"."party_time" IS '参与时间';
-
-COMMENT ON TABLE "app_live_lucky_bag_record" IS '直播间福袋参与记录表';

tzy-admin/src/main/resources/db/migration/V1.4_report_info_create.sql

@@ -1,50 +0,0 @@
-CREATE TABLE "public"."report_info" (
-    "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-        INCREMENT 1
-        MINVALUE  1
-        MAXVALUE 2147483647
-        START 1
-        ),
-    "user_id" int4,
-    "nickname" varchar(255) COLLATE "pg_catalog"."default",
-    "create_time" timestamp(6),
-    "report_source" varchar(255) COLLATE "pg_catalog"."default",
-    "report_type" varchar(255) COLLATE "pg_catalog"."default",
-    "merchant_id" int4,
-    "merchant_name" varchar(255) COLLATE "pg_catalog"."default",
-    "group_info_code" varchar(255) COLLATE "pg_catalog"."default",
-    "review" int4 DEFAULT 0,
-    "desc" varchar(255) COLLATE "pg_catalog"."default",
-    "media_proof" varchar(255) COLLATE "pg_catalog"."default",
-    "review_time" timestamp(6),
-    CONSTRAINT "report_info_pkey" PRIMARY KEY ("id")
-)
-;
-
-
-
-COMMENT ON COLUMN "public"."report_info"."user_id" IS '用户ID';
-
-COMMENT ON COLUMN "public"."report_info"."nickname" IS '用户昵称';
-
-COMMENT ON COLUMN "public"."report_info"."create_time" IS '提交时间';
-
-COMMENT ON COLUMN "public"."report_info"."report_source" IS '举报来源(拼团详情页/直播间)';
-
-COMMENT ON COLUMN "public"."report_info"."report_type" IS '举报类型';
-
-COMMENT ON COLUMN "public"."report_info"."merchant_id" IS '商家ID';
-
-COMMENT ON COLUMN "public"."report_info"."merchant_name" IS '商家名称';
-
-COMMENT ON COLUMN "public"."report_info"."group_info_code" IS '拼团编码';
-
-COMMENT ON COLUMN "public"."report_info"."review" IS '审核状态(0未审核、1举报无效、2举报成立)';
-
-COMMENT ON COLUMN "public"."report_info"."desc" IS '详情描述';
-
-COMMENT ON COLUMN "public"."report_info"."media_proof" IS '图片/视频凭证';
-
-COMMENT ON COLUMN "public"."report_info"."review_time" IS '审核时间';
-
-COMMENT ON TABLE "public"."report_info" IS '举报详情表';

tzy-admin/src/main/resources/db/migration/V1.5_volunteer_create.sql

@@ -1,33 +0,0 @@
-CREATE TABLE "public"."volunteer" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-      INCREMENT 1
-      MINVALUE  1
-      MAXVALUE 2147483647
-      START 1
-      ),
-  "user_id" int4,
-  "wechat" varchar(255) COLLATE "pg_catalog"."default",
-  "type" varchar(255) COLLATE "pg_catalog"."default",
-  "play_year" varchar(255) COLLATE "pg_catalog"."default",
-  "play_hour" varchar(255) COLLATE "pg_catalog"."default",
-  "create_time" timestamp(6),
-  "review_status" int4,
-  CONSTRAINT "volunteer_pkey" PRIMARY KEY ("id")
-)
-;
-
-COMMENT ON COLUMN "public"."volunteer"."user_id" IS '用户ID';
-
-COMMENT ON COLUMN "public"."volunteer"."wechat" IS '微信号';
-
-COMMENT ON COLUMN "public"."volunteer"."type" IS '小卫士类型';
-
-COMMENT ON COLUMN "public"."volunteer"."play_year" IS '玩卡年限';
-
-COMMENT ON COLUMN "public"."volunteer"."play_hour" IS '花费时长';
-
-COMMENT ON COLUMN "public"."volunteer"."create_time" IS '创建时间';
-
-COMMENT ON COLUMN "public"."volunteer"."review_status" IS '审核状态：0未审核 1审核通过 2审核拒绝';
-
-COMMENT ON TABLE "public"."volunteer" IS '志愿者招募';

tzy-admin/src/main/resources/db/migration/V1.6_report_info_update.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "report_info"
-  ADD COLUMN "remark" varchar(255);

tzy-admin/src/main/resources/db/migration/V1.7_volunteer_update.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "volunteer"
-  ADD COLUMN "remark" varchar(255);

tzy-admin/src/main/resources/db/migration/V1.8_volunteer_update.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "volunteer"
-    ADD COLUMN "describe" varchar(255);

tzy-admin/src/main/resources/db/migration/V1.9_fadada_task_create.sql

@@ -1,45 +0,0 @@
-CREATE TABLE "fadada_task" (
-    "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-        INCREMENT 1
-        MINVALUE  1
-        MAXVALUE 2147483647
-        START 1
-        ),
-    "subject" varchar(255) COLLATE "pg_catalog"."default",
-    "sign_task_id" int4,
-    "sign_task_status" int4,
-    "sign_task_status_name" varchar(255) COLLATE "pg_catalog"."default",
-    "initiator_name" varchar(255) COLLATE "pg_catalog"."default",
-    "party_names" varchar(255) COLLATE "pg_catalog"."default",
-    "close_time" timestamp(6),
-    "expire_time" timestamp(6),
-    "initiate_time" timestamp(6),
-    "creator_name" varchar(255) COLLATE "pg_catalog"."default",
-    "url" varchar(255) COLLATE "pg_catalog"."default",
-    CONSTRAINT "fadada_task_pkey" PRIMARY KEY ("id")
-)
-;
-
-COMMENT ON COLUMN "fadada_task"."subject" IS '主题';
-
-COMMENT ON COLUMN "fadada_task"."sign_task_id" IS '任务编号';
-
-COMMENT ON COLUMN "fadada_task"."sign_task_status" IS '任务状态';
-
-COMMENT ON COLUMN "fadada_task"."sign_task_status_name" IS '任务状态名称';
-
-COMMENT ON COLUMN "fadada_task"."initiator_name" IS '发起方';
-
-COMMENT ON COLUMN "fadada_task"."party_names" IS '参与方，多个都号隔开';
-
-COMMENT ON COLUMN "fadada_task"."close_time" IS '完成时间';
-
-COMMENT ON COLUMN "fadada_task"."expire_time" IS '截止时间';
-
-COMMENT ON COLUMN "fadada_task"."initiate_time" IS '发起时间';
-
-COMMENT ON COLUMN "fadada_task"."creator_name" IS '创建者';
-
-COMMENT ON COLUMN "fadada_task"."url" IS '电子合同文件路径';
-
-COMMENT ON TABLE "fadada_task" IS '法大大电子合同'

tzy-admin/src/main/resources/db/migration/V10.0_app_act_manage_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_act_manage"
-    ADD COLUMN if not exists "draw_type" varchar(255);
-
-COMMENT ON COLUMN "app_act_manage"."draw_type" IS '开奖方式：默认null 组齐开奖， ACT_EXPIRE 到期自动开奖';

tzy-admin/src/main/resources/db/migration/V10.1_user_bank_info_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "public"."user_bank_info"
-    ADD COLUMN "free_pay" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."user_bank_info"."free_pay" IS '是否免密支付：0=否 ，1=是';

tzy-admin/src/main/resources/db/migration/V10.2_app_user_card_record_index.sql

@@ -1,4 +0,0 @@
---No.11
---https://doc.weixin.qq.com/doc/w3_AeMAewZLAK0CNC9ciPa0FRJ2L30zr?scode=AFQAjgc5AAoF2O0e90AeMAewZLAK0&version=4.1.38.6011&platform=win
-CREATE INDEX CONCURRENTLY idx_aucr_card_no ON app_user_card_record(card_no);
-CREATE INDEX CONCURRENTLY idx_aucr_card_user ON app_user_card_record(card_no, user_id, card_id);

tzy-admin/src/main/resources/db/migration/V10.3_card_group_lives_config_index.sql

@@ -1,16 +0,0 @@
---No.14
---https://doc.weixin.qq.com/doc/w3_AeMAewZLAK0CNC9ciPa0FRJ2L30zr?scode=AFQAjgc5AAoF2O0e90AeMAewZLAK0&version=4.1.38.6011&platform=win
--- 为 card_group_lives_config 表添加复合索引
-CREATE INDEX CONCURRENTLY idx_cglc_category_del_flg_status_time ON card_group_lives_config(
-    category,
-    del_flg,
-    status,
-    start_time,
-    playback_path
-) WHERE category = 'group' AND del_flg = 0;
---  app_merchant_fans 表复合索引
-CREATE INDEX CONCURRENTLY idx_amf_merchant_type_user ON app_merchant_fans(
-    merchant_id,
-    type,
-    user_id
-);

tzy-admin/src/main/resources/db/migration/V10.4_order_list_update.sql

@@ -1 +0,0 @@
-CREATE INDEX idx_order_list_liveStatus ON order_list(live_status);

tzy-admin/src/main/resources/db/migration/V10.5_sys_user_fas_auth_update.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "sys_user_fas_auth"
-    ALTER COLUMN "id" ADD GENERATED ALWAYS AS IDENTITY;

tzy-admin/src/main/resources/db/migration/V10.6_app_user_detail_info_update.sql

@@ -1,3 +0,0 @@
-ALTER TABLE "app_user_detail_info" ADD COLUMN "consume_limit" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "app_user_detail_info"."consume_limit" IS '是否重置消费限额：默认0重置，1不重置';

tzy-admin/src/main/resources/db/migration/V10.7_panini_checklist_version_config_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE panini_checklist_version_config
-    ADD COLUMN display_name_translations text;
-
-COMMENT ON COLUMN panini_checklist_version_config.display_name_translations IS '国际版配置 别名';

tzy-admin/src/main/resources/db/migration/V10.8_act_task_table_create.sql

@@ -1,129 +0,0 @@
-
-CREATE TABLE if not exists "app_act_task_manage" (
-  "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "type" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
-  "name" varchar(255) COLLATE "pg_catalog"."default",
-  "description" text COLLATE "pg_catalog"."default",
-  "img_url" varchar(8000) COLLATE "pg_catalog"."default",
-  "repeat" int4,
-  "repeat_hours" int4,
-  "status" varchar(255) COLLATE "pg_catalog"."default",
-  "create_time" timestamp(0),
-  "update_time" timestamp(0),
-  "start_time" timestamp(0),
-  "end_time" timestamp(0),
-  "remark" varchar(8000) COLLATE "pg_catalog"."default",
-  "popup" text COLLATE "pg_catalog"."default",
-  "reward" text COLLATE "pg_catalog"."default",
-  "act_id" int4,
-  "reward_count" int4,
-  "reset" int4,
-  "reward_limit" int4,
-  "level_diff" int4,
-  "level_rule" text COLLATE "pg_catalog"."default",
-  "task_delay" int4,
-  "icon" varchar(8000) COLLATE "pg_catalog"."default",
-  "task_delay_hours" int4,
-  "reset_hours" int4,
-  "enabled" int4,
-  "start_time_in_day" timestamp(0),
-  "end_time_in_day" timestamp(0),
-  "reward_id" int4,
-  "task_rule" text COLLATE "pg_catalog"."default",
-  "share_effect" int4,
-  "list_info" text COLLATE "pg_catalog"."default"
-)
-;
-COMMENT ON COLUMN "app_act_task_manage"."id" IS '主键自增id';
-COMMENT ON COLUMN "app_act_task_manage"."type" IS '任务类型：打卡/消费/完善信息/邀请助力/消费达标';
-COMMENT ON COLUMN "app_act_task_manage"."name" IS '任务名';
-COMMENT ON COLUMN "app_act_task_manage"."description" IS '任务解释性文本';
-COMMENT ON COLUMN "app_act_task_manage"."img_url" IS '任务图';
-COMMENT ON COLUMN "app_act_task_manage"."repeat" IS '任务在活动周期内是否重复开启';
-COMMENT ON COLUMN "app_act_task_manage"."repeat_hours" IS '任务在活动周期内是否重复开启的周期';
-COMMENT ON COLUMN "app_act_task_manage"."status" IS '任务状态';
-COMMENT ON COLUMN "app_act_task_manage"."create_time" IS '创建时间';
-COMMENT ON COLUMN "app_act_task_manage"."update_time" IS '更新时间';
-COMMENT ON COLUMN "app_act_task_manage"."start_time" IS '开始时间';
-COMMENT ON COLUMN "app_act_task_manage"."end_time" IS '结束时间';
-COMMENT ON COLUMN "app_act_task_manage"."remark" IS '备注';
-COMMENT ON COLUMN "app_act_task_manage"."popup" IS '弹窗文本';
-COMMENT ON COLUMN "app_act_task_manage"."reward" IS '奖励类型';
-COMMENT ON COLUMN "app_act_task_manage"."act_id" IS '主活动id';
-COMMENT ON COLUMN "app_act_task_manage"."reward_count" IS '单次任务奖励份数';
-COMMENT ON COLUMN "app_act_task_manage"."reset" IS '任务是否支持重置';
-COMMENT ON COLUMN "app_act_task_manage"."reward_limit" IS '单任务最大奖励份数';
-COMMENT ON COLUMN "app_act_task_manage"."level_diff" IS '是否使用用户等级差异';
-COMMENT ON COLUMN "app_act_task_manage"."level_rule" IS '用户等级差异规则';
-COMMENT ON COLUMN "app_act_task_manage"."task_delay" IS '参与次数是否可以延期使用';
-COMMENT ON COLUMN "app_act_task_manage"."icon" IS '任务图标';
-COMMENT ON COLUMN "app_act_task_manage"."task_delay_hours" IS '延期使用时长';
-COMMENT ON COLUMN "app_act_task_manage"."reset_hours" IS '重置周期';
-COMMENT ON COLUMN "app_act_task_manage"."enabled" IS '是否上架';
-COMMENT ON COLUMN "app_act_task_manage"."start_time_in_day" IS '活动当天开始的时间';
-COMMENT ON COLUMN "app_act_task_manage"."end_time_in_day" IS '活动当天结束的时间';
-COMMENT ON COLUMN "app_act_task_manage"."reward_id" IS '开奖id';
-COMMENT ON COLUMN "app_act_task_manage"."task_rule" IS '任务规则';
-COMMENT ON COLUMN "app_act_task_manage"."share_effect" IS '分享有效时间（分钟）';
-COMMENT ON COLUMN "app_act_task_manage"."list_info" IS '基础库信息';
-COMMENT ON TABLE "app_act_task_manage" IS '活动下关联的任务详情子表';
-
--- ----------------------------
--- Primary Key structure for table app_act_task_manage
--- ----------------------------
-
-
-
--- ----------------------------
--- Table structure for app_act_task_prize_record
--- ----------------------------
-CREATE TABLE if not exists "app_act_task_prize_record" (
-  "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "user_id" int4,
-  "code" varchar(8000) COLLATE "pg_catalog"."default",
-  "used" int4,
-  "can_use" int4,
-  "status" int4,
-  "task_id" int4,
-  "act_id" int4,
-  "prize_id" int4,
-  "create_time" timestamp(0),
-  "update_time" timestamp(0),
-  "start_time" timestamp(0),
-  "end_time" timestamp(0),
-  "prize_code" varchar(8000) COLLATE "pg_catalog"."default",
-  "apply_user_id" int4,
-  "type" int4,
-  "batch_id" int4
-)
-;
-COMMENT ON COLUMN "app_act_task_prize_record"."id" IS '参与兑换的主键id';
-COMMENT ON COLUMN "app_act_task_prize_record"."user_id" IS '用户id';
-COMMENT ON COLUMN "app_act_task_prize_record"."code" IS '活动码';
-COMMENT ON COLUMN "app_act_task_prize_record"."used" IS '是否已经兑换';
-COMMENT ON COLUMN "app_act_task_prize_record"."can_use" IS '能否兑换';
-COMMENT ON COLUMN "app_act_task_prize_record"."status" IS '开奖状态';
-COMMENT ON COLUMN "app_act_task_prize_record"."task_id" IS '任务id';
-COMMENT ON COLUMN "app_act_task_prize_record"."act_id" IS '活动id';
-COMMENT ON COLUMN "app_act_task_prize_record"."prize_id" IS '奖品id';
-COMMENT ON COLUMN "app_act_task_prize_record"."prize_code" IS '开奖码';
-COMMENT ON COLUMN "app_act_task_prize_record"."apply_user_id" IS '助力用户id';
-COMMENT ON COLUMN "app_act_task_prize_record"."type" IS '类型：0兑换抽奖记录1助力';
-COMMENT ON COLUMN "app_act_task_prize_record"."batch_id" IS '批次id';
-COMMENT ON TABLE "app_act_task_prize_record" IS '活动任务参与详情表';
-
--- ----------------------------
--- Primary Key structure for table app_act_task_prize_record
--- ----------------------------

tzy-admin/src/main/resources/db/migration/V10.9_tzy_merchant_detail_update.sql

@@ -1,16 +0,0 @@
-ALTER TABLE "tzy_merchant_detail"
-    ADD COLUMN "config" text,
-    ADD COLUMN "prop1" text,
-    ADD COLUMN "prop2" text,
-    ADD COLUMN "prop3" text,
-    ADD COLUMN "prop4" text;
-
-COMMENT ON COLUMN "tzy_merchant_detail"."config" IS '扩展配置';
-
-COMMENT ON COLUMN "tzy_merchant_detail"."prop1" IS '扩展字段1';
-
-COMMENT ON COLUMN "tzy_merchant_detail"."prop2" IS '扩展字段2';
-
-COMMENT ON COLUMN "tzy_merchant_detail"."prop3" IS '扩展字段3';
-
-COMMENT ON COLUMN "tzy_merchant_detail"."prop4" IS '扩展字段4';

tzy-admin/src/main/resources/db/migration/V11.0_order_change_record_create.sql

@@ -1,48 +0,0 @@
-CREATE TABLE if not exists  "order_change_record" (
-  "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
-  "order_id" int4,
-  "order_item_id" int4,
-  "status" int4 DEFAULT 0,
-  "amount" numeric(18,2),
-  "remark" text COLLATE "pg_catalog"."default",
-  "old_prop_json" text COLLATE "pg_catalog"."default",
-  "prop_json" text COLLATE "pg_catalog"."default",
-  "prop1" text COLLATE "pg_catalog"."default",
-  "prop2" text COLLATE "pg_catalog"."default",
-  "create_time" timestamp(0),
-  "user_id" int4,
-  "group_id" int4,
-  "update_time" timestamp(0)
-)
-;
-COMMENT ON COLUMN "order_change_record"."type" IS '订单变动类型,退款:refund,变更地址:edit_address,用户申请退款,商家退款审核等';
-COMMENT ON COLUMN "order_change_record"."order_id" IS '订单id';
-COMMENT ON COLUMN "order_change_record"."order_item_id" IS '订单明细id';
-COMMENT ON COLUMN "order_change_record"."status" IS '0、新建，1、同意，2、拒绝，3、过期';
-COMMENT ON COLUMN "order_change_record"."amount" IS '变动涉及金额';
-COMMENT ON COLUMN "order_change_record"."remark" IS '备注';
-COMMENT ON COLUMN "order_change_record"."old_prop_json" IS '变动前参数记录';
-COMMENT ON COLUMN "order_change_record"."prop_json" IS '变动参数记录';
-COMMENT ON COLUMN "order_change_record"."prop1" IS '预留1';
-COMMENT ON COLUMN "order_change_record"."prop2" IS '预留2';
-COMMENT ON COLUMN "order_change_record"."create_time" IS '创建时间';
-COMMENT ON COLUMN "order_change_record"."user_id" IS '用户id';
-COMMENT ON COLUMN "order_change_record"."group_id" IS '拼团id';
-COMMENT ON COLUMN "order_change_record"."update_time" IS '更新时间';
-
-CREATE INDEX "order_change_record_index" ON "order_change_record" USING btree (
-  "id" "pg_catalog"."int4_ops" ASC NULLS LAST,
-  "type" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST,
-  "order_id" "pg_catalog"."int4_ops" ASC NULLS LAST,
-  "status" "pg_catalog"."int4_ops" ASC NULLS LAST,
-  "user_id" "pg_catalog"."int4_ops" ASC NULLS LAST,
-  "group_id" "pg_catalog"."int4_ops" ASC NULLS LAST
-);
-

tzy-admin/src/main/resources/db/migration/V11.1_idx_app_user_win_card_create.sql

@@ -1,2 +0,0 @@
-CREATE INDEX CONCURRENTLY idx_app_user_win_card_public_time_desc
-ON app_user_win_card(public_time DESC);

tzy-admin/src/main/resources/db/migration/V11.2_tzy_card_task_detail_create.sql

@@ -1,155 +0,0 @@
-/*
- Navicat Premium Dump SQL
-
- Source Server         : dev
- Source Server Type    : PostgreSQL
- Source Server Version : 130021 (130021)
- Source Host           : 192.168.50.10:5432
- Source Catalog        : tzy_system
- Source Schema         : public
-
- Target Server Type    : PostgreSQL
- Target Server Version : 130021 (130021)
- File Encoding         : 65001
-
- Date: 05/09/2025 17:20:02
-*/
-
-
--- ----------------------------
--- Table structure for tzy_card_task_detail
--- ----------------------------
-DROP TABLE IF EXISTS "public"."tzy_card_task_detail";
-CREATE TABLE "public"."tzy_card_task_detail" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "card_task_id" int4,
-  "coupon_id" int4,
-  "coupon_name" varchar(255) COLLATE "pg_catalog"."default"
-)
-;
-COMMENT ON COLUMN "public"."tzy_card_task_detail"."id" IS '记录主键id';
-COMMENT ON COLUMN "public"."tzy_card_task_detail"."card_task_id" IS '发放卡券任务id';
-COMMENT ON COLUMN "public"."tzy_card_task_detail"."coupon_id" IS '优惠券id';
-COMMENT ON COLUMN "public"."tzy_card_task_detail"."coupon_name" IS '优惠券名称';
-
--- ----------------------------
--- Table structure for tzy_card_task_info
--- ----------------------------
-DROP TABLE IF EXISTS "public"."tzy_card_task_info";
-CREATE TABLE "public"."tzy_card_task_info" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "task_name" varchar(100) COLLATE "pg_catalog"."default",
-  "user_range" int2,
-  "send_time" timestamp(0),
-  "is_now_send" int2,
-  "send_num" int4,
-  "create_time" timestamp(0),
-  "begin_register_time" timestamp(0),
-  "end_register_time" timestamp(0),
-  "execute_status" varchar(255) COLLATE "pg_catalog"."default",
-  "img_url" varchar(255) COLLATE "pg_catalog"."default"
-)
-;
-COMMENT ON COLUMN "public"."tzy_card_task_info"."id" IS '记录主键id';
-COMMENT ON COLUMN "public"."tzy_card_task_info"."task_name" IS '任务名称';
-COMMENT ON COLUMN "public"."tzy_card_task_info"."user_range" IS '用户范围：0：全部用户，1：大陆用户，2：香港用户，3：自定义用户，4：大陆新用户，5：香港新用户
-';
-COMMENT ON COLUMN "public"."tzy_card_task_info"."send_time" IS '优惠券发送时间';
-COMMENT ON COLUMN "public"."tzy_card_task_info"."is_now_send" IS '是否立即发送';
-COMMENT ON COLUMN "public"."tzy_card_task_info"."send_num" IS '发送次数';
-COMMENT ON COLUMN "public"."tzy_card_task_info"."create_time" IS '创建时间';
-COMMENT ON COLUMN "public"."tzy_card_task_info"."begin_register_time" IS '用户注册开始时间';
-COMMENT ON COLUMN "public"."tzy_card_task_info"."end_register_time" IS '用户注册结束时间';
-COMMENT ON COLUMN "public"."tzy_card_task_info"."execute_status" IS '执行状态：0：未执行，1：已执行';
-COMMENT ON TABLE "public"."tzy_card_task_info" IS '发送优惠券任务表';
-
--- ----------------------------
--- Table structure for tzy_card_task_record
--- ----------------------------
-DROP TABLE IF EXISTS "public"."tzy_card_task_record";
-CREATE TABLE "public"."tzy_card_task_record" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "task_id" int4 NOT NULL,
-  "coupon_id" int4,
-  "begin_user_id" int4,
-  "exception" varchar(255) COLLATE "pg_catalog"."default"
-)
-;
-COMMENT ON COLUMN "public"."tzy_card_task_record"."id" IS '主键id';
-COMMENT ON COLUMN "public"."tzy_card_task_record"."task_id" IS '任务id';
-COMMENT ON COLUMN "public"."tzy_card_task_record"."coupon_id" IS '优惠券id';
-COMMENT ON COLUMN "public"."tzy_card_task_record"."begin_user_id" IS '本批次起始用户id';
-COMMENT ON COLUMN "public"."tzy_card_task_record"."exception" IS '执行的异常信息';
-COMMENT ON TABLE "public"."tzy_card_task_record" IS '发送优惠券异常记录表';
-
--- ----------------------------
--- Table structure for tzy_card_task_remind
--- ----------------------------
-DROP TABLE IF EXISTS "public"."tzy_card_task_remind";
-CREATE TABLE "public"."tzy_card_task_remind" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "task_id" int4,
-  "user_id" int4,
-  "remind" int4
-)
-;
-COMMENT ON COLUMN "public"."tzy_card_task_remind"."task_id" IS '发送优惠券任务id';
-COMMENT ON COLUMN "public"."tzy_card_task_remind"."user_id" IS '用户id';
-COMMENT ON COLUMN "public"."tzy_card_task_remind"."remind" IS '是否已提醒';
-COMMENT ON TABLE "public"."tzy_card_task_remind" IS '发送优惠券提醒表';
-
--- ----------------------------
--- Table structure for tzy_card_task_user
--- ----------------------------
-DROP TABLE IF EXISTS "public"."tzy_card_task_user";
-CREATE TABLE "public"."tzy_card_task_user" (
-  "task_id" int4,
-  "user_id" int4
-)
-;
-COMMENT ON COLUMN "public"."tzy_card_task_user"."task_id" IS '任务id';
-COMMENT ON COLUMN "public"."tzy_card_task_user"."user_id" IS '用户id';
-
--- ----------------------------
--- Primary Key structure for table tzy_card_task_detail
--- ----------------------------
-ALTER TABLE "public"."tzy_card_task_detail" ADD CONSTRAINT "tzy_card_task_detail_pkey" PRIMARY KEY ("id");
-
--- ----------------------------
--- Primary Key structure for table tzy_card_task_info
--- ----------------------------
-ALTER TABLE "public"."tzy_card_task_info" ADD CONSTRAINT "tzy_card_task_info_pkey" PRIMARY KEY ("id");
-
--- ----------------------------
--- Primary Key structure for table tzy_card_task_record
--- ----------------------------
-ALTER TABLE "public"."tzy_card_task_record" ADD CONSTRAINT "tzy_card_task_record_pkey" PRIMARY KEY ("id");
-
--- ----------------------------
--- Primary Key structure for table tzy_card_task_remind
--- ----------------------------
-ALTER TABLE "public"."tzy_card_task_remind" ADD CONSTRAINT "tzy_card_task_remind_pkey" PRIMARY KEY ("id");

tzy-admin/src/main/resources/db/migration/V11.3_carousel_name_modify.sql

@@ -1,7 +0,0 @@
-ALTER TABLE "public"."app_carousel_picture"
-  ADD COLUMN "name" varchar(255),
-  ADD COLUMN "description" varchar(1024);
-
-COMMENT ON COLUMN "public"."app_carousel_picture"."name" IS '轮播图名称';
-
-COMMENT ON COLUMN "public"."app_carousel_picture"."description" IS '轮播图描述';

tzy-admin/src/main/resources/db/migration/V11.4_app_user_detail_modify.sql

@@ -1,10 +0,0 @@
-ALTER TABLE "public"."app_user_detail_info"
-  ADD COLUMN "invite_code" varchar(255),
-  ADD COLUMN "parent_invite_code" varchar(255),
-  ADD COLUMN "invite_time" timestamp(6);
-
-COMMENT ON COLUMN "public"."app_user_detail_info"."invite_code" IS '邀请码';
-
-COMMENT ON COLUMN "public"."app_user_detail_info"."parent_invite_code" IS '邀请人的码';
-
-COMMENT ON COLUMN "public"."app_user_detail_info"."invite_time" IS '邀请时间';

tzy-admin/src/main/resources/db/migration/V11.5_oversea_repayment_create.sql

@@ -1,58 +0,0 @@
-
-DROP TABLE IF EXISTS "public"."oversea_repayment";
-CREATE TABLE "public"."oversea_repayment" (
-  "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "merchant_id" int4,
-  "user_id" int4,
-  "group_id" int4,
-  "apply_time" timestamp(6),
-  "update_time" timestamp(6),
-  "approve_time" timestamp(6),
-  "reject_time" timestamp(6),
-  "status" int2,
-  "attachments" json,
-  "amount" numeric(9,2),
-  "audit_user_id" int4,
-  "audit_comment" text COLLATE "pg_catalog"."default",
-  "audit_count" int2,
-  "payout_ratio" numeric(5,2),
-  "bank_details" json,
-  "repayment_status" int2,
-  "actual_amount" numeric(9,2),
-  "repayment_user_id" int4,
-  "repayment_comment" text COLLATE "pg_catalog"."default",
-  "repayment_time" timestamp(6)
-)
-;
-COMMENT ON COLUMN "public"."oversea_repayment"."id" IS '主键';
-COMMENT ON COLUMN "public"."oversea_repayment"."merchant_id" IS '商家唯一标识';
-COMMENT ON COLUMN "public"."oversea_repayment"."user_id" IS '申请人唯一标识';
-COMMENT ON COLUMN "public"."oversea_repayment"."group_id" IS '拼团id';
-COMMENT ON COLUMN "public"."oversea_repayment"."apply_time" IS '申请提交时间';
-COMMENT ON COLUMN "public"."oversea_repayment"."update_time" IS '最后更新时间';
-COMMENT ON COLUMN "public"."oversea_repayment"."approve_time" IS '审核通过时间';
-COMMENT ON COLUMN "public"."oversea_repayment"."reject_time" IS '审核拒绝时间';
-COMMENT ON COLUMN "public"."oversea_repayment"."status" IS '审核状态';
-COMMENT ON COLUMN "public"."oversea_repayment"."attachments" IS '附件';
-COMMENT ON COLUMN "public"."oversea_repayment"."amount" IS '申请金额';
-COMMENT ON COLUMN "public"."oversea_repayment"."audit_user_id" IS '审核人ID';
-COMMENT ON COLUMN "public"."oversea_repayment"."audit_comment" IS '审核意见';
-COMMENT ON COLUMN "public"."oversea_repayment"."audit_count" IS '累计审核次数';
-COMMENT ON COLUMN "public"."oversea_repayment"."payout_ratio" IS '实际打款比例';
-COMMENT ON COLUMN "public"."oversea_repayment"."bank_details" IS '收款账户信息';
-COMMENT ON COLUMN "public"."oversea_repayment"."repayment_status" IS '打款状态';
-COMMENT ON COLUMN "public"."oversea_repayment"."actual_amount" IS '实际打款金额';
-COMMENT ON COLUMN "public"."oversea_repayment"."repayment_user_id" IS '打款人ID';
-COMMENT ON COLUMN "public"."oversea_repayment"."repayment_comment" IS '打款人意见';
-COMMENT ON COLUMN "public"."oversea_repayment"."repayment_time" IS '打款时间';
-
--- ----------------------------
--- Primary Key structure for table oversea_repayment
--- ----------------------------
-ALTER TABLE "public"."oversea_repayment" ADD CONSTRAINT "oversea_repayment_pkey" PRIMARY KEY ("id");

tzy-admin/src/main/resources/db/migration/V11.6_oversea_repayment_alter.sql

@@ -1,2 +0,0 @@
-alter table oversea_repayment alter column amount type NUMERIC(18),
-alter column actual_amount type NUMERIC(18)

tzy-admin/src/main/resources/db/migration/V11.7_sys_sub_pay_config_update.sql

@@ -1,10 +0,0 @@
-ALTER TABLE "sys_sub_pay_config"
-    ADD COLUMN "trading_frequency" text,
-    ADD COLUMN "transaction_limit" text,
-    ADD COLUMN "settlement_config" text;
-
-COMMENT ON COLUMN "sys_sub_pay_config"."trading_frequency" IS '交易频率：每？分钟，随机分配min~max单';
-
-COMMENT ON COLUMN "sys_sub_pay_config"."transaction_limit" IS '单笔限制：单笔最大金额？，可上浮金额？';
-
-COMMENT ON COLUMN "sys_sub_pay_config"."settlement_config" IS '清算时间限制：设置清算时间？段内 可交易上限？元，清算时不可交易';

tzy-admin/src/main/resources/db/migration/V11.8_app_user_card_record_index_create.sql

@@ -1 +0,0 @@
-CREATE INDEX idx_user_card_record_id_discount ON app_user_card_record(id, discount);

tzy-admin/src/main/resources/db/migration/V11.9_app_user_card_record_index_id_recreate.sql

@@ -1 +0,0 @@
-CREATE INDEX idx_ucr_id_numeric ON app_user_card_record USING btree ((id::numeric));

tzy-admin/src/main/resources/db/migration/V12.0_app_user_card_record_index_id_drop.sql

@@ -1 +0,0 @@
-DROP INDEX "public"."idx_ucr_id_numeric";

tzy-admin/src/main/resources/db/migration/V12.1_app_live_luck_bag_alter.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_live_lucky_bag" ADD COLUMN super_bag INT2,
-ADD COLUMN remark VARCHAR (255);
-COMMENT ON COLUMN "public"."app_live_lucky_bag"."super_bag" IS '是否为超级福袋，0否，1是';
-COMMENT ON COLUMN "public"."app_live_lucky_bag"."remark" IS '备注';

tzy-admin/src/main/resources/db/migration/V12.2_quiz_activity_create.sql

@@ -1,126 +0,0 @@
-/*
- Navicat Premium Dump SQL
-
- Source Server         : dev_new
- Source Server Type    : PostgreSQL
- Source Server Version : 140019 (140019)
- Source Host           : 192.168.50.8:5432
- Source Catalog        : tzy_system
- Source Schema         : public
-
- Target Server Type    : PostgreSQL
- Target Server Version : 140019 (140019)
- File Encoding         : 65001
-
- Date: 03/11/2025 15:53:48
-*/
-
-
--- ----------------------------
--- Table structure for quiz_activity
--- ----------------------------
-
-CREATE TABLE "public"."quiz_activity" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "activity_name" varchar(255) COLLATE "pg_catalog"."default",
-  "start_time" timestamp(6),
-  "end_time" timestamp(6),
-  "refresh_cycle" int2,
-  "question_num" int4,
-  "status" int2,
-  "act_id_1" int4,
-  "act_id_2" int4,
-  "create_time" timestamp(6)
-)
-;
-COMMENT ON COLUMN "public"."quiz_activity"."id" IS '答题活动id';
-COMMENT ON COLUMN "public"."quiz_activity"."activity_name" IS '活动名称';
-COMMENT ON COLUMN "public"."quiz_activity"."start_time" IS '开始时间';
-COMMENT ON COLUMN "public"."quiz_activity"."end_time" IS '结束时间';
-COMMENT ON COLUMN "public"."quiz_activity"."refresh_cycle" IS '刷新周期';
-COMMENT ON COLUMN "public"."quiz_activity"."question_num" IS '题目数量';
-COMMENT ON COLUMN "public"."quiz_activity"."status" IS '状态，0，禁用，1、启用';
-COMMENT ON COLUMN "public"."quiz_activity"."act_id_1" IS '大转盘活动1';
-COMMENT ON COLUMN "public"."quiz_activity"."act_id_2" IS '大转盘活动2';
-COMMENT ON COLUMN "public"."quiz_activity"."create_time" IS '创建时间';
-COMMENT ON TABLE "public"."quiz_activity" IS '答题活动表';
-
--- ----------------------------
--- Table structure for quiz_answer
--- ----------------------------
-
-CREATE TABLE "public"."quiz_answer" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "activity_id" int4,
-  "quiz_id" int4,
-  "user_id" int4,
-  "round" int4,
-  "answer" varchar(255) COLLATE "pg_catalog"."default",
-  "create_time" timestamp(6)
-)
-;
-COMMENT ON COLUMN "public"."quiz_answer"."id" IS 'id';
-COMMENT ON COLUMN "public"."quiz_answer"."activity_id" IS '答题活动id';
-COMMENT ON COLUMN "public"."quiz_answer"."quiz_id" IS '问题id';
-COMMENT ON COLUMN "public"."quiz_answer"."user_id" IS '用户id';
-COMMENT ON COLUMN "public"."quiz_answer"."round" IS '答题轮次';
-COMMENT ON COLUMN "public"."quiz_answer"."answer" IS '用户答案';
-COMMENT ON COLUMN "public"."quiz_answer"."create_time" IS '创建时间';
-COMMENT ON TABLE "public"."quiz_answer" IS '用户答题表';
-
--- ----------------------------
--- Table structure for quiz_lib
--- ----------------------------
-
-CREATE TABLE "public"."quiz_lib" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "activity_id" int4,
-  "type" varchar(255) COLLATE "pg_catalog"."default",
-  "question_text" text COLLATE "pg_catalog"."default",
-  "question_choice_text" text COLLATE "pg_catalog"."default",
-  "create_time" timestamp(6),
-  "required" int2,
-  "status" int2
-)
-;
-COMMENT ON COLUMN "public"."quiz_lib"."activity_id" IS '活动id';
-COMMENT ON COLUMN "public"."quiz_lib"."type" IS '类型';
-COMMENT ON COLUMN "public"."quiz_lib"."question_text" IS '问题';
-COMMENT ON COLUMN "public"."quiz_lib"."question_choice_text" IS '选项';
-COMMENT ON COLUMN "public"."quiz_lib"."create_time" IS '创建时间';
-COMMENT ON COLUMN "public"."quiz_lib"."required" IS '是否必刷题';
-COMMENT ON COLUMN "public"."quiz_lib"."status" IS '状态';
-COMMENT ON TABLE "public"."quiz_lib" IS '答题活动题库';
-
--- ----------------------------
--- Primary Key structure for table quiz_activity
--- ----------------------------
-ALTER TABLE "public"."quiz_activity" ADD CONSTRAINT "quiz_activity_pkey" PRIMARY KEY ("id");
-
--- ----------------------------
--- Primary Key structure for table quiz_answer
--- ----------------------------
-ALTER TABLE "public"."quiz_answer" ADD CONSTRAINT "quiz_answer_pkey" PRIMARY KEY ("id");
-
--- ----------------------------
--- Primary Key structure for table quiz_lib
--- ----------------------------
-ALTER TABLE "public"."quiz_lib" ADD CONSTRAINT "quiz_lib_pkey" PRIMARY KEY ("id");

tzy-admin/src/main/resources/db/migration/V12.3_app_act_guess_team_alter.sql

@@ -1,2 +0,0 @@
-ALTER TABLE app_act_guess_team ADD COLUMN blockchain_id INT4;
-COMMENT ON COLUMN "public"."app_act_guess_team"."blockchain_id" IS '区块链id';

tzy-admin/src/main/resources/db/migration/V12.4_card_group_goods_idx_ref_create.sql

@@ -1,42 +0,0 @@
-/*
- Navicat Premium Dump SQL
-
- Source Server         : dev_new
- Source Server Type    : PostgreSQL
- Source Server Version : 140019 (140019)
- Source Host           : 192.168.50.8:5432
- Source Catalog        : tzy_system
- Source Schema         : public
-
- Target Server Type    : PostgreSQL
- Target Server Version : 140019 (140019)
- File Encoding         : 65001
-
- Date: 07/11/2025 13:13:12
-*/
-
-
--- ----------------------------
--- Table structure for card_group_goods_idx_ref
--- ----------------------------
-CREATE TABLE "public"."card_group_goods_idx_ref" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "goods_id" int4,
-  "idx_id" int4
-)
-;
-COMMENT ON COLUMN "public"."card_group_goods_idx_ref"."id" IS '主键id';
-COMMENT ON COLUMN "public"."card_group_goods_idx_ref"."goods_id" IS '卡密id';
-COMMENT ON COLUMN "public"."card_group_goods_idx_ref"."idx_id" IS '坐标id';
-COMMENT ON TABLE "public"."card_group_goods_idx_ref" IS '卡密坐标关联表';
-
--- ----------------------------
--- Primary Key structure for table card_group_goods_idx_ref
--- ----------------------------
-ALTER TABLE "public"."card_group_goods_idx_ref" ADD CONSTRAINT "card_goods_idx_pkey" PRIMARY KEY ("id");

tzy-admin/src/main/resources/db/migration/V12.5_py_pay_complaint_record_update.sql

@@ -1,2 +0,0 @@
--- 添加id自增
-ALTER TABLE py_pay_complaint_record ALTER COLUMN id ADD GENERATED ALWAYS AS IDENTITY;

tzy-admin/src/main/resources/db/migration/V2.0_app_act_prize_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_act_prize"
-    ADD COLUMN "prize_name" varchar(255);
-
-COMMENT ON COLUMN "app_act_prize"."prize_name" IS '奖品名称';

tzy-admin/src/main/resources/db/migration/V2.1_app_act_manage_update.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "app_act_manage"
-  ADD COLUMN "auto_add_once" int4;

tzy-admin/src/main/resources/db/migration/V2.2_tzy_card_base_info_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "tzy_card_base_info"
-  ADD COLUMN "special_act_type" varchar(255);
-
-COMMENT ON COLUMN "tzy_card_base_info"."special_act_type" IS '特殊活动类型: coupon_center 领券中心 goods_act 卡密活动';

tzy-admin/src/main/resources/db/migration/V2.3_tzy_merchant_assess_create.sql

@@ -1,93 +0,0 @@
-CREATE TABLE "tzy_merchant_assess" (
-    "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-        INCREMENT 1
-        MINVALUE  1
-        MAXVALUE 2147483647
-        START 1
-        ),
-    "assess_time" timestamp(6),
-    "merchant_id" int4,
-    "merchant_name" varchar(255) COLLATE "pg_catalog"."default",
-    "group_amount" numeric,
-    "group_success_num" int4,
-    "group_success_rate" float4,
-    "live_time" float4,
-    "camera_stand" int4,
-    "inform_agein_box" float4,
-    "inform_agein_case" float4,
-    "delivery_speed" float4,
-    "group_amount_score" int4,
-    "group_success_num_score" int4,
-    "live_time_score" int4,
-    "camera_stand_score" int4,
-    "inform_agein_box_score" float4,
-    "inform_agein_case_score" float4,
-    "delivery_speed_score" float4,
-    "total_value" float4,
-    "merchant_services" float4,
-    "products_live" float4,
-    "logistics_services" float4,
-    "card_removal_report" float4,
-    "group_score" float4,
-    "professions" float4,
-    "user_evaluate" float4,
-    "total_score" float4,
-    CONSTRAINT "tzy_merchant_assess_pkey" PRIMARY KEY ("id")
-)
-;
-
-COMMENT ON COLUMN "tzy_merchant_assess"."assess_time" IS '考核时间(yyyy-mm)';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."merchant_id" IS '商家ID';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."merchant_name" IS '商家名称';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."group_amount" IS '每月拼团金额';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."group_success_num" IS '每月拼团成功数';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."group_success_rate" IS '每月拼团成功率';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."live_time" IS '平均开播时效（h）';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."camera_stand" IS '镜头机位';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."inform_agein_box" IS '平均报告时效- 盒（h）';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."inform_agein_case" IS '平均报告时效-箱（h）';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."delivery_speed" IS '平均发货速度（h）';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."group_amount_score" IS '每月拼团金额评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."group_success_num_score" IS '每月拼团成功数评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."live_time_score" IS '平均开播时效（h）评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."camera_stand_score" IS '镜头机位评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."inform_agein_box_score" IS '平均报告时效- 盒（h）评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."inform_agein_case_score" IS '平均报告时效-箱（h）评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."delivery_speed_score" IS '平均发货速度（h）评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."total_value" IS '整体满意度评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."merchant_services" IS '商家服务评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."products_live" IS '产品和直播内容评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."logistics_services" IS '物流服务评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."card_removal_report" IS '拆卡报告评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."group_score" IS '拼团总评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."professions" IS '专业总评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."user_evaluate" IS '用户评价总评分';
-
-COMMENT ON COLUMN "tzy_merchant_assess"."total_score" IS '总评分';
-
-COMMENT ON TABLE "tzy_merchant_assess" IS '商家会员指标';

tzy-admin/src/main/resources/db/migration/V2.4_tzy_merchant_assess_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "tzy_merchant_assess"
-  ADD COLUMN "group_success_rate_score" int4;
-
-COMMENT ON COLUMN "tzy_merchant_assess"."group_success_rate_score" IS '每月拼团成功率评分';

tzy-admin/src/main/resources/db/migration/V2.5_tzy_merchant_assess_update.sql

@@ -1,22 +0,0 @@
-ALTER TABLE "tzy_merchant_assess"
-    ALTER COLUMN "group_amount_score" TYPE float8,
-    ALTER COLUMN "group_success_num_score" TYPE float8,
-    ALTER COLUMN "group_success_rate_score" TYPE float8,
-    ALTER COLUMN "live_time" TYPE float8,
-    ALTER COLUMN "live_time_score" TYPE float8,
-    ALTER COLUMN "camera_stand_score" TYPE float8,
-    ALTER COLUMN "inform_agein_box" TYPE float8,
-    ALTER COLUMN "inform_agein_box_score" TYPE float8,
-    ALTER COLUMN "inform_agein_case" TYPE float8,
-    ALTER COLUMN "inform_agein_case_score" TYPE float8,
-    ALTER COLUMN "delivery_speed" TYPE float8,
-    ALTER COLUMN "delivery_speed_score" TYPE float8,
-    ALTER COLUMN "total_value" TYPE float8,
-    ALTER COLUMN "merchant_services" TYPE float8,
-    ALTER COLUMN "products_live" TYPE float8,
-    ALTER COLUMN "logistics_services" TYPE float8,
-    ALTER COLUMN "card_removal_report" TYPE float8,
-    ALTER COLUMN "group_score" TYPE float8,
-    ALTER COLUMN "professions" TYPE float8,
-    ALTER COLUMN "total_score" TYPE float8;
-

tzy-admin/src/main/resources/db/migration/V2.6_tzy_merchant_bond_create.sql

@@ -1,63 +0,0 @@
-CREATE TABLE "tzy_merchant_bond" (
-      "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-          INCREMENT 1
-          MINVALUE  1
-          MAXVALUE 2147483647
-          START 1
-          ),
-      "type" varchar(255) COLLATE "pg_catalog"."default",
-      "amount" numeric,
-      "sign_status" int2,
-      "verify_status" int2,
-      "pay_time" timestamp(6),
-      "express_level" varchar(255) COLLATE "pg_catalog"."default",
-      "voucher" varchar(255) COLLATE "pg_catalog"."default",
-      "create_time" timestamp(6),
-      "verify_time" timestamp(6),
-      "swift_code" varchar(255) COLLATE "pg_catalog"."default",
-      "merchant_id" int4,
-      "merchant_name" varchar(255) COLLATE "pg_catalog"."default",
-      "sign_time" timestamp(6),
-      "expire_time" timestamp(6),
-      "remark" varchar(255) COLLATE "pg_catalog"."default",
-      "invoice_id" int4,
-      "presale_bond" numeric,
-      "product_bond" numeric,
-      CONSTRAINT "tzy_merchant_bond_pkey" PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "tzy_merchant_bond"."type" IS '保证金类型：顺丰一键发货、店铺保证金、店铺积分商城';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."amount" IS '保证金额';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."sign_status" IS '签署状态：0未签署、1已签署';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."verify_status" IS '审核状态：0待支付、1待审核、2已审核、3审核驳回';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."pay_time" IS '支付时间';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."express_level" IS '快递等级：默认未开通、S、A、B';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."voucher" IS '转账凭证';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."create_time" IS '提交时间';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."verify_time" IS '审核时间';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."swift_code" IS '汇款识别码';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."merchant_id" IS '商家ID';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."merchant_name" IS '商家名称';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."sign_time" IS '合同签署时间';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."expire_time" IS '合同到期时间';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."remark" IS '驳回原因';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."invoice_id" IS '发票ID';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."presale_bond" IS '预售保证金';
-
-COMMENT ON COLUMN "tzy_merchant_bond"."product_bond" IS '产品保证金';

tzy-admin/src/main/resources/db/migration/V2.7_tzy_merchant_invoice_create.sql

@@ -1,36 +0,0 @@
-CREATE TABLE "tzy_merchant_invoice" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY (
-         INCREMENT 1
-         MINVALUE  1
-         MAXVALUE 2147483647
-         START 1
-         ),
-     "merchant_id" int4 NOT NULL,
-     "type" varchar(16) COLLATE "pg_catalog"."default",
-     "invoice_name" varchar(255) COLLATE "pg_catalog"."default",
-     "tax_id" varchar(32) COLLATE "pg_catalog"."default",
-     "company_bank" varchar(255) COLLATE "pg_catalog"."default",
-     "bank_account" varchar(255) COLLATE "pg_catalog"."default",
-     "company_address" varchar(512) COLLATE "pg_catalog"."default",
-     "tel_phone" varchar(16) COLLATE "pg_catalog"."default",
-     "status" int2,
-     "create_time" timestamp(6),
-     "update_time" timestamp(6),
-     CONSTRAINT "app_user_invoice_copy1_pkey" PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "tzy_merchant_invoice"."merchant_id" IS '商家id';
-
-COMMENT ON COLUMN "tzy_merchant_invoice"."type" IS '发票类型：normal-普票, special-专票';
-
-COMMENT ON COLUMN "tzy_merchant_invoice"."invoice_name" IS '抬头名称';
-
-COMMENT ON COLUMN "tzy_merchant_invoice"."tax_id" IS '税号';
-
-COMMENT ON COLUMN "tzy_merchant_invoice"."company_bank" IS '开户行';
-
-COMMENT ON COLUMN "tzy_merchant_invoice"."bank_account" IS '开户行账号';
-
-COMMENT ON COLUMN "tzy_merchant_invoice"."company_address" IS '公司地址';
-
-COMMENT ON COLUMN "tzy_merchant_invoice"."tel_phone" IS '联系电话';

tzy-admin/src/main/resources/db/migration/V2.8_member_manage_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "member_manage"
-    ADD COLUMN "level_medal" varchar(255);
-
-COMMENT ON COLUMN "member_manage"."level_medal" IS '等级勋章';

tzy-admin/src/main/resources/db/migration/V2.9_member_benefits_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "member_benefits"
-    ADD COLUMN "benefits_image" varchar(255);
-
-COMMENT ON COLUMN "member_benefits"."benefits_image" IS '权益图';

tzy-admin/src/main/resources/db/migration/V3.0_member_benefits_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "member_benefits"
-    ADD COLUMN "description" varchar(255);
-
-COMMENT ON COLUMN "member_benefits"."description" IS '权益说明';

tzy-admin/src/main/resources/db/migration/V3.1_member_benefits_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "member_benefits"
-    ADD COLUMN "extra_charge" varchar(255);
-
-COMMENT ON COLUMN "member_benefits"."extra_charge" IS '附加运费';

tzy-admin/src/main/resources/db/migration/V3.2_card_group_order_info_update.sql

@@ -1,10 +0,0 @@
-ALTER TABLE "card_group_order_info"
-    ADD COLUMN "discount_amount" numeric(12,2),
-    ADD COLUMN "member_discount"  numeric(12,2),
-    ADD COLUMN "shipping_free_id" int4,
-    ADD COLUMN "shipping_free_amount" numeric(12,2);
-
-COMMENT ON COLUMN "card_group_order_info"."discount_amount" IS '折扣金额';
-COMMENT ON COLUMN "card_group_order_info"."member_discount" IS '会员折扣';
-COMMENT ON COLUMN "card_group_order_info"."shipping_free_id" IS '运费券id';
-COMMENT ON COLUMN "card_group_order_info"."shipping_free_amount" IS '运费券金额';

tzy-admin/src/main/resources/db/migration/V3.3_order_list_update.sql

@@ -1,6 +0,0 @@
-ALTER TABLE "order_list"
-    ADD COLUMN "discount_amount" numeric(12,2),
-    ADD COLUMN "member_discount"  numeric(12,2);
-
-COMMENT ON COLUMN "order_list"."discount_amount" IS '折扣金额';
-COMMENT ON COLUMN "order_list"."member_discount" IS '会员折扣';

tzy-admin/src/main/resources/db/migration/V3.4_spu_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "spu"
-    ADD COLUMN "remote_shipping_cost" numeric(12,2);
-
-COMMENT ON COLUMN "spu"."remote_shipping_cost" IS '偏远地区运费';

tzy-admin/src/main/resources/db/migration/V3.5_member_benefits_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "member_benefits"
-    ADD COLUMN "name" varchar(255);
-
-COMMENT ON COLUMN "member_benefits"."name" IS '权益名称';

tzy-admin/src/main/resources/db/migration/V3.6_spu_update.sql

@@ -1,5 +0,0 @@
-ALTER TABLE "spu"
-    ADD COLUMN "mem_benefits_type" varchar(255);
-COMMENT ON COLUMN "spu"."mem_benefits_type" IS '会员权益类型：关联商品:goods,优惠劵:coupon,积分权益:point,折扣:goods_discount,组队折扣:group_discount,运费券:shipping_free';
-
-

tzy-admin/src/main/resources/db/migration/V3.7_user_update.sql

@@ -1,7 +0,0 @@
-ALTER TABLE "app_base_user"
-    ADD COLUMN "consume_amount" numeric(10,2),
-  ADD COLUMN "order_total_num" int4;
-
-COMMENT ON COLUMN "app_base_user"."consume_amount" IS '消费总金额';
-
-COMMENT ON COLUMN "app_base_user"."order_total_num" IS '订单总数';

tzy-admin/src/main/resources/db/migration/V3.8_tzy_merchant_tag_create.sql

@@ -1,18 +0,0 @@
-CREATE TABLE "tzy_merchant_tag" (
-     "id" int4 NOT NULL,
-     "name" varchar(255) COLLATE "pg_catalog"."default",
-     "parent_id" int4 DEFAULT 0,
-     "sort" int4,
-     "del_flg" int4,
-     "create_time" timestamp(6),
-     "update_time" timestamp(6),
-     CONSTRAINT "tzy_merchant_tag_pkey" PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "tzy_merchant_tag"."name" IS '分类/标签名称';
-
-COMMENT ON COLUMN "tzy_merchant_tag"."parent_id" IS '父级id';
-
-COMMENT ON COLUMN "tzy_merchant_tag"."sort" IS '分类排序';
-
-COMMENT ON TABLE "tzy_merchant_tag" IS '商家标签';

tzy-admin/src/main/resources/db/migration/V3.9_act_prize_edit.sql

@@ -1,10 +0,0 @@
-ALTER TABLE "app_act_prize"
-     ADD COLUMN "prize_prop" text;
-
-COMMENT ON COLUMN "app_act_prize"."prize_prop" IS '奖品额外信息,json,字段:队伍:team,卡种:card_set,系列:sets,星级:starLevel,品类:cat';
-
-
-ALTER TABLE "app_act_prize_record"
-     ADD COLUMN "prize_prop" text;
-
-COMMENT ON COLUMN "app_act_prize_record"."prize_prop" IS '奖品额外信息,json';

tzy-admin/src/main/resources/db/migration/V4.0_act_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_act_manage"
-     ADD COLUMN "banner_url" varchar(512);
-
-COMMENT ON COLUMN "app_act_manage"."banner_url" IS 'banner图';

tzy-admin/src/main/resources/db/migration/V4.1_sale_code_edit.sql

@@ -1,24 +0,0 @@
-ALTER TABLE "act_sale_code"
-    ADD COLUMN "ref_num" int4 DEFAULT 0;
-
-COMMENT ON COLUMN "act_sale_code"."ref_num" IS '关联核销次数';
-
-
-
-CREATE OR REPLACE FUNCTION "edit_act_sale_code_num_trigger_function"()
-    RETURNS "pg_catalog"."trigger" AS $BODY$
-begin
-    if new.code_id is not null THEN
-        UPDATE act_sale_code set ref_num=(SELECT "count"(0) FROM sale_code_record WHERE code_id=new.code_id)
-        WHERE id=new.code_id;
-    end if;
-    return new;
-end
-$BODY$
-    LANGUAGE plpgsql VOLATILE
-                     COST 100;
-
-CREATE TRIGGER "edit_ref_num" AFTER INSERT ON "sale_code_record"
-    FOR EACH ROW
-EXECUTE PROCEDURE "edit_act_sale_code_num_trigger_function"();
-

tzy-admin/src/main/resources/db/migration/V4.2_amount_act_new.sql

@@ -1,37 +0,0 @@
---砍一刀活动
-
-ALTER TABLE "app_act_prize_record"
-    ADD COLUMN "share_user_id" int4,
-    ADD COLUMN "share_config" text,
-    ADD COLUMN "act_amount" numeric(9,2),
-    ADD COLUMN "joint_remark" text;
-
-COMMENT ON COLUMN "app_act_prize_record"."share_user_id" IS '分享来源用户id';
-
-COMMENT ON COLUMN "app_act_prize_record"."act_amount" IS '本次砍一刀金额,单位分';
-
-COMMENT ON COLUMN "app_act_prize_record"."share_config" IS '用户分享记录';
-
-COMMENT ON COLUMN "app_act_prize_record"."joint_remark" IS '留言';
-
-ALTER TABLE "app_act_manage"
-    ADD COLUMN "default_times_type" varchar(16) default 'all',
-    ADD COLUMN "ref_act_id" int4  default 0,
-    ADD COLUMN "ref_sub_type" varchar(32),
-    ADD COLUMN "ref_act_enable" int2 default 0,
-    ADD COLUMN "open_popup" int2 default 0,
-    ADD COLUMN "popup_url" text,
-    ADD COLUMN "popup_img" text,
-    ADD COLUMN "popup_config" text;
-
-COMMENT ON COLUMN "app_act_manage"."ref_act_id" IS '关联活动id';
-COMMENT ON COLUMN "app_act_manage"."ref_sub_type" IS '关联特殊活动类型:会员砍一刀次数达标:spec_member_num';
-COMMENT ON COLUMN "app_act_manage"."ref_act_enable" IS '关联活动是否满足条件开启,默认0:不打开;1:打开';
-COMMENT ON COLUMN "app_act_manage"."open_popup" IS '是否打开弹窗,默认0:不打开;1:打开';
-COMMENT ON COLUMN "app_act_manage"."popup_url" IS '弹窗跳转路径';
-COMMENT ON COLUMN "app_act_manage"."popup_img" IS '弹窗图';
-COMMENT ON COLUMN "app_act_manage"."popup_config" IS '弹窗额外配置:json';
-COMMENT ON COLUMN "app_act_manage"."default_times_type" IS '赠送默认次数类型,天:day,周:week,月:month,整期:all';
-
-
-

tzy-admin/src/main/resources/db/migration/V4.3_group_order_review_edit.sql

@@ -1,13 +0,0 @@
-ALTER TABLE "card_group_order_review"
-    ADD COLUMN "type" varchar(32) DEFAULT 'report',
-    ADD COLUMN "sub_type" varchar(32),
-    ADD COLUMN "refund_fee" int4 DEFAULT 0,
-    ADD COLUMN "refund_remark" text;
-
-COMMENT ON COLUMN "card_group_order_review"."refund_remark" IS '运营退款备注,json:{"serviceCharge":true,"sendUserCoupon":true,"operateUser":"test","review_msg":"拒绝原因"}';
-
-COMMENT ON COLUMN "card_group_order_review"."type" IS '类型;拆卡报告审核:report,拼团退款:group_refund,订单退款:order_refund';
-
-COMMENT ON COLUMN "card_group_order_review"."sub_type" IS '退款子类型,拼团退款并下架:"refund_off",仅退款:"refund"';
-
-COMMENT ON COLUMN "card_group_order_review"."refund_fee" IS '退款金额,单位分';

tzy-admin/src/main/resources/db/migration/V4.4_group_order_express_create.sql

@@ -1,22 +0,0 @@
-CREATE TABLE group_order_express (
-     id SERIAL PRIMARY KEY,
-     order_no VARCHAR(255),
-     courier_no VARCHAR(255),
-     sign_status INTEGER DEFAULT 0,
-     result TEXT,
-     sync_time TIMESTAMP
-);
-
-CREATE INDEX idx_sync_time ON group_order_express(sync_time);
-
-COMMENT ON COLUMN "group_order_express"."order_no" IS '订单号';
-
-COMMENT ON COLUMN "group_order_express"."courier_no" IS '快递单号';
-
-COMMENT ON COLUMN "group_order_express"."sign_status" IS '签收状态：0未签收 1已签收';
-
-COMMENT ON COLUMN "group_order_express"."result" IS '物流结果';
-
-COMMENT ON COLUMN "group_order_express"."sync_time" IS '同步时间';
-
-COMMENT ON TABLE "group_order_express" IS '订单物流信息';

tzy-admin/src/main/resources/db/migration/V4.5_ad_pay_edit.sql

@@ -1,10 +0,0 @@
-ALTER TABLE "app_ad_config"
-    ADD COLUMN "pay_trade_no" varchar(64),
-    ADD COLUMN "pay_success_time" timestamp,
-    ADD COLUMN "pay_expire_time" timestamp;
-
-COMMENT ON COLUMN "app_ad_config"."pay_expire_time" IS '支付过期时间';
-
-COMMENT ON COLUMN "app_ad_config"."pay_success_time" IS '支付成功时间';
-
-COMMENT ON COLUMN "app_ad_config"."pay_trade_no" IS '支付编号';

tzy-admin/src/main/resources/db/migration/V4.6_tzy_merchant_info_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "tzy_merchant_info"
-    ADD COLUMN "bond_amount" numeric(9,2);
-
-COMMENT ON COLUMN "tzy_merchant_info"."bond_amount" IS '保证金最低金额';

tzy-admin/src/main/resources/db/migration/V4.7_app_ad_edit.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "app_ad_config"
-    ADD COLUMN "merchant_name" varchar(256);

tzy-admin/src/main/resources/db/migration/V4.8_shop_goods_config_create.sql

@@ -1,68 +0,0 @@
-CREATE TABLE shop_goods_config
-(
-    id                   int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-        INCREMENT 1
-        MINVALUE 1
-        MAXVALUE 2147483647
-        START 1
-        ),
-    appid                varchar(125) ,
-    merchant_id          int4,
-    merchant_name        varchar(255) ,
-    archives_id          int4,
-    archives_name        varchar(255) ,
-    type                 varchar(255) ,
-    payment_type         varchar(255) ,
-    refund_type          varchar(255) ,
-    payment_bank_record  text ,
-    merchant_bank_record text ,
-    status               int4 DEFAULT 0,
-    del_flg              int2 DEFAULT 0,
-    remark               text ,
-    prop1                text ,
-    prop2                text ,
-    prop3                text ,
-    prop4                text ,
-    spu_id               int4,
-    sku_id               int4,
-    close_payment_status int2 DEFAULT 0,
-    close_payment_record text ,
-    CONSTRAINT shop_goods_config_pkey PRIMARY KEY (id)
-)
-;
-
-COMMENT ON COLUMN shop_goods_config.appid IS 'appid';
-
-COMMENT ON COLUMN shop_goods_config.merchant_id IS '商家id';
-
-COMMENT ON COLUMN shop_goods_config.merchant_name IS '商家名';
-
-COMMENT ON COLUMN shop_goods_config.archives_id IS '主体id';
-
-COMMENT ON COLUMN shop_goods_config.archives_name IS '主体名称';
-
-COMMENT ON COLUMN shop_goods_config.type IS '类型：生态购等';
-
-COMMENT ON COLUMN shop_goods_config.payment_type IS '支付类型';
-
-COMMENT ON COLUMN shop_goods_config.refund_type IS '退款类型';
-
-COMMENT ON COLUMN shop_goods_config.payment_bank_record IS '对公转账信息-收款';
-
-COMMENT ON COLUMN shop_goods_config.merchant_bank_record IS '对公转账信息-商家';
-
-COMMENT ON COLUMN shop_goods_config.status IS '状态：0=正常';
-
-COMMENT ON COLUMN shop_goods_config.del_flg IS '删除标记：0=正常';
-
-COMMENT ON COLUMN shop_goods_config.remark IS '备注';
-
-COMMENT ON COLUMN shop_goods_config.spu_id IS 'spuid';
-
-COMMENT ON COLUMN shop_goods_config.sku_id IS 'skuid';
-
-COMMENT ON COLUMN shop_goods_config.close_payment_status IS '打款状态：0=未打款';
-
-COMMENT ON COLUMN shop_goods_config.close_payment_record IS '打款记录';
-
-COMMENT ON TABLE shop_goods_config IS '商城商品配置信息';