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-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 3a2aa2d..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;
@@ -118,6 +119,10 @@
public R<String> add(@RequestBody TCompany company) {
company.setStatus(1);
company.setCreateUserId(getUserId());
+ if(company.getAccount()!=null && "admin".equals(company.getAccount())){
+ return R.fail("账号不能为admin");
+ }
+
SysUser user = new SysUser();
user.setRoleType(2);
user.setDeptId(124l);
@@ -126,7 +131,8 @@
user.setPassword(company.getPassword());
user.setPhonenumber(company.getChargePersonPhone());
user.setNickName(company.getChargePerson());
- user.setRoleId(1l);
+ user.setCode(company.getCode());
+ user.setRoleId(2l);
if (!userService.checkUserNameUnique(user)) {
return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
} else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
@@ -152,6 +158,9 @@
@PostMapping(value = "/edit")
@Log(title = "修改公司-修改", businessType = BusinessType.UPDATE)
public R<String> edit(@RequestBody TCompany company) {
+ if(company.getAccount()!=null && "admin".equals(company.getAccount())){
+ return R.fail("账号不能为admin");
+ }
SysUser user = userService.getUserByCompanyId(company.getId());
if (!userService.checkUserNameUnique(user)) {
return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -159,8 +168,9 @@
return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
}
user.setUserName(company.getAccount());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setPassword(SecurityUtils.encryptPassword(company.getPassword()));
company.setUpdateUserId(getUserId());
+ user.setRoleId(2L);
int count = userService.updateUser(user);
if (count > 0) {
boolean update = companyService.updateById(company);
@@ -210,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));
@@ -254,6 +264,9 @@
@PostMapping("/system/user/add")
public R<String> add(@RequestBody SysUser user)
{
+ if(user.getUserName()!=null && "admin".equals(user.getUserName())){
+ return R.fail("账号不能为admin");
+ }
user.setUserName(user.getUserName());
if (!userService.checkUserNameUnique(user))
{
@@ -267,6 +280,8 @@
{
return R.fail("新增用户'" + user.getUserName() + "'失败，推广号已存在");
}
+
+
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -281,7 +296,8 @@
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));
@@ -299,6 +315,9 @@
@PostMapping("/system/user/edit")
public R edit(@RequestBody SysUser user)
{
+ if(user.getUserName()!=null && "admin".equals(user.getUserName())){
+ return R.fail("账号不能为admin");
+ }
user.setUserName(user.getPhonenumber());
// userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
@@ -314,6 +333,7 @@
if(StringUtils.isNotEmpty(user.getPassword())){
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
}
+ user.setRoleId(2L);
// 移除之前的二维码
redisTemplate.delete("ADMIN_WX_IMG" + user.getUserId());
return R.ok(userService.updateUser(user));
@@ -408,7 +428,7 @@
sysUser.setCreateBy(getUsername());
sysUser.setRoleType(3);
- sysUser.setRoleId(1L);
+ sysUser.setRoleId(2L);
// sysUsers.add(sysUser);
userService.insertUser(sysUser);
i++;
--
Gitblit v1.7.1