From 596cf10a1c2b175e2878666d845c6d24e932388b Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sat, 6 Apr 2024 14:31:25 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=20=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AF=86=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DockerFile_admin | 8 + .../ruoyi/web/controller/AuthController.java | 5 - .../web/controller/CaptchaController.java | 28 ++ .../src/main/resources/application-dev.yml | 6 +- .../src/main/resources/application-prod.yml | 14 +- .../src/main/resources/application.yml | 3 +- ruoyi-admin/src/main/resources/logback.xml | 16 +- .../common/encrypt/filter/CryptoFilter.java | 2 +- .../filter/DecryptRequestBodyWrapper.java | 30 +- .../ruoyi/common/encrypt/utils/RSAUtils.java | 363 ++++++++++++++++++ .../main/resources/application-dev.properties | 4 +- 11 files changed, 437 insertions(+), 42 deletions(-) create mode 100644 DockerFile_admin create mode 100644 ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/utils/RSAUtils.java diff --git a/DockerFile_admin b/DockerFile_admin new file mode 100644 index 0000000..f12e6f1 --- /dev/null +++ b/DockerFile_admin @@ -0,0 +1,8 @@ +# 使用官方的 Java 运行时作为父镜像 +FROM openjdk:8-jdk-alpine + +# 将本地文件复制到容器中 +COPY target/my-app.jar /app.jar + +# 运行应用 +ENTRYPOINT ["java","-jar","/app.jar"] diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java index 2d664c0..ab1bc14 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java @@ -5,8 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.mybatisflex.core.query.QueryWrapper; import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.core.domain.AjaxResult; -import com.ruoyi.common.core.core.domain.model.LoginUser; import com.ruoyi.common.core.core.domain.model.SocialLoginBody; import com.ruoyi.common.core.utils.*; import com.ruoyi.common.encrypt.annotation.ApiEncrypt; @@ -15,13 +13,11 @@ import com.ruoyi.common.security.utils.LoginHelper; import com.ruoyi.common.social.config.properties.SocialLoginConfigProperties; import com.ruoyi.common.social.config.properties.SocialProperties; import com.ruoyi.common.social.utils.SocialUtils; -import com.ruoyi.common.tenant.helper.TenantHelper; import com.ruoyi.common.websocket.dto.WebSocketMessageDto; import com.ruoyi.common.websocket.utils.WebSocketUtils; import com.ruoyi.system.domain.bo.SysTenantBo; import com.ruoyi.system.domain.vo.SysClientVo; import com.ruoyi.system.domain.vo.SysTenantVo; -import com.ruoyi.system.domain.vo.SysUserVo; import com.ruoyi.system.service.*; import com.ruoyi.web.domain.vo.LoginTenantVo; import com.ruoyi.web.domain.vo.LoginVo; @@ -34,7 +30,6 @@ import lombok.extern.slf4j.Slf4j; import com.ruoyi.common.core.core.domain.R; import com.ruoyi.common.core.core.domain.model.LoginBody; import com.ruoyi.common.core.core.domain.model.RegisterBody; -import com.ruoyi.system.domain.SysClient; import com.ruoyi.web.service.IAuthStrategy; import com.ruoyi.web.service.SysLoginService; import me.zhyd.oauth.model.AuthResponse; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java index c38550d..53b180b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java @@ -2,7 +2,10 @@ package com.ruoyi.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import java.time.Duration; +import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.Map; +import java.util.UUID; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.generator.CodeGenerator; @@ -10,11 +13,13 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; import com.ruoyi.common.core.annotation.RateLimiter; import com.ruoyi.common.core.constant.GlobalConstants; +import com.ruoyi.common.core.core.domain.AjaxResult; import com.ruoyi.common.core.enums.LimitType; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.reflect.ReflectUtils; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.core.domain.R; +import com.ruoyi.common.encrypt.utils.RSAUtils; import com.ruoyi.common.mail.config.properties.MailProperties; import com.ruoyi.common.mail.utils.MailUtils; import com.ruoyi.common.redis.utils.RedisUtils; @@ -134,4 +139,27 @@ public class CaptchaController } return R.ok(); } + + @GetMapping("/genKeyPair") + public R genKeyPair() { + Map map=new HashMap<>(); + try { + log.info("开始生产rsa秘钥"); + + Map keyPair = RSAUtils.genKeyPair(); + String publicKey = RSAUtils.getPublicKey(keyPair); + String privateKey = RSAUtils.getPrivateKey(keyPair); + log.info("privateKey："+privateKey); + String uuid="ruoyi_"+ UUID.randomUUID().toString().replace("-",""); + RedisUtils.setCacheMapValue("loginRsa",uuid,privateKey); + RedisUtils.expire("loginRsa",60*60); + log.info("写入redis完成"); + + map.put("uuidPrivateKey",uuid); + map.put("RSA_PUBLIC_KEY",publicKey); + } catch (Exception e) { + return R.fail("生成RSA秘钥失败,"+e.getMessage()); + } + return R.ok(map); + } } diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index f751497..1721b93 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -36,8 +36,8 @@ mybatis-flex: #postgresql数据库 driver-class-name: org.postgresql.Driver url: jdbc:postgresql://localhost:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true - username: postgres - password: postgres@369 + username: root + password: root # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) spring.data: @@ -49,7 +49,7 @@ spring.data: # 数据库索引 database: 0 # 密码(如没有密码请注释掉) - # password: + password: root # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 86d9829..f42cf20 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -35,21 +35,21 @@ mybatis-flex: # password: Root@369 #postgresql数据库 driver-class-name: org.postgresql.Driver - url: jdbc:postgresql://localhost:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true - username: postgres - password: postgres@369 + url: jdbc:postgresql://172.16.0.151:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true + username: root + password: root # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) spring.data: redis: # 地址 - host: localhost + host: 172.16.0.151 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 密码(如没有密码请注释掉) - # password: + password: root # 连接超时时间 timeout: 10s # 是否开启ssl @@ -81,7 +81,7 @@ redisson: spring.boot.admin.client: # 增加客户端开关 enabled: true - url: http://localhost:9090/admin + url: http://172.16.0.151:9090/admin instance: service-host-type: IP username: ruoyi @@ -97,7 +97,7 @@ powerjob: # 28080 端口 随着主应用端口飘逸 避免集群冲突 port: 2${server.port} protocol: http - server-address: 127.0.0.1:7700 + server-address: 172.16.0.151:7700 store-strategy: disk allow-lazy-connect-server: false max-appended-wf-context-length: 4096 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index a7e5394..df7555e 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: /home/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false @@ -298,6 +298,7 @@ security: - /captchaImage - /captcha/get - /captcha/check + - /genKeyPair --- # Actuator 监控端点的配置项 management: diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index a360583..f8ec9b4 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -11,7 +11,7 @@ ${log.pattern} - + ${log.path}/sys-info.log @@ -34,7 +34,7 @@ DENY - + ${log.path}/sys-error.log @@ -56,7 +56,7 @@ DENY - + ${log.path}/sys-user.log @@ -70,7 +70,7 @@ ${log.pattern} - + @@ -79,15 +79,15 @@ - + - + - \ No newline at end of file + diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/filter/CryptoFilter.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/filter/CryptoFilter.java index aab5d2b..94d774d 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/filter/CryptoFilter.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/filter/CryptoFilter.java @@ -51,7 +51,7 @@ public class CryptoFilter implements Filter { String headerValue = servletRequest.getHeader(properties.getHeaderFlag()); if (StringUtils.isNotBlank(headerValue)) { // 请求解密 - requestWrapper = new DecryptRequestBodyWrapper(servletRequest, properties.getPrivateKey(), properties.getHeaderFlag()); + requestWrapper = new DecryptRequestBodyWrapper(servletRequest, headerValue); } else { // 是否有注解，有就报错，没有放行 if (ObjectUtil.isNotNull(apiEncrypt)) { diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/filter/DecryptRequestBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/filter/DecryptRequestBodyWrapper.java index 83d1f3a..2ac22a6 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/filter/DecryptRequestBodyWrapper.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/filter/DecryptRequestBodyWrapper.java @@ -2,12 +2,14 @@ package com.ruoyi.common.encrypt.filter; import cn.hutool.core.io.IoUtil; import com.ruoyi.common.encrypt.utils.EncryptUtils; +import com.ruoyi.common.redis.utils.RedisUtils; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; import com.ruoyi.common.core.constant.Constants; import org.springframework.http.MediaType; +import org.springframework.web.util.UriUtils; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -24,22 +26,20 @@ public class DecryptRequestBodyWrapper extends HttpServletRequestWrapper { private final byte[] body; - public DecryptRequestBodyWrapper(HttpServletRequest request, String privateKey, String headerFlag) throws IOException { - super(request); - // 获取 AES 密码 采用 RSA 加密 - String headerRsa = request.getHeader(headerFlag); - String decryptAes = EncryptUtils.decryptByRsa(headerRsa, privateKey); - // 解密 AES 密码 - String aesPassword = EncryptUtils.decryptByBase64(decryptAes); - request.setCharacterEncoding(Constants.UTF8); - byte[] readBytes = IoUtil.readBytes(request.getInputStream(), false); - String requestBody = new String(readBytes, StandardCharsets.UTF_8); - // 解密 body 采用 AES 加密 - String decryptBody = EncryptUtils.decryptByAes(requestBody, aesPassword); - body = decryptBody.getBytes(StandardCharsets.UTF_8); - } + public DecryptRequestBodyWrapper(HttpServletRequest request, String privateKey) throws IOException { + super(request); + // 获取 AES 密码 采用 RSA 加密 + String privateKeyValue = RedisUtils.getCacheMapValue("loginRsa", privateKey); - @Override + byte[] readBytes = IoUtil.readBytes(request.getInputStream(), false); + String requestBody = new String(readBytes, StandardCharsets.UTF_8); + // 解密 body 采用 AES 加密 + String decryptBody = EncryptUtils.decryptByRsa(requestBody, privateKeyValue); + body = UriUtils.decode(decryptBody, StandardCharsets.UTF_8).getBytes(StandardCharsets.UTF_8); + } + + + @Override public BufferedReader getReader() { return new BufferedReader(new InputStreamReader(getInputStream())); } diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/utils/RSAUtils.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/utils/RSAUtils.java new file mode 100644 index 0000000..a6c73f7 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/utils/RSAUtils.java @@ -0,0 +1,363 @@ +package com.ruoyi.common.encrypt.utils; + +import org.apache.commons.codec.binary.Base64; + +import javax.crypto.Cipher; +import java.io.ByteArrayOutputStream; +import java.security.*; +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; +import java.util.HashMap; +import java.util.Map; + +/** + * @NAME: RSAEncryptUtils + * @AUTHOR: gaoly + * @DATE: 2021/1/26 15:15 + * @DES: + **/ +public class RSAUtils { + /** */ + /** + * 加密算法RSA + */ + public static final String KEY_ALGORITHM = "RSA"; + + /** */ + /** + * 签名算法 + */ + public static final String SIGNATURE_ALGORITHM = "MD5withRSA"; + + /** */ + /** + * 获取公钥的key + */ + private static final String PUBLIC_KEY = "RSAPublicKey"; + + /** */ + /** + * 获取私钥的key + */ + private static final String PRIVATE_KEY = "RSAPrivateKey"; + + /** */ + /** + * RSA最大加密明文大小 + */ + private static final int MAX_ENCRYPT_BLOCK = 117; + + /** */ + /** + * RSA最大解密密文大小 + */ + private static final int MAX_DECRYPT_BLOCK = 128; + + /** */ + /** + * RSA 位数 如果采用2048 上面最大加密和最大解密则须填写: 245 256 + */ + private static final int INITIALIZE_LENGTH = 1024; + + /** */ + /** + *

+ * 生成密钥对(公钥和私钥) + *

+ * + * @return + * @throws Exception + */ + public static Map genKeyPair() throws Exception { + KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM); + keyPairGen.initialize(INITIALIZE_LENGTH); + KeyPair keyPair = keyPairGen.generateKeyPair(); + RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); + RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); + Map keyMap = new HashMap(2); + keyMap.put(PUBLIC_KEY, publicKey); + keyMap.put(PRIVATE_KEY, privateKey); + return keyMap; + } + + /** */ + /** + *

+ * 用私钥对信息生成数字签名 + *

+ * + * @param data + * 已加密数据 + * @param privateKey + * 私钥(BASE64编码) + * + * @return + * @throws Exception + */ + public static String sign(byte[] data, String privateKey) throws Exception { + byte[] keyBytes = Base64.decodeBase64(privateKey); + PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + PrivateKey privateK = keyFactory.generatePrivate(pkcs8KeySpec); + Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM); + signature.initSign(privateK); + signature.update(data); + return Base64.encodeBase64String(signature.sign()); + } + + /** */ + /** + *

+ * 校验数字签名 + *

+ * + * @param data + * 已加密数据 + * @param publicKey + * 公钥(BASE64编码) + * @param sign + * 数字签名 + * + * @return + * @throws Exception + * + */ + public static boolean verify(byte[] data, String publicKey, String sign) throws Exception { + byte[] keyBytes = Base64.decodeBase64(publicKey); + X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + PublicKey publicK = keyFactory.generatePublic(keySpec); + Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM); + signature.initVerify(publicK); + signature.update(data); + return signature.verify(Base64.decodeBase64(sign)); + } + + /** */ + /** + *

+ * 私钥解密 + *

+ * + * @param encryptedData + * 已加密数据 + * @param privateKey + * 私钥(BASE64编码) + * @return + * @throws Exception + */ + public static byte[] decryptByPrivateKey(byte[] encryptedData, String privateKey) throws Exception { + byte[] keyBytes = Base64.decodeBase64(privateKey); + PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + Key privateK = keyFactory.generatePrivate(pkcs8KeySpec); + Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm()); + cipher.init(Cipher.DECRYPT_MODE, privateK); + int inputLen = encryptedData.length; + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int offSet = 0; + byte[] cache; + int i = 0; + // 对数据分段解密 + while (inputLen - offSet > 0) { + if (inputLen - offSet > MAX_DECRYPT_BLOCK) { + cache = cipher.doFinal(encryptedData, offSet, MAX_DECRYPT_BLOCK); + } else { + cache = cipher.doFinal(encryptedData, offSet, inputLen - offSet); + } + out.write(cache, 0, cache.length); + i++; + offSet = i * MAX_DECRYPT_BLOCK; + } + byte[] decryptedData = out.toByteArray(); + out.close(); + return decryptedData; + } + + /** */ + /** + *

+ * 公钥解密 + *

+ * + * @param encryptedData + * 已加密数据 + * @param publicKey + * 公钥(BASE64编码) + * @return + * @throws Exception + */ + public static byte[] decryptByPublicKey(byte[] encryptedData, String publicKey) throws Exception { + byte[] keyBytes = Base64.decodeBase64(publicKey); + X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + Key publicK = keyFactory.generatePublic(x509KeySpec); + Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm()); + cipher.init(Cipher.DECRYPT_MODE, publicK); + int inputLen = encryptedData.length; + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int offSet = 0; + byte[] cache; + int i = 0; + // 对数据分段解密 + while (inputLen - offSet > 0) { + if (inputLen - offSet > MAX_DECRYPT_BLOCK) { + cache = cipher.doFinal(encryptedData, offSet, MAX_DECRYPT_BLOCK); + } else { + cache = cipher.doFinal(encryptedData, offSet, inputLen - offSet); + } + out.write(cache, 0, cache.length); + i++; + offSet = i * MAX_DECRYPT_BLOCK; + } + byte[] decryptedData = out.toByteArray(); + out.close(); + return decryptedData; + } + + /** */ + /** + *

+ * 公钥加密 + *

+ * + * @param data + * 源数据 + * @param publicKey + * 公钥(BASE64编码) + * @return + * @throws Exception + */ + public static byte[] encryptByPublicKey(byte[] data, String publicKey) throws Exception { + byte[] keyBytes = Base64.decodeBase64(publicKey); + X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + Key publicK = keyFactory.generatePublic(x509KeySpec); + // 对数据加密 + Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm()); + cipher.init(Cipher.ENCRYPT_MODE, publicK); + int inputLen = data.length; + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int offSet = 0; + byte[] cache; + int i = 0; + // 对数据分段加密 + while (inputLen - offSet > 0) { + if (inputLen - offSet > MAX_ENCRYPT_BLOCK) { + cache = cipher.doFinal(data, offSet, MAX_ENCRYPT_BLOCK); + } else { + cache = cipher.doFinal(data, offSet, inputLen - offSet); + } + out.write(cache, 0, cache.length); + i++; + offSet = i * MAX_ENCRYPT_BLOCK; + } + byte[] encryptedData = out.toByteArray(); + out.close(); + return encryptedData; + } + + /** */ + /** + *

+ * 私钥加密 + *

+ * + * @param data + * 源数据 + * @param privateKey + * 私钥(BASE64编码) + * @return + * @throws Exception + */ + public static byte[] encryptByPrivateKey(byte[] data, String privateKey) throws Exception { + byte[] keyBytes = Base64.decodeBase64(privateKey); + PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + Key privateK = keyFactory.generatePrivate(pkcs8KeySpec); + Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm()); + cipher.init(Cipher.ENCRYPT_MODE, privateK); + int inputLen = data.length; + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int offSet = 0; + byte[] cache; + int i = 0; + // 对数据分段加密 + while (inputLen - offSet > 0) { + if (inputLen - offSet > MAX_ENCRYPT_BLOCK) { + cache = cipher.doFinal(data, offSet, MAX_ENCRYPT_BLOCK); + } else { + cache = cipher.doFinal(data, offSet, inputLen - offSet); + } + out.write(cache, 0, cache.length); + i++; + offSet = i * MAX_ENCRYPT_BLOCK; + } + byte[] encryptedData = out.toByteArray(); + out.close(); + return encryptedData; + } + + /** */ + /** + *

+ * 获取私钥 + *

+ * + * @param keyMap + * 密钥对 + * @return + * @throws Exception + */ + public static String getPrivateKey(Map keyMap) throws Exception { + Key key = (Key) keyMap.get(PRIVATE_KEY); + return Base64.encodeBase64String(key.getEncoded()); + } + + /** */ + /** + *

+ * 获取公钥 + *

+ * + * @param keyMap + * 密钥对 + * @return + * @throws Exception + */ + public static String getPublicKey(Map keyMap) throws Exception { + Key key = (Key) keyMap.get(PUBLIC_KEY); + return Base64.encodeBase64String(key.getEncoded()); + } + + /** + * java端公钥加密 + */ + public static String encryptedDataOnJava(String data, String PUBLICKEY) { + try { + data = Base64.encodeBase64String(encryptByPublicKey(data.getBytes(), PUBLICKEY)); + } catch (Exception e) { + } + return data; + } + + /** + * java端私钥解密 + */ + public static String decryptDataOnJava(String data, String PRIVATEKEY) { + String temp = ""; + try { + byte[] rs = Base64.decodeBase64(data); + temp = new String(RSAUtils.decryptByPrivateKey(rs, PRIVATEKEY),"UTF-8"); + + } catch (Exception e) { + } + return temp; + } + + public static void main(String[] args) throws Exception{ + + } +} diff --git a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-dev.properties b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-dev.properties index a8fa651..9e42d35 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-dev.properties +++ b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-dev.properties @@ -4,8 +4,8 @@ oms.env=dev spring.datasource.remote.hibernate.properties.hibernate.dialect=tech.powerjob.server.persistence.config.dialect.PowerJobPGDialect spring.datasource.core.driver-class-name=org.postgresql.Driver spring.datasource.core.jdbc-url=jdbc:postgresql://localhost:5432/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -spring.datasource.core.username=postgres -spring.datasource.core.password=postgres@369 +spring.datasource.core.username=root +spring.datasource.core.password=root ## MySQL数据库连接参数 #spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver #spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true From 0b99d54edf874e2583fda3f1e3d97bd383024bd4 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sat, 6 Apr 2024 14:53:21 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi-monitor/src/main/resources/application.yml | 2 +- .../src/main/resources/application-prod.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-extra/ruoyi-monitor/src/main/resources/application.yml b/ruoyi-extra/ruoyi-monitor/src/main/resources/application.yml index 5fa3a1b..ec419bf 100644 --- a/ruoyi-extra/ruoyi-monitor/src/main/resources/application.yml +++ b/ruoyi-extra/ruoyi-monitor/src/main/resources/application.yml @@ -38,7 +38,7 @@ spring.boot.admin.client: # 增加客户端开关 enabled: true # 设置 Spring Boot Admin Server 地址 - url: http://localhost:9090/admin + url: http://172.16.0.151:9090/admin instance: service-host-type: IP username: ruoyi diff --git a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties index 2a2109d..1560993 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties +++ b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties @@ -2,9 +2,9 @@ oms.env=prod ####### Database properties(Configure according to the the environment) ####### spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.core.jdbc-url=jdbc:mysql://172.16.0.151:3306/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true spring.datasource.core.username=root -spring.datasource.core.password=Root@369 +spring.datasource.core.password=root spring.datasource.core.maximum-pool-size=20 spring.datasource.core.minimum-idle=5 @@ -12,7 +12,7 @@ spring.datasource.core.minimum-idle=5 # 客户端开关 spring.boot.admin.client.enabled=true # 设置 Spring Boot Admin Server 地址 -spring.boot.admin.client.url: http://localhost:9090/admin +spring.boot.admin.client.url: http://172.16.0.151:9090/admin spring.boot.admin.client.instance.service-host-type=IP spring.boot.admin.client.username=ruoyi spring.boot.admin.client.password=123456 From fad4f8e19e8480849906046a3ba015a480e23026 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sat, 6 Apr 2024 15:18:52 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DockerFile_admin => DockerFile_ruoyi-admin | 4 ++-- DockerFile_ruoyi-monitor | 8 ++++++++ DockerFile_ruoyi-powerjob-server | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) rename DockerFile_admin => DockerFile_ruoyi-admin (60%) create mode 100644 DockerFile_ruoyi-monitor create mode 100644 DockerFile_ruoyi-powerjob-server diff --git a/DockerFile_admin b/DockerFile_ruoyi-admin similarity index 60% rename from DockerFile_admin rename to DockerFile_ruoyi-admin index f12e6f1..c28cbb2 100644 --- a/DockerFile_admin +++ b/DockerFile_ruoyi-admin @@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine # 将本地文件复制到容器中 -COPY target/my-app.jar /app.jar +COPY ruoyi-admin.jar /ruoyi-admin.jar # 运行应用 -ENTRYPOINT ["java","-jar","/app.jar"] +ENTRYPOINT ["java","-jar","/ruoyi-admin.jar"] diff --git a/DockerFile_ruoyi-monitor b/DockerFile_ruoyi-monitor new file mode 100644 index 0000000..c0f9963 --- /dev/null +++ b/DockerFile_ruoyi-monitor @@ -0,0 +1,8 @@ +# 使用官方的 Java 运行时作为父镜像 +FROM openjdk:8-jdk-alpine + +# 将本地文件复制到容器中 +COPY ruoyi-monitor.jar /ruoyi-monitor.jar + +# 运行应用 +ENTRYPOINT ["java","-jar","/ruoyi-monitor.jar"] diff --git a/DockerFile_ruoyi-powerjob-server b/DockerFile_ruoyi-powerjob-server new file mode 100644 index 0000000..c0f9963 --- /dev/null +++ b/DockerFile_ruoyi-powerjob-server @@ -0,0 +1,8 @@ +# 使用官方的 Java 运行时作为父镜像 +FROM openjdk:8-jdk-alpine + +# 将本地文件复制到容器中 +COPY ruoyi-monitor.jar /ruoyi-monitor.jar + +# 运行应用 +ENTRYPOINT ["java","-jar","/ruoyi-monitor.jar"] From b07033ba510c6a299f7b47de2c61519f9c146a9b Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sat, 6 Apr 2024 15:25:47 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DockerFile_ruoyi-admin | 2 +- DockerFile_ruoyi-monitor | 2 +- DockerFile_ruoyi-powerjob-server | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DockerFile_ruoyi-admin b/DockerFile_ruoyi-admin index c28cbb2..d7bc9ac 100644 --- a/DockerFile_ruoyi-admin +++ b/DockerFile_ruoyi-admin @@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine # 将本地文件复制到容器中 -COPY ruoyi-admin.jar /ruoyi-admin.jar +COPY ruoyi-admin/target/ruoyi-admin.jar /ruoyi-admin.jar # 运行应用 ENTRYPOINT ["java","-jar","/ruoyi-admin.jar"] diff --git a/DockerFile_ruoyi-monitor b/DockerFile_ruoyi-monitor index c0f9963..31e666f 100644 --- a/DockerFile_ruoyi-monitor +++ b/DockerFile_ruoyi-monitor @@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine # 将本地文件复制到容器中 -COPY ruoyi-monitor.jar /ruoyi-monitor.jar +COPY ruoyi-extra/ruoyi-monitor/target/ruoyi-monitor.jar /ruoyi-monitor.jar # 运行应用 ENTRYPOINT ["java","-jar","/ruoyi-monitor.jar"] diff --git a/DockerFile_ruoyi-powerjob-server b/DockerFile_ruoyi-powerjob-server index c0f9963..cced01d 100644 --- a/DockerFile_ruoyi-powerjob-server +++ b/DockerFile_ruoyi-powerjob-server @@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine # 将本地文件复制到容器中 -COPY ruoyi-monitor.jar /ruoyi-monitor.jar +COPY ruoyi-extra/ruoyi-powerjob-server/target/ruoyi-powerjob-server.jar /ruoyi-powerjob-server.jar # 运行应用 -ENTRYPOINT ["java","-jar","/ruoyi-monitor.jar"] +ENTRYPOINT ["java","-jar","/ruoyi-powerjob-server.jar"] From 92b3efb87d56703bf2cc3674911b744b454a7733 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sat, 6 Apr 2024 15:36:38 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DockerFile_ruoyi-admin => ruoyi-admin/DockerFile | 4 ++-- .../ruoyi-monitor/DockerFile | 4 ++-- .../ruoyi-powerjob-server/DockerFile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename DockerFile_ruoyi-admin => ruoyi-admin/DockerFile (60%) rename DockerFile_ruoyi-monitor => ruoyi-extra/ruoyi-monitor/DockerFile (59%) rename DockerFile_ruoyi-powerjob-server => ruoyi-extra/ruoyi-powerjob-server/DockerFile (55%) diff --git a/DockerFile_ruoyi-admin b/ruoyi-admin/DockerFile similarity index 60% rename from DockerFile_ruoyi-admin rename to ruoyi-admin/DockerFile index d7bc9ac..bda50a7 100644 --- a/DockerFile_ruoyi-admin +++ b/ruoyi-admin/DockerFile @@ -1,8 +1,8 @@ # 使用官方的 Java 运行时作为父镜像 -FROM openjdk:8-jdk-alpine +FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 -COPY ruoyi-admin/target/ruoyi-admin.jar /ruoyi-admin.jar +COPY target/ruoyi-admin.jar /ruoyi-admin.jar # 运行应用 ENTRYPOINT ["java","-jar","/ruoyi-admin.jar"] diff --git a/DockerFile_ruoyi-monitor b/ruoyi-extra/ruoyi-monitor/DockerFile similarity index 59% rename from DockerFile_ruoyi-monitor rename to ruoyi-extra/ruoyi-monitor/DockerFile index 31e666f..8632e6f 100644 --- a/DockerFile_ruoyi-monitor +++ b/ruoyi-extra/ruoyi-monitor/DockerFile @@ -1,8 +1,8 @@ # 使用官方的 Java 运行时作为父镜像 -FROM openjdk:8-jdk-alpine +FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 -COPY ruoyi-extra/ruoyi-monitor/target/ruoyi-monitor.jar /ruoyi-monitor.jar +COPY target/ruoyi-monitor.jar /ruoyi-monitor.jar # 运行应用 ENTRYPOINT ["java","-jar","/ruoyi-monitor.jar"] diff --git a/DockerFile_ruoyi-powerjob-server b/ruoyi-extra/ruoyi-powerjob-server/DockerFile similarity index 55% rename from DockerFile_ruoyi-powerjob-server rename to ruoyi-extra/ruoyi-powerjob-server/DockerFile index cced01d..c56a60a 100644 --- a/DockerFile_ruoyi-powerjob-server +++ b/ruoyi-extra/ruoyi-powerjob-server/DockerFile @@ -1,8 +1,8 @@ # 使用官方的 Java 运行时作为父镜像 -FROM openjdk:8-jdk-alpine +FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 -COPY ruoyi-extra/ruoyi-powerjob-server/target/ruoyi-powerjob-server.jar /ruoyi-powerjob-server.jar +COPY target/ruoyi-powerjob-server.jar /ruoyi-powerjob-server.jar # 运行应用 ENTRYPOINT ["java","-jar","/ruoyi-powerjob-server.jar"] From 445ef5763d73f7f49291904eb10ae2ff251052de Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sat, 6 Apr 2024 17:08:40 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/{DockerFile => Dockerfile} | 0 ruoyi-extra/ruoyi-monitor/{DockerFile => Dockerfile} | 0 ruoyi-extra/ruoyi-powerjob-server/{DockerFile => Dockerfile} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename ruoyi-admin/{DockerFile => Dockerfile} (100%) rename ruoyi-extra/ruoyi-monitor/{DockerFile => Dockerfile} (100%) rename ruoyi-extra/ruoyi-powerjob-server/{DockerFile => Dockerfile} (100%) diff --git a/ruoyi-admin/DockerFile b/ruoyi-admin/Dockerfile similarity index 100% rename from ruoyi-admin/DockerFile rename to ruoyi-admin/Dockerfile diff --git a/ruoyi-extra/ruoyi-monitor/DockerFile b/ruoyi-extra/ruoyi-monitor/Dockerfile similarity index 100% rename from ruoyi-extra/ruoyi-monitor/DockerFile rename to ruoyi-extra/ruoyi-monitor/Dockerfile diff --git a/ruoyi-extra/ruoyi-powerjob-server/DockerFile b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile similarity index 100% rename from ruoyi-extra/ruoyi-powerjob-server/DockerFile rename to ruoyi-extra/ruoyi-powerjob-server/Dockerfile From d494c551d5a5cdd60ac6b6769cbc7077ddea2b5b Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sat, 6 Apr 2024 20:03:08 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.properties | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties index 1560993..d45bd76 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties +++ b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties @@ -1,8 +1,9 @@ oms.env=prod ####### Database properties(Configure according to the the environment) ####### -spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.core.jdbc-url=jdbc:mysql://172.16.0.151:3306/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.remote.hibernate.properties.hibernate.dialect=tech.powerjob.server.persistence.config.dialect.PowerJobPGDialect +spring.datasource.core.driver-class-name=org.postgresql.Driver +spring.datasource.core.jdbc-url=jdbc:postgresql://172.16.0.151:5432/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true spring.datasource.core.username=root spring.datasource.core.password=root spring.datasource.core.maximum-pool-size=20 From 41ea876a969fa4ad9e98b07fd690decc4ff76ac1 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sat, 6 Apr 2024 23:58:27 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties index d45bd76..12139ec 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties +++ b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties @@ -49,3 +49,4 @@ oms.instance.metadata.cache.size=2048 ####### Threshold in precise fetching server(0~100). 100 means full detection of server, in which ####### ####### split-brain could be avoided while performance overhead would increase. ####### oms.accurate.select.server.percentage = 50 +powerjob.network.external.address = 172.16.0.151 From 3573a71af3bf510d08c246f95951d2fcad899387 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sat, 6 Apr 2024 23:59:03 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties index 12139ec..a25a664 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties +++ b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties @@ -49,4 +49,5 @@ oms.instance.metadata.cache.size=2048 ####### Threshold in precise fetching server(0~100). 100 means full detection of server, in which ####### ####### split-brain could be avoided while performance overhead would increase. ####### oms.accurate.select.server.percentage = 50 +#需要指定服务端的ip 否则客户端注册不成功 powerjob.network.external.address = 172.16.0.151 From 048fb6abcb6bb9d1518d9eeafa33534719bbbea2 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sun, 7 Apr 2024 00:05:57 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-prod.properties | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index f42cf20..f51123e 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -97,7 +97,7 @@ powerjob: # 28080 端口 随着主应用端口飘逸 避免集群冲突 port: 2${server.port} protocol: http - server-address: 172.16.0.151:7700 + server-address: 172.16.0.151:7070 store-strategy: disk allow-lazy-connect-server: false max-appended-wf-context-length: 4096 diff --git a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties index a25a664..d45bd76 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties +++ b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties @@ -49,5 +49,3 @@ oms.instance.metadata.cache.size=2048 ####### Threshold in precise fetching server(0~100). 100 means full detection of server, in which ####### ####### split-brain could be avoided while performance overhead would increase. ####### oms.accurate.select.server.percentage = 50 -#需要指定服务端的ip 否则客户端注册不成功 -powerjob.network.external.address = 172.16.0.151 From 7a67dce92315043ec4d618d16bf35cb67129672f Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sun, 7 Apr 2024 20:57:27 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 1721b93..1bb12c6 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -97,7 +97,7 @@ powerjob: # 28080 端口 随着主应用端口飘逸 避免集群冲突 port: 2${server.port} protocol: http - server-address: 127.0.0.1:7700 + server-address: 127.0.0.1:7070 store-strategy: disk allow-lazy-connect-server: false max-appended-wf-context-length: 4096 diff --git a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application.properties b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application.properties index e59248b..e39b86b 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application.properties +++ b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application.properties @@ -1,5 +1,5 @@ # Http server port -server.port=7700 +server.port=7070 spring.profiles.active=@profiles.active@ spring.main.banner-mode=log From a53709481c348924e1566a87b14382923ae9beb2 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Sun, 7 Apr 2024 23:33:43 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-prod.yml | 6 +++--- .../src/main/resources/application-prod.properties | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index f51123e..d0395df 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -35,9 +35,9 @@ mybatis-flex: # password: Root@369 #postgresql数据库 driver-class-name: org.postgresql.Driver - url: jdbc:postgresql://172.16.0.151:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true - username: root - password: root + url: jdbc:postgresql://rm-cn-em93orkmv001b83o.rwlb.rds.aliyuncs.com:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true + username: root_pg + password: Yzl@1998 # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) spring.data: diff --git a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties index d45bd76..fc8dddc 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties +++ b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application-prod.properties @@ -3,9 +3,9 @@ oms.env=prod ####### Database properties(Configure according to the the environment) ####### spring.datasource.remote.hibernate.properties.hibernate.dialect=tech.powerjob.server.persistence.config.dialect.PowerJobPGDialect spring.datasource.core.driver-class-name=org.postgresql.Driver -spring.datasource.core.jdbc-url=jdbc:postgresql://172.16.0.151:5432/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -spring.datasource.core.username=root -spring.datasource.core.password=root +spring.datasource.core.jdbc-url=jdbc:postgresql://rm-cn-em93orkmv001b83o.rwlb.rds.aliyuncs.com:5432/ruoyi-flex?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.core.username=root_pg +spring.datasource.core.password=Yzl@1998 spring.datasource.core.maximum-pool-size=20 spring.datasource.core.minimum-idle=5 From 54b134e942c126bc4c0b8bfbdc093226d2065242 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Mon, 8 Apr 2024 09:08:29 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=86=85=E5=AD=98?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/Dockerfile | 6 +++++- ruoyi-extra/ruoyi-monitor/Dockerfile | 7 ++++++- ruoyi-extra/ruoyi-powerjob-server/Dockerfile | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile index bda50a7..146cf8e 100644 --- a/ruoyi-admin/Dockerfile +++ b/ruoyi-admin/Dockerfile @@ -3,6 +3,10 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-admin.jar /ruoyi-admin.jar +# 设置环境变量 +ENV JAVA_OPTS="-server -Xms512m -Xmx512m" +# 时区设置 +RUN echo "Asia/shanghai" > /etc/timezone # 运行应用 -ENTRYPOINT ["java","-jar","/ruoyi-admin.jar"] +ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-admin.jar diff --git a/ruoyi-extra/ruoyi-monitor/Dockerfile b/ruoyi-extra/ruoyi-monitor/Dockerfile index 8632e6f..43488c2 100644 --- a/ruoyi-extra/ruoyi-monitor/Dockerfile +++ b/ruoyi-extra/ruoyi-monitor/Dockerfile @@ -4,5 +4,10 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-monitor.jar /ruoyi-monitor.jar +# 设置环境变量 +ENV JAVA_OPTS="-server -Xms512m -Xmx512m" +# 时区设置 +RUN echo "Asia/shanghai" > /etc/timezone + # 运行应用 -ENTRYPOINT ["java","-jar","/ruoyi-monitor.jar"] +ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-monitor.jar diff --git a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile index c56a60a..86e8f91 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile +++ b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile @@ -4,5 +4,10 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-powerjob-server.jar /ruoyi-powerjob-server.jar +# 设置环境变量 +ENV JAVA_OPTS="-server -Xms512m -Xmx512m" +# 时区设置 +RUN echo "Asia/shanghai" > /etc/timezone + # 运行应用 -ENTRYPOINT ["java","-jar","/ruoyi-powerjob-server.jar"] +ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-powerjob-server.jar From 0d91f150619467b0416584a768914836c8edcb99 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Mon, 8 Apr 2024 09:14:55 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=86=85=E5=AD=98?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=A7=E5=B0=8F001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/Dockerfile | 2 +- ruoyi-extra/ruoyi-monitor/Dockerfile | 4 ++-- ruoyi-extra/ruoyi-powerjob-server/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile index 146cf8e..3b9cff2 100644 --- a/ruoyi-admin/Dockerfile +++ b/ruoyi-admin/Dockerfile @@ -4,7 +4,7 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-admin.jar /ruoyi-admin.jar # 设置环境变量 -ENV JAVA_OPTS="-server -Xms512m -Xmx512m" +ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=192M -XX:MetaspaceSize=192M" # 时区设置 RUN echo "Asia/shanghai" > /etc/timezone diff --git a/ruoyi-extra/ruoyi-monitor/Dockerfile b/ruoyi-extra/ruoyi-monitor/Dockerfile index 43488c2..dbf6c90 100644 --- a/ruoyi-extra/ruoyi-monitor/Dockerfile +++ b/ruoyi-extra/ruoyi-monitor/Dockerfile @@ -5,9 +5,9 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 COPY target/ruoyi-monitor.jar /ruoyi-monitor.jar # 设置环境变量 -ENV JAVA_OPTS="-server -Xms512m -Xmx512m" +ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=192M -XX:MetaspaceSize=192M" # 时区设置 RUN echo "Asia/shanghai" > /etc/timezone # 运行应用 -ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-monitor.jar +ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-monitor.jar diff --git a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile index 86e8f91..abf03ef 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile +++ b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile @@ -5,7 +5,7 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 COPY target/ruoyi-powerjob-server.jar /ruoyi-powerjob-server.jar # 设置环境变量 -ENV JAVA_OPTS="-server -Xms512m -Xmx512m" +ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=192M -XX:MetaspaceSize=192M" # 时区设置 RUN echo "Asia/shanghai" > /etc/timezone From 226d18b6272e99dfca1819d00239e923e21ab580 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Mon, 8 Apr 2024 09:33:03 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=86=85=E5=AD=98?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=A7=E5=B0=8F001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-extra/ruoyi-powerjob-server/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile index abf03ef..0b94691 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile +++ b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile @@ -5,7 +5,7 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 COPY target/ruoyi-powerjob-server.jar /ruoyi-powerjob-server.jar # 设置环境变量 -ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=192M -XX:MetaspaceSize=192M" +ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=256M -XX:MetaspaceSize=256M" # 时区设置 RUN echo "Asia/shanghai" > /etc/timezone From 6517cdd084a2b28b0549cdd00c5d23b333a166ac Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Mon, 8 Apr 2024 09:59:29 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=86=85=E5=AD=98?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=A7=E5=B0=8F002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/Dockerfile | 6 +----- ruoyi-extra/ruoyi-powerjob-server/Dockerfile | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile index 3b9cff2..bda50a7 100644 --- a/ruoyi-admin/Dockerfile +++ b/ruoyi-admin/Dockerfile @@ -3,10 +3,6 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-admin.jar /ruoyi-admin.jar -# 设置环境变量 -ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=192M -XX:MetaspaceSize=192M" -# 时区设置 -RUN echo "Asia/shanghai" > /etc/timezone # 运行应用 -ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-admin.jar +ENTRYPOINT ["java","-jar","/ruoyi-admin.jar"] diff --git a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile index 0b94691..c56a60a 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile +++ b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile @@ -4,10 +4,5 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-powerjob-server.jar /ruoyi-powerjob-server.jar -# 设置环境变量 -ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=256M -XX:MetaspaceSize=256M" -# 时区设置 -RUN echo "Asia/shanghai" > /etc/timezone - # 运行应用 -ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-powerjob-server.jar +ENTRYPOINT ["java","-jar","/ruoyi-powerjob-server.jar"] From 70d286448851af328a8974c8feaf63a9cf02ac9a Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Mon, 8 Apr 2024 10:15:18 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=86=85=E5=AD=98?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=A7=E5=B0=8F003?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/Dockerfile | 6 +++++- ruoyi-extra/ruoyi-monitor/Dockerfile | 2 +- ruoyi-extra/ruoyi-powerjob-server/Dockerfile | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile index bda50a7..05c6621 100644 --- a/ruoyi-admin/Dockerfile +++ b/ruoyi-admin/Dockerfile @@ -3,6 +3,10 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-admin.jar /ruoyi-admin.jar +# 设置环境变量 +ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=512M -XX:MetaspaceSize=512M" +# 时区设置 +RUN echo "Asia/shanghai" > /etc/timezone # 运行应用 -ENTRYPOINT ["java","-jar","/ruoyi-admin.jar"] +ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-admin.jar diff --git a/ruoyi-extra/ruoyi-monitor/Dockerfile b/ruoyi-extra/ruoyi-monitor/Dockerfile index dbf6c90..3f4325b 100644 --- a/ruoyi-extra/ruoyi-monitor/Dockerfile +++ b/ruoyi-extra/ruoyi-monitor/Dockerfile @@ -5,7 +5,7 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 COPY target/ruoyi-monitor.jar /ruoyi-monitor.jar # 设置环境变量 -ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=192M -XX:MetaspaceSize=192M" +ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=512M -XX:MetaspaceSize=512M" # 时区设置 RUN echo "Asia/shanghai" > /etc/timezone diff --git a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile index c56a60a..c9b3eea 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile +++ b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile @@ -4,5 +4,10 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-powerjob-server.jar /ruoyi-powerjob-server.jar +# 设置环境变量 +ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=512M -XX:MetaspaceSize=512M" +# 时区设置 +RUN echo "Asia/shanghai" > /etc/timezone + # 运行应用 -ENTRYPOINT ["java","-jar","/ruoyi-powerjob-server.jar"] +ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-powerjob-server.jar From 8555e6d68434990177a5a7c0f8aa318bc85a86b8 Mon Sep 17 00:00:00 2001 From: yuzl6 Date: Mon, 8 Apr 2024 10:35:07 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=86=85=E5=AD=98?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=A7=E5=B0=8F003?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/Dockerfile | 6 +----- ruoyi-extra/ruoyi-monitor/Dockerfile | 7 +------ ruoyi-extra/ruoyi-powerjob-server/Dockerfile | 7 +------ 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile index 05c6621..bda50a7 100644 --- a/ruoyi-admin/Dockerfile +++ b/ruoyi-admin/Dockerfile @@ -3,10 +3,6 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-admin.jar /ruoyi-admin.jar -# 设置环境变量 -ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=512M -XX:MetaspaceSize=512M" -# 时区设置 -RUN echo "Asia/shanghai" > /etc/timezone # 运行应用 -ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-admin.jar +ENTRYPOINT ["java","-jar","/ruoyi-admin.jar"] diff --git a/ruoyi-extra/ruoyi-monitor/Dockerfile b/ruoyi-extra/ruoyi-monitor/Dockerfile index 3f4325b..8632e6f 100644 --- a/ruoyi-extra/ruoyi-monitor/Dockerfile +++ b/ruoyi-extra/ruoyi-monitor/Dockerfile @@ -4,10 +4,5 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-monitor.jar /ruoyi-monitor.jar -# 设置环境变量 -ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=512M -XX:MetaspaceSize=512M" -# 时区设置 -RUN echo "Asia/shanghai" > /etc/timezone - # 运行应用 -ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-monitor.jar +ENTRYPOINT ["java","-jar","/ruoyi-monitor.jar"] diff --git a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile index c9b3eea..c56a60a 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/Dockerfile +++ b/ruoyi-extra/ruoyi-powerjob-server/Dockerfile @@ -4,10 +4,5 @@ FROM registry.cn-qingdao.aliyuncs.com/yuzl1/jdk:21 # 将本地文件复制到容器中 COPY target/ruoyi-powerjob-server.jar /ruoyi-powerjob-server.jar -# 设置环境变量 -ENV JAVA_OPTS="-Xmx1344M -Xms1344M -Xmn448M -XX:MaxMetaspaceSize=512M -XX:MetaspaceSize=512M" -# 时区设置 -RUN echo "Asia/shanghai" > /etc/timezone - # 运行应用 -ENTRYPOINT exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ruoyi-powerjob-server.jar +ENTRYPOINT ["java","-jar","/ruoyi-powerjob-server.jar"]