WANG 6 жил өмнө
parent
commit
676bc33c41

+ 5 - 5
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/SysConfigController.java → examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/SystemPropertyController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.core.basic.service.SysConfigService;
+import cn.com.qmth.examcloud.core.basic.service.SystemPropertyService;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 
@@ -20,16 +20,16 @@ import io.swagger.annotations.ApiOperation;
  */
 @Transactional
 @RestController
-@RequestMapping("${$rmp.ctr.basic}/sysConfig")
-public class SysConfigController extends ControllerSupport {
+@RequestMapping("${$rmp.ctr.basic}/systemProperty")
+public class SystemPropertyController extends ControllerSupport {
 
 	@Autowired
-	SysConfigService sysConfigService;
+	SystemPropertyService systemPropertyService;
 
 	@ApiOperation(value = "查询系统配置")
 	@GetMapping("{key}")
 	public Object get(@PathVariable String key) {
-		Object object = sysConfigService.get(key);
+		Object object = systemPropertyService.get(key);
 		return object;
 	}
 

+ 16 - 16
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/SysConfigCloudServiceProvider.java → examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/SystemPropertyCloudServiceProvider.java

@@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RestController;
 import cn.com.qmth.examcloud.commons.util.DateUtil;
 import cn.com.qmth.examcloud.commons.util.DateUtil.DatePatterns;
 import cn.com.qmth.examcloud.core.basic.api.SysConfigCloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.GetSysConfigReq;
-import cn.com.qmth.examcloud.core.basic.api.request.SetSysConfigReq;
-import cn.com.qmth.examcloud.core.basic.api.response.GetSysConfigResp;
-import cn.com.qmth.examcloud.core.basic.api.response.SetSysConfigResp;
-import cn.com.qmth.examcloud.core.basic.service.SysConfigService;
+import cn.com.qmth.examcloud.core.basic.api.request.GetSystemPropertyReq;
+import cn.com.qmth.examcloud.core.basic.api.request.SetSystemPropertyReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetSystemPropertyResp;
+import cn.com.qmth.examcloud.core.basic.api.response.SetSystemPropertyResp;
+import cn.com.qmth.examcloud.core.basic.service.SystemPropertyService;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 
@@ -29,36 +29,36 @@ import io.swagger.annotations.ApiOperation;
  */
 @Transactional
 @RestController
-@RequestMapping("${$rmp.cloud.basic}" + "sysConfig")
-public class SysConfigCloudServiceProvider extends ControllerSupport
+@RequestMapping("${$rmp.cloud.basic}" + "systemProperty")
+public class SystemPropertyCloudServiceProvider extends ControllerSupport
 		implements
 			SysConfigCloudService {
 
 	private static final long serialVersionUID = 2299432976949405946L;
 
 	@Autowired
-	SysConfigService sysConfigService;
+	SystemPropertyService systemPropertyService;
 
 	@ApiOperation(value = "设置配置")
-	@PostMapping("setSysConfig")
+	@PostMapping("setSystemProperty")
 	@Override
-	public SetSysConfigResp setSysConfig(@RequestBody SetSysConfigReq req) {
+	public SetSystemPropertyResp setSystemProperty(@RequestBody SetSystemPropertyReq req) {
 		String key = req.getKey();
 		String value = req.getValue();
-		sysConfigService.set(key, value);
+		systemPropertyService.set(key, value);
 
-		SetSysConfigResp resp = new SetSysConfigResp();
+		SetSystemPropertyResp resp = new SetSystemPropertyResp();
 		resp.setKey(key);
 		resp.setValue(value);
 		return resp;
 	}
 
 	@ApiOperation(value = "获取配置")
-	@PostMapping("getSysConfig")
+	@PostMapping("getSystemProperty")
 	@Override
-	public GetSysConfigResp getSysConfig(@RequestBody GetSysConfigReq req) {
+	public GetSystemPropertyResp getSystemProperty(@RequestBody GetSystemPropertyReq req) {
 		String key = req.getKey();
-		Object value = sysConfigService.get(key);
+		Object value = systemPropertyService.get(key);
 
 		String strValue = null;
 		if (null == value) {
@@ -69,7 +69,7 @@ public class SysConfigCloudServiceProvider extends ControllerSupport
 			strValue = String.valueOf(value);
 		}
 
-		GetSysConfigResp resp = new GetSysConfigResp();
+		GetSystemPropertyResp resp = new GetSystemPropertyResp();
 		resp.setKey(key);
 		resp.setValue(strValue);
 		return resp;

+ 22 - 22
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/SysConfigRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/SystemPropertyRepo.java

@@ -1,22 +1,22 @@
-package cn.com.qmth.examcloud.core.basic.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.repository.query.QueryByExampleExecutor;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.SysConfigEntity;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年12月3日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface SysConfigRepo
-		extends
-			JpaRepository<SysConfigEntity, String>,
-			QueryByExampleExecutor<SysConfigEntity>,
-			JpaSpecificationExecutor<SysConfigEntity> {
-
-}
+package cn.com.qmth.examcloud.core.basic.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.query.QueryByExampleExecutor;
+
+import cn.com.qmth.examcloud.core.basic.dao.entity.SystemPropertyEntity;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年12月3日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public interface SystemPropertyRepo
+		extends
+			JpaRepository<SystemPropertyEntity, String>,
+			QueryByExampleExecutor<SystemPropertyEntity>,
+			JpaSpecificationExecutor<SystemPropertyEntity> {
+
+}

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/SysConfigEntity.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/SystemPropertyEntity.java

@@ -18,8 +18,8 @@ import cn.com.qmth.examcloud.web.jpa.JpaEntity;
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
 @Entity
-@Table(name = "EC_B_SYS_CONFIG")
-public class SysConfigEntity extends JpaEntity {
+@Table(name = "EC_B_SYS_PROP")
+public class SystemPropertyEntity extends JpaEntity {
 
 	private static final long serialVersionUID = -3688247462533274177L;
 

+ 16 - 16
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/SysConfigService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/SystemPropertyService.java

@@ -1,16 +1,16 @@
-package cn.com.qmth.examcloud.core.basic.service;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年12月3日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface SysConfigService {
-
-	void set(String key, String value);
-
-	Object get(String key);
-
-}
+package cn.com.qmth.examcloud.core.basic.service;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年12月3日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public interface SystemPropertyService {
+
+	void set(String key, String value);
+
+	Object get(String key);
+
+}

+ 2 - 2
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/AuthServiceImpl.java

@@ -43,7 +43,7 @@ import cn.com.qmth.examcloud.core.basic.dao.entity.UserEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserRoleRelationEntity;
 import cn.com.qmth.examcloud.core.basic.service.AuthService;
 import cn.com.qmth.examcloud.core.basic.service.SmsCodeService;
-import cn.com.qmth.examcloud.core.basic.service.SysConfigService;
+import cn.com.qmth.examcloud.core.basic.service.SystemPropertyService;
 import cn.com.qmth.examcloud.core.basic.service.UserService;
 import cn.com.qmth.examcloud.core.basic.service.bean.LoginInfo;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
@@ -91,7 +91,7 @@ public class AuthServiceImpl implements AuthService {
 	PrivilegeRepo privilegeRepo;
 
 	@Autowired
-	SysConfigService sysConfigService;
+	SystemPropertyService sysConfigService;
 
 	@Autowired
 	SmsCodeService smsCodeService;

+ 7 - 7
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/SysConfigServiceImpl.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/SystemPropertyServiceImpl.java

@@ -8,9 +8,9 @@ import cn.com.qmth.examcloud.api.commons.enums.BasicDataType;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.util.DateUtil;
 import cn.com.qmth.examcloud.commons.util.DateUtil.DatePatterns;
-import cn.com.qmth.examcloud.core.basic.dao.SysConfigRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.SysConfigEntity;
-import cn.com.qmth.examcloud.core.basic.service.SysConfigService;
+import cn.com.qmth.examcloud.core.basic.dao.SystemPropertyRepo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.SystemPropertyEntity;
+import cn.com.qmth.examcloud.core.basic.service.SystemPropertyService;
 
 /**
  * 系统配置服务
@@ -20,10 +20,10 @@ import cn.com.qmth.examcloud.core.basic.service.SysConfigService;
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
 @Service
-public class SysConfigServiceImpl implements SysConfigService {
+public class SystemPropertyServiceImpl implements SystemPropertyService {
 
 	@Autowired
-	SysConfigRepo sysConfigRepo;
+	SystemPropertyRepo systemPropertyRepo;
 
 	@Override
 	public void set(String key, String value) {
@@ -31,7 +31,7 @@ public class SysConfigServiceImpl implements SysConfigService {
 			throw new StatusException("350001", "key is blank");
 		}
 
-		SysConfigEntity sysConf = sysConfigRepo.getOne(key);
+		SystemPropertyEntity sysConf = systemPropertyRepo.getOne(key);
 		if (null == sysConf) {
 			throw new StatusException("350002", "key is wrong");
 		}
@@ -79,7 +79,7 @@ public class SysConfigServiceImpl implements SysConfigService {
 			throw new StatusException("350001", "key is blank");
 		}
 
-		SysConfigEntity sysConf = sysConfigRepo.getOne(key);
+		SystemPropertyEntity sysConf = systemPropertyRepo.getOne(key);
 		if (null == sysConf) {
 			throw new StatusException("350002", "key is wrong");
 		}