Skip to content

A
appbuild
Commit 4531923a authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改部分生成代码逻辑

parent 5b6faec7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 285 additions and 138 deletions
appbuild-manage-ui/admin/package.json
View file @ 4531923a
...@@ -3,9 +3,7 @@ ...@@ -3,9 +3,7 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "stage": "vue-cli-service serve",
"dev2": "vue-cli-service serve --use ",
"dev3": "vue-cli-service serve --use 现网",
"build": "vue-cli-service build" "build": "vue-cli-service build"
}, },
"dependencies": { "dependencies": {
......
appbuild-manage-ui/admin/vue.config.js
View file @ 4531923a
...@@ -17,7 +17,7 @@ module.exports = { ...@@ -17,7 +17,7 @@ module.exports = {
hot: true,//自动保存 hot: true,//自动保存
proxy: { proxy: {
'/m': { '/m': {
target: 'http://127.0.0.1:17211', target: 'http://127.0.0.1:17311',
changeOrigin: true, changeOrigin: true,
secure: false, secure: false,
cookieDomainRewrite: 'plm.testnew.com', cookieDomainRewrite: 'plm.testnew.com',
......
appbuild-manager/pom.xml
View file @ 4531923a
...@@ -110,17 +110,6 @@ ...@@ -110,17 +110,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <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>
<plugin> <plugin>
...@@ -139,12 +128,6 @@ ...@@ -139,12 +128,6 @@
<outputDirectory>${project.parent.basedir}/dist/${project.parent.artifactId}/boot</outputDirectory> <outputDirectory>${project.parent.basedir}/dist/${project.parent.artifactId}/boot</outputDirectory>
<layout>ZIP</layout> <layout>ZIP</layout>
<!-- 打包时，本jar包不包含其他依赖包 ， 否则打出的jar包还是很大 --> <!-- 打包时，本jar包不包含其他依赖包 ， 否则打出的jar包还是很大 -->
<includes>
<include>
<groupId>nothing</groupId>
<artifactId>nothing</artifactId>
</include>
</includes>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
...@@ -156,61 +139,11 @@ ...@@ -156,61 +139,11 @@
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
</configuration> </configuration>
</plugin> </plugin>
<!--设置jar所依赖的三方jar包存放的路径 -->
<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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<executions> <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> <execution>
<id>copy-bin</id> <id>copy-bin</id>
<phase>package</phase> <phase>package</phase>
......
appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/model/ParamEntity.java
View file @ 4531923a
...@@ -8,9 +8,10 @@ ...@@ -8,9 +8,10 @@
package com.mortals.xhx.base.system.param.model; package com.mortals.xhx.base.system.param.model;
import java.util.Date;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.framework.service.IParam;
import java.util.Date;
/** /**
* <p>Title: 参数信息</p> * <p>Title: 参数信息</p>
...@@ -20,8 +21,8 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -20,8 +21,8 @@ import com.mortals.framework.model.BaseEntityLong;
* @author * @author
* @version 1.0.0 * @version 1.0.0
*/ */
public class ParamEntity extends BaseEntityLong{ public class ParamEntity extends BaseEntityLong implements IParam {
private static final long serialVersionUID = 1547777703336L; private static final long serialVersionUID = 1536307966363L;
/** 参数名称 */ /** 参数名称 */
private String name; private String name;
...@@ -44,7 +45,7 @@ public class ParamEntity extends BaseEntityLong{ ...@@ -44,7 +45,7 @@ public class ParamEntity extends BaseEntityLong{
/** 参数修改状态，0：隐藏，1：页面仅查看，2：页面可修改，3：页面可删除，4：页面可修改删除，默认4 */ /** 参数修改状态，0：隐藏，1：页面仅查看，2：页面可修改，3：页面可删除，4：页面可修改删除，默认4 */
private Integer modStatus; private Integer modStatus;
/** 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0 */ /** 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0 */
private Integer displayType; private Integer displayType;
/** 备注 */ /** 备注 */
...@@ -53,7 +54,7 @@ public class ParamEntity extends BaseEntityLong{ ...@@ -53,7 +54,7 @@ public class ParamEntity extends BaseEntityLong{
/** 创建时间 */ /** 创建时间 */
private Date createTime; private Date createTime;
/** 创建用户 */ /** 创建用户ID */
private Long createUserId; private Long createUserId;
/** 创建用户名称 */ /** 创建用户名称 */
...@@ -176,7 +177,7 @@ public class ParamEntity extends BaseEntityLong{ ...@@ -176,7 +177,7 @@ public class ParamEntity extends BaseEntityLong{
} }
/** /**
* 获取 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0 * 获取 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0
* @return displayType * @return displayType
*/ */
public Integer getDisplayType(){ public Integer getDisplayType(){
...@@ -184,7 +185,7 @@ public class ParamEntity extends BaseEntityLong{ ...@@ -184,7 +185,7 @@ public class ParamEntity extends BaseEntityLong{
} }
/** /**
* 设置 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0 * 设置 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0
* @param displayType * @param displayType
*/ */
public void setDisplayType(Integer displayType){ public void setDisplayType(Integer displayType){
...@@ -224,7 +225,7 @@ public class ParamEntity extends BaseEntityLong{ ...@@ -224,7 +225,7 @@ public class ParamEntity extends BaseEntityLong{
} }
/** /**
* 获取 创建用户 * 获取 创建用户ID
* @return createUserId * @return createUserId
*/ */
public Long getCreateUserId(){ public Long getCreateUserId(){
...@@ -232,7 +233,7 @@ public class ParamEntity extends BaseEntityLong{ ...@@ -232,7 +233,7 @@ public class ParamEntity extends BaseEntityLong{
} }
/** /**
* 设置 创建用户 * 设置 创建用户ID
* @param createUserId * @param createUserId
*/ */
public void setCreateUserId(Long createUserId){ public void setCreateUserId(Long createUserId){
......
appbuild-manager/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java
View file @ 4531923a
...@@ -2,6 +2,7 @@ package com.mortals.xhx.base.system.param.service; ...@@ -2,6 +2,7 @@ package com.mortals.xhx.base.system.param.service;
import com.mortals.framework.service.ICRUDCacheService; import com.mortals.framework.service.ICRUDCacheService;
import com.mortals.framework.service.IParamService;
import com.mortals.xhx.base.system.param.model.ParamEntity; import com.mortals.xhx.base.system.param.model.ParamEntity;
import java.util.Map; import java.util.Map;
...@@ -15,7 +16,7 @@ import java.util.Map; ...@@ -15,7 +16,7 @@ import java.util.Map;
* @version 1.0.0 * @version 1.0.0
*/ */
public interface ParamService extends ICRUDCacheService<ParamEntity, Long> { public interface ParamService extends ICRUDCacheService<ParamEntity, Long>, IParamService {
/** /**
* 通过Key获取参数值 * 通过Key获取参数值
...@@ -33,4 +34,14 @@ public interface ParamService extends ICRUDCacheService<ParamEntity, Long> { ...@@ -33,4 +34,14 @@ public interface ParamService extends ICRUDCacheService<ParamEntity, Long> {
*/ */
Map<String, String> getParamByFirstOrganize(String firstOrganize, String... excludeParamKeys); Map<String, String> getParamByFirstOrganize(String firstOrganize, String... excludeParamKeys);
/**
* 通过firstOrganize获取配置参数key-value
*
* @param firstOrganize
* @param excludeParamKeys 需要过虑掉的paramKey
* @return
*/
Map<String, String> getParamBySecondOrganize(String firstOrganize,String secondOrganize, String... excludeParamKeys);
} }
\ No newline at end of file
appbuild-manager/src/main/java/com/mortals/xhx/common/utils/GenUtils.java
View file @ 4531923a
...@@ -117,12 +117,11 @@ public class GenUtils { ...@@ -117,12 +117,11 @@ public class GenUtils {
column.setIsQuery(GenConstants.NOREQUIRE); column.setIsQuery(GenConstants.NOREQUIRE);
//拆解枚举类，格式必须为（1.啊啊啊，2.不不不） //拆解枚举类，格式必须为（1.啊啊啊，2.不不不）
String temp1 = StringUtils.substringBetween(column.getColumnComment(), "(", ")"); String temp = column.getColumnComment().replaceAll("（", "(").replaceAll("）", ")");
String temp2 = StringUtils.substringBetween(column.getColumnComment(), "（", "）"); String temp1 = StringUtils.substringBetween(temp, "(", ")");
//String temp2 = StringUtils.substringBetween(column.getColumnComment(), "（", "）");
checkDict(column, temp1); checkDict(column, temp1);
checkDict(column, temp2); //checkDict(column, temp2);
if(!ObjectUtils.isEmpty(column.getDict())){ if(!ObjectUtils.isEmpty(column.getDict())){
if(column.getDict().size()>2){ if(column.getDict().size()>2){
...@@ -164,7 +163,7 @@ public class GenUtils { ...@@ -164,7 +163,7 @@ public class GenUtils {
temp=temp.replaceAll("，",","); temp=temp.replaceAll("，",",");
temp=temp.replaceAll(";",","); temp=temp.replaceAll(";",",");
temp=temp.replaceAll("、","."); //temp=temp.replaceAll("、",".");
temp=temp.replaceAll("。","."); temp=temp.replaceAll("。",".");
String[] split = checkSplitStr(temp, ","); String[] split = checkSplitStr(temp, ",");
......
appbuild-manager/src/main/resources/template/java/entity.java.ftl
View file @ 4531923a
...@@ -94,7 +94,7 @@ public class ${ClassName}Entity extends ${ClassName}Vo { ...@@ -94,7 +94,7 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
<#--get set属性 --> <#--get set属性 -->
<#list columns as column> <#list columns as column>
<#if !column.isSuperColumn(column.javaField)> <#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> <#assign AttrName = column.javaField>
<#else> <#else>
<#assign AttrName = column.javaField?cap_first> <#assign AttrName = column.javaField?cap_first>
......
appbuild-manager/src/main/resources/template/xml/sqlMap.xml.ftl
View file @ 4531923a
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<#list columns as column> <#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}')))"> <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> </if>
</#list> </#list>
</trim> </trim>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<!-- 子表所有列 --> <!-- 子表所有列 -->
<sql id="_columns_sub"> <sql id="_columns_sub">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<#list subColumns as column>b.${column.columnName} as ${column.javaField},</#list> <#list subColumns as column>b.${column.columnName},</#list>
</trim> </trim>
</sql> </sql>
</#if> </#if>
......
pom.xml
View file @ 4531923a
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</activation> </activation>
<properties> <properties>
<profiles.active>develop</profiles.active> <profiles.active>develop</profiles.active>
<profiles.server.port>17211</profiles.server.port> <profiles.server.port>17311</profiles.server.port>
<profiles.datasource.uri> <profiles.datasource.uri>
<![CDATA[jdbc:mysql://localhost:3306/appbuild-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></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> <profiles.datasource.username>root</profiles.datasource.username>
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
<id>test</id> <id>test</id>
<properties> <properties>
<profiles.active>test</profiles.active> <profiles.active>test</profiles.active>
<profiles.server.port>17211</profiles.server.port> <profiles.server.port>17311</profiles.server.port>
<profiles.datasource.uri> <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.username>root</profiles.datasource.username>
<profiles.datasource.password>nacos@2020</profiles.datasource.password> <profiles.datasource.password>nacos@2020</profiles.datasource.password>
<profiles.redis.uri>192.168.0.252</profiles.redis.uri> <profiles.redis.uri>192.168.0.252</profiles.redis.uri>
...@@ -77,36 +77,6 @@ ...@@ -77,36 +77,6 @@
</profile> </profile>
</profiles> </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> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment