Skip to content

S
SiEn
Commit 4ae65440 by hewei
Options

Merge branch 'future/strokeList' into 'master' 

Future/stroke list

See merge request hewei/Jumeirah!50
parents 5b9bf6aa 94923d66
Showing with 9 additions and 463 deletions
.gitignore
...@@ -49,3 +49,4 @@ logs ...@@ -49,3 +49,4 @@ logs
*/.rebel.xml.bak */.rebel.xml.bak
*/rebel.xml */rebel.xml
/common/src/main/resources/rebel.xml /common/src/main/resources/rebel.xml
/customer-service/target/
common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java
...@@ -14,6 +14,7 @@ import com.jumeirah.common.param.MerchantLoginParam; ...@@ -14,6 +14,7 @@ import com.jumeirah.common.param.MerchantLoginParam;
import com.jumeirah.common.param.MerchantUpdatePwdParam; import com.jumeirah.common.param.MerchantUpdatePwdParam;
import com.jumeirah.common.param.MerchantUserPageParam; import com.jumeirah.common.param.MerchantUserPageParam;
import com.jumeirah.common.service.MerchantPermissionService; import com.jumeirah.common.service.MerchantPermissionService;
import com.jumeirah.common.service.MerchantService;
import com.jumeirah.common.service.MerchantUserPermissionService; import com.jumeirah.common.service.MerchantUserPermissionService;
import com.jumeirah.common.service.MerchantUserService; import com.jumeirah.common.service.MerchantUserService;
import com.jumeirah.common.vo.LoginMerUserTokenVo; import com.jumeirah.common.vo.LoginMerUserTokenVo;
...@@ -208,10 +209,14 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper, ...@@ -208,10 +209,14 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
loginSysUserTokenVo.setLoginSysUserVo(loginSysUserVo); loginSysUserTokenVo.setLoginSysUserVo(loginSysUserVo);
loginSysUserTokenVo.setIsAdmin(merchantUser.getIsAdmin()); loginSysUserTokenVo.setIsAdmin(merchantUser.getIsAdmin());
loginSysUserTokenVo.setMerchantId(merchantUser.getMcId()); loginSysUserTokenVo.setMerchantId(merchantUser.getMcId());
loginSysUserTokenVo.setMerchantName(merchantService.getMerchantById(merchantUser.getMcId()).getName());
return ApiResult.ok(loginSysUserTokenVo); return ApiResult.ok(loginSysUserTokenVo);
} }
@Autowired
private MerchantService merchantService;
@Override @Override
public ApiResult<Boolean> updatePwd(MerchantUpdatePwdParam merchantUpdatePwdParam) throws Exception { public ApiResult<Boolean> updatePwd(MerchantUpdatePwdParam merchantUpdatePwdParam) throws Exception {
......
common/src/main/java/com/jumeirah/common/vo/LoginMerUserTokenVo.java
...@@ -43,6 +43,9 @@ public class LoginMerUserTokenVo implements LoginToken { ...@@ -43,6 +43,9 @@ public class LoginMerUserTokenVo implements LoginToken {
@ApiModelProperty("商户ID") @ApiModelProperty("商户ID")
private Long merchantId; private Long merchantId;
@ApiModelProperty("商户name")
private String merchantName;
/** /**
* 登录用户对象 * 登录用户对象
*/ */
......
customer-service/target/classes/application-dev.yml deleted 100644 → 0
---
#开发环境
spring:
datasource:
# 数据库连接池配置
druid:
# 初始化时建立物理连接的个数
initial-size: 5
# 最大连接池数量
max-active: 10
# 用来检测连接是否有效的sql语句
validation-query: SELECT 1 FROM DUAL
# 最小连接池数量
min-idle: 5
# 获取连接时最大等待时间，单位毫秒
max-wait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位毫秒
time-between-eviction-runs-millis: 60000
url: jdbc:mysql://47.99.47.225:3306/pathfinder_im?useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: temple123456
driver-class-name: com.mysql.cj.jdbc.Driver
jackson:
default-property-inclusion: non_null
rabbitmq:
host: 127.0.0.1
port: 5672
username: admin
password: admin
delay-queue-name: delay.ack.dev
staff-offline-Queue-Name: staff.offline.dev
exchange-name: delay.exchange.dev
listener:
simple:
default-requeue-rejected: false
redis:
database: 5
host: 127.0.0.1
password:
port: 6379
# （重要！）设置mvc默认语言为zh_CN，默认语言必须为static.i18n目录下有的语言配置文件，否则跟随服务器语言
mvc:
locale: zh_CN
devtools:
restart:
log-condition-evaluation-delta: false
customer-service/target/classes/application-prd.yml deleted 100644 → 0
---
#生产环境
spring:
datasource:
# 数据库连接池配置
druid:
# 初始化时建立物理连接的个数
initial-size: 5
# 最大连接池数量
max-active: 10
# 用来检测连接是否有效的sql语句
validation-query: SELECT 1 FROM DUAL
# 最小连接池数量
min-idle: 5
# 获取连接时最大等待时间，单位毫秒
max-wait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位毫秒
time-between-eviction-runs-millis: 60000
url: jdbc:mysql://172.31.33.14:3306/pathfinder_im?useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: Yum123456
driver-class-name: com.mysql.cj.jdbc.Driver
jackson:
default-property-inclusion: non_null
rabbitmq:
host: 172.31.33.14
port: 5672
username: admin
password: Yum123456
delay-queue-name: delay.ack
staff-offline-Queue-Name: staff.offline
exchange-name: delayAck
listener:
simple:
default-requeue-rejected: false
redis:
database: 5
host: 172.31.33.14
password: Yum123456
port: 6379
# （重要！）设置mvc默认语言为zh_CN，默认语言必须为static.i18n目录下有的语言配置文件，否则跟随服务器语言
mvc:
locale: zh_CN
devtools:
restart:
log-condition-evaluation-delta: false
#日志配置
logging:
file: logs/${spring.application.name}.log
eureka:
client:
service-url:
defaultZone: http://172.31.41.108:20000/eureka/
instance:
prefer-ip-address: true
\ No newline at end of file
customer-service/target/classes/application-test.yml deleted 100644 → 0
---
#开发环境
spring:
datasource:
# 数据库连接池配置
druid:
# 初始化时建立物理连接的个数
initial-size: 5
# 最大连接池数量
max-active: 10
# 用来检测连接是否有效的sql语句
validation-query: SELECT 1 FROM DUAL
# 最小连接池数量
min-idle: 5
# 获取连接时最大等待时间，单位毫秒
max-wait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位毫秒
time-between-eviction-runs-millis: 60000
url: jdbc:mysql://192.168.1.237:3306/pathfinder_im?useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
jackson:
default-property-inclusion: non_null
rabbitmq:
host: 127.0.0.1
port: 5672
username: admin
password: admin
delay-queue-name: delay.ack.dev
staff-offline-Queue-Name: staff.offline.dev
exchange-name: delay.exchange.dev
listener:
simple:
default-requeue-rejected: false
redis:
database: 5
host: 127.0.0.1
password:
port: 6379
# （重要！）设置mvc默认语言为zh_CN，默认语言必须为static.i18n目录下有的语言配置文件，否则跟随服务器语言
mvc:
locale: zh_CN
devtools:
restart:
log-condition-evaluation-delta: false
customer-service/target/classes/application.yml deleted 100644 → 0
spring:
profiles:
active: dev
application:
name: customer-service
# 404抛出异常
mvc:
throw-exception-if-no-handler-found: true
resources:
add-mappings: false
server:
port: 20002
# 关闭tomcat自带/error页面
error:
whitelabel:
enabled: false
netty:
port: 9095
#日志配置
logging:
level:
root: info
com.ym.im.mapper: debug
pagehelper:
helper-dialect: mysql
reasonable: true
support-methods-arguments: ture
params: count=contSql
customer-service/target/classes/com/ym/im/mapper/ChatRecordMapper.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ym.im.mapper.ChatRecordMapper">
<resultMap id="BaseResultMap" type="com.ym.im.entity.ChatRecord">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="user_id" jdbcType="BIGINT" property="userId"/>
<result column="staff_id" jdbcType="BIGINT" property="staffId"/>
<result column="msg_type" jdbcType="TINYINT" property="msgType"/>
<result column="msg_info" jdbcType="VARCHAR" property="msgInfo"/>
<result column="send_receive" jdbcType="TINYINT" property="sendReceive"/>
<result column="scope" jdbcType="TINYINT" property="scope"/>
<result column="send_time" jdbcType="TIMESTAMP" property="sendTime"/>
<result column="receive_time" jdbcType="TIMESTAMP" property="receiveTime"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/>
</resultMap>
<sql id="Base_Column_List">
id, user_id, staff_id, msg_type, msg_info, send_receive, scope, send_time, receive_time, create_time, modify_time
</sql>
<insert id="insert">
INSERT INTO chat_record_${index} (<include refid="Base_Column_List"/>)
VALUES (
#{chat.id},
#{chat.userId},
#{chat.staffId},
#{chat.msgType},
#{chat.msgInfo},
#{chat.sendReceive},
#{chat.scope},
#{chat.sendTime},
#{chat.receiveTime},
#{chat.createTime},
#{chat.modifyTime})
</insert>
<insert id="insertSelective">
INSERT INTO chat_record_${index}
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="chat.id != null">
id,
</if>
<if test="chat.userId != null">
user_id,
</if>
<if test="chat.staffId != null">
staff_id,
</if>
<if test="chat.msgType != null">
msg_type,
</if>
<if test="chat.msgInfo != null">
msg_info,
</if>
<if test="chat.sendReceive != null">
send_receive,
</if>
<if test="chat.scope != null">
scope,
</if>
<if test="chat.sendTime != null">
send_time,
</if>
<if test="chat.receiveTime != null">
receive_time,
</if>
<if test="chat.createTime != null">
create_time,
</if>
<if test="chat.modifyTime != null">
modify_time,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="chat.id != null">
#{chat.id},
</if>
<if test="chat.userId != null">
#{chat.userId},
</if>
<if test="chat.staffId != null">
#{chat.staffId},
</if>
<if test="chat.msgType != null">
#{chat.msgType},
</if>
<if test="chat.msgInfo != null">
#{chat.msgInfo},
</if>
<if test="chat.sendReceive != null">
#{chat.sendReceive},
</if>
<if test="chat.scope != null">
#{chat.scope},
</if>
<if test="chat.sendTime != null">
#{chat.sendTime},
</if>
<if test="chat.receiveTime != null">
#{chat.receiveTime},
</if>
<if test="chat.createTime != null">
#{chat.createTime},
</if>
<if test="chat.modifyTime != null">
#{chat.modifyTime},
</if>
</trim>
</insert>
<update id="updateById">
UPDATE chat_record_${index}
SET user_id = #{chat.userId},
staff_id = #{chat.staffId},
msg_type = #{chat.msgType},
msg_info = #{chat.msgInfo},
send_receive = #{chat.sendReceive},
scope = #{chat.scope},
send_time = #{chat.sendTime},
receive_time = #{chat.receiveTime},
create_time = #{chat.createTime},
modify_time = #{chat.modifyTime}
WHERE id = #{chat.id}
</update>
<update id="updateByIdSelective">
UPDATE chat_record_${index}
<set>
<if test="chat.id != null">
#{chat.id}
</if>
<if test="chat.userId != null">
#{chat.userId}
</if>
<if test="chat.staffId != null">
#{chat.staffId}
</if>
<if test="chat.msgType != null">
#{chat.msgType}
</if>
<if test="chat.msgInfo != null">
#{chat.msgInfo}
</if>
<if test="chat.sendReceive != null">
#{chat.sendReceive}
</if>
<if test="chat.scope != null">
#{chat.scope}
</if>
<if test="chat.sendTime != null">
#{chat.sendTime}
</if>
<if test="chat.receiveTime != null">
#{chat.receiveTime}
</if>
<if test="chat.createTime != null">
#{chat.createTime}
</if>
<if test="chat.modifyTime != null">
#{chat.modifyTime}
</if>
</set>
</update>
<update id="updateBatchReceiveTimeById">
UPDATE chat_record_${index}
<set>
receive_time =
<foreach collection="chats" item="chat" index="index" separator=" " open="CASE" close="END">
WHEN id = #{chat.id} THEN #{chat.receiveTime}
</foreach>
</set>
WHERE id IN
<foreach collection="chats" item="chat" index="index" separator="," open="(" close=")">
#{chat.id}
</foreach>
</update>
<update id="updateReceiveTime">
UPDATE chat_record_${index}
<set>
receive_time = #{chat.receiveTime},
modify_time = #{chat.modifyTime}
</set>
WHERE id = #{chat.id}
</update>
<select id="selectById" resultType="com.ym.im.entity.ChatRecord">
SELECT
<include refid="Base_Column_List"/>
FROM chat_record_${index} WHERE id = #{id}
</select>
<select id="getChatRecord" resultType="com.ym.im.entity.ChatRecord">
SELECT
<include refid="Base_Column_List"/>
FROM chat_record_${index}
<trim prefix="WHERE" suffixOverrides="AND">
<if test="pull.userId != null">
user_id = #{pull.userId} AND
</if>
<if test="pull.direction == 'forward' and pull.chatRecordId != null">
--id小于传入id
id &lt; #{pull.chatRecordId}
</if>
<if test="pull.direction == 'backward' and pull.chatRecordId != null">
--id大于传入id
id &gt; #{pull.chatRecordId}
</if>
</trim>
</select>
</mapper>
customer-service/target/classes/rebel.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!--
This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
Refer to https://manuals.zeroturnaround.com/jrebel/standalone/config.html for more information.
-->
<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
<classpath>
<dir name="/Users/JJww/Documents/Workspaces/pathfinder/pathfinder_im/target/classes">
</dir>
</classpath>
</application>
customer-service/target/classes/static/i18n/error_en.properties deleted 100644 → 0
error.top_level_error=Please contact the developer!
error.bad_parameter=Bad parameter!
error.chat_id_direction=Direction can only be forward or backward, and ignore case!
error.chat_id_greater_than_zero=The chat id should be greater than zero!
error.chat_order_by_empty=orderBy can't be empty!
error.chat_page_num=The page number must be greater than zero!
error.chat_page_size=The page size must be greater than zero!
error.chat_sorting=Sorting can only be asc or desc, and ignore case!
error.missing_body=Required request body is missing!
error.system=Error number:[{0}],Internal server error!
error.user_id_greater_than_zero=The user id should be greater than zero!
error.user_id_empty=User id cannot be empty!
error.chat_id_empty=Chat id cannot be empty!
error.staff_id_empty=Staff id cannot be empty!
error.staff_id_greater_than_zero=The staff id should be greater than zero!
error.chat_msg_type_empty=MsgType id cannot be empty!
error.chat_send_receive=sendReceive can only be 0(send) or 1(receive)!
error.chat_scope=Scope can only be 0(all) or 1(air tickets) or 2(hotel)!
error.chat_receive_time_empty=receiveTime cant not be empty!
error.chat_send_time_empty=sendTime cant not be empty!
error.chat_create_time_empty=createTime cant not be empty!
error.chat_modify_time_empty=modifyTime cant not be empty!
error.msg_body_data_empty=MsgBody data cant not be null!
error.msg_body_status_empty=MsgBody status cant not be empty!
error.service.user=Wrong service user!
\ No newline at end of file
customer-service/target/classes/static/i18n/error_zh_CN.properties deleted 100644 → 0
error.chat_id_empty=\u804A\u5929Id\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.top_level_error=\u8BF7\u8054\u7CFB\u5F00\u53D1\u4EBA\u5458\uFF01
error.bad_parameter=\u53C2\u6570\u9519\u8BEF\uFF01
error.chat_id_direction=direction\u53EA\u80FD\u4E3Aforward\u6216backward\uFF0C\u5E76\u5FFD\u7565\u5927\u5C0F\u5199\uFF01
error.chat_id_greater_than_zero=\u804A\u5929\u8BB0\u5F55Id\u5FC5\u987B\u5927\u4E8E0\uFF01
error.chat_order_by_empty=orderBy\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.chat_page_num=\u9875\u7801\u5FC5\u987B\u5927\u4E8E0\uFF01
error.chat_page_size=\u5206\u9875\u5927\u5C0F\u5FC5\u987B\u5927\u4E8E0\uFF01
error.chat_sorting=sorting\u53EA\u80FD\u4E3Aasc\u6216desc\uFF0C\u5E76\u5FFD\u7565\u5927\u5C0F\u5199\uFF01
error.missing_body=\u7F3A\u5C11\u8BF7\u6C42\u4FE1\u606F\uFF01
error.system=\u9519\u8BEF\u7F16\u53F7\uFF1A[{0}]\uFF0C\u670D\u52A1\u5668\u5185\u90E8\u5F02\u5E38\uFF01
error.user_id_greater_than_zero=\u7528\u6237Id\u5FC5\u987B\u5927\u4E8E0\uFF01
error.user_id_empty=\u7528\u6237Id\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.staff_id_empty=\u5BA2\u670DId\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.staff_id_greater_than_zero=\u5BA2\u670DId\u5FC5\u987B\u5927\u4E8E0\uFF01
error.chat_msg_type_empty=\u6D88\u606F\u7C7B\u578B\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.chat_send_receive=\u6536\u6216\u53D1\u53EA\u80FD\u4E3A0\uFF08\u53D1\u9001\uFF09\u62161\uFF08\u63A5\u6536\uFF09\uFF01
error.chat_scope=\u5185\u5BB9\u8303\u56F4\u53EA\u80FD\u4E3A0\uFF08\u6240\u6709\uFF09\u30011\uFF08\u673A\u7968\uFF09\u30012\uFF08\u9152\u5E97\uFF09\uFF01
error.chat_receive_time_empty=\u63A5\u6536\u65F6\u95F4\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.chat_send_time_empty=\u53D1\u9001\u65F6\u95F4\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.chat_create_time_empty=\u521B\u5EFA\u65F6\u95F4\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.chat_modify_time_empty=\u4FEE\u6539\u65F6\u95F4\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.msg_body_data_empty=MsgBody data\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.msg_body_status_empty=MsgBody status\u4E0D\u53EF\u4E3A\u7A7A\uFF01
error.service.user=\u8BE5\u7528\u6237\u4E0D\u5728\u670D\u52A1\u5217\u8868\u5185\uFF01
\ No newline at end of file
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