【CHG】修改文件域名配置

railway-business/src/main/java/com/railway/business/push/service/impl/BusPushMsgServiceImpl.java

@@ -18,6 +18,7 @@ import com.railway.business.push.service.IBusPushMsgService;
 import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
+import com.railway.system.enums.ConfigEnum;
 import com.railway.system.service.ISysConfigService;
 import com.railway.system.service.ISysUserService;
 import java.io.IOException;
@@ -57,12 +58,12 @@ public class BusPushMsgServiceImpl implements IBusPushMsgService {
   public BusPushMsgServiceImpl(ISysConfigService configService, BusPushMsgMapper busPushMsgMapper,
       ISysUserService sysUserService) {
     this.busPushMsgMapper = busPushMsgMapper;
-    this.appId = configService.selectConfigByKey("getui.appId");
-    this.appKey = configService.selectConfigByKey("getui.appKey");
+    this.appId = configService.selectConfigByKey(ConfigEnum.GETUI_APP_ID.getKey());
+    this.appKey = configService.selectConfigByKey(ConfigEnum.GETUI_APP_KEY.getKey());
     /*
      * 服务端API鉴权码
      */
-    String masterSecret = configService.selectConfigByKey("getui.masterSecret");
+    String masterSecret = configService.selectConfigByKey(ConfigEnum.GETUI_MASTER_SECRET.getKey());
     this.sysUserService = sysUserService;
 
     push = new IGtPush(appKey, masterSecret);

railway-framework/src/main/java/com/railway/framework/web/service/SysLoginService.java

@@ -21,6 +21,7 @@ import com.railway.common.utils.ip.IpUtils;
 import com.railway.framework.manager.AsyncManager;
 import com.railway.framework.manager.factory.AsyncFactory;
 import com.railway.system.domain.SysConfig;
+import com.railway.system.enums.ConfigEnum;
 import com.railway.system.service.ISysConfigService;
 import com.railway.system.service.ISysDeptService;
 import com.railway.system.service.ISysUserService;
@@ -110,7 +111,7 @@ public class SysLoginService {
    */
   public Boolean isInitPassword(){
     String password = SecurityUtils.getLoginUser().getPassword();
-    String initPassword = configService.selectConfigByKey("sys.user.initPassword");
+    String initPassword = configService.selectConfigByKey(ConfigEnum.INIT_PASSWORD.getKey());
     initPassword = SecurityUtils.encryptPassword(initPassword);
     return StringUtils.isEmpty(password) || password.equals(initPassword);
   }
@@ -129,7 +130,7 @@ public class SysLoginService {
     if (null == pwdSetDate) {
       return true;
     }
-    String pwdExpired = configService.selectConfigByKey("pwd.expired");
+    String pwdExpired = configService.selectConfigByKey(ConfigEnum.PWD_EXPIRED.getKey());
     if(StringUtils.isEmpty(pwdExpired)){
       pwdExpired = "30";
       SysConfig config = new SysConfig();

railway-system/src/main/java/com/railway/system/enums/ConfigEnum.java

@@ -0,0 +1,37 @@
+package com.railway.system.enums;
+
+/**
+ * @author ZhaoMn
+ */
+public enum ConfigEnum {
+
+  /**
+   * 固定系统配置
+   */
+  INIT_PASSWORD("sys.user.initPassword", "用户管理-账号初始密码"),
+  CAPTCHA_ON_OFF("sys.account.captchaOnOff", "账号自助-验证码开关"),
+  REGISTER_USER("sys.account.registerUser", "账号自助-是否开启用户注册功能"),
+  GETUI_APP_ID("getui.appId", "个推-appId"),
+  GETUI_APP_KEY("getui.appKey", "个推-appKey"),
+  GETUI_APP_SECRET("getui.appSecret", "个推-appSecret"),
+  GETUI_MASTER_SECRET("getui.masterSecret", "个推-masterSecret"),
+  PWD_EXPIRED("pwd.expired", "密码限定使用日期"),
+  LOCAL_DOMAIN("local.domain", "本地域名"),
+  ;
+
+  private final String key;
+  private final String info;
+
+  ConfigEnum(String key, String info) {
+    this.key = key;
+    this.info = info;
+  }
+
+  public String getKey() {
+    return key;
+  }
+
+  public String getInfo() {
+    return info;
+  }
+}

railway-system/src/main/java/com/railway/system/service/impl/LocalSysFileServiceImpl.java

@@ -2,6 +2,8 @@ package com.railway.system.service.impl;
 
 import com.railway.common.constant.Constants;
 import com.railway.common.utils.file.FileUploadUtils;
+import com.railway.system.enums.ConfigEnum;
+import com.railway.system.service.ISysConfigService;
 import com.railway.system.service.ISysFileService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
@@ -26,6 +28,15 @@ public class LocalSysFileServiceImpl extends AbstractFileService implements ISys
   @Value("${local.domain}")
   private String serverUrl;
 
+  @Value("${spring.profiles.active}")
+  private String env;
+
+  private final ISysConfigService configService;
+
+  public LocalSysFileServiceImpl(ISysConfigService configService) {
+    this.configService = configService;
+  }
+
   /**
    * 本地文件上传接口
    *
@@ -35,6 +46,10 @@ public class LocalSysFileServiceImpl extends AbstractFileService implements ISys
    */
   @Override
   public String uploadFile(MultipartFile file) throws Exception {
+    String local = "local";
+    if(!local.equals(env)){
+      serverUrl = configService.selectConfigByKey(ConfigEnum.LOCAL_DOMAIN.getKey());
+    }
     String name = FileUploadUtils.upload(localFilePath, file);
     return serverUrl + Constants.RESOURCE_PREFIX + name;
   }

railway-system/src/main/java/com/railway/system/service/impl/SysConfigServiceImpl.java

@@ -3,6 +3,7 @@ package com.railway.system.service.impl;
 import com.railway.common.annotation.DataSource;
 import com.railway.common.core.redis.RedisCache;
 import com.railway.common.enums.DataSourceType;
+import com.railway.system.enums.ConfigEnum;
 import java.util.Collection;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -84,7 +85,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
    */
   @Override
   public boolean selectRegisterUser() {
-    return getBoolValue("sys.account.registerUser");
+    return getBoolValue(ConfigEnum.REGISTER_USER.getKey());
   }
 
   /**
@@ -94,7 +95,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
    */
   @Override
   public boolean selectCaptchaOnOff() {
-    return getBoolValue("sys.account.captchaOnOff");
+    return getBoolValue(ConfigEnum.CAPTCHA_ON_OFF.getKey());
   }
 
   /**

railway-system/src/main/java/com/railway/system/service/impl/SysUserServiceImpl.java

@@ -14,6 +14,7 @@ import com.railway.common.utils.spring.SpringUtils;
 import com.railway.system.domain.SysPost;
 import com.railway.system.domain.SysUserPost;
 import com.railway.system.domain.SysUserRole;
+import com.railway.system.enums.ConfigEnum;
 import com.railway.system.mapper.SysPostMapper;
 import com.railway.system.mapper.SysRoleMapper;
 import com.railway.system.mapper.SysUserMapper;
@@ -354,7 +355,7 @@ public class SysUserServiceImpl implements ISysUserService {
   public int insertUser(SysUser user) {
     String password = user.getPassword();
     if (StringUtils.isEmpty(password)) {
-      password = configService.selectConfigByKey("sys.user.initPassword");
+      password = configService.selectConfigByKey(ConfigEnum.INIT_PASSWORD.getKey());
     }
     user.setPassword(SecurityUtils.encryptPassword(password));
     // 新增用户信息
@@ -453,7 +454,7 @@ public class SysUserServiceImpl implements ISysUserService {
    */
   @Override
   public int resetPwd(SysUser user) {
-    String password = configService.selectConfigByKey("sys.user.initPassword");
+    String password = configService.selectConfigByKey(ConfigEnum.INIT_PASSWORD.getKey());
     user.setPassword(SecurityUtils.encryptPassword(password));
     return userMapper.updateUser(user);
   }
@@ -588,7 +589,7 @@ public class SysUserServiceImpl implements ISysUserService {
     int failureNum = 0;
     StringBuilder successMsg = new StringBuilder();
     StringBuilder failureMsg = new StringBuilder();
-    String password = configService.selectConfigByKey("sys.user.initPassword");
+    String password = configService.selectConfigByKey(ConfigEnum.INIT_PASSWORD.getKey());
     for (SysUser user : userList) {
       try {
         // 验证是否存在这个用户

sql/railway.sql

@@ -696,9 +696,7 @@ create table sys_config (
     primary key (config_id)
 ) engine=innodb auto_increment=100 comment = '参数配置表';
 
-insert into sys_config values(1, '主框架页-默认皮肤样式名称',     'sys.index.skinName',            'skin-blue',     'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
 insert into sys_config values(2, '用户管理-账号初始密码',         'sys.user.initPassword',         '123456',        'Y', 'admin', sysdate(), '', null, '初始化密码 123456' );
-insert into sys_config values(3, '主框架页-侧边栏主题',           'sys.index.sideTheme',           'theme-dark',    'Y', 'admin', sysdate(), '', null, '深色主题theme-dark，浅色主题theme-light' );
 insert into sys_config values(4, '账号自助-验证码开关',           'sys.account.captchaOnOff',      'true',          'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（true开启，false关闭）');
 insert into sys_config values(5, '账号自助-是否开启用户注册功能', 'sys.account.registerUser',      'false',         'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能（true开启，false关闭）');