From 4531923ae659505f04e698c3cc5cfa374e7c204c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Sat, 2 Apr 2022 15:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
appbuild-manage-ui/admin/package.json | 4 +-
appbuild-manage-ui/admin/vue.config.js | 2 +-
appbuild-manager/pom.xml | 69 +----
.../base/system/param/model/ParamEntity.java | 21 +-
.../system/param/service/ParamService.java | 13 +-
.../param/service/impl/ParamServiceImpl.java | 261 +++++++++++++++++-
.../mortals/xhx/common/utils/GenUtils.java | 11 +-
.../resources/template/java/entity.java.ftl | 2 +-
.../resources/template/xml/sqlMap.xml.ftl | 4 +-
pom.xml | 36 +--
10 files changed, 285 insertions(+), 138 deletions(-)
diff --git a/appbuild-manage-ui/admin/package.json b/appbuild-manage-ui/admin/package.json
index 3ae9716..238bc39 100644
--- a/appbuild-manage-ui/admin/package.json
+++ b/appbuild-manage-ui/admin/package.json
@@ -3,9 +3,7 @@
"version": "0.1.0",
"private": true,
"scripts": {
- "dev": "vue-cli-service serve",
- "dev2": "vue-cli-service serve --use ",
- "dev3": "vue-cli-service serve --use 鐜扮綉",
+ "stage": "vue-cli-service serve",
"build": "vue-cli-service build"
},
"dependencies": {
diff --git a/appbuild-manage-ui/admin/vue.config.js b/appbuild-manage-ui/admin/vue.config.js
index 71d4c89..e3a6844 100644
--- a/appbuild-manage-ui/admin/vue.config.js
+++ b/appbuild-manage-ui/admin/vue.config.js
@@ -17,7 +17,7 @@ module.exports = {
hot: true,//鑷姩淇濆瓨
proxy: {
'/m': {
- target: 'http://127.0.0.1:17211',
+ target: 'http://127.0.0.1:17311',
changeOrigin: true,
secure: false,
cookieDomainRewrite: 'plm.testnew.com',
diff --git a/appbuild-manager/pom.xml b/appbuild-manager/pom.xml
index 19caad5..f80120a 100644
--- a/appbuild-manager/pom.xml
+++ b/appbuild-manager/pom.xml
@@ -110,17 +110,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!-- 鍘婚櫎resources涓嬬殑鎵€鏈夋枃浠� -->
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.yml</exclude>
- <exclude>etlsql/**</exclude>
- <exclude>sqlmap/**</exclude>
- <exclude>config/**</exclude>
- </excludes>
- </configuration>
</plugin>
<plugin>
@@ -139,12 +128,6 @@
<outputDirectory>${project.parent.basedir}/dist/${project.parent.artifactId}/boot</outputDirectory>
<layout>ZIP</layout>
<!-- 鎵撳寘鏃讹紝鏈琷ar鍖呬笉鍖呭惈鍏朵粬渚濊禆鍖� 锛� 鍚﹀垯鎵撳嚭鐨刯ar鍖呰繕鏄緢澶� -->
- <includes>
- <include>
- <groupId>nothing</groupId>
- <artifactId>nothing</artifactId>
- </include>
- </includes>
</configuration>
</plugin>
<plugin>
@@ -156,61 +139,11 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
- <!--璁剧疆jar鎵€渚濊禆鐨勪笁鏂筳ar鍖呭瓨鏀剧殑璺緞 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dep</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>
- copy-dependencies
- </goal>
- </goals>
- <configuration>
- <outputDirectory>${project.parent.basedir}/dist/${project.parent.artifactId}/lib</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>false</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
- <!-- 鏄惁涓嶅寘鍚棿鎺ヤ緷璧� -->
- <excludeTransitive>false</excludeTransitive>
- <!-- 蹇界暐鐗堟湰 -->
- <stripVersion>false</stripVersion>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
- <execution>
- <id>copy-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <encoding>UTF-8</encoding>
- <outputDirectory>${project.parent.basedir}/dist/${project.parent.artifactId}/conf</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources/</directory>
- <includes>
- <include>etlsql/**</include>
- <include>sqlmap/**</include>
- <include>config/**</include>
- <include>*.yml</include>
- <include>*.xml</include>
- <include>*.properties</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
<execution>
<id>copy-bin</id>
<phase>package</phase>
diff --git a/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/model/ParamEntity.java b/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/model/ParamEntity.java
index 370e0d0..fb76321 100644
--- a/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/model/ParamEntity.java
+++ b/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/model/ParamEntity.java
@@ -8,9 +8,10 @@
package com.mortals.xhx.base.system.param.model;
-import java.util.Date;
-
import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.framework.service.IParam;
+
+import java.util.Date;
/**
* <p>Title: 鍙傛暟淇℃伅</p>
@@ -20,8 +21,8 @@ import com.mortals.framework.model.BaseEntityLong;
* @author
* @version 1.0.0
*/
-public class ParamEntity extends BaseEntityLong{
- private static final long serialVersionUID = 1547777703336L;
+public class ParamEntity extends BaseEntityLong implements IParam {
+ private static final long serialVersionUID = 1536307966363L;
/** 鍙傛暟鍚嶇О */
private String name;
@@ -44,7 +45,7 @@ public class ParamEntity extends BaseEntityLong{
/** 鍙傛暟淇敼鐘舵€侊紝0锛氶殣钘忥紝1锛氶〉闈粎鏌ョ湅锛�2锛氶〉闈㈠彲淇敼锛�3锛氶〉闈㈠彲鍒犻櫎锛�4锛氶〉闈㈠彲淇敼鍒犻櫎锛岄粯璁�4 */
private Integer modStatus;
- /** 灞曠幇绫诲瀷锛�0锛氭櫘閫氭枃鏈锛�1锛氬琛屾枃鏈锛�2锛氬紑鍏筹紝3锛氬潡杈撳叆妗嗭紝榛樿锛�0 */
+ /** 灞曠幇绫诲瀷锛�0锛氭櫘閫氭枃鏈锛�1锛氬琛屾枃鏈锛�2锛氬紑鍏筹紝3锛氬潡杈撳叆妗嗭紝4锛氬瘑鐮佽緭鍏ユ锛岄粯璁わ細0 */
private Integer displayType;
/** 澶囨敞 */
@@ -53,7 +54,7 @@ public class ParamEntity extends BaseEntityLong{
/** 鍒涘缓鏃堕棿 */
private Date createTime;
- /** 鍒涘缓鐢ㄦ埛 */
+ /** 鍒涘缓鐢ㄦ埛ID */
private Long createUserId;
/** 鍒涘缓鐢ㄦ埛鍚嶇О */
@@ -176,7 +177,7 @@ public class ParamEntity extends BaseEntityLong{
}
/**
- * 鑾峰彇 灞曠幇绫诲瀷锛�0锛氭櫘閫氭枃鏈锛�1锛氬琛屾枃鏈锛�2锛氬紑鍏筹紝3锛氬潡杈撳叆妗嗭紝榛樿锛�0
+ * 鑾峰彇 灞曠幇绫诲瀷锛�0锛氭櫘閫氭枃鏈锛�1锛氬琛屾枃鏈锛�2锛氬紑鍏筹紝3锛氬潡杈撳叆妗嗭紝4锛氬瘑鐮佽緭鍏ユ锛岄粯璁わ細0
* @return displayType
*/
public Integer getDisplayType(){
@@ -184,7 +185,7 @@ public class ParamEntity extends BaseEntityLong{
}
/**
- * 璁剧疆 灞曠幇绫诲瀷锛�0锛氭櫘閫氭枃鏈锛�1锛氬琛屾枃鏈锛�2锛氬紑鍏筹紝3锛氬潡杈撳叆妗嗭紝榛樿锛�0
+ * 璁剧疆 灞曠幇绫诲瀷锛�0锛氭櫘閫氭枃鏈锛�1锛氬琛屾枃鏈锛�2锛氬紑鍏筹紝3锛氬潡杈撳叆妗嗭紝4锛氬瘑鐮佽緭鍏ユ锛岄粯璁わ細0
* @param displayType
*/
public void setDisplayType(Integer displayType){
@@ -224,7 +225,7 @@ public class ParamEntity extends BaseEntityLong{
}
/**
- * 鑾峰彇 鍒涘缓鐢ㄦ埛
+ * 鑾峰彇 鍒涘缓鐢ㄦ埛ID
* @return createUserId
*/
public Long getCreateUserId(){
@@ -232,7 +233,7 @@ public class ParamEntity extends BaseEntityLong{
}
/**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * 璁剧疆 鍒涘缓鐢ㄦ埛ID
* @param createUserId
*/
public void setCreateUserId(Long createUserId){
diff --git a/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java b/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java
index cc17e5e..f606913 100644
--- a/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java
+++ b/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java
@@ -2,6 +2,7 @@ package com.mortals.xhx.base.system.param.service;
import com.mortals.framework.service.ICRUDCacheService;
+import com.mortals.framework.service.IParamService;
import com.mortals.xhx.base.system.param.model.ParamEntity;
import java.util.Map;
@@ -15,7 +16,7 @@ import java.util.Map;
* @version 1.0.0
*/
-public interface ParamService extends ICRUDCacheService<ParamEntity, Long> {
+public interface ParamService extends ICRUDCacheService<ParamEntity, Long>, IParamService {
/**
* 閫氳繃Key鑾峰彇鍙傛暟鍊�
@@ -33,4 +34,14 @@ public interface ParamService extends ICRUDCacheService<ParamEntity, Long> {
*/
Map<String, String> getParamByFirstOrganize(String firstOrganize, String... excludeParamKeys);
+
+ /**
+ * 閫氳繃firstOrganize鑾峰彇閰嶇疆鍙傛暟key-value
+ *
+ * @param firstOrganize
+ * @param excludeParamKeys 闇€瑕佽繃铏戞帀鐨刾aramKey
+ * @return
+ */
+ Map<String, String> getParamBySecondOrganize(String firstOrganize,String secondOrganize, String... excludeParamKeys);
+
}
\ No newline at end of file
diff --git a/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java b/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java
index ce282b5..cdc7897 100644
--- a/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java
+++ b/appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java
@@ -1,13 +1,17 @@
package com.mortals.xhx.base.system.param.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.code.YesNo;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
+import com.mortals.framework.service.IParam;
import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
+import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.base.system.param.dao.ParamDao;
import com.mortals.xhx.base.system.param.model.ParamEntity;
import com.mortals.xhx.base.system.param.model.ParamQuery;
import com.mortals.xhx.base.system.param.service.ParamService;
-
import org.springframework.stereotype.Service;
import java.util.Arrays;
@@ -32,16 +36,16 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
protected String getExtKey(ParamEntity data) {
return data.getParamKey();
}
-
+
@Override
protected String getCacheName() {
return "ParamEntity.paramKey";
}
-
- @Override
- public void putCache(String key, ParamEntity data) {
- cacheService.set(data.getParamKey(), data.getParamValue());
- }
+
+// @Override
+// public void putCache(String key, ParamEntity data) {
+// cacheService.set(data.getParamKey(), data.getParamValue());
+// }
@Override
public void removeCache(String key) {
@@ -62,16 +66,247 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
@Override
public String getValueByKey(String key) {
- return cacheService.get(key);
+ return cacheService.hget(getCacheName(),key,ParamEntity.class).getParamValue();
+ //return cacheService.hget(key);
}
@Override
public Map<String, String> getParamByFirstOrganize(String firstOrganize, String... excludeParamKeys) {
- ParamQuery query = new ParamQuery();
- query.setFirstOrganize(firstOrganize);
- List<ParamEntity> list = this.getDao().getList(query);
- return list.stream().filter(s -> {
+ List<ParamEntity> list =this.getCacheList();
+// ParamQuery query = new ParamQuery();
+// query.setFirstOrganize(firstOrganize);
+// List<ParamEntity> list = this.getDao().getList(query);
+ return list.stream()
+ .filter(f->firstOrganize.equals(f.getFirstOrganize()))
+ .filter(s -> {
+ return !Arrays.asList(excludeParamKeys).contains(s.getParamKey());
+ }).collect(Collectors.toMap(ParamEntity::getParamKey, ParamEntity::getParamValue,(o,n)->n));
+ }
+
+ public Map<String, String> getParamBySecondOrganize(String firstOrganize, String secondOrganize, String... excludeParamKeys) {
+
+ List<ParamEntity> list =this.getCacheList();
+// ParamQuery query = new ParamQuery();
+// query.setFirstOrganize(firstOrganize);
+// query.setSecondOrganize(secondOrganize);
+// List<ParamEntity> list = this.getDao().getList(query);
+ return list.stream()
+ .filter(f->firstOrganize.equals(f.getFirstOrganize()))
+ .filter(f->secondOrganize.equals(f.getSecondOrganize()))
+ .filter(s -> {
return !Arrays.asList(excludeParamKeys).contains(s.getParamKey());
- }).collect(Collectors.toMap(ParamEntity::getParamKey, ParamEntity::getParamValue));
+ }).collect(Collectors.toMap(ParamEntity::getParamKey, ParamEntity::getParamValue,(o,n)->n));
+ }
+
+
+ @Override
+ public boolean needRefresh() {
+ if (super.cacheService.isShareCache())//鍏变韩缂撳瓨锛屼笉闇€瑕佸疄鏃跺埛鏂�
+ {
+ return false;
+ }
+ IParam param = this.findByKey(IParam.KEY_PARAM_REFRESH_COUNT);
+ if (param != null) {
+ String value = StringUtils.trim(param.getParamValue());
+ IParam memParam = getParamByKey(IParam.KEY_PARAM_REFRESH_COUNT);
+ if (memParam == null || !value.equals(StringUtils.trim(memParam.getParamValue()))) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public void refresh() {
+ log.info("寮€濮嬪垵濮嬪寲绯荤粺鍙傛暟...");
+ try {
+ super.removeAllCache();
+ super.loadCache();
+ log.info("绯荤粺鍙傛暟鍒濆鍖栧畬鎴愶紒");
+ } catch (Exception e) {
+ log.error("鏌ヨ绯荤粺鍙傛暟寮傚父", e);
+ }
+ }
+
+ @Override
+ public IParam findByKey(String key) throws AppException {
+ ParamQuery params = new ParamQuery();
+ params.setValidStatus(YesNo.YES.getValue());
+ params.setParamKey(key);
+ List<ParamEntity> list = super.find(params, null);
+ if (list != null && !list.isEmpty()) {
+ return list.get(0);
+ }
+ return null;
+ }
+
+ @Override
+ public List<? extends IParam> findAll() throws AppException {
+ ParamQuery params = new ParamQuery();
+ params.setValidStatus(YesNo.YES.getValue());
+ return super.find(params, null);
+ }
+
+ @Override
+ public boolean containsParamKey(String key) {
+ return cacheService.hget(getCacheName(), key) != null;
+ }
+
+ @Override
+ public IParam getParamByKey(String key) {
+ return getExtCache(key);
+ }
+
+ @Override
+ public String getParamValue(String key) {
+ IParam param = wrapParamObject(cacheService.hget(getCacheName(), key));
+// IParam param = getExtCache(key);
+ if (param != null) {
+ return StringUtils.trim(param.getParamValue());
+ }
+ return "";
+ }
+
+ private IParam wrapParamObject(String entityString) {
+ JSONObject jsonObject = JSON.parseObject(entityString);
+ ParamEntity param = new ParamEntity();
+ param.setCreateTime(jsonObject.getDate("createTime"));
+ param.setCreateUserId(jsonObject.getLong("createUserId"));
+ param.setDisplayType(jsonObject.getInteger("displayType"));
+ param.setFirstOrganize(jsonObject.getString("firstOrganize"));
+ param.setId(jsonObject.getLong("id"));
+ param.setModStatus(jsonObject.getInteger("modStatus"));
+ param.setName(jsonObject.getString("name"));
+ param.setParamKey(jsonObject.getString("paramKey"));
+ param.setParamValue(jsonObject.getString("paramValue"));
+ param.setValidStatus(jsonObject.getInteger("validStatus"));
+
+ return param;
+ }
+
+ @Override
+ public String getParamValue(String key, String defaultValue) {
+ if (containsParamKey(key)) {
+ String value = getParamValue(key);
+ if (StringUtils.isEmpty(value)) {
+ return defaultValue;
+ }
+ return value;
+ } else {
+ log.debug("cannot found key[" + key + "], use default value[" + defaultValue + "]");
+ return defaultValue;
+ }
+ }
+
+ @Override
+ public int getParamIntValue(String key) {
+ ParamEntity extCache = getExtCache(key);
+ IParam param = (IParam) extCache;
+ try {
+ if (param == null) {
+ return 0;
+ }
+ String value = param.getParamValue();
+ if (StringUtils.isEmpty(value)) {
+ return 0;
+ } else {
+ return Integer.parseInt(value);
+ }
+ } catch (Exception e) {
+ return 0;
+ }
+ }
+
+ @Override
+ public int getParamIntValue(String key, int defaultValue) {
+ if (containsParamKey(key)) {
+ String value = getParamValue(key);
+ if (StringUtils.isEmpty(value)) {
+ return defaultValue;
+ }
+ try {
+ return Integer.parseInt(value);
+ } catch (Exception e) {
+ log.debug("cannot conver key[" + key + "]'s value[" + value + "] to int, use default value[" + defaultValue + "]");
+ return defaultValue;
+ }
+ } else {
+ log.debug("cannot found key[" + key + "], use default value[" + defaultValue + "]");
+ return defaultValue;
+ }
+ }
+
+ @Override
+ public long getParamLongValue(String key) {
+ IParam param = getExtCache(key);
+ try {
+ if (param == null) {
+ return 0;
+ }
+ String value = param.getParamValue();
+ if (StringUtils.isEmpty(value)) {
+ return 0;
+ } else {
+ return Long.parseLong(value);
+ }
+ } catch (Exception e) {
+ return 0;
+ }
+ }
+
+ @Override
+ public long getParamLongValue(String key, long defaultValue) {
+ if (containsParamKey(key)) {
+ String value = getParamValue(key);
+ if (StringUtils.isEmpty(value)) {
+ return defaultValue;
+ }
+ try {
+ return Long.parseLong(value);
+ } catch (Exception e) {
+ log.debug("cannot conver key[" + key + "]'s value[" + value + "] to long, use default value[" + defaultValue + "]");
+ return defaultValue;
+ }
+ } else {
+ log.debug("cannot found key[" + key + "], use default value[" + defaultValue + "]");
+ return defaultValue;
+ }
+ }
+
+ @Override
+ public boolean getParamBooleanValue(String key) {
+ IParam param = getExtCache(key);
+ try {
+ if (param == null) {
+ return false;
+ }
+ String value = param.getParamValue();
+ if (StringUtils.isEmpty(value)) {
+ return false;
+ } else {
+ return Boolean.parseBoolean(value);
+ }
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ @Override
+ public boolean getParamBooleanValue(String key, boolean defaultValue) {
+ if (containsParamKey(key)) {
+ String value = getParamValue(key);
+ if (StringUtils.isEmpty(value)) {
+ return defaultValue;
+ }
+ try {
+ return Boolean.parseBoolean(value);
+ } catch (Exception e) {
+ log.debug("cannot conver key[" + key + "]'s value[" + value + "] to boolean, use default value[" + defaultValue + "]");
+ return defaultValue;
+ }
+ } else {
+ log.debug("cannot found key[" + key + "], use default value[" + defaultValue + "]");
+ return defaultValue;
+ }
}
}
\ No newline at end of file
diff --git a/appbuild-manager/src/main/java/com/mortals/xhx/common/utils/GenUtils.java b/appbuild-manager/src/main/java/com/mortals/xhx/common/utils/GenUtils.java
index 71dd249..08dfe4f 100644
--- a/appbuild-manager/src/main/java/com/mortals/xhx/common/utils/GenUtils.java
+++ b/appbuild-manager/src/main/java/com/mortals/xhx/common/utils/GenUtils.java
@@ -117,12 +117,11 @@ public class GenUtils {
column.setIsQuery(GenConstants.NOREQUIRE);
//鎷嗚В鏋氫妇绫伙紝鏍煎紡蹇呴』涓猴紙1.鍟婂晩鍟婏紝2.涓嶄笉涓嶏級
- String temp1 = StringUtils.substringBetween(column.getColumnComment(), "(", ")");
- String temp2 = StringUtils.substringBetween(column.getColumnComment(), "锛�", "锛�");
+ String temp = column.getColumnComment().replaceAll("锛�", "(").replaceAll("锛�", ")");
+ String temp1 = StringUtils.substringBetween(temp, "(", ")");
+ //String temp2 = StringUtils.substringBetween(column.getColumnComment(), "锛�", "锛�");
checkDict(column, temp1);
- checkDict(column, temp2);
-
-
+ //checkDict(column, temp2);
if(!ObjectUtils.isEmpty(column.getDict())){
if(column.getDict().size()>2){
@@ -164,7 +163,7 @@ public class GenUtils {
temp=temp.replaceAll("锛�",",");
temp=temp.replaceAll(";",",");
- temp=temp.replaceAll("銆�",".");
+ //temp=temp.replaceAll("銆�",".");
temp=temp.replaceAll("銆�",".");
String[] split = checkSplitStr(temp, ",");
diff --git a/appbuild-manager/src/main/resources/template/java/entity.java.ftl b/appbuild-manager/src/main/resources/template/java/entity.java.ftl
index 7ad16c7..96802d4 100644
--- a/appbuild-manager/src/main/resources/template/java/entity.java.ftl
+++ b/appbuild-manager/src/main/resources/template/java/entity.java.ftl
@@ -94,7 +94,7 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
<#--get set灞炴€� -->
<#list columns as column>
<#if !column.isSuperColumn(column.javaField)>
- <#if column.javaField[1..2]?matches("[A-Z]")>
+ <#if column.javaField[0..1]?matches("[A-Z]")>
<#assign AttrName = column.javaField>
<#else>
<#assign AttrName = column.javaField?cap_first>
diff --git a/appbuild-manager/src/main/resources/template/xml/sqlMap.xml.ftl b/appbuild-manager/src/main/resources/template/xml/sqlMap.xml.ftl
index 55577e3..8d4681e 100644
--- a/appbuild-manager/src/main/resources/template/xml/sqlMap.xml.ftl
+++ b/appbuild-manager/src/main/resources/template/xml/sqlMap.xml.ftl
@@ -82,7 +82,7 @@
<trim suffixOverrides="," suffix="">
<#list columns as column>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('${column.javaField}') or colPickMode == 1 and data.containsKey('${column.javaField}')))">
- a.${column.columnName} as ${column.javaField},
+ a.${column.columnName},
</if>
</#list>
</trim>
@@ -91,7 +91,7 @@
<!-- 瀛愯〃鎵€鏈夊垪 -->
<sql id="_columns_sub">
<trim suffixOverrides="," suffix="">
- <#list subColumns as column>b.${column.columnName} as ${column.javaField},</#list>
+ <#list subColumns as column>b.${column.columnName},</#list>
</trim>
</sql>
</#if>
diff --git a/pom.xml b/pom.xml
index a308f80..98b0c4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
</activation>
<properties>
<profiles.active>develop</profiles.active>
- <profiles.server.port>17211</profiles.server.port>
+ <profiles.server.port>17311</profiles.server.port>
<profiles.datasource.uri>
<![CDATA[jdbc:mysql://localhost:3306/appbuild-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username>
@@ -53,9 +53,9 @@
<id>test</id>
<properties>
<profiles.active>test</profiles.active>
- <profiles.server.port>17211</profiles.server.port>
+ <profiles.server.port>17311</profiles.server.port>
<profiles.datasource.uri>
- <![CDATA[jdbc:mysql://192.168.0.252:3306/appbuild-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
+ <![CDATA[jdbc:mysql://192.168.0.98:3306/appbuild-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>nacos@2020</profiles.datasource.password>
<profiles.redis.uri>192.168.0.252</profiles.redis.uri>
@@ -77,36 +77,6 @@
</profile>
</profiles>
- <repositories>
- <repository>
- <id>nexus</id>
- <name>nexus</name>
- <!--浠撳簱鍦板潃-->
- <url>http://192.168.0.251:8081/repository/xhx-group/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <!--鎻掍欢鍦板潃-->
- <id>nexus</id>
- <name>nexus</name>
- <url>http://192.168.0.251:8081/repository/xhx-group/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<dependencyManagement>
<dependencies>
<dependency>
--
2.24.3