Skip to content

S
srm
Commit 3b0afeb9 authored by 顾俭's avatar 顾俭
Browse files
Options

fcn -> aship

parent 56b41129
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 103 deletions
build.gradle
View file @ 3b0afeb9
......@@ -32,7 +32,7 @@ flyway {
url = 'jdbc:mysql://localhost:3306/'
user = 'root'
password = ''
schemas = ['srm_fcn']
schemas = ['srm_aship']
locations = ['filesystem:upgrade/sql/mysql']
outOfOrder = true
......
fcn.sh deleted 100755 → 0
View file @ 56b41129
#!/usr/bin/env bash
GROUP_NAME=fcn
PROJECT_NAME=srm
ISSUE_ID=prod
PORT=57002
MEMORY=1024
DOCKER_NAME=${GROUP_NAME}-${PROJECT_NAME}-${ISSUE_ID}
echo "============================================="
echo GROUP_NAME=${GROUP_NAME}
echo PROJECT_NAME=${PROJECT_NAME}
echo PORT=${PORT}
echo MEMORY=${MEMORY}
echo DOCKER_NAME=${DOCKER_NAME}
echo "============================================="
echo "stop docker ${DOCKER_NAME}"
docker rm -f ${DOCKER_NAME}
echo "Update code..."
git checkout "master"
git branch -d "#${ISSUE_ID}"
git fetch
git checkout -b "#${ISSUE_ID}" "origin/#${ISSUE_ID}"
echo "Checkout branch origin/"${ISSUE_ID}
cp /alidata1/dev/bq/gradle-cache-fcn /alidata1/dev/bq/gradle-cache-fcn-${ISSUE_ID} -R
echo "start docker ${DOCKER_NAME}"
docker run -d \
--user $UID \
--name ${DOCKER_NAME} \
-v "$PWD":/${PROJECT_NAME} \
-v /alidata1/dev/bq/gradle-cache-fcn-${ISSUE_ID}:/root/.gradle \
-p ${PORT}:1098 \
-w /${PROJECT_NAME} \
gradle:alpine \
bash -c "gradle flywayRepair -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm_fcn -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql; gradle flywayMigrate -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql -Pflyway.outOfOrder=true -Pflyway.validateOnMigrate=false -Pflyway.ignoreMissingMigrations=true -Pflyway.ignoreFutureMigrations=true; gradle build; gradle bootRun"
issue.sh
View file @ 3b0afeb9
......@@ -7,10 +7,10 @@ if [ -z "$1" ]
fi
GROUP_NAME=fcn
GROUP_NAME=aship
PROJECT_NAME=srm
ISSUE_ID=$1
PORT=57001
PORT=58001
MEMORY=1024
DOCKER_NAME=${GROUP_NAME}-${PROJECT_NAME}-ISSUE
......@@ -33,7 +33,7 @@ git checkout -b "#${ISSUE_ID}" "origin/#${ISSUE_ID}"
echo "Checkout branch origin/"${ISSUE_ID}
cp /alidata1/dev/bq/gradle-cache-fcn /alidata1/dev/bq/gradle-cache-fcn-new -R
cp /alidata1/dev/bq/gradle-cache-aship /alidata1/dev/bq/gradle-cache-aship-new -R
echo "start docker ${DOCKER_NAME}"
......@@ -41,10 +41,10 @@ docker run -d \
--user $UID \
--name ${DOCKER_NAME} \
-v "$PWD":/${PROJECT_NAME} \
-v /alidata1/dev/bq/gradle-cache-fcn-new:/root/.gradle \
-v /alidata1/dev/bq/gradle-cache-aship-new:/root/.gradle \
-v /etc/localtime:/etc/localtime:ro \
-p ${PORT}:1098 \
-w /${PROJECT_NAME} \
gradle:alpine \
bash -c "gradle flywayRepair -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm_fcn -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql; gradle flywayMigrate -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql -Pflyway.outOfOrder=true -Pflyway.validateOnMigrate=false -Pflyway.ignoreMissingMigrations=true -Pflyway.ignoreFutureMigrations=true; gradle bootRun"
bash -c "gradle flywayRepair -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm_aship -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql; gradle flywayMigrate -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql -Pflyway.outOfOrder=true -Pflyway.validateOnMigrate=false -Pflyway.ignoreMissingMigrations=true -Pflyway.ignoreFutureMigrations=true; gradle bootRun"
readme
View file @ 3b0afeb9
SIT:
URL: http://project.benchmarkchina.com:57000/
Database:jdbc:mysql://project.benchmarkchina.com:3306/srm_fcn?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
环境启动：目录：/alidata1/dev/fcn/srm 脚本：run-docker.sh
URL: http://project.benchmarkchina.com:58000/
Database:jdbc:mysql://project.benchmarkchina.com:3306/srm_aship?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
环境启动：目录：/alidata1/dev/aship/srm 脚本：run-docker.sh
ISSUE:
URL: http://project.benchmarkchina.com:57001/
Database:jdbc:mysql://project.benchmarkchina.com:3306/srm_fcn?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
环境启动：目录：/alidata1/dev/launcher/fcn/srm 脚本：issue.sh issueNo(如执行：sh issue.sh 2)
URL: http://project.benchmarkchina.com:58001/
Database:jdbc:mysql://project.benchmarkchina.com:3306/srm_aship?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
环境启动：目录：/alidata1/dev/launcher/aship/srm 脚本：issue.sh issueNo(如执行：sh issue.sh 2)
Staging:
URL: http://58.210.204.82:1098/
......
run-docker.sh
View file @ 3b0afeb9
#!/usr/bin/env bash
GROUP_NAME=fcn
GROUP_NAME=aship
PROJECT_NAME=srm
PORT=57000
PORT=58000
PROFILE=default
MEMORY=1024
......@@ -29,10 +29,10 @@ docker run -d \
--user $UID \
--name ${DOCKER_NAME} \
-v "$PWD":/${PROJECT_NAME} \
-v /alidata1/dev/bq/gradle-cache-fcn:/root/.gradle \
-v /alidata1/dev/bq/gradle-cache-aship:/root/.gradle \
-v /etc/localtime:/etc/localtime:ro \
-p ${PORT}:1098 \
-w /${PROJECT_NAME} \
gradle:alpine \
bash -c "gradle flywayRepair -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm_fcn -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql; gradle flywayMigrate -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql -Pflyway.outOfOrder=true -Pflyway.validateOnMigrate=false -Pflyway.ignoreMissingMigrations=true -Pflyway.ignoreFutureMigrations=true; gradle build;gradle bootRun"
bash -c "gradle flywayRepair -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm_aship -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql; gradle flywayMigrate -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql -Pflyway.outOfOrder=true -Pflyway.validateOnMigrate=false -Pflyway.ignoreMissingMigrations=true -Pflyway.ignoreFutureMigrations=true; gradle build;gradle bootRun"
src/main/resources/application.yml
View file @ 3b0afeb9
......@@ -106,20 +106,20 @@ srm:
supplierErpSend: false
email:
enable: false
recipients: srm@mail.forcecon.com,gujian@benchmarkchina.com,raven@benchmarkchina.com
recipients: gujian@benchmarkchina.com,raven@benchmarkchina.com
--- # default profile
spring:
profiles: default
datasource:
driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://project.benchmarkchina.com:3306/srm_fcn?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://project.benchmarkchina.com:3306/srm_aship?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
username: root
password: benchmark123
srm:
dev: false
aclSchema: srm_fcn
companyName: 聚力
aclSchema: srm_aship
companyName: 一舟
logging:
level:
......@@ -147,14 +147,7 @@ spring:
max-file-size: 20MB
max-request-size: 20MB
location: /home/srm/SRM/IOne-SRM-Prod/upload
mail:
host: mail.forcecon.com
password: 1m7tc10p
port: 25
username: srm@mail.forcecon.com
properties.mail.smtp.auth: true
properties.mail.smtp.starttls.enable: false
properties.mail.debug: true
server:
port: 1099
session:
......@@ -162,7 +155,7 @@ server:
srm:
dev: false
aclSchema: srm
companyName: 聚力
companyName: 一舟
bannerInfo:
print:
printInSrm: false
......@@ -193,7 +186,7 @@ srm:
defaultPoChgReturnType: 0
email:
enable: true
recipients: srm@mail.forcecon.com,gujian@benchmarkchina.com,raven@benchmarkchina.com
recipients: gujian@benchmarkchina.com,raven@benchmarkchina.com
logoImg:
logging:
level:
......@@ -228,7 +221,7 @@ server:
srm:
dev: false
aclSchema: srm_staging
companyName: 聚力
companyName: 一舟
bannerInfo: 测试数据! 请勿送货!
print:
printInSrm: false
......@@ -282,7 +275,7 @@ server:
srm:
dev: true
aclSchema: srm_staging
companyName: 聚力
companyName: 一舟
bannerInfo: 测试数据! 请勿送货!
print:
printInSrm: false
......@@ -329,7 +322,7 @@ server:
srm:
dev: true
aclSchema: srm
companyName: 聚力
companyName: 一舟
bannerInfo: 正式区
print:
printInSrm: false
......@@ -374,25 +367,25 @@ spring:
datasource:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://project.benchmarkchina.com:3306/srm_fcn?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
url: jdbc:mysql://project.benchmarkchina.com:3306/srm_aship?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
username: root
password: benchmark123
http:
multipart:
max-file-size: 20MB
max-request-size: 20MB
location: /Users/TryXD/devRep/fcn
location: /Users/TryXD/devRep/aship
resources:
static-locations: file:/Users/TryXD/devRep/fcn/srm, classpath:/static/,classpath:/META-INF/resources/,classpath:/resources/,classpath:/public/
static-locations: file:/Users/TryXD/devRep/aship/srm, classpath:/static/,classpath:/META-INF/resources/,classpath:/resources/,classpath:/public/
mail:
host: mail.forcecon.com
password: 1m7tc10p
port: 25
username: srm@mail.forcecon.com
properties.mail.smtp.auth: true
properties.mail.smtp.starttls.enable: false
properties.mail.debug: true
# mail:
# host: mail.forcecon.com
# password: 1m7tc10p
# port: 25
# username: srm@mail.forcecon.com
# properties.mail.smtp.auth: true
# properties.mail.smtp.starttls.enable: false
# properties.mail.debug: true
server:
port: 8080
......@@ -401,7 +394,7 @@ server:
srm:
dev: true
aclSchema: srm_fcn
aclSchema: srm_aship
companyName: 公司名
bannerInfo: 测试数据! 请勿送货!
print:
......@@ -435,7 +428,7 @@ srm:
supplierErpSend: false
email:
enable: true
recipients: gujian@benchmarkchina.com,raven@benchmarkchina.com,srm@mail.forcecon.com
recipients: gujian@benchmarkchina.com,raven@benchmarkchina.com
logging:
level:
org.hibernate.SQL: DEBUG
......
src/main/resources/hibernate.cfg.xml
View file @ 3b0afeb9
......@@ -4,7 +4,7 @@
"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<property name="connection.url">jdbc:mysql://project.benchmarkchina.com:3306/srm_fcn</property>
<property name="connection.url">jdbc:mysql://project.benchmarkchina.com:3306/srm_aship</property>
<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
<mapping class="com.i1.srm.base.dao.entity.BaseDictFile"/>
......
src/main/resources/static/app/srm/supplier/view/view.js
View file @ 3b0afeb9
......@@ -231,7 +231,7 @@
item.dtlIndex = index + 1;
var temp1 = {
index: index + 1,
SupplierAndFacturer: '聚力',
SupplierAndFacturer: '一舟',
productName: item.productName,
hscode: item.hscode,
currencyName: item.currency == null ? "" : item.currency.name,
......
src/main/resources/static/app/srm/supplierSurvey/check/check.js
View file @ 3b0afeb9
......@@ -292,7 +292,7 @@
item.dtlIndex = index + 1;
var temp1 = {
index: index + 1,
SupplierAndFacturer: '聚力',
SupplierAndFacturer: '一舟',
productName: item.productName,
hscode: item.hscode,
currencyName: item.currency == null ? "" : item.currency.name,
......
src/main/resources/static/app/srm/supplierSurvey/feedback/feedback.html
View file @ 3b0afeb9
......@@ -1934,7 +1934,7 @@
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label>（聚力）商品名称</label>
<label>（一舟）商品名称</label>
<input type="text" class="form-control" maxlength="200"
ng-model="currentInvestCustomsdoc.productName"
required>
......@@ -1945,7 +1945,7 @@
<div class="col-md-4">
<div class="form-group">
<label>（聚力）HSCODE</label>
<label>（一舟）HSCODE</label>
<input type="text" class="form-control" maxlength="100"
ng-model="currentInvestCustomsdoc.hscode" required/>
<span style="color: red;"
......@@ -1955,7 +1955,7 @@
<div class="col-md-4">
<div class="form-group">
<label>（聚力）币别</label>
<label>（一舟）币别</label>
<select class="form-control" style="width: 100%;"
ng-model="currentInvestCustomsdoc.currency.id" required>
<option ng-repeat="item in currencyData"
......@@ -1968,7 +1968,7 @@
<div class="col-md-4">
<div class="form-group">
<label>（聚力）备案单价</label>
<label>（一舟）备案单价</label>
<input class="form-control"
ng-pattern="/^(\d{1,13}|\d{1,13}\.\d{1,5})$/"
name="recodePrice"
......@@ -1980,7 +1980,7 @@
<div class="col-md-4">
<div class="form-group">
<label>（聚力）备案单位</label>
<label>（一舟）备案单位</label>
<input type="text" class="form-control" maxlength="100"
ng-model="currentInvestCustomsdoc.recodeComp" required/>
<span style="color: red;"
......
src/main/resources/static/app/srm/supplierSurvey/feedback/feedback.js
View file @ 3b0afeb9
......@@ -299,7 +299,7 @@
currency: item.currency,
supplierInvest: item.supplierInvest,
index: index + 1,
SupplierAndFacturer: '聚力',
SupplierAndFacturer: '一舟',
productName: item.productName,
hscode: item.hscode,
currencyName: item.currency == null ? "" : item.currency.name,
......@@ -838,7 +838,7 @@
currency: $scope.currentInvestCustomsdoc.currency,
index: $scope.currentInvestCustomsdoc.index,
supplierInvest: $scope.currentSupplierInvestMain,
SupplierAndFacturer: '聚力',
SupplierAndFacturer: '一舟',
productName: $scope.currentInvestCustomsdoc.productName,
hscode: $scope.currentInvestCustomsdoc.hscode,
currencyName: $scope.currentInvestCustomsdoc.currency.name,
......
src/main/resources/static/app/srm/supplierSurvey/view/view.js
View file @ 3b0afeb9
......@@ -238,7 +238,7 @@
item.dtlIndex = index + 1;
var temp1 = {
index: index + 1,
SupplierAndFacturer: '聚力',
SupplierAndFacturer: '一舟',
productName: item.productName,
hscode: item.hscode,
currencyName: item.currency == null ? "" : item.currency.name,
......
src/test/java/com/i1/test/erp/HttpURLConnectionTest.java
View file @ 3b0afeb9
......@@ -13,10 +13,10 @@ import java.net.URL;
public class HttpURLConnectionTest {
@Ignore
@Test
public void fcnTest() {
public void httpWsTest() {
try {
//第一步：创建服务地址，不是WSDL地址
URL url = new URL("http://192.168.1.30:6394/ws/r/aws_ttsrv4_toptest");//聚力
URL url = new URL("http://192.168.1.30:6394/ws/r/aws_ttsrv4_toptest");//一舟
//第二步：打开一个通向服务地址的连接
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
//第三步：设置参数
......@@ -40,7 +40,7 @@ public class HttpURLConnectionTest {
" <tip:request>123</tip:request>\n" +
" </tip:SRM_fahuoRequest>\n" +
" </soapenv:Body>\n" +
"</soapenv:Envelope>"; //聚力
"</soapenv:Envelope>"; //一舟
OutputStream os = connection.getOutputStream();
os.write(soapXML.getBytes());
......
src/test/java/com/i1/test/erp/JaxWsProxyTest.java
View file @ 3b0afeb9
......@@ -24,7 +24,7 @@ public class JaxWsProxyTest {
" <tip:request>123</tip:request>\n" +
" </tip:SRM_fahuoRequest>\n" +
" </soapenv:Body>\n" +
"</soapenv:Envelope>"; //聚力
"</soapenv:Envelope>"; //一舟
soapXML = "123";
......
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