huwhois 1 anno fa
parent
commit
bada1df904

+ 4 - 4
pom.xml

99
			<version>${mysql.version}</version>
99
			<version>${mysql.version}</version>
100
		</dependency>
100
		</dependency>
101
		 <!--oracle驱动-->
101
		 <!--oracle驱动-->
102
		<dependency>
102
		<!-- <dependency>
103
			<groupId>com.oracle</groupId>
103
			<groupId>com.oracle</groupId>
104
			<artifactId>ojdbc6</artifactId>
104
			<artifactId>ojdbc6</artifactId>
105
			<version>${oracle.version}</version>
105
			<version>${oracle.version}</version>
106
		</dependency>
106
		</dependency> -->
107
		 <!--mssql驱动-->
107
		 <!--mssql驱动-->
108
		<dependency>
108
		<!-- <dependency>
109
			<groupId>com.microsoft.sqlserver</groupId>
109
			<groupId>com.microsoft.sqlserver</groupId>
110
			<artifactId>sqljdbc4</artifactId>
110
			<artifactId>sqljdbc4</artifactId>
111
			<version>${mssql.version}</version>
111
			<version>${mssql.version}</version>
112
		</dependency>
112
		</dependency> -->
113
		 <!--postgresql驱动-->
113
		 <!--postgresql驱动-->
114
		<dependency>
114
		<dependency>
115
			<groupId>org.postgresql</groupId>
115
			<groupId>org.postgresql</groupId>

+ 8 - 7
src/main/java/io/renren/modules/admin/controller/SignController.java

253
        titles.add("费用类型");
253
        titles.add("费用类型");
254
        titles.add("是否缴费");
254
        titles.add("是否缴费");
255
        titles.add("金额");
255
        titles.add("金额");
256
        titles.add("最后签到时间");
256
        titles.add("签到时间");
257
        data.setTitles(titles);
257
        data.setTitles(titles);
258
        //添加列
258
        //添加列
259
        List<List<Object>> rows = new ArrayList<List<Object>>();
259
        List<List<Object>> rows = new ArrayList<List<Object>>();
276
                row.add("未知");
276
                row.add("未知");
277
            }
277
            }
278
            row.add(signInfo.getPhone());
278
            row.add(signInfo.getPhone());
279
            row.add(signInfo.getEmail());
279
            Integer memberType = signInfo.getMemberType();
280
            Integer memberType = signInfo.getMemberType();
280
            if (memberType == 1) {
281
            if (memberType == 1) {
281
                row.add("免注册");
282
                row.add("免注册");
295
                row.add("是");
296
                row.add("是");
296
            }
297
            }
297
            row.add(signInfo.getMoney());
298
            row.add(signInfo.getMoney());
298
            if (signInfo.getLastTime()==null) {
299
                row.add("");
300
            } else {
301
                String lastTime = lastdate.format((Date) signInfo.getLastTime());
302
                row.add(lastTime);
303
            }
299
            // if (signInfo.getLastTime()==null) {
300
            //     row.add("");
301
            // } else {
302
            // }
303
            String lastTime = lastdate.format((Date) signInfo.getCreateTime());
304
            row.add(lastTime);
304
            
305
            
305
            rows.add(row);
306
            rows.add(row);
306
            row = null;
307
            row = null;

+ 4 - 0
src/main/java/io/renren/modules/admin/entity/SignviewEntity.java

46
     * 电话
46
     * 电话
47
     */
47
     */
48
    private String phone;
48
    private String phone;
49
    /**
50
     * 电话
51
     */
52
    private String email;
49
    /**
53
    /**
50
     * 性别
54
     * 性别
51
     * 
55
     * 

+ 0 - 1
src/main/java/io/renren/modules/app/controller/AppReportController.java

53
        return R.ok().put("report", report);
53
        return R.ok().put("report", report);
54
    }
54
    }
55
55
56
57
}
56
}

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

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

+ 2 - 2
src/main/resources/application.yml

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