From a9bd1965dee1250edde098984c63dfee367bc308 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 13:50:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=B8=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/config/ShiroConfig.java | 1 - .../java/com/lz/modules/job/business/DingtalkBusiness.java | 2 +- .../modules/third/controller/DingTalkLoginController.java | 2 +- src/main/resources/application-dev.yml | 6 +++--- src/main/resources/mapper/generator/DepartmentsDao.xml | 4 ++-- .../mapper/generator/DepartmentsStaffRelateDao.xml | 2 +- src/main/resources/mapper/generator/StaffDao.xml | 4 ++-- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 07e3d6f4..7337a0bb 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -66,7 +66,6 @@ public class ShiroConfig { filterMap.put("/dtlg/luck", "anon"); filterMap.put("/dtlg/look", "anon"); filterMap.put("/luck/getLuckById", "anon"); - filterMap.put("/thirdAppConfig/syn", "anon"); filterMap.put("/luck/updateLuck", "anon"); filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index d344a3fd..ae427989 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -67,7 +67,7 @@ public class DingtalkBusiness { // @DataSource(name = DataSourceNames.FOUR) public void getDingTalkepartmentsIntoData(String appid) { - /*List staffEntityList = staffDao.selectByRang("535");//飞书数据更新为钉钉数据 + /*List staffEntityList = staffDao.selectByRang("1004");//飞书数据更新为钉钉数据 for (StaffEntity staff:staffEntityList ) { List list = staffDao.selectByName(staff.getName()); diff --git a/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java b/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java index 7b6e250e..862d2795 100644 --- a/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java +++ b/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java @@ -39,7 +39,7 @@ public class DingTalkLoginController { public R luck(@RequestBody String body){ log.info("luck{}", body); JSONObject json = JSONObject.parseObject(body); - Luck luck = luckService.selectLuckById(1L);//默认第一个活动 + Luck luck = luckService.selectLuckById(2L);//默认第一个活动 if(luck.getStopTime().getTime() > System.currentTimeMillis()){ return dingtalkBusiness.luck(json.getString("code"), appid, luck.getId()); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 16e8aaaa..00e06772 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,9 +3,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://172.16.157.238:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - username: ldd_biz - password: Hello1234 + url: jdbc:mysql://rm-bp1xhc66ruz72t68p.mysql.rds.aliyuncs.com:3306/lz_manger?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + username: lz_manger + password: N8zfBwhOC initial-size: 10 max-active: 100 min-idle: 10 diff --git a/src/main/resources/mapper/generator/DepartmentsDao.xml b/src/main/resources/mapper/generator/DepartmentsDao.xml index 8a43c61b..90528e90 100644 --- a/src/main/resources/mapper/generator/DepartmentsDao.xml +++ b/src/main/resources/mapper/generator/DepartmentsDao.xml @@ -92,11 +92,11 @@ - + INSERT INTO lz_departments(department_id,department_parent_id,member_count,department_name,chat_id,leader_employee_id,leader_open_id,status) VALUES - (#{department.departmentId},#{department.departmentParentId},#{department.memberCount},#{department.departmentName},#{department.chatId},#{department.leaderEmployeeId},#{department.leaderOpenId},#{department.status}) + (#{departments.departmentId},#{departments.departmentParentId},#{departments.memberCount},#{departments.departmentName},#{departments.chatId},#{departments.leaderEmployeeId},#{departments.leaderOpenId},#{departments.status}) diff --git a/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml b/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml index 267180d7..df3dbf2e 100644 --- a/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml +++ b/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml @@ -34,7 +34,7 @@ diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index f97ff1df..78b598d2 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -171,7 +171,7 @@ select * from lz_staff where is_delete=0 and open_id = #{openId} - + UPDATE lz_staff update_time = now(), @@ -182,7 +182,7 @@ gender = #{gender,jdbcType=INTEGER}, - birthday = #{birthday,jdbcType=DATETIME}, + birthday = #{birthday,jdbcType=TIMESTAMP}, marital_status = #{maritalStatus,jdbcType=INTEGER}, From 6ef4426bb86677a66baeed1c60a1e3f72f8d2e2d Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 13:53:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9appid=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/common/utils/DingTalkUtil.java | 2 +- src/main/java/com/lz/modules/job/task/DingtalkSynDataJob.java | 2 +- .../lz/modules/third/controller/DingTalkLoginController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/common/utils/DingTalkUtil.java b/src/main/java/com/lz/common/utils/DingTalkUtil.java index ce5c0029..1799f78e 100644 --- a/src/main/java/com/lz/common/utils/DingTalkUtil.java +++ b/src/main/java/com/lz/common/utils/DingTalkUtil.java @@ -270,7 +270,7 @@ public class DingTalkUtil { public static void main(String[] args) { DingTalkUtil dingTalkUtil = new DingTalkUtil(); - String token = dingTalkUtil.getAccessToken("855818566"); + String token = dingTalkUtil.getAccessToken("856016278"); } diff --git a/src/main/java/com/lz/modules/job/task/DingtalkSynDataJob.java b/src/main/java/com/lz/modules/job/task/DingtalkSynDataJob.java index 2b8a7291..fedb5c50 100644 --- a/src/main/java/com/lz/modules/job/task/DingtalkSynDataJob.java +++ b/src/main/java/com/lz/modules/job/task/DingtalkSynDataJob.java @@ -29,7 +29,7 @@ public class DingtalkSynDataJob implements ITask { @Autowired DingtalkBusiness dingtalkBusiness; - static String appid = "855818566"; + static String appid = "856016278"; @Override public void run(String params) { diff --git a/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java b/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java index 862d2795..6b2daa60 100644 --- a/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java +++ b/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java @@ -26,7 +26,7 @@ public class DingTalkLoginController { LuckService luckService; @Autowired LuckRecordService luckRecordService; - static String appid = "855818566"; + static String appid = "856016278"; @PostMapping("/login") public R login(@RequestBody String body){ log.info("钉钉免登录luck{}", body); From cda89826a68a86c9cfc7263e9a56726191b66dc4 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 13:57:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0get=20set=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/luck/entity/LuckRecord.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/lz/modules/luck/entity/LuckRecord.java b/src/main/java/com/lz/modules/luck/entity/LuckRecord.java index 6efe0889..7b6174ad 100644 --- a/src/main/java/com/lz/modules/luck/entity/LuckRecord.java +++ b/src/main/java/com/lz/modules/luck/entity/LuckRecord.java @@ -132,6 +132,14 @@ public class LuckRecord implements java.io.Serializable { this.name = name; } + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + /** * 是否中将 0为中将 1中将 * @return From 9f6b9dc754eab77ff4e9473d7c381eb1393b38a8 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 14:06:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dget=20set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/modules/luck/entity/LuckRecord.java | 2 +- .../java/com/lz/modules/luck/entity/LuckRecordReq.java | 10 +++++++++- src/main/resources/mapper/luck/LuckRecordMapper.xml | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/modules/luck/entity/LuckRecord.java b/src/main/java/com/lz/modules/luck/entity/LuckRecord.java index 7b6174ad..38e98efa 100644 --- a/src/main/java/com/lz/modules/luck/entity/LuckRecord.java +++ b/src/main/java/com/lz/modules/luck/entity/LuckRecord.java @@ -12,7 +12,6 @@ import java.util.Date; * @since 2020-08-21 */ -@Data @TableName("luck_record") public class LuckRecord implements java.io.Serializable { // @@ -239,6 +238,7 @@ public class LuckRecord implements java.io.Serializable { ",gmtModified=" + gmtModified + ",staffId=" + staffId + ",name=" + name + + ",mobile=" + mobile + ",isLuck=" + isLuck + ",weight=" + weight + ",luckId=" + luckId + diff --git a/src/main/java/com/lz/modules/luck/entity/LuckRecordReq.java b/src/main/java/com/lz/modules/luck/entity/LuckRecordReq.java index 633f3e6c..8e9a92af 100644 --- a/src/main/java/com/lz/modules/luck/entity/LuckRecordReq.java +++ b/src/main/java/com/lz/modules/luck/entity/LuckRecordReq.java @@ -10,7 +10,6 @@ import java.util.Date; */ -@Data public class LuckRecordReq implements java.io.Serializable { @@ -58,6 +57,14 @@ public class LuckRecordReq implements java.io.Serializable { this.name = name; } + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + /** * 是否中将 0为中将 1中将 * @return @@ -140,6 +147,7 @@ public class LuckRecordReq implements java.io.Serializable { return "LuckRecord{" + ",id=" + id + ",name=" + name + + ",name=" + mobile + ",isLuck=" + isLuck + ",weight=" + weight + ",luckId=" + luckId + diff --git a/src/main/resources/mapper/luck/LuckRecordMapper.xml b/src/main/resources/mapper/luck/LuckRecordMapper.xml index 93f45a60..da350d32 100644 --- a/src/main/resources/mapper/luck/LuckRecordMapper.xml +++ b/src/main/resources/mapper/luck/LuckRecordMapper.xml @@ -37,7 +37,7 @@ insert into luck_record( staff_id, name, - name, + mobile, is_luck, weight, luck_id, From e9a7f6a2236d4fc6ac7b1d5d66546784334a41e8 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 14:12:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/luck/LuckRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/luck/LuckRecordMapper.xml b/src/main/resources/mapper/luck/LuckRecordMapper.xml index da350d32..a2eadfb0 100644 --- a/src/main/resources/mapper/luck/LuckRecordMapper.xml +++ b/src/main/resources/mapper/luck/LuckRecordMapper.xml @@ -37,7 +37,7 @@ insert into luck_record( staff_id, name, - mobile, + mobile, is_luck, weight, luck_id,