Skip to content

N
new-nms
Commit 0a19d600 authored by YazhouChen's avatar YazhouChen
Browse files
Options

删除注释

parent 83fb22b0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 76 deletions
.idea/workspace.xml
View file @ 0a19d600
This diff is collapsed.
admin/target/maven-archiver/pom.properties
View file @ 0a19d600
#Generated by Maven
#Wed Jul 28 12:13:15 CST 2021
#Mon Aug 02 14:36:44 CST 2021
version=2.0
groupId=io.geekidea.springbootplus
artifactId=admin
bootstrap/target/maven-archiver/pom.properties
View file @ 0a19d600
#Generated by Maven
#Wed Jul 28 12:13:54 CST 2021
#Mon Aug 02 14:37:36 CST 2021
version=2.0
groupId=io.geekidea.springbootplus
artifactId=bootstrap
config/target/maven-archiver/pom.properties
View file @ 0a19d600
#Generated by Maven
#Wed Jul 28 12:13:19 CST 2021
#Mon Aug 02 14:36:51 CST 2021
version=2.0
groupId=io.geekidea.springbootplus
artifactId=config
distribution/target/maven-archiver/pom.properties
View file @ 0a19d600
#Generated by Maven
#Wed Jul 28 12:13:54 CST 2021
#Mon Aug 02 14:37:37 CST 2021
version=2.0
groupId=io.geekidea.springbootplus
artifactId=distribution
framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java
View file @ 0a19d600
......@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2021-07-28T12:13:24+0800",
date = "2021-08-02T14:36:57+0800",
comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_131 (Oracle Corporation)"
)
public class LoginSysUserVoConvertImpl implements LoginSysUserVoConvert {
......
framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java
View file @ 0a19d600
......@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2021-07-28T12:13:25+0800",
date = "2021-08-02T14:36:57+0800",
comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_131 (Oracle Corporation)"
)
public class ShiroMapstructConvertImpl implements ShiroMapstructConvert {
......
framework/target/maven-archiver/pom.properties
View file @ 0a19d600
#Generated by Maven
#Wed Jul 28 12:13:29 CST 2021
#Mon Aug 02 14:37:01 CST 2021
version=2.0
groupId=io.geekidea.springbootplus
artifactId=framework
generator/target/maven-archiver/pom.properties
View file @ 0a19d600
#Generated by Maven
#Wed Jul 28 12:13:57 CST 2021
#Mon Aug 02 14:37:39 CST 2021
version=2.0
groupId=io.geekidea.springbootplus
artifactId=generator
hongxinhui/src/main/java/com/hongxinhui/entity/Survey.java
View file @ 0a19d600
......@@ -47,7 +47,7 @@ public class Survey extends BaseEntity {
private String querycode;
@ApiModelProperty("金额（万元）")
private Double money;
private String money;
@ApiModelProperty("备案申请方")
@TableField("filingApplicant")
......@@ -58,7 +58,7 @@ public class Survey extends BaseEntity {
private String managePeo;
@ApiModelProperty("期限（月）")
private Date term;
private String term;
@ApiModelProperty("年化收益率（%）")
@TableField("annualizedYield")
......
hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembers.java
View file @ 0a19d600
......@@ -74,8 +74,6 @@ public class EnterpriseMembers extends BaseEntity {
@ApiModelProperty("会员类型 1管理类会员 2自营类会员 3经济类会员 4服务类会员")
private Integer mtype;
@ApiModelProperty(value = "密码没加密的",required = true)
private String pwd;
@ApiModelProperty(value = "密码md5的",required = true)
private String password;
......
hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembers.java
View file @ 0a19d600
......@@ -46,9 +46,6 @@ public class PersonalMembers extends BaseEntity {
// @ApiModelProperty(value = "openid",required = true)
// private String openid;
@ApiModelProperty(value = "密码没加密的",required = true)
private String pwd;
@ApiModelProperty(value = "密码",required = true)
private String password;
......
hongxinhui/src/main/java/com/hongxinhui/param/SurveyAdd.java
View file @ 0a19d600
......@@ -45,7 +45,7 @@ public class SurveyAdd {
private Date registerTime;
@ApiModelProperty("期限（月）")
private Date term;
private String term;
@ApiModelProperty("年化收益率（%）")
@TableField("annualizedYield")
......
hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java
View file @ 0a19d600
......@@ -175,7 +175,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
return hashMap;
}
members = new Members();
members.setPassword(personalMembers.getPassword());//DigestUtils.md5Hex(
members.setPassword(DigestUtils.md5Hex(personalMembers.getPassword()));//
members.setName(personalMembers.getName());
members.setPhone(personalMembers.getPhone());
members.setEmail(personalMembers.getEmail());//邮箱
......@@ -183,7 +183,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
members.setIdcard(personalMembers.getIdcard());
//个人用户类型
members.setUserType(1);
members.setPwd(personalMembers.getPwd());
members.setPwd(personalMembers.getPassword());
int insert = membersMapper.insert(members);
if(insert>0){
hashMap.put("code","200");
......@@ -191,7 +191,12 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
SendMail sendMail = new SendMail();
sendMail.setSubject("请保管好您的账号密码");
sendMail.setContent("请保管好您的账号密码：</br>账号："+personalMembers.getPhone()+"</br>密码："+personalMembers.getPwd());
// sendMail.setContent("请保管好您的账号密码：</br>账号："+personalMembers.getPhone()+"</br>密码："+personalMembers.getPassword());
sendMail.setContent("尊敬的会员：您好!\n" +
"感谢您注册宜春弘鑫汇资产服务有限公司的会员。 \n" +
"您的登录账号为： "+personalMembers.getPhone()+" ；密码为 ："+personalMembers.getPassword()+"\n" +
"重要提示：请妥善保管您的会员账号和密码；若忘记登录密码，请申请重置密码。如有任何疑问可通过以下方式联系我方，非常感谢您的理解与支持。有疑问通过以下方式咨询：xiangmubu@hxhsevice.com\n" +
"宜春弘鑫汇资产服务有限公司");
//收件人电子邮箱
sendMail.setToAccount(personalMembers.getEmail());
//抄送人电子邮箱
......@@ -245,8 +250,8 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
BeanUtils.copyProperties(enterpriseMembers, members);
//企业用户类型
members.setUserType(2);
members.setPassword(enterpriseMembers.getPassword());
members.setPwd(enterpriseMembers.getPwd());
members.setPassword(DigestUtils.md5Hex(enterpriseMembers.getPassword()));
members.setPwd(enterpriseMembers.getPassword());
int insert = membersMapper.insert(members);
if(insert>0){
hashMap.put("code","200");
......@@ -254,7 +259,12 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
SendMail sendMail = new SendMail();
sendMail.setSubject("请保管好您的账号密码");
sendMail.setContent("请保管好您的账号密码：</br>账号："+enterpriseMembers.getPhone()+"</br>密码："+enterpriseMembers.getPwd());
// sendMail.setContent("请保管好您的账号密码：</br>账号："+enterpriseMembers.getPhone()+"</br>密码："+enterpriseMembers.getPassword());
sendMail.setContent("尊敬的会员：您好!\n" +
"感谢您注册宜春弘鑫汇资产服务有限公司的会员。 \n" +
"您的登录账号为： "+enterpriseMembers.getPhone()+" ；密码为 ："+enterpriseMembers.getPassword()+"\n" +
"重要提示：请妥善保管您的会员账号和密码；若忘记登录密码，请申请重置密码。如有任何疑问可通过以下方式联系我方，非常感谢您的理解与支持。有疑问通过以下方式咨询：xiangmubu@hxhsevice.com\n" +
"宜春弘鑫汇资产服务有限公司");
//收件人电子邮箱
sendMail.setToAccount(enterpriseMembers.getEmail());
//抄送人电子邮箱
......@@ -495,7 +505,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
notice.setTypeStr(noticetype.getName());
}
notice.setContent(StringEscapeUtils.unescapeHtml4(notice.getContent()));
System.out.println("notice.getContent() = " + notice.getContent());
// System.out.println("notice.getContent() = " + notice.getContent());
}
hashMap.put("code","200");
hashMap.put("info","查询成功");
......
hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java
View file @ 0a19d600
......@@ -97,7 +97,7 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
notice.setCreateUserstr(superadmindbMapper.selectById(createUser).getNickname());
}
notice.setContent(StringEscapeUtils.unescapeHtml4(notice.getContent()));
System.out.println("notice.getContent() = " + notice.getContent());
// System.out.println("notice.getContent() = " + notice.getContent());
}
return new Paging<Notice>(iPage);
}
......
hongxinhui/target/maven-archiver/pom.properties
View file @ 0a19d600
#Generated by Maven
#Wed Jul 28 12:13:47 CST 2021
#Mon Aug 02 14:37:27 CST 2021
version=2.0
groupId=io.geekidea.springbootplus
artifactId=example
scheduled/target/maven-archiver/pom.properties
View file @ 0a19d600
#Generated by Maven
#Wed Jul 28 12:13:58 CST 2021
#Mon Aug 02 14:37:40 CST 2021
version=2.0
groupId=io.geekidea.springbootplus
artifactId=scheduled
system/target/maven-archiver/pom.properties
View file @ 0a19d600
#Generated by Maven
#Wed Jul 28 12:13:49 CST 2021
#Mon Aug 02 14:37:32 CST 2021
version=2.0
groupId=io.geekidea.springbootplus
artifactId=system
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment