Skip to content

8
8timerapiv200
Commit ff32ab44 by 翁国栋
Options

运营后台-- 

更改登录密码验证
parent 76da2e74
Showing with 96 additions and 45 deletions
src/main/java/cn/timer/api/controller/insure/InsureContorll.java
......@@ -295,11 +295,11 @@ public class InsureContorll {
if(dataMap.get("errcode").toString().equals("suc")) {
y.setIsInsure(1);
y.insertOrUpdate();
return ResultUtil.error("投保成功");
}
}
}
return ResultUtil.success(dataMap.get("errmsg").toString());
return ResultUtil.error(dataMap.get("errmsg").toString());
}
......
src/main/java/cn/timer/api/controller/insure/InsureUserController.java
......@@ -5,8 +5,11 @@ import java.util.Map;
import java.util.Optional;
import cn.timer.api.bean.insure.InsureUser;
import cn.timer.api.config.annotation.CurrentUser;
import cn.timer.api.config.annotation.UserBean;
import cn.timer.api.dao.insure.InsureUserMapper;
import cn.timer.api.dto.insure.PolicyDto;
import cn.timer.api.utils.Page;
import cn.timer.api.utils.Result;
import cn.timer.api.utils.ResultUtil;
import com.beust.jcommander.internal.Lists;
......@@ -35,7 +38,7 @@ public class InsureUserController{
private InsureUserMapper insureUserMapper;
@PostMapping(value = "/policyList")
@ApiOperation(value = "3.保单列表", httpMethod = "Post", notes = "保单列表")
@ApiOperation(value = "3.保单列表--运营后台", httpMethod = "Post", notes = "保单列表")
public Result<Object> policyList(@RequestBody PolicyDto policyDto) {
Map map = Maps.newHashMap();
List<PolicyDto> list = insureUserMapper.selectPolicyList(policyDto.getPage(), String.valueOf(policyDto.getId()));
......@@ -50,4 +53,14 @@ public class InsureUserController{
return ResultUtil.data(user);
}
@PostMapping(value = "/userPolicyList")
@ApiOperation(value = "3.保单列表--8小时端", httpMethod = "Post", notes = "保单列表")
public Result<Object> userPolicyList(@CurrentUser UserBean userBean, @RequestBody Page page) {
Map map = Maps.newHashMap();
List<PolicyDto> list = insureUserMapper.selectPolicyList(page, String.valueOf(userBean.getOrgCode()));
map.put("list", Optional.ofNullable(list).orElse(Lists.newArrayList()));
map.put("total", insureUserMapper.totalUser(String.valueOf(userBean.getOrgCode())));
return ResultUtil.data(map);
}
}
src/main/java/cn/timer/api/controller/superadmin/SuperLoginController.java
......@@ -39,7 +39,8 @@ public class SuperLoginController {
String ip = UserIp.getIpAddr(request);
AdminAccount adminAccount = AdminAccount.builder().build().selectOne(new QueryWrapper<AdminAccount>().lambda()
.eq(AdminAccount::getAccount,entRegisterDto.getPhone())
.eq(AdminAccount::getPwd,Md5.md5(entRegisterDto.getPw())));
.eq(AdminAccount::getPwd,entRegisterDto.getPw()
));
if(adminAccount==null){
return ResultUtil.error("用户不存在或密码错误");
}
......
src/main/resources/application-dev.yml
#生产环境
server:
port: 8089
port: 8866
servlet:
# context-path: /YoulinghrApiV100
session:
......@@ -31,7 +31,7 @@ spring:
# username: tang
# password: Tang123456!
# url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
url: jdbc:mysql://120.78.162.177:3306/8timer_20210904?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
url: jdbc:mysql://120.78.162.177:3306/timer_test?useUnicode=SpmkApproveSummaryMappertrue&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
driver-class-name: com.mysql.cj.jdbc.Driver
......@@ -238,3 +238,17 @@ config-8timer:
zip:
path: 'D:/zip/'
insure:
#投保
appid: '1002303100602312445'
secret: 'acb329868c31d5b3ba03de40dac13dd9'
uploadUrl: 'http://sandbox.portal.unistar-ins.com/service/Home/Index/fileUpload'
insuredUrl: 'http://sandbox.portal.unistar-ins.com/mall/Home/Index/createQuotePolicy'
#保全
appidq: '1000115041006006938'
secretq: '6ba1bf4aa0bd14368c95ff0b9934a17b'
uploadUrlq: 'http://sandbox.portal.unistar-ins.com/fuli/Home/Index/file_upload'
batchUrl: 'http://sandbox.portal.unistar-ins.com/fuli/Home/WelfareProduct/batch_declare'
# base_api_url
BASE_API_URL: 'http://test-8timer-api.youlingrc.com'
src/main/resources/application-pro.yml
......@@ -3,24 +3,24 @@ server:
port: 8089
servlet:
# context-path: /YoulinghrApiV100
session:
session:
timeout: 2592000 # session会话过期时间
spring:
servlet:
multipart:
max-file-size: 500MB
servlet:
multipart:
max-file-size: 500MB
max-request-size: 500MB
jpa:
# 配置生成表 存储引擎InnoDB
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
# database:
# database:
open-in-view: false
# naming:
# naming:
# spring boot jpa hibernate 根据实体类生成表以及字段的命名策略
# 无修改命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
# 遇到大写字母 加”_”的命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
# physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
hibernate:
hibernate:
ddl-auto: update
show-sql: true
datasource:
......@@ -55,7 +55,7 @@ spring:
#max-pool-prepared-statement-per-connection-size: 20
# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
#connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
druid:
druid:
# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 ,不能用log4j，不然报错：Failed to bind properties under 'spring.datasource.druid' to javax.sql.DataSource:
filters: stat,slf4j
# 配置监控服务器
......@@ -78,15 +78,15 @@ spring:
date-format: yyyy-MM-dd HH:mm:ss
# spring boot启动打印横幅 配置
banner:
charset: UTF-8 # Banner file encoding.
charset: UTF-8 # Banner file encoding.
location: banner.txt # Banner text resource location.
image:
image:
location: banner.gif # Banner image file location (jpg or png can also be used).
width: 76 # Width of the banner image in chars.
height: 76 # Height of the banner image in chars (default based on image height).
margin: 2 # Left hand image margin in chars.
invert: false # Whether images should be inverted for dark terminal themes.
mail:
mail:
port: 465
protocol: smtp
host: smtp.youlingrc.com
......@@ -94,15 +94,15 @@ spring:
password: YoulingRC2020
default-encoding: utf-8
properties:
mail:
mail:
smtp:
auth: true
starttls:
starttls:
enable: true
required: true
ssl: # SSL Config
enable: true
socketFactory:
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
redis:
......@@ -150,7 +150,7 @@ pagehelper:
reasonable: true
supportMethodsArguments: true
params: count=countSql
#showSql
logging:
level:
......@@ -158,7 +158,7 @@ logging:
cn.timer.api.dao: error
pattern:
console: '--%p--%m%n'
#swagger:
# ui-config:
# operations-sorter: method # 它提供了两个配置项：alpha和method，分别代表了按字母表排序以及按方法定义顺序排序
......@@ -195,14 +195,14 @@ config-8timer:
two: 7
three: 30
init-password: 123456
# 创建企业默认添加讯息
qyxx:
title: '欢迎来到8小时'
cover: 'https://8time-v2.oss-cn-shenzhen.aliyuncs.com/8timer2.0/common/qyxx/welcome/%E6%AC%A2%E8%BF%8E%E5%9B%BE.png'
summary: '<h1>欢迎来到8小时！可先前往组织管理-组织架构添加公司架构及岗位，再前往员工管理-员工名册添加企业员工。</h1>'
author: 'System'
# 客户管理导入服务器保存路径
crm-excel:
realPath: '/data/crm-excel/'
......@@ -227,4 +227,16 @@ sftp:
channelConnectedTimeout: '1500'
serverUrl: 'https://img.8timer.cn'
targetPath: '/disk'
reservedName: false
\ No newline at end of file
reservedName: false
insure:
#投保
appid: '1002209110212305335'
secret: '1ef7b79471be7f6b5489832c65109f81'
uploadUrl: 'https://portal-unistar-ins.com /service/Home/Index/fileUpload'
insuredUrl: 'https://portal.unistar-ins.com/mall/Home/Index/createQuotePolicy'
#保全
appidq: '1000711000604326196'
secretq: 'a2da17a2797c63dff9172df50af9da65'
uploadUrlq: 'https://portal-unistar-ins.com /fuli/Home/Index/file_upload'
batchUrl: 'https://portal. unistar-ins.com /fuli/Home/WelfareProduct/batch_declare'
src/main/resources/application-test.yml
......@@ -3,24 +3,24 @@ server:
port: 8189
servlet:
# context-path: /YoulinghrApiV100
session:
session:
timeout: 2592000 # session会话过期时间
spring:
servlet:
multipart:
max-file-size: 500MB
servlet:
multipart:
max-file-size: 500MB
max-request-size: 500MB
jpa:
# 配置生成表 存储引擎InnoDB
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
# database:
# database:
open-in-view: false
# naming:
# naming:
# spring boot jpa hibernate 根据实体类生成表以及字段的命名策略
# 无修改命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
# 遇到大写字母 加”_”的命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
# physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
hibernate:
hibernate:
ddl-auto: update
show-sql: true
datasource:
......@@ -55,7 +55,7 @@ spring:
#max-pool-prepared-statement-per-connection-size: 20
# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
#connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
druid:
druid:
# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 ,不能用log4j，不然报错：Failed to bind properties under 'spring.datasource.druid' to javax.sql.DataSource:
filters: stat,slf4j
# 配置监控服务器
......@@ -78,30 +78,30 @@ spring:
date-format: yyyy-MM-dd HH:mm:ss
# spring boot启动打印横幅 配置
banner:
charset: UTF-8 # Banner file encoding.
charset: UTF-8 # Banner file encoding.
location: banner.txt # Banner text resource location.
image:
image:
location: banner.gif # Banner image file location (jpg or png can also be used).
width: 76 # Width of the banner image in chars.
height: 76 # Height of the banner image in chars (default based on image height).
margin: 2 # Left hand image margin in chars.
invert: false # Whether images should be inverted for dark terminal themes.
mail:
mail:
port: 465
host: smtp.youlingrc.com
username: postmaster@youlingrc.com
password: YoulingRC2020
default-encoding: utf-8
properties:
mail:
mail:
smtp:
auth: true
starttls:
starttls:
enable: true
required: true
ssl: # SSL Config
enable: true
socketFactory:
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactor
redis:
......@@ -149,7 +149,7 @@ pagehelper:
reasonable: true
supportMethodsArguments: true
params: count=countSql
#showSql
logging:
level:
......@@ -157,7 +157,7 @@ logging:
cn.timer.api.dao: info
pattern:
console: '--%p--%m%n'
#swagger:
# ui-config:
# operations-sorter: method # 它提供了两个配置项：alpha和method，分别代表了按字母表排序以及按方法定义顺序排序
......@@ -195,14 +195,14 @@ config-8timer:
two: 7
three: 30
init-password: 123456
# 创建企业默认添加讯息
qyxx:
title: '欢迎来到8小时'
cover: 'https://8time-v2.oss-cn-shenzhen.aliyuncs.com/8timer2.0/common/qyxx/welcome/%E6%AC%A2%E8%BF%8E%E5%9B%BE.png'
summary: '<h1>欢迎来到8小时！可先前往组织管理-组织架构添加公司架构及岗位，再前往员工管理-员工名册添加企业员工。</h1>'
author: 'System'
# 客户管理导入服务器保存路径
crm-excel:
realPath: '/data/crm-excel/'
......@@ -228,4 +228,16 @@ sftp:
serverUrl: 'https://test-img.8timer.cn'
targetPath: '/disk'
reservedName: false
insure:
#投保
appid: '1002303100602312445'
secret: 'acb329868c31d5b3ba03de40dac13dd9'
uploadUrl: 'http://sandbox.portal.unistar-ins.com/service/Home/Index/fileUpload'
insuredUrl: 'http://sandbox.portal.unistar-ins.com/mall/Home/Index/createQuotePolicy'
#保全
appidq: '1000115041006006938'
secretq: '6ba1bf4aa0bd14368c95ff0b9934a17b'
uploadUrlq: 'http://sandbox.portal.unistar-ins.com/fuli/Home/Index/file_upload'
batchUrl: 'http://sandbox.portal.unistar-ins.com/fuli/Home/WelfareProduct/batch_declare'
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