jiapeng vor 6 Jahren
Ursprung
Commit
41825a875c

+ 2 - 0
src/main/java/com/ekexiu/portal/article/file/ArticleFileDao.java

@ -4,6 +4,7 @@ import java.sql.Connection;
4 4
import java.sql.SQLException;
5 5
import java.util.List;
6 6

7
import org.jfw.apt.annotation.Nullable;
7 8
import org.jfw.apt.orm.annotation.dao.Batch;
8 9
import org.jfw.apt.orm.annotation.dao.DAO;
9 10
import org.jfw.apt.orm.annotation.dao.method.From;
@ -23,6 +24,7 @@ public interface ArticleFileDao {
23 24
	@SelectList
24 25
	List<ArticleFile> query(Connection con,String id)throws SQLException;
25 26
	@SelectOne
27
	@Nullable
26 28
	ArticleFile queryByurl(Connection con,String url)throws SQLException;
27 29
	
28 30
	

+ 4 - 0
src/main/java/com/ekexiu/portal/dao/ProfessorDao.java

@ -110,6 +110,10 @@ public abstract class ProfessorDao {
110 110
	@UpdateWith
111 111
	@From(Professor.class)
112 112
	public abstract int updateOrgAuth(Connection con, String id, @Set String orgAuth) throws SQLException;
113
	
114
	@UpdateWith
115
	@From(Professor.class)
116
	public abstract int joinAndPassOrgAuth(Connection con, String id,@Set String orgId, @Set String orgAuth) throws SQLException;
113 117

114 118
	@UpdateWith
115 119
	@From(Professor.class)

+ 2 - 0
src/main/java/com/ekexiu/portal/org/OrgLinkManDao.java

@ -4,6 +4,7 @@ import java.sql.Connection;
4 4
import java.sql.SQLException;
5 5
import java.util.List;
6 6

7
import org.jfw.apt.annotation.Nullable;
7 8
import org.jfw.apt.orm.annotation.dao.Batch;
8 9
import org.jfw.apt.orm.annotation.dao.DAO;
9 10
import org.jfw.apt.orm.annotation.dao.method.From;
@ -31,6 +32,7 @@ public interface OrgLinkManDao {
31 32
	
32 33
	
33 34
	@SelectOne
35
	@Nullable
34 36
	OrgLinkMan queryByPid(Connection con,String pid)throws SQLException;
35 37
	
36 38
	@SelectList

+ 7 - 0
src/main/java/com/ekexiu/portal/service/ProfessorService.java

@ -666,6 +666,13 @@ public class ProfessorService {
666 666
		// 通过企业认证给用户增加积分
667 667
		this.growthLogService.authOrg(con, id);
668 668
	}
669
	
670
	
671
	@Post
672
	@Path("/joinAndPassOrgAuth")
673
	public void passOrgAuth(@JdbcConn(true) Connection con, String pid,String oid) throws SQLException {
674
		this.professorDao.joinAndPassOrgAuth(con, pid, oid, "1");
675
	}
669 676

670 677
	@Post
671 678
	@Path("/removeOrgAuth")

+ 37 - 0
src/main/java/com/ekexiu/portal/system/OrgInviteLog.java

@ -0,0 +1,37 @@
1
package com.ekexiu.portal.system;
2

3
import org.jfw.apt.orm.annotation.entry.Column;
4
import org.jfw.apt.orm.annotation.entry.Table;
5
import org.jfw.apt.orm.core.enums.DE;
6

7
import com.ekexiu.portal.basepo.CreateTimeSupported;
8

9
@Table
10
public class OrgInviteLog implements CreateTimeSupported {
11

12
	private String id;
13
	private String oid;
14
	private String createTime;
15
	@Column(DE.id_32)
16
	public String getId() {
17
		return id;
18
	}
19
	public void setId(String id) {
20
		this.id = id;
21
	}
22
	@Column(DE.text_de)
23
	public String getOid() {
24
		return oid;
25
	}
26
	public void setOid(String oid) {
27
		this.oid = oid;
28
	}
29
	public String getCreateTime() {
30
		return createTime;
31
	}
32
	public void setCreateTime(String createTime) {
33
		this.createTime = createTime;
34
	}
35
	
36
	
37
}

+ 28 - 0
src/main/java/com/ekexiu/portal/system/OrgInviteLogDao.java

@ -0,0 +1,28 @@
1
package com.ekexiu.portal.system;
2

3
import java.sql.Connection;
4
import java.sql.SQLException;
5

6
import org.jfw.apt.annotation.Nullable;
7
import org.jfw.apt.orm.annotation.dao.DAO;
8
import org.jfw.apt.orm.annotation.dao.method.From;
9
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
10
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
11
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
12
import org.jfw.apt.orm.annotation.dao.param.LessThan;
13

14
@DAO
15
public interface OrgInviteLogDao {
16

17
	@Insert
18
	int insert(Connection con, OrgInviteLog log) throws SQLException;
19

20
	@SelectOne
21
	@Nullable
22
	OrgInviteLog query(Connection con, String id) throws SQLException;
23

24
	@DeleteWith
25
	@From(OrgInviteLog.class)
26
	int delete(Connection con, @LessThan String createTime) throws SQLException;
27

28
}

+ 152 - 0
src/main/java/com/ekexiu/portal/system/SysMailService.java

@ -0,0 +1,152 @@
1
package com.ekexiu.portal.system;
2

3
import java.sql.Connection;
4
import java.sql.SQLException;
5
import java.util.HashMap;
6
import java.util.List;
7
import java.util.Map;
8

9
import org.jfw.apt.annotation.Autowrie;
10
import org.jfw.apt.web.annotation.Path;
11
import org.jfw.apt.web.annotation.operate.Get;
12
import org.jfw.apt.web.annotation.operate.Post;
13
import org.jfw.apt.web.annotation.param.AfterCommit;
14
import org.jfw.apt.web.annotation.param.JdbcConn;
15
import org.jfw.util.DateUtil;
16
import org.jfw.util.StringUtil;
17
import org.jfw.util.exception.JfwBaseException;
18

19
import com.ekexiu.portal.dao.OrgDao;
20
import com.ekexiu.portal.mail.MailService;
21
import com.ekexiu.portal.po.Organization;
22

23
@Path()
24
public class SysMailService {
25

26
	
27
	private long timeoutOfOrgInviteLog = 1000 *60 * 60 *24;
28
	private String orgInviteCodeKey;
29
	private String orgInviteNameKey;
30
	private String orgInviteTemplate;
31
	@Autowrie
32
	private MailService mailservice;
33
	@Autowrie
34
	private OrgDao orgDao;
35
	@Autowrie
36
	private OrgInviteLogDao orgInviteLogDao;
37
	
38
	
39

40
	public long getTimeoutOfOrgInviteLog() {
41
		return timeoutOfOrgInviteLog;
42
	}
43

44
	public void setTimeoutOfOrgInviteLog(long timeoutOfOrgInviteLog) {
45
		this.timeoutOfOrgInviteLog = timeoutOfOrgInviteLog;
46
	}
47

48
	public String getOrgInviteCodeKey() {
49
		return orgInviteCodeKey;
50
	}
51

52
	public void setOrgInviteCodeKey(String orgInviteCodeKey) {
53
		this.orgInviteCodeKey = orgInviteCodeKey;
54
	}
55

56
	public String getOrgInviteNameKey() {
57
		return orgInviteNameKey;
58
	}
59

60
	public void setOrgInviteNameKey(String orgInviteNameKey) {
61
		this.orgInviteNameKey = orgInviteNameKey;
62
	}
63

64
	public String getOrgInviteTemplate() {
65
		return orgInviteTemplate;
66
	}
67

68
	public void setOrgInviteTemplate(String orgInviteTemplate) {
69
		this.orgInviteTemplate = orgInviteTemplate;
70
	}
71

72
	public MailService getMailservice() {
73
		return mailservice;
74
	}
75

76
	public void setMailservice(MailService mailservice) {
77
		this.mailservice = mailservice;
78
	}
79

80
	public OrgDao getOrgDao() {
81
		return orgDao;
82
	}
83

84
	public void setOrgDao(OrgDao orgDao) {
85
		this.orgDao = orgDao;
86
	}
87

88
	public OrgInviteLogDao getOrgInviteLogDao() {
89
		return orgInviteLogDao;
90
	}
91

92
	public void setOrgInviteLogDao(OrgInviteLogDao orgInviteLogDao) {
93
		this.orgInviteLogDao = orgInviteLogDao;
94
	}
95

96
	@Get
97
	@Path("/cleanInviteOrg")
98
	public void cleanInviteOrg(@JdbcConn(true) Connection con) throws SQLException{
99
		String time = DateUtil.formatDateTime(System.currentTimeMillis()-this.timeoutOfOrgInviteLog);
100
		this.orgInviteLogDao.delete(con, time);
101
	}
102
	
103
	@Post
104
	@Path("/sendMailWithInviteOrg")
105
	public void send(@JdbcConn(true) Connection con, final String mail, String oid, @AfterCommit List<Runnable> runs) throws SQLException, JfwBaseException {
106

107
		final Organization org = orgDao.query(con, oid);
108
		if (org == null) {
109
			throw new JfwBaseException(-600001, "invalid param oid");
110
		}
111

112
		final String logId = StringUtil.buildUUID();
113
		OrgInviteLog log = new OrgInviteLog();
114
		log.setId(logId);
115
		log.setOid(oid);
116
		orgInviteLogDao.insert(con, log);
117

118
		final Map<String, String> map = new HashMap<String, String>();
119
		map.put(this.orgInviteCodeKey, logId);
120
		map.put(orgInviteNameKey, org.getName());
121
		final String mailTitle = "「科袖网」 " + org.getName() + " 邀请您成为企业认证员工";
122

123
		runs.add(new Runnable() {
124

125
			@Override
126
			public void run() {
127
				try {
128
					mailservice.sendSimpleMail(mail, orgInviteTemplate, map, mailTitle);
129
				} catch (Exception e) {
130
				}
131
			}
132
		});
133
	}
134
	
135
	@Get
136
	@Path("/queryOrgByOrgInviteLogId")
137
	public Organization queryOrgByOrgInviteLogId(@JdbcConn Connection con,String code)throws SQLException{
138
		OrgInviteLog log = this.orgInviteLogDao.query(con,code);
139
		if(log!=null){
140
			String time = DateUtil.formatDateTime(System.currentTimeMillis()-this.timeoutOfOrgInviteLog);
141
			if(time.compareTo(log.getCreateTime())<=0){
142
				return this.orgDao.query(con,log.getOid());
143
			}
144
		}
145
		return null;
146
	}
147
	
148
	
149
	
150
	
151

152
}

+ 11 - 0
src/main/java/com/ekexiu/portal/system/SystemService.java

@ -0,0 +1,11 @@
1
package com.ekexiu.portal.system;
2

3
import org.jfw.apt.web.annotation.Path;
4

5
@Path("/")
6
public class SystemService {
7

8
	
9
	
10
	
11
}

+ 24 - 3
src/main/resources/database.sql

@ -2375,6 +2375,27 @@ ALTER TABLE public.article DROP professor_id;
2375 2375
ALTER TABLE public.article DROP org_id
2376 2376

2377 2377

2378

2379

2380

2378
--modify begin at 2.50
2379
CREATE TABLE ARTICLE_FILE (ID TEXT NOT NULL,SEQ INTEGER NOT NULL,NAME TEXT NOT NULL,URL TEXT NOT NULL,SIZE BIGINT NOT NULL);
2380
ALTER TABLE ARTICLE_FILE ADD PRIMARY KEY (ID,SEQ);
2381

2382
COMMENT ON TABLE ARTICLE_FILE is '文章附件表';
2383
COMMENT ON COLUMN ARTICLE_FILE.ID is '文章ID';
2384
COMMENT ON COLUMN ARTICLE_FILE.SEQ is '文章附件顺序号';
2385
COMMENT ON COLUMN ARTICLE_FILE.URL is '文章附件URL';
2386
COMMENT ON COLUMN ARTICLE_FILE.SIZE is '文章附件大小';
2387
COMMENT ON COLUMN ARTICLE_FILE.SIZE is '文章附件名称';
2388

2389
CREATE TABLE ORG_LINK_MAN (OID TEXT NOT NULL,PID TEXT NOT NULL,SEQ INTEGER NOT NULL);
2390
ALTER TABLE ORG_LINK_MAN ADD PRIMARY KEY (OID,PID);
2391

2392
COMMENT ON TABLE ORG_LINK_MAN is '企业默认联系人';
2393
COMMENT ON COLUMN ORG_LINK_MAN.OID is '企业ID';
2394
COMMENT ON COLUMN ORG_LINK_MAN.SEQ is '顺序号';
2395
COMMENT ON COLUMN ORG_LINK_MAN.PID is '联系人ID';
2396

2397
CREATE TABLE ORG_INVITE_LOG (ID CHAR(32) NOT NULL,OID TEXT NOT NULL,CREATE_TIME CHAR(14) NOT NULL);
2398
COMMENT ON TABLE ORG_INVITE_LOG is '企业邀请记录';
2399
COMMENT ON COLUMN ORG_INVITE_LOG.OID is '企业ID';
2400
COMMENT ON COLUMN ORG_INVITE_LOG.ID is '邀请ID';
2401
COMMENT ON COLUMN ORG_INVITE_LOG.CREATE_TIME is '邀请时间';

+ 4 - 1
src/main/resources/project-test-dev.properties

@ -287,4 +287,7 @@ com_ekexiu_portal_platform_PlatformService.subjectWithRestPasswordWithEmail=\u30
287 287
com_ekexiu_portal_platform_PlatformService.urlWithBindEmail=MAIL_BIND_URL
288 288
com_ekexiu_portal_platform_PlatformService.stateCodeWithBindEmail=MAIL_BIND_SC
289 289
com_ekexiu_portal_platform_PlatformService.templateWithBindEmail=<html style\="height\:auto;"><head><meta name\="viewport" content\="width\=device-width, initial-scale\=1" /><meta http-equiv\="Content-Type" content\="text/html;charset\=UTF-8"><style type\="text/css">html,body {font\: 14px/1.666 Tahoma, Arial;border\: 0;margin\: 0;padding\: 0;color\: \#000000;scrollbar-base-color\: \#dddddd;scrollbar-3dlight-color\: \#ffffff;scrollbar-highlight-color\: \#dddddd;scrollbar-shadow-color\: \#ffffff;scrollbar-darkshadow-color\: \#ffffff;scrollbar-track-color\: \#ffffff;scrollbar-arrow-color\: \#999999;}        div,form,input,textarea,span,img,iframe {margin\: 0;padding\: 0;border\: 0;outline\: 0;}input {cursor\: pointer;}blockquote { margin-left\: 30px;margin-right\: 0; padding\: 0; border\: 0;}blockquote blockquote { margin-left\: 0px;}pre { white-space\: pre-wrap;white-space\: -moz-pre-wrap;white-space\: -pre-wrap;white-space\: -o-pre-wrap;}@media only screen and (max-width\: 600px) {\tdiv[class\="img-responsive"]{\t\ttext-align\:center\!important;}}</style></head><body style\="height\:auto;padding\:0;margin\:0;border\:0;overflow\:hidden;background\:\#d9dfe2;"><div class\="img-responsive" style\="margin-top\:40px;padding\:20px;background\:\#ECF0F5;width\:100%;"><img src\="http\://www.ekexiu.com/images/logo4.png"></div><div style\="width\:100.0%;"><div class\="wrapper" style\="width\: auto; margin\: auto; background\: rgb(255, 255, 255);" _ow\="600px"><div style\="margin\:auto"><div class\="row" style\="text-align\:left;"></div><div class\="row"><div style\="position\:relative;padding\:15.0px 50.0px 10.0px 50.0px;"><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u5C0A\u656C\u7684\u7528\u6237\uFF1A</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u597D\uFF01</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u6B63\u5728\u7ED1\u5B9A\u65B0\u90AE\u7BB1\uFF0C\u8BF7\u8BBF\u95EE\u4E0B\u9762\u7684\u7F51\u5740\u5B8C\u6210\u7ED1\u5B9A\u3002</p><p><a style\="color\:\#ff9900" href\="MAIL_BIND_URL\=MAIL_BIND_SC" target\="_blank">MAIL_BIND_URL\=MAIL_BIND_SC</a></p><p style\="margin-top\:30.0px;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;border-top\:1.0px solid \#eeeded;padding-top\:15.0px;">\u7CFB\u7EDF\u53D1\u4FE1\uFF0C\u8BF7\u52FF\u56DE\u590D</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u7535\u8BDD\: 010-62343359</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u90AE\u7BB1\: service@ekexiu.com</p><p style\="margin-top\:0;margin-bottom\:30.0px;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u5B98\u7F51\: <a style\="color\:\#ff9900" href\="http\://www.ekexiu.com/" target\="_blank">www.ekexiu.com</a></p></div></div></div><\!--footer\u5E95\u90E8--><div style\="background\:\#ECF0F5;width\:100.0%;color\:\#999999;padding\:10px 20px;font-size\:12.0px;"><p style\="padding-bottom\:0;margin-bottom\:0;">&copy; 2016 \u5317\u4EAC\u79D1\u8896\u79D1\u6280\u6709\u9650\u516C\u53F8 &nbsp; | &nbsp; \u4EACICP\u590716042588\u53F7-1 &nbsp; | &nbsp;<a class\="beianbox" style\="color\:\#399A9B;" target\="_black" rel\="nofollow" href\="http\://www.beian.gov.cn/portal/registerSystemInfo?recordcode\=11010802022306"><span class\="beian-icon"></span> \u4EAC\u516C\u7F51\u5B89\u590711010802022306\u53F7</a></p><p style\="padding-top\:0;margin-top\:0;">\u610F\u89C1\u5EFA\u8BAE\uFF1A<strong><a style\="color\:\#399A9B;" rel\="nofollow" href\="mailto\:service@ekexiu.com">service@ekexiu.com</a></strong>&nbsp;&nbsp;&nbsp; \u5BA2\u670D\u7535\u8BDD\uFF1A  010-62343359\uFF089\:00-17\:00\uFF09 </p></div><\!--footer\u5E95\u90E8--></div></div></body></html>
290
com_ekexiu_portal_platform_PlatformService.subjectWithBindEmail=\u300C\u79D1\u8896\u300D\u5E73\u53F0\u8D26\u6237\u90AE\u7BB1\u7ED1\u5B9A
290
com_ekexiu_portal_platform_PlatformService.subjectWithBindEmail=\u300C\u79D1\u8896\u300D\u5E73\u53F0\u8D26\u6237\u90AE\u7BB1\u7ED1\u5B9A
291
com_ekexiu_portal_platform_system_SysMailService.orgInviteCodeKey=MAIL_SC
292
com_ekexiu_portal_platform_system_SysMailService.orgInviteNameKey=MAIL_ORG_NAME
293
com_ekexiu_portal_platform_system_SysMailService.orgInviteTemplate=<html style\="height\:auto;"><head><meta name\="viewport" content\="width\=device-width, initial-scale\=1" /><meta http-equiv\="Content-Type" content\="text/html;charset\=UTF-8"><style type\="text/css">html,body {font\: 14px/1.666 Tahoma, Arial;border\: 0;margin\: 0;padding\: 0;color\: \#000000;scrollbar-base-color\: \#dddddd;scrollbar-3dlight-color\: \#ffffff;scrollbar-highlight-color\: \#dddddd;scrollbar-shadow-color\: \#ffffff;scrollbar-darkshadow-color\: \#ffffff;scrollbar-track-color\: \#ffffff;scrollbar-arrow-color\: \#999999;}        div,form,input,textarea,span,img,iframe {margin\: 0;padding\: 0;border\: 0;outline\: 0;}input {cursor\: pointer;}blockquote { margin-left\: 30px;margin-right\: 0; padding\: 0; border\: 0;}blockquote blockquote { margin-left\: 0px;}pre { white-space\: pre-wrap;white-space\: -moz-pre-wrap;white-space\: -pre-wrap;white-space\: -o-pre-wrap;}@media only screen and (max-width\: 600px) {\tdiv[class\="img-responsive"]{\t\ttext-align\:center\!important;}}</style></head><body style\="height\:auto;padding\:0;margin\:0;border\:0;overflow\:hidden;background\:\#d9dfe2;"><div class\="img-responsive" style\="margin-top\:40px;padding\:20px;background\:\#ECF0F5;width\:100%;"><img src\="http\://www.ekexiu.com/images/logo4.png"></div><div style\="width\:100.0%;"><div class\="wrapper" style\="width\: auto; margin\: auto; background\: rgb(255, 255, 255);" _ow\="600px"><div style\="margin\:auto"><div class\="row" style\="text-align\:left;"></div><div class\="row"><div style\="position\:relative;padding\:15.0px 50.0px 10.0px 50.0px;"><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u5C0A\u656C\u7684\u7528\u6237\uFF1A</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u597D\uFF01</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u7684\u4F01\u4E1AMAIL_ORG_NAME\u9080\u8BF7\u60A8\u6210\u4E3A\u4F01\u4E1A\u8BA4\u8BC1\u5458\u5DE5\uFF0C\u8BF7\u8BBF\u95EE\u4E0B\u9762\u7684\u7F51\u5740\u5B8C\u6210\u64CD\u4F5C\u3002</p><p><a style\="color\:\#ff9900" href\="http\://192.168.3.233:81/emaiFindPwdOk.html?sc\=MAIL_SC" target\="_blank">http\://192.168.3.233:81/emaiFindPwdOk.html?sc\=MAIL_SC</a></p><p style\="margin-top\:30.0px;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;border-top\:1.0px solid \#eeeded;padding-top\:15.0px;">\u7CFB\u7EDF\u53D1\u4FE1\uFF0C\u8BF7\u52FF\u56DE\u590D</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u7535\u8BDD\: 010-62343359</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u90AE\u7BB1\: service@ekexiu.com</p><p style\="margin-top\:0;margin-bottom\:30.0px;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u5B98\u7F51\: <a style\="color\:\#ff9900" href\="http\://www.ekexiu.com/" target\="_blank">www.ekexiu.com</a></p></div></div></div><\!--footer\u5E95\u90E8--><div style\="background\:\#ECF0F5;width\:100.0%;color\:\#999999;padding\:10px 20px;font-size\:12.0px;"><p style\="padding-bottom\:0;margin-bottom\:0;">&copy; 2016 \u5317\u4EAC\u79D1\u8896\u79D1\u6280\u6709\u9650\u516C\u53F8 &nbsp; | &nbsp; \u4EACICP\u590716042588\u53F7-1 &nbsp; | &nbsp;<a class\="beianbox" style\="color\:\#399A9B;" target\="_black" rel\="nofollow" href\="http\://www.beian.gov.cn/portal/registerSystemInfo?recordcode\=11010802022306"><span class\="beian-icon"></span> \u4EAC\u516C\u7F51\u5B89\u590711010802022306\u53F7</a></p><p style\="padding-top\:0;margin-top\:0;">\u610F\u89C1\u5EFA\u8BAE\uFF1A<strong><a style\="color\:\#399A9B;" rel\="nofollow" href\="mailto\:service@ekexiu.com">service@ekexiu.com</a></strong>&nbsp;&nbsp;&nbsp; \u5BA2\u670D\u7535\u8BDD\uFF1A  010-62343359\uFF089\:00-17\:00\uFF09 </p></div><\!--footer\u5E95\u90E8--></div></div></body></html>

+ 4 - 1
src/main/resources/project-test.properties

@ -287,4 +287,7 @@ com_ekexiu_portal_platform_PlatformService.subjectWithRestPasswordWithEmail=\u30
287 287
com_ekexiu_portal_platform_PlatformService.urlWithBindEmail=MAIL_BIND_URL
288 288
com_ekexiu_portal_platform_PlatformService.stateCodeWithBindEmail=MAIL_BIND_SC
289 289
com_ekexiu_portal_platform_PlatformService.templateWithBindEmail=<html style\="height\:auto;"><head><meta name\="viewport" content\="width\=device-width, initial-scale\=1" /><meta http-equiv\="Content-Type" content\="text/html;charset\=UTF-8"><style type\="text/css">html,body {font\: 14px/1.666 Tahoma, Arial;border\: 0;margin\: 0;padding\: 0;color\: \#000000;scrollbar-base-color\: \#dddddd;scrollbar-3dlight-color\: \#ffffff;scrollbar-highlight-color\: \#dddddd;scrollbar-shadow-color\: \#ffffff;scrollbar-darkshadow-color\: \#ffffff;scrollbar-track-color\: \#ffffff;scrollbar-arrow-color\: \#999999;}        div,form,input,textarea,span,img,iframe {margin\: 0;padding\: 0;border\: 0;outline\: 0;}input {cursor\: pointer;}blockquote { margin-left\: 30px;margin-right\: 0; padding\: 0; border\: 0;}blockquote blockquote { margin-left\: 0px;}pre { white-space\: pre-wrap;white-space\: -moz-pre-wrap;white-space\: -pre-wrap;white-space\: -o-pre-wrap;}@media only screen and (max-width\: 600px) {\tdiv[class\="img-responsive"]{\t\ttext-align\:center\!important;}}</style></head><body style\="height\:auto;padding\:0;margin\:0;border\:0;overflow\:hidden;background\:\#d9dfe2;"><div class\="img-responsive" style\="margin-top\:40px;padding\:20px;background\:\#ECF0F5;width\:100%;"><img src\="http\://www.ekexiu.com/images/logo4.png"></div><div style\="width\:100.0%;"><div class\="wrapper" style\="width\: auto; margin\: auto; background\: rgb(255, 255, 255);" _ow\="600px"><div style\="margin\:auto"><div class\="row" style\="text-align\:left;"></div><div class\="row"><div style\="position\:relative;padding\:15.0px 50.0px 10.0px 50.0px;"><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u5C0A\u656C\u7684\u7528\u6237\uFF1A</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u597D\uFF01</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u6B63\u5728\u7ED1\u5B9A\u65B0\u90AE\u7BB1\uFF0C\u8BF7\u8BBF\u95EE\u4E0B\u9762\u7684\u7F51\u5740\u5B8C\u6210\u7ED1\u5B9A\u3002</p><p><a style\="color\:\#ff9900" href\="MAIL_BIND_URL\=MAIL_BIND_SC" target\="_blank">MAIL_BIND_URL\=MAIL_BIND_SC</a></p><p style\="margin-top\:30.0px;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;border-top\:1.0px solid \#eeeded;padding-top\:15.0px;">\u7CFB\u7EDF\u53D1\u4FE1\uFF0C\u8BF7\u52FF\u56DE\u590D</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u7535\u8BDD\: 010-62343359</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u90AE\u7BB1\: service@ekexiu.com</p><p style\="margin-top\:0;margin-bottom\:30.0px;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u5B98\u7F51\: <a style\="color\:\#ff9900" href\="http\://www.ekexiu.com/" target\="_blank">www.ekexiu.com</a></p></div></div></div><\!--footer\u5E95\u90E8--><div style\="background\:\#ECF0F5;width\:100.0%;color\:\#999999;padding\:10px 20px;font-size\:12.0px;"><p style\="padding-bottom\:0;margin-bottom\:0;">&copy; 2016 \u5317\u4EAC\u79D1\u8896\u79D1\u6280\u6709\u9650\u516C\u53F8 &nbsp; | &nbsp; \u4EACICP\u590716042588\u53F7-1 &nbsp; | &nbsp;<a class\="beianbox" style\="color\:\#399A9B;" target\="_black" rel\="nofollow" href\="http\://www.beian.gov.cn/portal/registerSystemInfo?recordcode\=11010802022306"><span class\="beian-icon"></span> \u4EAC\u516C\u7F51\u5B89\u590711010802022306\u53F7</a></p><p style\="padding-top\:0;margin-top\:0;">\u610F\u89C1\u5EFA\u8BAE\uFF1A<strong><a style\="color\:\#399A9B;" rel\="nofollow" href\="mailto\:service@ekexiu.com">service@ekexiu.com</a></strong>&nbsp;&nbsp;&nbsp; \u5BA2\u670D\u7535\u8BDD\uFF1A  010-62343359\uFF089\:00-17\:00\uFF09 </p></div><\!--footer\u5E95\u90E8--></div></div></body></html>
290
com_ekexiu_portal_platform_PlatformService.subjectWithBindEmail=\u300C\u79D1\u8896\u300D\u5E73\u53F0\u8D26\u6237\u90AE\u7BB1\u7ED1\u5B9A
290
com_ekexiu_portal_platform_PlatformService.subjectWithBindEmail=\u300C\u79D1\u8896\u300D\u5E73\u53F0\u8D26\u6237\u90AE\u7BB1\u7ED1\u5B9A
291
com_ekexiu_portal_platform_system_SysMailService.orgInviteCodeKey=MAIL_SC
292
com_ekexiu_portal_platform_system_SysMailService.orgInviteNameKey=MAIL_ORG_NAME
293
com_ekexiu_portal_platform_system_SysMailService.orgInviteTemplate=<html style\="height\:auto;"><head><meta name\="viewport" content\="width\=device-width, initial-scale\=1" /><meta http-equiv\="Content-Type" content\="text/html;charset\=UTF-8"><style type\="text/css">html,body {font\: 14px/1.666 Tahoma, Arial;border\: 0;margin\: 0;padding\: 0;color\: \#000000;scrollbar-base-color\: \#dddddd;scrollbar-3dlight-color\: \#ffffff;scrollbar-highlight-color\: \#dddddd;scrollbar-shadow-color\: \#ffffff;scrollbar-darkshadow-color\: \#ffffff;scrollbar-track-color\: \#ffffff;scrollbar-arrow-color\: \#999999;}        div,form,input,textarea,span,img,iframe {margin\: 0;padding\: 0;border\: 0;outline\: 0;}input {cursor\: pointer;}blockquote { margin-left\: 30px;margin-right\: 0; padding\: 0; border\: 0;}blockquote blockquote { margin-left\: 0px;}pre { white-space\: pre-wrap;white-space\: -moz-pre-wrap;white-space\: -pre-wrap;white-space\: -o-pre-wrap;}@media only screen and (max-width\: 600px) {\tdiv[class\="img-responsive"]{\t\ttext-align\:center\!important;}}</style></head><body style\="height\:auto;padding\:0;margin\:0;border\:0;overflow\:hidden;background\:\#d9dfe2;"><div class\="img-responsive" style\="margin-top\:40px;padding\:20px;background\:\#ECF0F5;width\:100%;"><img src\="http\://www.ekexiu.com/images/logo4.png"></div><div style\="width\:100.0%;"><div class\="wrapper" style\="width\: auto; margin\: auto; background\: rgb(255, 255, 255);" _ow\="600px"><div style\="margin\:auto"><div class\="row" style\="text-align\:left;"></div><div class\="row"><div style\="position\:relative;padding\:15.0px 50.0px 10.0px 50.0px;"><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u5C0A\u656C\u7684\u7528\u6237\uFF1A</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u597D\uFF01</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u7684\u4F01\u4E1AMAIL_ORG_NAME\u9080\u8BF7\u60A8\u6210\u4E3A\u4F01\u4E1A\u8BA4\u8BC1\u5458\u5DE5\uFF0C\u8BF7\u8BBF\u95EE\u4E0B\u9762\u7684\u7F51\u5740\u5B8C\u6210\u64CD\u4F5C\u3002</p><p><a style\="color\:\#ff9900" href\="http\://192.168.3.233/emaiFindPwdOk.html?sc\=MAIL_SC" target\="_blank">http\://192.168.3.233/emaiFindPwdOk.html?sc\=MAIL_SC</a></p><p style\="margin-top\:30.0px;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;border-top\:1.0px solid \#eeeded;padding-top\:15.0px;">\u7CFB\u7EDF\u53D1\u4FE1\uFF0C\u8BF7\u52FF\u56DE\u590D</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u7535\u8BDD\: 010-62343359</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u90AE\u7BB1\: service@ekexiu.com</p><p style\="margin-top\:0;margin-bottom\:30.0px;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u5B98\u7F51\: <a style\="color\:\#ff9900" href\="http\://www.ekexiu.com/" target\="_blank">www.ekexiu.com</a></p></div></div></div><\!--footer\u5E95\u90E8--><div style\="background\:\#ECF0F5;width\:100.0%;color\:\#999999;padding\:10px 20px;font-size\:12.0px;"><p style\="padding-bottom\:0;margin-bottom\:0;">&copy; 2016 \u5317\u4EAC\u79D1\u8896\u79D1\u6280\u6709\u9650\u516C\u53F8 &nbsp; | &nbsp; \u4EACICP\u590716042588\u53F7-1 &nbsp; | &nbsp;<a class\="beianbox" style\="color\:\#399A9B;" target\="_black" rel\="nofollow" href\="http\://www.beian.gov.cn/portal/registerSystemInfo?recordcode\=11010802022306"><span class\="beian-icon"></span> \u4EAC\u516C\u7F51\u5B89\u590711010802022306\u53F7</a></p><p style\="padding-top\:0;margin-top\:0;">\u610F\u89C1\u5EFA\u8BAE\uFF1A<strong><a style\="color\:\#399A9B;" rel\="nofollow" href\="mailto\:service@ekexiu.com">service@ekexiu.com</a></strong>&nbsp;&nbsp;&nbsp; \u5BA2\u670D\u7535\u8BDD\uFF1A  010-62343359\uFF089\:00-17\:00\uFF09 </p></div><\!--footer\u5E95\u90E8--></div></div></body></html>

+ 5 - 0
src/main/resources/project.properties

@ -292,4 +292,9 @@ com_ekexiu_portal_platform_PlatformService.urlWithBindEmail=MAIL_BIND_URL
292 292
com_ekexiu_portal_platform_PlatformService.stateCodeWithBindEmail=MAIL_BIND_SC
293 293
com_ekexiu_portal_platform_PlatformService.templateWithBindEmail=<html style\="height\:auto;"><head><meta name\="viewport" content\="width\=device-width, initial-scale\=1" /><meta http-equiv\="Content-Type" content\="text/html;charset\=UTF-8"><style type\="text/css">html,body {font\: 14px/1.666 Tahoma, Arial;border\: 0;margin\: 0;padding\: 0;color\: \#000000;scrollbar-base-color\: \#dddddd;scrollbar-3dlight-color\: \#ffffff;scrollbar-highlight-color\: \#dddddd;scrollbar-shadow-color\: \#ffffff;scrollbar-darkshadow-color\: \#ffffff;scrollbar-track-color\: \#ffffff;scrollbar-arrow-color\: \#999999;}        div,form,input,textarea,span,img,iframe {margin\: 0;padding\: 0;border\: 0;outline\: 0;}input {cursor\: pointer;}blockquote { margin-left\: 30px;margin-right\: 0; padding\: 0; border\: 0;}blockquote blockquote { margin-left\: 0px;}pre { white-space\: pre-wrap;white-space\: -moz-pre-wrap;white-space\: -pre-wrap;white-space\: -o-pre-wrap;}@media only screen and (max-width\: 600px) {\tdiv[class\="img-responsive"]{\t\ttext-align\:center\!important;}}</style></head><body style\="height\:auto;padding\:0;margin\:0;border\:0;overflow\:hidden;background\:\#d9dfe2;"><div class\="img-responsive" style\="margin-top\:40px;padding\:20px;background\:\#ECF0F5;width\:100%;"><img src\="http\://www.ekexiu.com/images/logo4.png"></div><div style\="width\:100.0%;"><div class\="wrapper" style\="width\: auto; margin\: auto; background\: rgb(255, 255, 255);" _ow\="600px"><div style\="margin\:auto"><div class\="row" style\="text-align\:left;"></div><div class\="row"><div style\="position\:relative;padding\:15.0px 50.0px 10.0px 50.0px;"><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u5C0A\u656C\u7684\u7528\u6237\uFF1A</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u597D\uFF01</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u6B63\u5728\u7ED1\u5B9A\u65B0\u90AE\u7BB1\uFF0C\u8BF7\u8BBF\u95EE\u4E0B\u9762\u7684\u7F51\u5740\u5B8C\u6210\u7ED1\u5B9A\u3002</p><p><a style\="color\:\#ff9900" href\="MAIL_BIND_URL\=MAIL_BIND_SC" target\="_blank">MAIL_BIND_URL\=MAIL_BIND_SC</a></p><p style\="margin-top\:30.0px;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;border-top\:1.0px solid \#eeeded;padding-top\:15.0px;">\u7CFB\u7EDF\u53D1\u4FE1\uFF0C\u8BF7\u52FF\u56DE\u590D</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u7535\u8BDD\: 010-62343359</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u90AE\u7BB1\: service@ekexiu.com</p><p style\="margin-top\:0;margin-bottom\:30.0px;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u5B98\u7F51\: <a style\="color\:\#ff9900" href\="http\://www.ekexiu.com/" target\="_blank">www.ekexiu.com</a></p></div></div></div><\!--footer\u5E95\u90E8--><div style\="background\:\#ECF0F5;width\:100.0%;color\:\#999999;padding\:10px 20px;font-size\:12.0px;"><p style\="padding-bottom\:0;margin-bottom\:0;">&copy; 2016 \u5317\u4EAC\u79D1\u8896\u79D1\u6280\u6709\u9650\u516C\u53F8 &nbsp; | &nbsp; \u4EACICP\u590716042588\u53F7-1 &nbsp; | &nbsp;<a class\="beianbox" style\="color\:\#399A9B;" target\="_black" rel\="nofollow" href\="http\://www.beian.gov.cn/portal/registerSystemInfo?recordcode\=11010802022306"><span class\="beian-icon"></span> \u4EAC\u516C\u7F51\u5B89\u590711010802022306\u53F7</a></p><p style\="padding-top\:0;margin-top\:0;">\u610F\u89C1\u5EFA\u8BAE\uFF1A<strong><a style\="color\:\#399A9B;" rel\="nofollow" href\="mailto\:service@ekexiu.com">service@ekexiu.com</a></strong>&nbsp;&nbsp;&nbsp; \u5BA2\u670D\u7535\u8BDD\uFF1A  010-62343359\uFF089\:00-17\:00\uFF09 </p></div><\!--footer\u5E95\u90E8--></div></div></body></html>
294 294
com_ekexiu_portal_platform_PlatformService.subjectWithBindEmail=\u300C\u79D1\u8896\u300D\u5E73\u53F0\u8D26\u6237\u90AE\u7BB1\u7ED1\u5B9A
295
com_ekexiu_portal_platform_system_SysMailService.orgInviteCodeKey=MAIL_SC
296
com_ekexiu_portal_platform_system_SysMailService.orgInviteNameKey=MAIL_ORG_NAME
297
com_ekexiu_portal_platform_system_SysMailService.orgInviteTemplate=<html style\="height\:auto;"><head><meta name\="viewport" content\="width\=device-width, initial-scale\=1" /><meta http-equiv\="Content-Type" content\="text/html;charset\=UTF-8"><style type\="text/css">html,body {font\: 14px/1.666 Tahoma, Arial;border\: 0;margin\: 0;padding\: 0;color\: \#000000;scrollbar-base-color\: \#dddddd;scrollbar-3dlight-color\: \#ffffff;scrollbar-highlight-color\: \#dddddd;scrollbar-shadow-color\: \#ffffff;scrollbar-darkshadow-color\: \#ffffff;scrollbar-track-color\: \#ffffff;scrollbar-arrow-color\: \#999999;}        div,form,input,textarea,span,img,iframe {margin\: 0;padding\: 0;border\: 0;outline\: 0;}input {cursor\: pointer;}blockquote { margin-left\: 30px;margin-right\: 0; padding\: 0; border\: 0;}blockquote blockquote { margin-left\: 0px;}pre { white-space\: pre-wrap;white-space\: -moz-pre-wrap;white-space\: -pre-wrap;white-space\: -o-pre-wrap;}@media only screen and (max-width\: 600px) {\tdiv[class\="img-responsive"]{\t\ttext-align\:center\!important;}}</style></head><body style\="height\:auto;padding\:0;margin\:0;border\:0;overflow\:hidden;background\:\#d9dfe2;"><div class\="img-responsive" style\="margin-top\:40px;padding\:20px;background\:\#ECF0F5;width\:100%;"><img src\="http\://www.ekexiu.com/images/logo4.png"></div><div style\="width\:100.0%;"><div class\="wrapper" style\="width\: auto; margin\: auto; background\: rgb(255, 255, 255);" _ow\="600px"><div style\="margin\:auto"><div class\="row" style\="text-align\:left;"></div><div class\="row"><div style\="position\:relative;padding\:15.0px 50.0px 10.0px 50.0px;"><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u5C0A\u656C\u7684\u7528\u6237\uFF1A</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u597D\uFF01</p><p class\="start" style\="color\:\#555555;font-size\:14.0px;line-height\:24.0px;padding-top\:10.0px;text-justify\:inter-ideograph;text-align\:justify;">\u60A8\u7684\u4F01\u4E1AMAIL_ORG_NAME\u9080\u8BF7\u60A8\u6210\u4E3A\u4F01\u4E1A\u8BA4\u8BC1\u5458\u5DE5\uFF0C\u8BF7\u8BBF\u95EE\u4E0B\u9762\u7684\u7F51\u5740\u5B8C\u6210\u64CD\u4F5C\u3002</p><p><a style\="color\:\#ff9900" href\="http\://www.ekexiu.com/emaiFindPwdOk.html?sc\=MAIL_SC" target\="_blank">http\://www.ekexiu.com/emaiFindPwdOk.html?sc\=MAIL_SC</a></p><p style\="margin-top\:30.0px;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;border-top\:1.0px solid \#eeeded;padding-top\:15.0px;">\u7CFB\u7EDF\u53D1\u4FE1\uFF0C\u8BF7\u52FF\u56DE\u590D</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u7535\u8BDD\: 010-62343359</p><p style\="margin-top\:0;margin-bottom\:0;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u90AE\u7BB1\: service@ekexiu.com</p><p style\="margin-top\:0;margin-bottom\:30.0px;font-size\:14.0px;line-height\:24.0px;color\:\#555555;">\u5B98\u7F51\: <a style\="color\:\#ff9900" href\="http\://www.ekexiu.com/" target\="_blank">www.ekexiu.com</a></p></div></div></div><\!--footer\u5E95\u90E8--><div style\="background\:\#ECF0F5;width\:100.0%;color\:\#999999;padding\:10px 20px;font-size\:12.0px;"><p style\="padding-bottom\:0;margin-bottom\:0;">&copy; 2016 \u5317\u4EAC\u79D1\u8896\u79D1\u6280\u6709\u9650\u516C\u53F8 &nbsp; | &nbsp; \u4EACICP\u590716042588\u53F7-1 &nbsp; | &nbsp;<a class\="beianbox" style\="color\:\#399A9B;" target\="_black" rel\="nofollow" href\="http\://www.beian.gov.cn/portal/registerSystemInfo?recordcode\=11010802022306"><span class\="beian-icon"></span> \u4EAC\u516C\u7F51\u5B89\u590711010802022306\u53F7</a></p><p style\="padding-top\:0;margin-top\:0;">\u610F\u89C1\u5EFA\u8BAE\uFF1A<strong><a style\="color\:\#399A9B;" rel\="nofollow" href\="mailto\:service@ekexiu.com">service@ekexiu.com</a></strong>&nbsp;&nbsp;&nbsp; \u5BA2\u670D\u7535\u8BDD\uFF1A  010-62343359\uFF089\:00-17\:00\uFF09 </p></div><\!--footer\u5E95\u90E8--></div></div></body></html>
298
299
295 300