【feat】【第二版开发】

1.配置文件加密敏感数据
2.移除冗余代码
3.修改表设计

doc/sql/update-v2.sql

@@ -205,3 +205,48 @@ ALTER TABLE punch_settle.punch_in_record MODIFY COLUMN settle_rule int DEFAULT 1
 ALTER TABLE punch_settle.punch_in_record MODIFY COLUMN settle_count_track int DEFAULT 0 NULL COMMENT '结算时任务上的次数记录';
 ALTER TABLE punch_settle.punch_in_record MODIFY COLUMN settle_time_track time DEFAULT '00:00:00' NULL COMMENT '结算时任务上的时间记录';
 
+ALTER TABLE punch_settle.punch_in_record MODIFY COLUMN settle_reward_num int NULL COMMENT '结算时任务上的奖励倍数';
+ALTER TABLE punch_settle.punch_in_record MODIFY COLUMN settle_category int NULL COMMENT '结算时任务上的打卡类型(0-单次打卡，1-计数、2计时)';
+ALTER TABLE punch_settle.punch_in_record MODIFY COLUMN settle_rule int NULL COMMENT '结算时任务上的比较规则(0-大于，1-大于等于，2-小于，3-小于等于)';
+ALTER TABLE punch_settle.punch_in_record MODIFY COLUMN settle_count_track int NULL COMMENT '结算时任务上的次数记录';
+ALTER TABLE punch_settle.punch_in_record MODIFY COLUMN settle_time_track time NULL COMMENT '结算时任务上的时间记录';
+
+update punch_settle.punch_in_record
+set settle_reward_num = null,
+settle_category = null,
+settle_rule = null,
+settle_count_track = null,
+settle_time_track = null;
+
+update punch_settle.punch_in pi, punch_settle.punch_in_record pir
+set pir.settle_reward_num = pi.reward_num,
+pir.settle_category = pi.category
+where pi.id = pir.punch_in_id;
+
+ALTER TABLE punch_settle.lottery_scratch_record DROP COLUMN user_id;
+
+ALTER TABLE punch_settle.user_claim_reward_record DROP COLUMN user_id;
+
+ALTER TABLE punch_settle.lottery_scratch_record ADD INDEX lottery_scratch_record_creation_time (creation_time);
+ALTER TABLE punch_settle.lottery_scratch_record ADD INDEX lottery_scratch_record_created_by (created_by);
+
+ALTER TABLE punch_settle.punch_in ADD INDEX punch_in_creation_time (creation_time);
+ALTER TABLE punch_settle.punch_in ADD INDEX punch_in_created_by (created_by);
+
+ALTER TABLE punch_settle.punch_in_record ADD INDEX punch_in_record_creation_time (creation_time);
+ALTER TABLE punch_settle.punch_in_record ADD INDEX punch_in_record_created_by (created_by);
+ALTER TABLE punch_settle.punch_in_record ADD INDEX punch_in_record_punch_in_id (punch_in_id);
+ALTER TABLE punch_settle.punch_in_record ADD INDEX punch_in_record_punch_in_date (punch_in_date);
+
+ALTER TABLE punch_settle.punch_in_record_settlement_rela ADD INDEX punch_in_record_settlement_rela_record_id (record_id);
+ALTER TABLE punch_settle.punch_in_record_settlement_rela ADD INDEX punch_in_record_settlement_rela_settlement_id (settlement_id);
+
+ALTER TABLE punch_settle.punch_in_settlement ADD INDEX punch_in_settlement_user_id (user_id);
+ALTER TABLE punch_settle.punch_in_settlement ADD INDEX punch_in_settlement_settlement_time (settlement_time);
+
+ALTER TABLE punch_settle.user ADD UNIQUE punch_in_settlement_open_id (open_id);
+
+ALTER TABLE punch_settle.user_claim_reward_record ADD INDEX user_claim_reward_record_claim_reward_time (claim_reward_time);
+ALTER TABLE punch_settle.user_claim_reward_record ADD INDEX user_claim_reward_record_created_by (created_by);
+
+

doc/技术文档.md

@@ -299,7 +299,6 @@ ui设计工具：即时设计
 | 字段                    | 类型      | 描述                               |
 | ----------------------- | --------- | ---------------------------------- |
 | id                      | bigint    | 主键                               |
-| user_id                 | bigint    | 用户表主键                         |
 | claim_reward_num        | int       | 本次领取奖励数                     |
 | claim_reward_time       | timestamp | 领取奖励时间                       |
 | before_claim_reward_num | int       | 领取前用户拥有的奖励数             |
@@ -365,7 +364,6 @@ ui设计工具：即时设计
 | 字段             | 类型          | 描述                                                  |
 | ---------------- | ------------- | ----------------------------------------------------- |
 | id               | bigint        | 主键                                                  |
-| user_id          | bigint        | 用户主键                                              |
 | action_type      | int           | 动作类型(0-投入/购买，1-中奖，2-撤销投入，3-撤销中奖) |
 | source           | varchar(100)  | 彩票来源                                              |
 | category         | varchar(100)  | 彩票种类                                              |

src/main/java/com/punchsettle/server/JasyptGenerator.java

@@ -12,10 +12,10 @@ public class JasyptGenerator {
     public static void main(String[] args) {
         StandardPBEStringEncryptor standardPBEStringEncryptor = new StandardPBEStringEncryptor();
         standardPBEStringEncryptor.setPassword("");
-        standardPBEStringEncryptor.setAlgorithm("PBEWithMD5AndDES");
+        standardPBEStringEncryptor.setAlgorithm("");
         standardPBEStringEncryptor.setSaltGenerator(new RandomSaltGenerator());
         standardPBEStringEncryptor.setIvGenerator(new RandomIvGenerator());
-        String url = standardPBEStringEncryptor.encrypt("jdbc:mysql://47.119.150.157:3306/punch_settle?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai");
+        String url = standardPBEStringEncryptor.encrypt("");
         System.out.println("url：" + url);
         String username = standardPBEStringEncryptor.encrypt("");
         System.out.println("username：" + username);
@@ -26,5 +26,8 @@ public class JasyptGenerator {
         System.out.println("appid：" + appid);
         String secret = standardPBEStringEncryptor.encrypt("");
         System.out.println("secret：" + secret);
+
+        String token = standardPBEStringEncryptor.encrypt("");
+        System.out.println("token：" + token);
     }
 }

src/main/java/com/punchsettle/server/atomic/entity/LotteryScratchRecord.java

@@ -27,12 +27,6 @@ public class LotteryScratchRecord extends BaseEntity implements Serializable {
     @Serial
     private static final long serialVersionUID = -3521710481088966503L;
 
-    /**
-     * 用户表主键
-     */
-    @Column(name = "user_id")
-    private Long userId;
-
     /**
      * 动作类型(0-投入/购买，1-中奖，2-撤销投入，3-撤销中奖)
      */

src/main/java/com/punchsettle/server/atomic/entity/UserClaimRewardRecord.java

@@ -25,12 +25,6 @@ public class UserClaimRewardRecord extends BaseEntity implements Serializable {
     @Serial
     private static final long serialVersionUID = 3347775963495102677L;
 
-    /**
-     * 用户表主键
-     */
-    @Column(name = "user_id")
-    private Long userId;
-
     /**
      * 本次领取奖励数
      */

src/main/java/com/punchsettle/server/atomic/service/impl/LotteryScratchRecordServiceImpl.java

@@ -57,7 +57,7 @@ public class LotteryScratchRecordServiceImpl implements ILotteryScratchRecordSer
             criteria.andBetween(LotteryScratchRecord::getCreationTime, query.getStartDate(), query.getEndDate());
         }
         if (!Objects.isNull(query.getUserId())) {
-            criteria.andEqualTo(LotteryScratchRecord::getUserId, query.getUserId());
+            criteria.andEqualTo(LotteryScratchRecord::getCreatedBy, query.getUserId());
         }
         weekend.orderBy(LotteryScratchRecord::getCreationTime).desc();
         return scratchRecordMapper.selectByExample(weekend);

src/main/java/com/punchsettle/server/service/manager/impl/RewardManagerImpl.java

@@ -60,7 +60,6 @@ public class RewardManagerImpl implements IRewardManager {
 
         // 构建打卡记录
         UserClaimRewardRecord userClaimRewardRecord = new UserClaimRewardRecord();
-        userClaimRewardRecord.setUserId(currentUserId);
         userClaimRewardRecord.setClaimRewardNum(dto.getClaimRewardNum());
         userClaimRewardRecord.setClaimRewardTime(new Timestamp(System.currentTimeMillis()));
         userClaimRewardRecord.setBeforeClaimRewardNum(user.getUnclaimedRewardNum());

src/main/java/com/punchsettle/server/service/manager/impl/ScratchManagerImpl.java

@@ -59,7 +59,6 @@ public class ScratchManagerImpl implements IScratchManager {
         LotteryScratchRecord scratchRecord = new LotteryScratchRecord();
         BeanUtils.copyProperties(dto, scratchRecord);
         scratchRecord.setId(null);
-        scratchRecord.setUserId(user.getId());
         scratchRecordService.insert(scratchRecord);
     }
 

src/main/resources/application-dev.yaml

@@ -3,10 +3,15 @@ spring:
     username: root
     url: jdbc:mysql://localhost:3306/punch_settle?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
 
-logging:
-  level:
-    com.punchsettle.server: debug
-
 biz:
+  wechat:
+    mini-program:
+      url: https://api.weixin.qq.com
+      app-id: ENC(qw0NNe6VoMWvpoGKZLitIJ8HWMHBF+5FbCAVQyJGdxREenOAaEB1oQ==)
+      secret: ENC(i2ZFfTtFRvAUqpXSW4CQd6HEAMTc0Ltc1dVbhDiIxe4a5H7BbTV3bfiGhFvtRszOMIgyQDoxeZI=)
   token:
     password: 12123
+
+logging:
+  level:
+    com.punchsettle.server: debug

src/main/resources/application-prod.yaml

@@ -1,9 +1,14 @@
 spring:
   datasource:
-    username: dms
-    password: ENC(NKFY9LukTR0YBJB9xo2zMQxZgw8U0ZfLwYbfBgG+sZAY/DnqnJQqKQ==)
-    url: ENC(IaRC3q0H6vgdLTIzU9WZ4/b/zuOg4DKFjDn5E9fg4DyvE9RWFRZ3ES8ut7ShbvjuJO91ivJcQ0lR1gV7QTHl9Y3kWAFm+sgHV6Yc8xEYwxno8U22e5G2w0xJYcZj7UR7o4i/WAlYIjZE9/T3gHQ7hwYnamR1JRfGu93GXMoQdLT54jzCjDeLmGFBgfSQ8FWn)
+    username: ENC(AO+GGUhg+Jdc5rirLC0/NcXde+SNwJwE)
+    password: ENC(QCxQN/qaVQO9I9N4MjiSfvzF2x4iQPNQ3kyP+V5/pg/2sdAEJiWOzw==)
+    url: ENC(F+BIBjMNwhuPYRgxRFXipJE9FmRWmgalGZkTfFBtaJZedsvOqmX+4IdrSVtZwN+a5Su2LduWTF6LaYW/oC0t9Jc2ryYBUwgdQJgFxtTBOtzRWY5FQGkjClt36Qn9oiLyt79B/XarXToDKRI/fKoBUqFLPf4RaiSfYXjgRe0r5FLQhHcE6qoK5pgzYQeG9AY+NZThMhxUiXaBnW0x7W9pu8+PTexD4amZ)
 
 biz:
+  wechat:
+    mini-program:
+      url: https://api.weixin.qq.com
+      app-id: ENC(UoqAiNhs/NSeGxkqyBnWMfEsoivYiZXQNvRyBOwXC1Sl7BGnQfPJaQ==)
+      secret: ENC(kUivDH5QROfDWN6LolR9CrqIIYoanll1FkxXyFD1DpYhVy47a6dtLTfH0CrpOsq6pQidtof0/PU=)
   token:
-    password: 12123
+    password: ENC(nEvMwnWzB6W9pEmq9sSP4oHzIA9VkMmCsp67MZbyeaDv4awBEGOsyA==)

src/main/resources/application.yaml

@@ -20,7 +20,3 @@ biz:
   wechat:
     mini-program:
       url: https://api.weixin.qq.com
-      app-id: ENC(qw0NNe6VoMWvpoGKZLitIJ8HWMHBF+5FbCAVQyJGdxREenOAaEB1oQ==)
-      secret: ENC(i2ZFfTtFRvAUqpXSW4CQd6HEAMTc0Ltc1dVbhDiIxe4a5H7BbTV3bfiGhFvtRszOMIgyQDoxeZI=)
-  token:
-    expire: 7