XMTT 6 years ago
parent
commit
1a263c33a0

+ 1 - 1
src/main/java/com/ekexiu/portal/platform/PlatformInfo.java

@ -65,7 +65,7 @@ public class PlatformInfo {
65 65
	private String createTime;
66 66
	private String modifyTime;
67 67
	
68
	@Column(DE.id_10)
68
	@Column(DE.id_32)
69 69
	public String getId() {
70 70
		return id;
71 71
	}

+ 18 - 19
src/main/java/com/ekexiu/portal/platform/PlatformService.java

@ -1,21 +1,7 @@
1 1
package com.ekexiu.portal.platform;
2 2

3
import java.io.ByteArrayInputStream;
4
import java.io.File;
5
import java.io.FileInputStream;
6
import java.io.FileOutputStream;
7
import java.io.IOException;
8
import java.io.InputStream;
9
import java.io.OutputStream;
10
import java.sql.Connection;
11
import java.sql.SQLException;
12
import java.util.HashMap;
13
import java.util.LinkedList;
14
import java.util.List;
15
import java.util.Map;
16
import java.util.concurrent.TimeUnit;
17
import java.util.concurrent.atomic.AtomicInteger;
18

3
import com.ekexiu.portal.mail.MailService;
4
import com.ekexiu.portal.service.ImageService;
19 5
import org.jfw.apt.annotation.Autowrie;
20 6
import org.jfw.apt.annotation.DefaultValue;
21 7
import org.jfw.apt.annotation.Nullable;
@ -37,8 +23,21 @@ import org.jfw.util.state.StateCode;
37 23
import org.jfw.util.web.fileupload.Item;
38 24
import org.jfw.util.web.fileupload.UploadItemIterator;
39 25

40
import com.ekexiu.portal.mail.MailService;
41
import com.ekexiu.portal.service.ImageService;
26
import java.io.ByteArrayInputStream;
27
import java.io.File;
28
import java.io.FileInputStream;
29
import java.io.FileOutputStream;
30
import java.io.IOException;
31
import java.io.InputStream;
32
import java.io.OutputStream;
33
import java.sql.Connection;
34
import java.sql.SQLException;
35
import java.util.HashMap;
36
import java.util.LinkedList;
37
import java.util.List;
38
import java.util.Map;
39
import java.util.concurrent.TimeUnit;
40
import java.util.concurrent.atomic.AtomicInteger;
42 41

43 42
@Path("/platform")
44 43
public class PlatformService {
@ -178,7 +177,7 @@ public class PlatformService {
178 177
	}
179 178

180 179
	@SetCookie(checkResultNull = true, path = "/", value = { "plf_user=result.getId()", "plf_email=result.getEmail()",
181
			"plf_logo=result.getLogo()==null?\"\":result.getLogo()", "plf_name=result.getName()" })
180
			"plf_logo=result.getLogo()==null?\"\":result.getLogo()"})
182 181
	@Post
183 182
	@Path("/login")
184 183
	public LoginUserInfo login(@JdbcConn Connection con, String email, String pw) throws JfwBaseException, SQLException {

+ 1 - 1
src/main/resources/database.sql

@ -2280,7 +2280,7 @@ COMMENT ON COLUMN PLATFORM_USER.PASSWD is '登录密码';
2280 2280
COMMENT ON COLUMN PLATFORM_USER.PHONE is '状态 1:启用  0:未启用';
2281 2281

2282 2282
CREATE TABLE PLATFORM_INFO (
2283
	ID CHAR(10) NOT NULL,
2283
	ID CHAR(32) NOT NULL,
2284 2284
	NAME TEXT NOT NULL,
2285 2285
	LOGO TEXT,
2286 2286
	LINKMAN TEXT,