update index

This commit is contained in:
东皇 2017-10-17 11:58:23 +08:00
parent 75c5f982ac
commit 6a1a1f3a95
5 changed files with 106 additions and 16 deletions

View File

@ -13,13 +13,13 @@ App = Ember.Application.extend({
Resolver Resolver
}); });
// if (config.environment === 'production') { if (config.environment === 'production') {
// Ember.$.ajaxSetup({ Ember.$.ajaxSetup({
// beforeSend(jqXHR, opt) { beforeSend(jqXHR, opt) {
// opt.url = '/api/' + opt.url; opt.url = '/crm-api/' + opt.url;
// } }
// }); });
// } }
loadInitializers(App, config.modulePrefix); loadInitializers(App, config.modulePrefix);

View File

@ -1,15 +1,42 @@
{{!home-board}} {{!home-board}}
{{#main-content}} {{#main-content}}
<div class="col-sm-12"> <div class="col-sm-12">
<h3>User Tips: </h3> <h3>User tips: </h3>
<p class="bold">&nbsp;&nbsp;&nbsp;&nbsp;Customer Status:</p> <p class="bold">&nbsp;&nbsp;&nbsp;&nbsp;Customer Status:</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Active Auto assigned, Active customer, with PO in current year</p> <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Active Auto assigned, Active customer, with PO in current year</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Occasional Auto assigned, Not very active, no PO in current year, but occasional PO within past 2 years</p> <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Occasional Auto assigned, Not very active, no PO in current year, but occasional PO within past 2 years</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sleeping Auto assigned, Sleeping customer and no PO within past 2 years, still use PUSH-PULL</p> <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sleeping Auto assigned, Sleeping customer and no PO within past 2 years, still use PUSH-PULL</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NA Manually assigned, Not PUSH-PULL customer anymore</p> <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NA Manually assigned, Not PUSH-PULL customer anymore</p>
<p class="bold">&nbsp;&nbsp;&nbsp;&nbsp;LMCN Week Goals: </p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;每次访客时100%向需要的客户推广:新产品、光纤、组件和技术研讨会。</p>
<hr />
<h3>Admin Tips: </h3> <h3>Admin Tips: </h3>
<p>&nbsp;&nbsp;&nbsp;&nbsp;Step 1 Import Customers: QAD 2.2.23 </p> <p>&nbsp;&nbsp;&nbsp;&nbsp;Step 1 Import Customers: QAD 2.2.23</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;Step 2 Import Sales Data: QAD 7.17.13 </p> <p>&nbsp;&nbsp;&nbsp;&nbsp;Step 2 Import Sales Data: QAD 7.17.13</p>
{{!--
User Tips:
Customer Status:
Active Auto assigned, active customer, with PO in current year
Occasional Auto assigned, not very active, no PO in current year, but occasional PO within past 2 years
Sleeping Auto assigned, no PO in current year and in past 2 years, but still use PUSH-PULL
NA Manually assigned, not PUSH-PULL customer anymore
LMCN week goals:
每次访客时100%向需要的客户推广:新产品、光纤、组件和技术研讨会。
Admin Tips:
Step 1 Import Customers: QAD 2.2.23
Step 2 Import Sales Data: QAD 7.17.13
--}}
</div> </div>
{{/main-content}} {{/main-content}}

32
web/build_jar Executable file
View File

@ -0,0 +1,32 @@
#!/bin/sh
# get real path of softlink
get_real_path() {
local f="$1"
while [ -h "$f" ]; do
ls=`ls -ld "$f"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
f="$link"
else
f=`dirname "$f"`/"$link"
fi
done
eval "$2"="'$f'"
}
currDir=$(pwd)
get_real_path "$0" prg_path
echo "Script Path [$prg_path]"
# Service Home
pushd $(dirname "$prg_path") > /dev/null
PROJECT_HOME=$(dirname $(pwd))
popd > /dev/null
# ember build
targetPath="$PROJECT_HOME/server/crm/src/main/resources/static"
rm -rf "$targetPath"
cd "$PROJECT_HOME/web"
ember b -prod -o "$targetPath"
cd "$currDir"

View File

@ -25,8 +25,39 @@ PROJECT_HOME=$(dirname $(pwd))
popd > /dev/null popd > /dev/null
# ember build # ember build
targetPath="$PROJECT_HOME/server/crm/src/main/resources/static"
rm -rf "$targetPath"
cd "$PROJECT_HOME/web" cd "$PROJECT_HOME/web"
ember b -prod -o "$targetPath"
if [ "$1" = "prod" ]; then
SERVER=lemo@116.62.189.211
else
# SERVER=ambition@101.236.35.13
SERVER=lemo@116.62.189.211
fi
projName="lemo-crm-web"
targetPath="/data/program"
tgzFile="${projName}.tgz"
backupDir="${projName}_prev"
ember b -prod -o "${projName}"
# package dist
echo "tar czf ${tgzFile} ${projName}"
tar czf "${tgzFile}" "${projName}"
# remove backup
echo "ssh ${SERVER} rm -rf ${targetPath}/${backupDir} && mv ${targetPath}/${projName} ${targetPath}/${backupDir}"
ssh "${SERVER}" "rm -rf ${targetPath}/${backupDir} && mv ${targetPath}/${projName} ${targetPath}/${backupDir}"
# copy pakage to server
echo "scp ${tgzFile} ${SERVER}:${targetPath}/"
scp "${tgzFile}" "${SERVER}:${targetPath}/"
# extract package
ssh "${SERVER}" "tar xzf ${targetPath}/${tgzFile} -C ${targetPath} && rm -rf ${targetPath}/${tgzFile}"
# clean up
echo "rm -rf ${projName} ${tgzFile}"
rm -rf "${projName}" "${tgzFile}"
cd "$currDir" cd "$currDir"

View File

@ -2,8 +2,8 @@
rm -rf tmp dist rm -rf tmp dist
if [ "$1" = "test" ]; then if [ "$1" = "prod" ]; then
ember s -p 4201 -pr http://101.236.35.13/ ember s -p 4201 -pr http://116.62.189.211/
else else
ember s -pr http://127.0.0.1:8088/ ember s -pr http://127.0.0.1:8088/
fi fi