canrd-outside / order-erp · Commits

Commit 6813da9701ce0e797a10041bc2ff870d2086c68f

Authored by 谢茂盛
1 parent 41617a14
build: skipped

feat: 问题修复项 

1、业务员查询列表修复
Inline Side-by-side
Showing 6 changed files with 341 additions and 20 deletions
src/main/java/com/order/erp/common/utils/DbUtil.java 0 → 100644
  View file @6813da9
  1 +package com.order.erp.common.utils;
  2 +
  3 +import com.order.erp.config.AliOssConfig;
  4 +import lombok.extern.slf4j.Slf4j;
  5 +import org.springframework.stereotype.Service;
  6 +
  7 +import java.io.*;
  8 +import java.time.LocalDateTime;
  9 +
  10 +/**
  11 + * @author: xms
  12 + * @description: TODO
  13 + * @date: 2023/12/13 16:04
  14 + * @version: 1.0
  15 + */
  16 +
  17 +@Slf4j
  18 +@Service
  19 +public class DbUtil {
  20 +
  21 + /**
  22 + * 备份数据库
  23 + *
  24 + * @param ip
  25 + * @param port
  26 + * @param username
  27 + * @param password
  28 + * @param databaseName
  29 + * @param savePath
  30 + * @param fileName
  31 + */
  32 + public void exportDatabaseTool(String ip, String port, String username, String password, String databaseName, String savePath, String fileName) {
  33 + PrintWriter printWriter = null;
  34 + BufferedReader bufferedReader = null;
  35 + try {
  36 + String cmd1 = "/bin/sh";
  37 + String cmd2 = "-c";
  38 + String os_name = System.getProperty("os.name");
  39 + // 判断是否是windows系统
  40 + if (os_name.toLowerCase().startsWith("win")) {
  41 + cmd1 = "cmd";
  42 + cmd2 = "/c";
  43 + }
  44 + File saveFile = new File(savePath);
  45 + if (!saveFile.exists()) {
  46 + // 目录不存在创建新的文件夹
  47 + saveFile.mkdirs();
  48 + }
  49 + if (!savePath.endsWith(File.separator)) {
  50 + savePath = savePath + File.separator;
  51 + }
  52 + printWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(savePath + fileName), "utf-8"));
  53 + String stmt2 = "mysqldump -h" + ip + " -p" + port + " -u" + username + " -p" + password + " --default-character-set=utf8 " + databaseName;
  54 + String[] cmd = {cmd1, cmd2, stmt2};
  55 + Process process = Runtime.getRuntime().exec(cmd);
  56 + InputStreamReader inputStreamReader = new InputStreamReader(process.getInputStream(), "utf8");
  57 + bufferedReader = new BufferedReader(inputStreamReader);
  58 + String line;
  59 + while ((line = bufferedReader.readLine()) != null) {
  60 + printWriter.println(line);
  61 + }
  62 + printWriter.flush();
  63 + AliOssUtil.upload(AliOssConfig.ALIYUN_BUCKET, fileName, FileUtil.imageParseBytes(process.getInputStream()));
  64 + log.info("已备份数据库,日期:{}", DateUtils.format(LocalDateTime.now(), DateUtils.DATE_TIME));
  65 + } catch (Exception e) {
  66 + e.printStackTrace();
  67 + log.error("备份数据库失败,日期:{},e:{}", DateUtils.format(LocalDateTime.now(), DateUtils.DATE_TIME), e.toString());
  68 + } finally {
  69 + try {
  70 + if (bufferedReader != null) {
  71 + bufferedReader.close();
  72 + }
  73 + if (printWriter != null) {
  74 + printWriter.close();
  75 + }
  76 + } catch (IOException e) {
  77 + e.printStackTrace();
  78 + }
  79 + }
  80 + }
  81 +}
... ...
src/main/java/com/order/erp/job/DbBackUpJob.java 0 → 100644
  View file @6813da9
  1 +package com.order.erp.job;
  2 +
  3 +import com.order.erp.common.utils.DateUtils;
  4 +import com.order.erp.common.utils.DbUtil;
  5 +import lombok.extern.slf4j.Slf4j;
  6 +import org.springframework.beans.factory.annotation.Value;
  7 +import org.springframework.scheduling.annotation.Scheduled;
  8 +import org.springframework.stereotype.Component;
  9 +
  10 +import javax.annotation.Resource;
  11 +import java.time.LocalDateTime;
  12 +
  13 +/**
  14 + * @author: xms
  15 + * @description: TODO
  16 + * @date: 2023/6/25 10:35
  17 + * @version: 1.0
  18 + */
  19 +@Slf4j
  20 +@Component
  21 +public class DbBackUpJob {
  22 +
  23 + @Value("${db.mysql.ip}")
  24 + private String ip;
  25 +
  26 + @Value("${db.mysql.port}")
  27 + private String port;
  28 +
  29 + @Value("${db.mysql.user}")
  30 + private String user;
  31 +
  32 + @Value("${db.mysql.password}")
  33 + private String password;
  34 +
  35 + @Value("${db.mysql.savePath}")
  36 + private String savePath;
  37 +
  38 + @Value("${db.mysql.databaseName}")
  39 + private String databaseName;
  40 +
  41 + @Resource
  42 + private DbUtil dbUtil;
  43 +
  44 + /**
  45 + * 每隔30分执行一次
  46 + */
  47 +// @Scheduled(cron = "0 */30 * * * ?")
  48 + @Scheduled(cron = "0 */1 * * * ?")
  49 + public void backup() {
  50 + log.info("定时任务-开始备份db-时间：{}", DateUtils.format(LocalDateTime.now(), DateUtils.DATE_TIME));
  51 + String fileName = "db-backup-file";
  52 + dbUtil.exportDatabaseTool(ip, port, user, password, databaseName, savePath, fileName);
  53 + log.info("定时任务-完成备份db-时间：{}", DateUtils.format(LocalDateTime.now(), DateUtils.DATE_TIME));
  54 + }
  55 +}
... ...
src/main/resources/application-local.yml
  View file @6813da9
... ... @@ -174,3 +174,13 @@ oss:
174 174 accessKeyId: LTAIZCPI7OaWud0m
175 175 accessKeySecret: nvtGeScBwRztGeoj8WSp5OWalalgpK
176 176 bucket: order-erp
  177 +
  178 +
  179 +db:
  180 + mysql:
  181 + ip: 39.108.227.113
  182 + port: 3307
  183 + user: root
  184 + password: 123456
  185 + databaseName: order-erp
  186 + savePath: /home/canrd/order-erp/files/backup/
... ...
src/main/resources/application-prod.yml
  View file @6813da9
... ... @@ -4,7 +4,7 @@ mybatis-plus:
4 4 call-setters-on-nulls: true
5 5 jdbc-type-for-null: 'null'
6 6 map-underscore-to-camel-case: true
7   - log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
  7 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
8 8 global-config:
9 9 db-config:
10 10 capital-mode: false
... ... @@ -14,7 +14,7 @@ mybatis-plus:
14 14 logic-delete-value: 20
15 15 logic-not-delete-value: 10
16 16 mapper-locations: classpath:/mapper/**.xml
17   - type-aliases-package: com.canrd.shop.**.dto
  17 + type-aliases-package: com.order.erp.**.dto
18 18 #spring:
19 19 # datasource:
20 20 # dynamic:
... ... @@ -59,11 +59,11 @@ spring:
59 59 testOnReturn: true
60 60 password: 123456
61 61 time-between-eviction-runs-millis: 1000
62   - url: jdbc:mysql://159.75.211.11:3306/canrd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
  62 + url: jdbc:mysql://172.17.0.1:3306/order-erp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
63 63 username: root
64 64 redis:
65   - database: 3
66   - host: 159.75.211.11
  65 + database: 0
  66 + host: 172.17.0.1
67 67 lettuce:
68 68 pool:
69 69 max-active: 2000
... ... @@ -74,11 +74,52 @@ spring:
74 74 password: ''
75 75 port: 6379
76 76 timeout: 2000
  77 + mail:
  78 + # 配置 SMTP 服务器地址
  79 + host: xxx
  80 + # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
  81 + username: xxxx
  82 + # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
  83 + password: xxx
  84 + # 邮件接收者
  85 + mailRecipient: #邮件接收者邮箱
  86 + # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
  87 + port: 587
  88 + # 默认的邮件编码为UTF-8
  89 + default-encoding: UTF-8
  90 + # 配置SSL 加密工厂
  91 + properties:
  92 + mail:
  93 + smtp:
  94 + socketFactoryClass: javax.net.ssl.SSLSocketFactory
  95 + #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
  96 + debug: true
  97 +
  98 + freemarker:
  99 + template-loader-path: classpath:/template/
  100 + suffix: .flt
  101 + enabled: true
  102 + cache: false
  103 + charset: UTF-8
  104 + content-type: text/html
  105 + allow-request-override: false
  106 + check-template-location: true
  107 + expose-request-attributes: false
  108 + expose-session-attributes: false
  109 + expose-spring-macro-helpers: false
77 110  
78 111  
79 112 logging:
80 113 config: classpath:log4j2-prod.xml
81 114  
  115 +#登录图形验证码有效时间/分钟
  116 +loginCode:
  117 + expiration: 2
  118 +
  119 +#密码加密传输，前端公钥加密，后端私钥解密
  120 +rsa:
  121 + private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
  122 +
82 123  
83 124 #jwt
84 125 jwt:
... ... @@ -88,8 +129,58 @@ jwt:
88 129 # 必须使用最少88位的Base64对该令牌进行编码
89 130 base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
90 131 # 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
91   - token-validity-in-seconds: 7200000
  132 + token-validity-in-seconds: 720000000
92 133 # 在线用户key
93 134 online-key: online-token
94 135 # 验证码
95   - code-key: code-key
96 136 \ No newline at end of file
  137 + code-key: code-key
  138 +
  139 +outsys:
  140 + sms:
  141 + regionId: cn-hangzhou
  142 + accessKeyId: LTAIZCPI7OaWud0m
  143 + secret: nvtGeScBwRztGeoj8WSp5OWalalgpK
  144 + domain: dysmsapi.aliyuncs.com
  145 + version: 2017-05-25
  146 + action: SendSms
  147 + signName: canrd
  148 + templateCode: SMS_173005236
  149 + email:
  150 + host: xxxx
  151 + passwordRecoverKey: xxxxx
  152 +
  153 +
  154 +
  155 +system:
  156 + isLoginFailureLock: true
  157 + loginFailureLockTime: 5
  158 + loginFailureLockCount: 3
  159 +
  160 +openai:
  161 + token: Bearer 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
  162 +
  163 +# 文件存储路径
  164 +file:
  165 + path: /home/canrd/order-erp/files/
  166 + host: http://47.104.8.35
  167 + avatar: /home/order-erp/avatar/
  168 + # 文件大小 /M
  169 + maxSize: 100
  170 + avatarMaxSize: 5
  171 +
  172 +# 阿里pss图片服务
  173 +oss:
  174 + endpoint: https://oss-cn-qingdao.aliyuncs.com
  175 + accessKeyId: LTAI5t7u1gXR2vm82sd6CkVz
  176 + accessKeySecret: m4NzHZZsZiauKmRO8y7DihmcGNdQk4
  177 + bucket: alterego
  178 +
  179 +
  180 +db:
  181 + mysql:
  182 + ip: 172.17.0.1
  183 + port: 3306
  184 + user: root
  185 + password: 123456
  186 + databaseName: order-erp
  187 + savePath: /home/canrd/order-erp/files/backup/
... ...
src/main/resources/application-test.yml
  View file @6813da9
... ... @@ -4,7 +4,7 @@ mybatis-plus:
4 4 call-setters-on-nulls: true
5 5 jdbc-type-for-null: 'null'
6 6 map-underscore-to-camel-case: true
7   - log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
  7 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
8 8 global-config:
9 9 db-config:
10 10 capital-mode: false
... ... @@ -14,7 +14,7 @@ mybatis-plus:
14 14 logic-delete-value: 20
15 15 logic-not-delete-value: 10
16 16 mapper-locations: classpath:/mapper/**.xml
17   - type-aliases-package: com.canrd.shop.**.dto
  17 + type-aliases-package: com.order.erp.**.dto
18 18 #spring:
19 19 # datasource:
20 20 # dynamic:
... ... @@ -59,11 +59,11 @@ spring:
59 59 testOnReturn: true
60 60 password: 123456
61 61 time-between-eviction-runs-millis: 1000
62   - url: jdbc:mysql://159.75.211.11:3306/canrd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
  62 + url: jdbc:mysql://39.108.227.113:3307/order-erp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
63 63 username: root
64 64 redis:
65   - database: 3
66   - host: 159.75.211.11
  65 + database: 0
  66 + host: 39.108.227.113
67 67 lettuce:
68 68 pool:
69 69 max-active: 2000
... ... @@ -74,17 +74,51 @@ spring:
74 74 password: ''
75 75 port: 6379
76 76 timeout: 2000
  77 + mail:
  78 + # 配置 SMTP 服务器地址
  79 + host: smtp.mxhichina.com
  80 + # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
  81 + username: system@canrd.com
  82 + # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
  83 + password: Kelude2015
  84 + # 邮件接收者
  85 + mailRecipient: #邮件接收者邮箱
  86 + # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
  87 + port: 587
  88 + # 默认的邮件编码为UTF-8
  89 + default-encoding: UTF-8
  90 + # 配置SSL 加密工厂
  91 + properties:
  92 + mail:
  93 + smtp:
  94 + socketFactoryClass: javax.net.ssl.SSLSocketFactory
  95 + #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
  96 + debug: true
  97 +
  98 + freemarker:
  99 + template-loader-path: classpath:/template/
  100 + suffix: .flt
  101 + enabled: true
  102 + cache: false
  103 + charset: UTF-8
  104 + content-type: text/html
  105 + allow-request-override: false
  106 + check-template-location: true
  107 + expose-request-attributes: false
  108 + expose-session-attributes: false
  109 + expose-spring-macro-helpers: false
77 110  
78 111  
79 112 logging:
80 113 config: classpath:log4j2-dev.xml
81 114  
82   -#spring security相关配置
83   -#security:
84   -# token:
85   -# header: Authorization
86   -# expireTime: 30
87   -# permitAllUrls: /api/overtime/account/login,/api/overtime/account/logout,/api/overtime/sms/send_auth_code,/api/overtime/account/reset_password,/admin/shop/test/add,/admin/shop/test/demo
  115 +#登录图形验证码有效时间/分钟
  116 +loginCode:
  117 + expiration: 2
  118 +
  119 +#密码加密传输，前端公钥加密，后端私钥解密
  120 +rsa:
  121 + private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
88 122  
89 123  
90 124 #jwt
... ... @@ -95,8 +129,58 @@ jwt:
95 129 # 必须使用最少88位的Base64对该令牌进行编码
96 130 base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
97 131 # 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
98   - token-validity-in-seconds: 7200000
  132 + token-validity-in-seconds: 720000000
99 133 # 在线用户key
100 134 online-key: online-token
101 135 # 验证码
102 136 code-key: code-key
  137 +
  138 +outsys:
  139 + sms:
  140 + regionId: cn-hangzhou
  141 + accessKeyId: LTAIZCPI7OaWud0m
  142 + secret: nvtGeScBwRztGeoj8WSp5OWalalgpK
  143 + domain: dysmsapi.aliyuncs.com
  144 + version: 2017-05-25
  145 + action: SendSms
  146 + signName: canrd
  147 + templateCode: SMS_173005236
  148 + email:
  149 + host: http://core.canrd.com
  150 + passwordRecoverKey: http://www.canrd.com/canrd/shop/member/passwordModify
  151 +
  152 +
  153 +
  154 +system:
  155 + isLoginFailureLock: true
  156 + loginFailureLockTime: 5
  157 + loginFailureLockCount: 3
  158 +
  159 +openai:
  160 + token: Bearer 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
  161 +
  162 +# 文件存储路径
  163 +file:
  164 + path: /home/canrd/order-erp/files/
  165 + host: http://39.108.227.113
  166 + avatar: /home/order-erp/avatar/
  167 + # 文件大小 /M
  168 + maxSize: 100
  169 + avatarMaxSize: 5
  170 +
  171 +# 阿里pss图片服务
  172 +oss:
  173 + endpoint: https://oss-cn-qingdao.aliyuncs.com
  174 + accessKeyId: LTAIZCPI7OaWud0m
  175 + accessKeySecret: nvtGeScBwRztGeoj8WSp5OWalalgpK
  176 + bucket: order-erp
  177 +
  178 +
  179 +db:
  180 + mysql:
  181 + ip: 39.108.227.113
  182 + port: 3307
  183 + user: root
  184 + password: 123456
  185 + databaseName: order-erp
  186 + savePath: /home/canrd/order-erp/files/backup/
... ...
src/main/resources/application.yml
  View file @6813da9
... ... @@ -3,4 +3,4 @@ server:
3 3  
4 4 spring:
5 5 profiles:
6   - active: local
7 6 \ No newline at end of file
  7 + active: prod
8 8 \ No newline at end of file
... ...