..

pom.xml

@@ -99,17 +99,17 @@
			<version>${mysql.version}</version>
		</dependency>
		 <!--oracle驱动-->
		<dependency>
		<!-- <dependency>
			<groupId>com.oracle</groupId>
			<artifactId>ojdbc6</artifactId>
			<version>${oracle.version}</version>
		</dependency>
		</dependency> -->
		 <!--mssql驱动-->
		<dependency>
		<!-- <dependency>
			<groupId>com.microsoft.sqlserver</groupId>
			<artifactId>sqljdbc4</artifactId>
			<version>${mssql.version}</version>
		</dependency>
		</dependency> -->
		 <!--postgresql驱动-->
		<dependency>
			<groupId>org.postgresql</groupId>

src/main/java/io/renren/modules/admin/controller/SignController.java

@@ -253,7 +253,7 @@ public class SignController {
        titles.add("费用类型");
        titles.add("是否缴费");
        titles.add("金额");
        titles.add("最后签到时间");
        titles.add("签到时间");
        data.setTitles(titles);
        //添加列
        List<List<Object>> rows = new ArrayList<List<Object>>();
@@ -276,6 +276,7 @@ public class SignController {
                row.add("未知");
            }
            row.add(signInfo.getPhone());
            row.add(signInfo.getEmail());
            Integer memberType = signInfo.getMemberType();
            if (memberType == 1) {
                row.add("免注册");
@@ -295,12 +296,12 @@ public class SignController {
                row.add("是");
            }
            row.add(signInfo.getMoney());
            if (signInfo.getLastTime()==null) {
                row.add("");
            } else {
                String lastTime = lastdate.format((Date) signInfo.getLastTime());
                row.add(lastTime);
            }
            // if (signInfo.getLastTime()==null) {
            //     row.add("");
            // } else {
            // }
            String lastTime = lastdate.format((Date) signInfo.getCreateTime());
            row.add(lastTime);
            
            rows.add(row);
            row = null;

src/main/java/io/renren/modules/admin/entity/SignviewEntity.java

@@ -46,6 +46,10 @@ public class SignviewEntity implements Serializable {
     * 电话
     */
    private String phone;
    /**
     * 电话
     */
    private String email;
    /**
     * 性别
     * 

src/main/java/io/renren/modules/app/controller/AppReportController.java

@@ -53,5 +53,4 @@ public class AppReportController {
        return R.ok().put("report", report);
    }
}

src/main/resources/application-dev-bak.yml

@@ -3,9 +3,9 @@ spring:
        type: com.alibaba.druid.pool.DruidDataSource
        druid:
            driver-class-name: com.mysql.cj.jdbc.Driver
            url: jdbc:mysql://192.168.3.233:3306/meeting?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
            url: jdbc:mysql://localhost:3306/meeting?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
            username: root
            password: root001
            password: root
            initial-size: 10
            max-active: 100
            min-idle: 10

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
    uri-encoding: UTF-8
    max-threads: 1000
    min-spare-threads: 30
  port: 8002
  port: 8082
  connection-timeout: 50000ms
  servlet:
    context-path: /fyhs-meeting
@@ -70,7 +70,7 @@ renren:
  # APP模块，是通过jwt认证的，如果要使用APP模块，则需要修改【加密秘钥】
  jwt:
    # 加密秘钥
    secret: b94b2a1da0e5c1448f3a176dcd1e1e46[www.ecorr.org]
    secret: b94b2a1da0e5c1448f3a176dcd1e1e46[www.ecorr.org .cn]
    # token有效时长，7天，单位秒
    expire: 604800
    header: token