diff --git a/console-web/src/element-ui-theme/index.js b/console-web/src/element-ui-theme/index.js index 476420d6..fc928630 100644 --- a/console-web/src/element-ui-theme/index.js +++ b/console-web/src/element-ui-theme/index.js @@ -6,7 +6,7 @@ * 2. 要达到整站主题修改效果, 请确保[import './element-[#17B3A3]/index.css']当前主题色与[/src/assets/scss/_variables.scss]文件中[$--color-primary]属性值一致 */ import './element-#17B3A3/index.css' -//import './element-#997B71/index.css' // 当前主题色 +// import './element-#997B71/index.css' // 当前主题色 export default { list: [ diff --git a/doc/ECP-参考手册-Mapper说明-V1.0.1.pdf b/doc/ECP-参考手册-Mapper说明-V1.0.1.pdf index 2d0ccc95..26c1f914 100644 Binary files a/doc/ECP-参考手册-Mapper说明-V1.0.1.pdf and b/doc/ECP-参考手册-Mapper说明-V1.0.1.pdf differ diff --git a/doc/cre_bui.sql b/doc/cre_bui.sql index d58b3448..c91cc089 100644 --- a/doc/cre_bui.sql +++ b/doc/cre_bui.sql @@ -509,3 +509,52 @@ comment on column T_BUI_CONFIG.UPD_OPR is '操作员' ; create unique index ui1_T_BUI_CONFIG on T_BUI_CONFIG (PARAM_KEY); + + + +drop table T_BUI_OPERLOG; + +create table T_BUI_OPERLOG +( + ID NUMBER(20) not null + primary key, + OPER_NO VARCHAR2(50) default ' ' not null, + OPER_NM VARCHAR2(1024) default ' ' not null, + TXN_CD VARCHAR2(1) default '0' not null, + IP_ADDR VARCHAR2(80) default ' ' not null, + REQ_DATA VARCHAR2(80) default ' ' not null, + REQ_ID VARCHAR2(64) default ' ' not null, + NOD_ID VARCHAR2(20) default ' ' not null, + TM_SMP VARCHAR2(14) default ' ' not null, + UPD_OPR VARCHAR2(10) default ' ' not null +) +; + +comment on table T_BUI_CONFIG is '系统配置信息表' +; + +comment on column T_BUI_CONFIG.PARAM_KEY is 'key' +; + +comment on column T_BUI_CONFIG.PARAM_VALUE is 'value' +; + +comment on column T_BUI_CONFIG.STS is '状态 0：正常 1：无效' +; + +comment on column T_BUI_CONFIG.REMARK is '备注' +; + +comment on column T_BUI_CONFIG.REQ_ID is '请求id' +; + +comment on column T_BUI_CONFIG.NOD_ID is '节点' +; + +comment on column T_BUI_CONFIG.TM_SMP is '时间戳' +; + +comment on column T_BUI_CONFIG.UPD_OPR is '操作员' +; + +create unique index ui1_T_BUI_CONFIG on T_BUI_CONFIG (PARAM_KEY); \ No newline at end of file diff --git a/doc/中间业务平台开发指南.docx b/doc/中间业务平台开发指南.docx index 25ec9ad4..ab29258f 100644 Binary files a/doc/中间业务平台开发指南.docx and b/doc/中间业务平台开发指南.docx differ diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/BUIStartApplication.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/BUIStartApplication.java index 1e720b1f..33c16685 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/BUIStartApplication.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/BUIStartApplication.java @@ -18,6 +18,7 @@ public class BUIStartApplication extends SpringBootServletInitializer { YGBizContext.getCurrentContext().setProperty("SVR.log", YGLogger.getLogger("container.trc")); System.setProperty("java.net.preferIPv4Stack", "true"); + return builder.sources(BUIApplication.class); } } \ No newline at end of file diff --git a/ecp-mbu-web/src/main/resources/application.properties b/ecp-mbu-web/src/main/resources/application.properties index 600b1ee6..88032176 100644 --- a/ecp-mbu-web/src/main/resources/application.properties +++ b/ecp-mbu-web/src/main/resources/application.properties @@ -13,7 +13,7 @@ spring.mvc.view.prefix=/ spring.mvc.view.suffix=.jsp spring.application.name=mbu ecp.container.enable=true -ecp.datasource.mapper=com.murong.ecp.netpay.mbu.web.dal.dao,com.murong.ecp.netpay.mbu.web.plt.dao,com.murong.ecp.netpay.mbu.web.pub.dal.dao +ecp.datasource.mapper=com.murong.ecp.netpay.mbu.web.*.dao ecp.datasource.url=jdbc:oracle:thin:@//10.116.77.178:1521/orcl #ecp.datasource.username=boss01 #ecp.datasource.password=boss01$123 diff --git a/ecp-mbu-web/src/main/webapp/META-INF/autoconf/auto-config.xml b/ecp-mbu-web/src/main/webapp/META-INF/autoconf/auto-config.xml new file mode 100755 index 00000000..1b4b748d --- /dev/null +++ b/ecp-mbu-web/src/main/webapp/META-INF/autoconf/auto-config.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ecp-mbu-web/src/main/webapp/META-INF/autoconf/vm/application.properties.vm b/ecp-mbu-web/src/main/webapp/META-INF/autoconf/vm/application.properties.vm new file mode 100755 index 00000000..2bd43e21 --- /dev/null +++ b/ecp-mbu-web/src/main/webapp/META-INF/autoconf/vm/application.properties.vm @@ -0,0 +1,87 @@ +server.port=${ecp.server.port} +server.context-path=/${D}{spring.application.name} +server.tomcat.max-threads=10 +server.tomcat.max-connections=200 +server.tomcat.accesslog.enabled=true +server.tomcat.accesslog.directory=${D}{HWORKDIR}/log +server.tomcat.accesslog.buffered=false +server.tomcat.accesslog.pattern=%h %t "%r" %s %b "%{Referer}i" "%{User-Agent}i" "%D" +server.tomcat.uri-encoding=UTF-8 +server.jsp-servlet.init-parameters.development=true +spring.mvc.view.prefix=/ +spring.mvc.view.suffix=.jsp +spring.application.name=mbu +eureka.client.service-url.defaultZone=${eureka.client.service.url.defaultZone} +eureka.instance.prefer-ip-address=true +#ribbon: +#对所有操作请求都进行重试,默认false +ribbon.OkToRetryOnAllOperations= false +#负载均衡超时时间，默认值3000 +ribbon.ReadTimeout=30000 +#ribbon请求连接的超时时间，默认值3000 +ribbon.ConnectTimeout=30000 +#对当前实例的重试次数，默认0 +ribbon.MaxAutoRetries=0 +#对切换实例的重试次数，默认0 +ribbon.MaxAutoRetriesNextServer=0 +feign.httpclient.enabled=true +feign.client.config.defalut.logger-level=full +# 自动加载 +ecp.container.enable=true +# activiti自动部署验证设置:true-开启（默认）、false-关闭 +spring.activiti.check-process-definitions=true +spring.activiti.db-identity-used=false +# 数据库配置 +ecp.datasource.name=${db.datasource.name} +ecp.datasource.mapper=com.murong.ecp.netpay.mbu.web.dal.dao +ecp.datasource.ora1.url=${db.datasource.ora1.url} +ecp.datasource.ora1.username=${db.datasource.ora1.username} +ecp.datasource.ora1.password=${db.datasource.ora1.password} +ecp.datasource.ora1.publicKey=${db.datasource.ora1.publicKey} +ecp.datasource.ora1.driverClassName=${db.datasource.ora1.driverClassName} +# 下面为连接池的补充设置，应用到上面所有数据源中 +# 初始化大小，最小，最大 +ecp.datasource.ora1.initialSize=${db.datasource.ora1.initialSize} +ecp.datasource.ora1.minIdle=${db.datasource.ora1.minIdle} +ecp.datasource.ora1.maxActive=${db.datasource.ora1.maxActive} +ecp.datasource.ora1.maxWait=60000 +# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 +ecp.datasource.ora1.timeBetweenEvictionRunsMillis=60000 +# 配置一个连接在池中最小生存的时间，单位是毫秒 +ecp.datasource.ora1.minEvictableIdleTimeMillis=300000 +ecp.datasource.ora1.validationQuery=SELECT 1 FROM DUAL +ecp.datasource.ora1.testWhileIdle=true +ecp.datasource.ora1.testOnBorrow=false +ecp.datasource.ora1.testOnReturn=false +# 打开PSCache，并且指定每个连接上PSCache的大小 +ecp.datasource.ora1.poolPreparedStatements=false +ecp.datasource.ora1.filters=stat,wall,log4j +ecp.datasource.ora1.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + + + +ecp.datasource.ora2.url=${db.datasource.ora2.url} +ecp.datasource.ora2.username=${db.datasource.ora2.username} +ecp.datasource.ora2.password=${db.datasource.ora2.password} +ecp.datasource.ora2.publicKey=${db.datasource.ora2.publicKey} +ecp.datasource.ora2.driverClassName=${db.datasource.ora2.driverClassName} +# 下面为连接池的补充设置，应用到上面所有数据源中 +# 初始化大小，最小，最大 +ecp.datasource.ora2.initialSize=${db.datasource.ora2.initialSize} +ecp.datasource.ora2.minIdle=${db.datasource.ora2.minIdle} +ecp.datasource.ora2.maxActive=${db.datasource.ora2.maxActive} +ecp.datasource.ora2.maxWait=60000 +# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 +ecp.datasource.ora2.timeBetweenEvictionRunsMillis=60000 +# 配置一个连接在池中最小生存的时间，单位是毫秒 +ecp.datasource.ora2.minEvictableIdleTimeMillis=300000 +ecp.datasource.ora2.validationQuery=SELECT 1 FROM DUAL +ecp.datasource.ora2.testWhileIdle=true +ecp.datasource.ora2.testOnBorrow=false +ecp.datasource.ora2.testOnReturn=false +# 打开PSCache，并且指定每个连接上PSCache的大小 +ecp.datasource.ora2.poolPreparedStatements=false +ecp.datasource.ora2.filters=stat,wall,log4j +ecp.datasource.ora2.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +# 健康检查 +management.health.defaults.enabled=false \ No newline at end of file diff --git a/ecp-mbu-web/src/main/webapp/META-INF/autoconf/vm/env.properties.vm b/ecp-mbu-web/src/main/webapp/META-INF/autoconf/vm/env.properties.vm new file mode 100755 index 00000000..76978c90 --- /dev/null +++ b/ecp-mbu-web/src/main/webapp/META-INF/autoconf/vm/env.properties.vm @@ -0,0 +1,2 @@ +REGION_ID=${ecp.region.id} +HWORKDIR=${ecp.work.dir} diff --git a/ecp-mbu-web/src/main/webapp/META-INF/autoconf/vm/logback.xml.vm b/ecp-mbu-web/src/main/webapp/META-INF/autoconf/vm/logback.xml.vm new file mode 100755 index 00000000..ade0f4c0 --- /dev/null +++ b/ecp-mbu-web/src/main/webapp/META-INF/autoconf/vm/logback.xml.vm @@ -0,0 +1,50 @@ + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - [%X{TRACE_ID}] %msg%n + + + + + ${D}{logBase}/${D}{appName}.log + + ${D}{logBase}/${D}{appName}-%d{yyyy-MM-dd}.log.%i + 30 + + 100MB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - [%X{TRACE_ID}] %msg%n + + + + + ${D}{logBase}/${D}{appName}-error.log + + ERROR + + + ${D}{logBase}/${D}{appName}-error-%d{yyyy-MM-dd}.log.%i + 30 + + 50MB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - [%X{TRACE_ID}] %msg%n + + + + + + + + + diff --git a/ecp-mbu-web/src/test/java/generator/GeneratorCURD.java b/ecp-mbu-web/src/test/java/generator/GeneratorCURD.java index e6149179..68fcc4ce 100644 --- a/ecp-mbu-web/src/test/java/generator/GeneratorCURD.java +++ b/ecp-mbu-web/src/test/java/generator/GeneratorCURD.java @@ -516,7 +516,7 @@ public class GeneratorCURD { String moduleName = (String)properties.get("moduleName"); Long seqNo = getCurSeqNexVal(); - System.out.println(String.format("INSERT INTO T_BUI_MENU (MENU_ID, PARENT_ID, NAME, URL, PERMS, TYPE, ICON) VALUES (%d, 0, '序号管理', '%s/%s', ' ', '1', 'config');", seqNo, moduleName, name)); + System.out.println(String.format("INSERT INTO T_BUI_MENU (MENU_ID, PARENT_ID, NAME, URL, PERMS, TYPE, ICON) VALUES (%d, 1, '%s', '%s/%s', ' ', '1', 'config');", seqNo, title, moduleName, name)); System.out.println(String.format("INSERT INTO T_BUI_MENU (MENU_ID, PARENT_ID, NAME, URL, PERMS, TYPE, ICON) VALUES (S_PUB_ID.nextval, %d, '增加', ' ', '%s:%s:add', '2', ' ');", seqNo, moduleName, name)); System.out.println(String.format("INSERT INTO T_BUI_MENU (MENU_ID, PARENT_ID, NAME, URL, PERMS, TYPE, ICON) VALUES (S_PUB_ID.nextval, %d, '删除', ' ', '%s:%s:delete', '2', ' ');", seqNo, moduleName, name)); System.out.println(String.format("INSERT INTO T_BUI_MENU (MENU_ID, PARENT_ID, NAME, URL, PERMS, TYPE, ICON) VALUES (S_PUB_ID.nextval, %d, '修改', ' ', '%s:%s:update', '2', ' ');", seqNo, moduleName, name)); diff --git a/ecp-mbu-web/src/test/java/generator/GeneratorDict.java b/ecp-mbu-web/src/test/java/generator/GeneratorDict.java index 58194a0e..e2a55a33 100644 --- a/ecp-mbu-web/src/test/java/generator/GeneratorDict.java +++ b/ecp-mbu-web/src/test/java/generator/GeneratorDict.java @@ -13,7 +13,7 @@ import java.util.Map; /** * Created by syxlw on 2018/5/5. - * Զsql + * 自动生成sql语句 */ public class GeneratorDict { @@ -114,13 +114,13 @@ public class GeneratorDict { } enum DictItemType { - VARCHAR("varchar", "ַ"), - AMT("amt", ""), - NUMBER("number", ""), - DIGITS("digit", ""), - DATE("date", ""), - TIME("time", "ʱ"), - TIMESTAMP("timestamp", "ʱ"), + VARCHAR("varchar", "字符型"), + AMT("amt", "金额型"), + NUMBER("number", "数字型"), + DIGITS("digit", "数字型"), + DATE("date", "日期型"), + TIME("time", "时间型"), + TIMESTAMP("timestamp", "时间型"), ; private String type; private String msg; diff --git a/ecp-mbu-web/src/test/resources/conf/GeneratorCURD-generator-oracle.xml b/ecp-mbu-web/src/test/resources/conf/GeneratorCURD-generator-oracle.xml index a37b5fe4..157cefc8 100644 --- a/ecp-mbu-web/src/test/resources/conf/GeneratorCURD-generator-oracle.xml +++ b/ecp-mbu-web/src/test/resources/conf/GeneratorCURD-generator-oracle.xml @@ -16,14 +16,14 @@ - - + + + + org.springframework.cloud + spring-cloud-starter-feign + + + + + com.murong.ecp + ecp-bp-common + 1.1.0-SNAPSHOT + + + com.murong.ecp + ecp-bp-cloud + 1.0.0-SNAPSHOT + + + com.murong.ecp + ecp-bp-tool + 1.0.0-SNAPSHOT + + + com.murong.ecp + mrpubatc + 1.0.0-SNAPSHOT + + + org.bouncycastle + bcprov-jdk16 + 1.40 + + + org.springframework.boot + spring-boot-starter-aop + + + + + + + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-autoconfigure + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + org.springframework.boot + spring-boot-starter-test + + + + + de.codecentric + spring-boot-admin-starter-client + 1.5.7 + + + * + * + + + + + + + javax.servlet + jstl + 1.2 + + + + + org.mybatis + mybatis-spring + 1.3.1 + + + org.mybatis + mybatis + 3.4.5 + + + + + commons-io + commons-io + 2.6 + + + cn.afterturn + easypoi-base + 3.2.0 + + + org.apache.commons + commons-lang3 + + + + + cn.afterturn + easypoi-web + 3.2.0 + + + * + * + + + + + cn.afterturn + easypoi-annotation + 3.2.0 + + + * + * + + + + + + commons-httpclient + commons-httpclient + 3.1 + + + commons-logging + commons-logging + + + + + + + org.apache.httpcomponents + httpcore + 4.4.5 + + + + org.apache.httpcomponents + httpclient + 4.5 + + + com.murong.ecp + com.yuangou.ecp.bp.biz.engine + 1.0.13 + + + + + + commons-pool + commons-pool + 1.6 + + + + commons-digester + commons-digester + 1.8 + + + + commons-logging + commons-logging + 1.2 + + + + commons-beanutils + commons-beanutils + 1.9.3 + + + + commons-lang + commons-lang + 2.6 + + + + org.apache.commons + commons-lang3 + 3.8 + + + + com.alibaba + fastjson + 1.2.49 + + + + net.sf.oval + oval + 1.90 + + + + dom4j + dom4j + 1.6.1 + + + com.github.penggle + kaptcha + 2.3.2 + + + + com.google.code.gson + gson + 2.8.0 + + + + com.sun.mail + javax.mail + 1.5.6 + + + + com.alibaba + dubbo + 2.5.10 + + + + com.101tec + zkclient + 0.10 + + + org.apache.zookeeper + zookeeper + + + + + + org.apache.curator + curator-framework + 2.12.0 + + + + + + org.projectlombok + lombok + 1.18.2 + + + + javax.servlet + javax.servlet-api + provided + + + xom + xom + 1.2.5 + + + + + com.alibaba + druid + 1.1.4 + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + commons-lang + commons-lang + + + commons-logging + commons-logging + + + + + + + cglib + cglib + 3.1 + + + org.ow2.asm + asm + + + + + + commons-fileupload + commons-fileupload + 1.3.3 + + + commons-io + commons-io + + + + + + jaxen + jaxen + 1.1.6 + + + + + + + + + + + org.apache.rocketmq + rocketmq-client + 4.2.0 + + + com.alibaba + fastjson + + + org.apache.commons + commons-lang3 + + + + + + com.jcraft + jsch + 0.1.54 + + + + com.google.zxing + core + 3.3.0 + + + + commons-net + commons-net + 3.6 + + + + com.googlecode.aviator + aviator + 2.3.4 + + + + + com.murong.ecp.thirdlib + ojdbc6 + 11.2.0.3 + + + com.murong.ecp.thirdlib + report4 + 1.0.0 + + + com.murong.ecp + mrdubbo-spring-boot-starter + 2.0.0 + + + com.murong.ecp + com.yuangou.ecp.bp.bat.job + 1.0.1 + + + + + com.murong.ecp + com.yuangou.ecp.bp.biz.transengine + 1.0.31-SNAPSHOT + + + + + + com.murong.ecp + com.yuangou.ecp.bp.common.util + 1.0.2 + + + + + com.murong.ecp + com.yuangou.ecp.bp.comp.pubatc + 1.0.18-SNAPSHOT + + + + com.murong.ecp + com.yuangou.ecp.bp.comp.pubatcext + 1.0.4 + + + + com.murong.ecp + com.yuangou.ecp.bp.comp.util + 1.0.6-SNAPSHOT + + + + com.murong.ecp + com.yuangou.ecp.bp.core.lib + 1.0.1 + + + + + com.murong.ecp + com.yuangou.ecp.bp.dict.appconstant + 1.0.1 + + + + com.murong.ecp + com.yuangou.ecp.bp.mng + 1.0.1 + + + + com.murong.ecp + com.yuangou.ecp.bp.mngutil + 1.0.0 + + + + com.murong.ecp + com.yuangou.ecp.bp.monext + 1.0.0 + + + + + + com.murong.ecp + com.yuangou.ecp.bp.tools.test + 1.0.7-SNAPSHOT + + + + + + com.murong.ecp + com.yuangou.ecp.bp.transform.iif + 1.0.9-SNAPSHOT + + + + + com.murong.ecp + com.yuangou.ecp.bp.bpservice.sqn + 1.0.2 + + + + com.murong.ecp + com.yuangou.ecp.bp.bpservice.sequence + 1.0.2-SNAPSHOT + + + + + + com.murong.ecp + com.yuangou.ecp.bp.web.webatc + 1.0.5-SNAPSHOT + + + + com.murong.ecp + com.yuangou.ecp.bp.web + 1.0.8-SNAPSHOT + + + + + + com.murong.ecp + com.yuangou.ecp.bp.core.common + 1.0.15-SNAPSHOT + + + + com.murong.ecp + com.yuangou.ecp.bp.core.constant + 1.0.0 + + + + com.murong.ecp + com.yuangou.ecp.bp.core.dbutil + 1.0.12-SNAPSHOT + + + + com.murong.ecp + com.yuangou.ecp.bp.core.dispatcher + 1.0.5-SNAPSHOT + + + + com.murong.ecp + com.yuangou.ecp.bp.core.framework + 1.0.9 + + + + com.murong.ecp + com.yuangou.ecp.bp.core.hub + 1.0.5 + + + + com.murong.ecp + com.yuangou.ecp.bp.core.json + 1.0.1 + + + + com.murong.ecp + com.yuangou.ecp.bp.core.parse + 1.0.3 + + + + com.murong.ecp + com.yuangou.ecp.bp.core.register + 1.0.3 + + + + com.murong.ecp + com.yuangou.ecp.bp.core.workload + 1.0.1 + + + + + com.murong.ecp + com.yuangou.ecp.bp.mon + 1.0.1 + + + + + + com.murong.ecp + com.yuangou.ecp.bp.util + 1.0.10-SNAPSHOT + + + + + com.murong.ecp + com.yuangou.ecp.bp.comp.expr + 1.0.8-SNAPSHOT + + + + com.murong.ecp + com.yuangou.ecp.bp.comp.expression + 1.0.4 + + + + com.murong.ecp + com.yuangou.ecp.bp.bpservice.param + 1.0.5-SNAPSHOT + + + + com.murong.ecp + com.yuangou.ecp.bp.bpservice.paramhandler + 1.0.6-SNAPSHOT + + + + + com.murong.ecp + com.yuangou.ecp.bp.web.mvc + 1.0.14-SNAPSHOT + + + + com.murong.ecp + com.yuangou.ecp.bp.comp.handlers + 1.0.8-SNAPSHOT + + + + + cglib + cglib + 3.1 + + + + com.murong.ecp + com.yuangou.ecp.bp.tools.report + 1.0.1 + + + + com.murong.ecp + com.yuangou.ecp.bp.comp.cmp + 1.0.2 + + + + com.murong.ecp + com.yuangou.ecp.bp.bpservice.bsp + 1.0.5 + + + + + org.freemarker + freemarker + 2.3.23 + + + + + + + + + + + + + + + + + org.apache.commons + commons-text + 1.4 + + + + org.apache.commons