zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-10 21:19:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

♻️ 重构代码: 声明复用

Browse Source
This commit is contained in:
lishangbu committed 2018-09-27 22:45:39 +08:00
1 parent f0e4e996ed
commit 9278a31f1c
3 files changed
+12 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
+2 -1
View File
@@ -22,6 +22,7 @@ package com.pig4cloud.pigx.auth.endpoint;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.plugins.Page;
import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
import com.pig4cloud.pigx.common.core.util.R;
import com.pig4cloud.pigx.common.security.service.PigxUser;
import lombok.AllArgsConstructor;
@@ -53,7 +54,7 @@ import java.util.Map;
@AllArgsConstructor
@RequestMapping("/oauth")
public class PigxTokenEndpoint {
private static final String PIGX_OAUTH_ACCESS = "pigx_oauth:access:";
private static final String PIGX_OAUTH_ACCESS = SecurityConstants.PIGX_PREFIX + SecurityConstants.OAUTH_PREFIX + "access:";
private final TokenStore tokenStore;
private final RedisTemplate redisTemplate;
pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstant.java
+4 -4
View File
@@ -78,12 +78,12 @@ public interface CommonConstant {
String CONTENT_TYPE = "application/json; charset=utf-8";
/**
* 阿里大鱼
* 前端工程名
*/
String ALIYUN_SMS = "aliyun_sms";
String FRONT_END_PROJECT = "pigx-ui";
/**
* 路由信息Redis保存的key
* 后端工程名
*/
String ROUTE_KEY = "_ROUTE_KEY";
String BACK_END_PROJECT = "pigx";
}
pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenUtils.java
+6 -5
View File
@@ -24,6 +24,7 @@ import cn.hutool.core.util.StrUtil;
import com.pig4cloud.pigx.codegen.entity.ColumnEntity;
import com.pig4cloud.pigx.codegen.entity.GenConfig;
import com.pig4cloud.pigx.codegen.entity.TableEntity;
import com.pig4cloud.pigx.common.core.constant.CommonConstant;
import com.pig4cloud.pigx.common.core.exception.CheckedException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.configuration.Configuration;
@@ -239,7 +240,7 @@ public class GenUtils {
* 获取文件名
*/
private static String getFileName(String template, String className, String packageName, String moduleName) {
String packagePath = "pigx" + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator;
String packagePath = CommonConstant.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator;
if (StringUtils.isNotBlank(packageName)) {
packagePath += packageName.replace(".", File.separator) + File.separator + moduleName + File.separator;
}
@@ -265,7 +266,7 @@ public class GenUtils {
}
if (template.contains(MAPPER_XML_VM)) {
return "pigx" + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + className + "Mapper.xml";
return CommonConstant.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + className + "Mapper.xml";
}
if (template.contains(MENU_SQL_VM)) {
@@ -273,16 +274,16 @@ public class GenUtils {
}
if (template.contains(INDEX_VUE_VM)) {
return "pigx-ui" + File.separator + "src" + File.separator + "views" +
return CommonConstant.FRONT_END_PROJECT + File.separator + "src" + File.separator + "views" +
File.separator + moduleName + File.separator + className.toLowerCase() + File.separator + "index.vue";
}
if (template.contains(API_JS_VM)) {
return "pigx-ui" + File.separator + "src" + File.separator + "api" + File.separator + className.toLowerCase() + ".js";
return CommonConstant.FRONT_END_PROJECT + File.separator + "src" + File.separator + "api" + File.separator + className.toLowerCase() + ".js";
}
if (template.contains(CRUD_JS_VM)) {
return "pigx-ui" + File.separator + "src" + File.separator + "const" +
return CommonConstant.FRONT_END_PROJECT + File.separator + "src" + File.separator + "const" +
File.separator + "crud" + File.separator + className.toLowerCase() + ".js";
}