From c9e9737a7584ebf84e12ecc956a337c3f8f0d67b Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 02 二月 2026 16:33:09 +0800
Subject: [PATCH] fix:小程序码生成增加环境判断
---
ruoyi-system/src/main/java/com/ruoyi/system/utils/wx/WxQrCodeUtil.java | 5 ++++-
ruoyi-applet/src/main/resources/logback.xml | 3 ++-
ruoyi-applet/src/main/resources/application.yml | 2 +-
ruoyi-admin/src/main/resources/logback.xml | 3 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java | 7 ++++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 5 ++++-
6 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
index 4df9dd3..dbe0eee 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
@@ -82,7 +82,8 @@
private final TAppUserService appUserService ;
private final TBigGiftPackageOrderService bigGiftPackageOrderService;
-
+ @Value("${spring.profiles.active}")
+ private String env;
public TCompanyController(TCompanyService companyService, ISysUserService userService, RedisTemplate redisTemplate, TAppUserService appUserService, TBigGiftPackageOrderService bigGiftPackageOrderService) {
this.companyService = companyService;
this.userService = userService;
@@ -219,7 +220,7 @@
param.put("page", "pages/home/home");
param.put("width", 430); //二维码尺寸
param.put("scene", "code=" + sysUser.getCode()+"&type=1"); //二维码尺寸
- param.put("env_version", "trial"); //二维码尺寸
+ param.put("env_version", env.equals("prod") ? "release" : "trial"); //二维码尺寸
param.put("check_path", false); //二维码尺寸
HttpRequest post = HttpUtil.createPost(url);
post.body(JSON.toJSONString(param));
@@ -295,7 +296,7 @@
param.put("page", "pages/home/home");
param.put("width", 430); //二维码尺寸
param.put("scene", "code=" + user.getCode()+"&type=1"); //二维码尺寸
- param.put("env_version", "trial"); //二维码尺寸
+ param.put("env_version", env.equals("prod") ? "release" : "trial"); //二维码尺寸
param.put("check_path", false); //二维码尺寸
HttpRequest post = HttpUtil.createPost(url);
post.body(JSON.toJSONString(param));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index c69b024..edd3a6b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -58,6 +58,9 @@
private ISysDeptService deptService;
@Autowired
private TokenService tokenService;
+
+ @Value("${spring.profiles.active}")
+ private String env;
/**
* 获取用户列表
*/
@@ -197,7 +200,7 @@
param.put("page", "pages/home/home");
param.put("width", 430); //二维码尺寸
param.put("scene", "userId=" + user.getUserId()); //二维码尺寸
- param.put("env_version", "trial"); //二维码尺寸
+ param.put("env_version", env.equals("prod") ? "release" : "trial"); //二维码尺寸
HttpRequest post = HttpUtil.createPost(url);
post.body(JSON.toJSONString(param));
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index a360583..1d6e303 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
- <property name="log.path" value="/home/ruoyi/logs" />
+ <property name="log.path" value="/home/ruoyi/admin/logs" />
+<!-- <property name="log.path" value="/Users/mitao/Documents/logs/jiashida/admin/logs" />-->
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
diff --git a/ruoyi-applet/src/main/resources/application.yml b/ruoyi-applet/src/main/resources/application.yml
index dcc106d..e673e36 100644
--- a/ruoyi-applet/src/main/resources/application.yml
+++ b/ruoyi-applet/src/main/resources/application.yml
@@ -1,4 +1,4 @@
# 项目相关配置
spring:
profiles:
- active: test
+ active: prod
diff --git a/ruoyi-applet/src/main/resources/logback.xml b/ruoyi-applet/src/main/resources/logback.xml
index a360583..7cca861 100644
--- a/ruoyi-applet/src/main/resources/logback.xml
+++ b/ruoyi-applet/src/main/resources/logback.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
- <property name="log.path" value="/home/ruoyi/logs" />
+ <property name="log.path" value="/home/ruoyi/applet/logs" />
+<!-- <property name="log.path" value="/Users/mitao/Documents/logs/jiashida/applet/logs" />-->
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/utils/wx/WxQrCodeUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/utils/wx/WxQrCodeUtil.java
index 9277a66..2c855b0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/utils/wx/WxQrCodeUtil.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/utils/wx/WxQrCodeUtil.java
@@ -34,6 +34,9 @@
@Autowired
private RedisTemplate redisTemplate;
+ @Value("${spring.profiles.active}")
+ private String env;
+
private String getAccessToken() {
Object o = redisTemplate.opsForValue().get("accessToken");
if (o != null) {
@@ -62,7 +65,7 @@
param.put("page", "pages/home/home");
param.put("width", 430); // 二维码尺寸
param.put("scene", "code=" + code + "&type=" + type); // 二维码尺寸
- param.put("env_version", "trial"); // 二维码尺寸
+ param.put("env_version", env.equals("prod") ? "release" : "trial"); // 二维码尺寸
param.put("check_path", false); //二维码尺寸
HttpRequest post = HttpUtil.createPost(url);
post.body(JSON.toJSONString(param));
--
Gitblit v1.7.1