From 5b5f144abf3e8d5e4cc4d348aae1d6169abea6a6 Mon Sep 17 00:00:00 2001 From: cjl Date: Fri, 11 Jan 2019 08:58:44 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7springboot=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=BE=9D=E8=B5=96=E5=88=B02.0=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=B9=B1=E7=A0=81=EF=BC=8C=E5=8A=A0=E5=85=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=BAproperties?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lang/zh-cn.js" | 26 +- .../lang/zh-tw.js" | 26 +- .../readme.txt" | 4 +- .../skin/default/datepicker.css" | 532 ++++++++--------- .../skin/whyGreen/datepicker.css" | 552 +++++++++--------- erp_web/login.html | 357 +++++------ pom.xml | 25 +- .../java/com/jsh/erp/config/DbConfig.java | 97 --- .../java/com/jsh/erp/config/WebConfig.java | 71 +-- src/main/resources/application-dev.properties | 4 + .../resources/application-prod.properties | 0 .../resources/application-test.properties | 0 src/main/resources/application.properties | 37 ++ src/main/resources/application.yml | 13 - 14 files changed, 845 insertions(+), 899 deletions(-) delete mode 100644 src/main/java/com/jsh/erp/config/DbConfig.java create mode 100644 src/main/resources/application-dev.properties create mode 100644 src/main/resources/application-prod.properties create mode 100644 src/main/resources/application-test.properties create mode 100644 src/main/resources/application.properties delete mode 100644 src/main/resources/application.yml diff --git "a/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-cn.js" "b/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-cn.js" index 5ffa216d..bb9690e4 100644 --- "a/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-cn.js" +++ "b/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-cn.js" @@ -1,14 +1,14 @@ -var $lang={ -errAlertMsg: "不合法的日期格式或者日期超出限定范围,需要撤销吗?", -aWeekStr: ["周","日","一","二","三","四","五","六"], -aLongWeekStr:["周","星期日","星期一","星期二","星期三","星期四","星期五","星期六"], -aMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一","十二"], -aLongMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"], -clearStr: "清空", -todayStr: "今天", -okStr: "确定", -updateStr: "确定", -timeStr: "时间", -quickStr: "快速选择", -err_1: '最小日期不能大于最大日期!' +var $lang={ + errAlertMsg: "涓嶅悎娉曠殑鏃ユ湡鏍煎紡鎴栬呮棩鏈熻秴鍑洪檺瀹氳寖鍥,闇瑕佹挙閿鍚?", + aWeekStr: ["鍛","鏃","涓","浜","涓","鍥","浜","鍏"], + aLongWeekStr:["鍛","鏄熸湡鏃","鏄熸湡涓","鏄熸湡浜","鏄熸湡涓","鏄熸湡鍥","鏄熸湡浜","鏄熸湡鍏"], + aMonStr: ["涓鏈","浜屾湀","涓夋湀","鍥涙湀","浜旀湀","鍏湀","涓冩湀","鍏湀","涔濇湀","鍗佹湀","鍗佷竴","鍗佷簩"], + aLongMonStr: ["涓鏈","浜屾湀","涓夋湀","鍥涙湀","浜旀湀","鍏湀","涓冩湀","鍏湀","涔濇湀","鍗佹湀","鍗佷竴鏈","鍗佷簩鏈"], + clearStr: "娓呯┖", + todayStr: "浠婂ぉ", + okStr: "纭畾", + updateStr: "纭畾", + timeStr: "鏃堕棿", + quickStr: "蹇熼夋嫨", + err_1: '鏈灏忔棩鏈熶笉鑳藉ぇ浜庢渶澶ф棩鏈!' } \ No newline at end of file diff --git "a/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-tw.js" "b/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-tw.js" index aa716ad7..f23c0c12 100644 --- "a/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-tw.js" +++ "b/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-tw.js" @@ -1,14 +1,14 @@ -var $lang={ -errAlertMsg: "不合法的日期格式或者日期超出限定範圍,需要撤銷嗎?", -aWeekStr: ["周","日","一","二","三","四","五","六"], -aLongWeekStr:["周","星期日","星期一","星期二","星期三","星期四","星期五","星期六"], -aMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一","十二"], -aLongMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"], -clearStr: "清空", -todayStr: "今天", -okStr: "確定", -updateStr: "確定", -timeStr: "時間", -quickStr: "快速選擇", -err_1: '最小日期不能大於最大日期!' +var $lang={ + errAlertMsg: "涓嶅悎娉曠殑鏃ユ湡鏍煎紡鎴栬呮棩鏈熻秴鍑洪檺瀹氱瘎鍦,闇瑕佹挙閵峰棊?", + aWeekStr: ["鍛","鏃","涓","浜","涓","鍥","浜","鍏"], + aLongWeekStr:["鍛","鏄熸湡鏃","鏄熸湡涓","鏄熸湡浜","鏄熸湡涓","鏄熸湡鍥","鏄熸湡浜","鏄熸湡鍏"], + aMonStr: ["涓鏈","浜屾湀","涓夋湀","鍥涙湀","浜旀湀","鍏湀","涓冩湀","鍏湀","涔濇湀","鍗佹湀","鍗佷竴","鍗佷簩"], + aLongMonStr: ["涓鏈","浜屾湀","涓夋湀","鍥涙湀","浜旀湀","鍏湀","涓冩湀","鍏湀","涔濇湀","鍗佹湀","鍗佷竴鏈","鍗佷簩鏈"], + clearStr: "娓呯┖", + todayStr: "浠婂ぉ", + okStr: "纰哄畾", + updateStr: "纰哄畾", + timeStr: "鏅傞枔", + quickStr: "蹇熼伕鎿", + err_1: '鏈灏忔棩鏈熶笉鑳藉ぇ鏂兼渶澶ф棩鏈!' } \ No newline at end of file diff --git "a/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/readme.txt" "b/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/readme.txt" index 96f03c24..f7158977 100644 --- "a/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/readme.txt" +++ "b/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/readme.txt" @@ -1,3 +1 @@ -正式发布时,可将此文件夹删去 - - +姝ｅ紡鍙戝竷鏃,鍙皢姝ゆ枃浠跺す鍒犲幓 \ No newline at end of file diff --git "a/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/default/datepicker.css" "b/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/default/datepicker.css" index ecf944f1..9c9c5dc7 100644 --- "a/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/default/datepicker.css" +++ "b/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/default/datepicker.css" @@ -1,267 +1,267 @@ -/* - * My97 DatePicker 4.7 - * 皮肤名称:default - */ - -/* 日期选择容器 DIV */ -.WdateDiv{ - width:180px; - background-color:#FFFFFF; - border:#bbb 1px solid; - padding:2px; -} -/* 双月日历的宽度 */ -.WdateDiv2{ - width:360px; -} -.WdateDiv *{font-size:9pt;} - -/**************************** - * 导航图标 全部是A标签 - ***************************/ -.WdateDiv .NavImg a{ - display:block; - cursor:pointer; - height:16px; - width:16px; -} - -.WdateDiv .NavImgll a{ - float:left; - background:transparent url(img.gif) no-repeat scroll 0 0; -} -.WdateDiv .NavImgl a{ - float:left; - background:transparent url(img.gif) no-repeat scroll -16px 0; -} -.WdateDiv .NavImgr a{ - float:right; - background:transparent url(img.gif) no-repeat scroll -32px 0; -} -.WdateDiv .NavImgrr a{ - float:right; - background:transparent url(img.gif) no-repeat scroll -48px 0; -} - -/**************************** - * 年份月份相关 - ***************************/ -/* 年份月份栏 DIV */ -.WdateDiv #dpTitle{ - height:24px; - margin-bottom:2px; - padding:1px; -} -/* 年份月份输入框 INPUT */ -.WdateDiv .yminput{ - margin-top:2px; - text-align:center; - height:20px; - border:0px; - width:50px; - cursor:pointer; -} -/* 年份月份输入框获得焦点时的样式 INPUT */ -.WdateDiv .yminputfocus{ - margin-top:2px; - text-align:center; - font-weight:bold; - height:20px; - color:blue; - border:#ccc 1px solid; - width:50px; -} -/* 菜单选择框 DIV */ -.WdateDiv .menuSel{ - z-index:1; - position:absolute; - background-color:#FFFFFF; - border:#ccc 1px solid; - display:none; -} -/* 菜单的样式 TD */ -.WdateDiv .menu{ - cursor:pointer; - background-color:#fff; -} -/* 菜单的mouseover样式 TD */ -.WdateDiv .menuOn{ - cursor:pointer; - background-color:#BEEBEE; -} -/* 菜单无效时的样式 TD */ -.WdateDiv .invalidMenu{ - color:#aaa; -} -/* 年选择框的偏移 DIV */ -.WdateDiv .YMenu{ - margin-top:20px; - -} -/* 月选择框的偏移 DIV */ -.WdateDiv .MMenu{ - margin-top:20px; - *width:62px; -} -/* 时选择框的位置 DIV */ -.WdateDiv .hhMenu{ - margin-top:-90px; - margin-left:26px; -} -/* 分选择框的位置 DIV */ -.WdateDiv .mmMenu{ - margin-top:-46px; - margin-left:26px; -} -/* 秒选择框的位置 DIV */ -.WdateDiv .ssMenu{ - margin-top:-24px; - margin-left:26px; -} - -/**************************** - * 周相关 - ***************************/ - .WdateDiv .Wweek { - text-align:center; - background:#DAF3F5; - border-right:#BDEBEE 1px solid; - } -/**************************** - * 星期,日期相关 - ***************************/ -/* 星期栏 TR */ -.WdateDiv .MTitle{ - background-color:#BDEBEE; -} -.WdateDiv .WdayTable2{ - border-collapse:collapse; - border:#c5d9e8 1px solid; -} -.WdateDiv .WdayTable2 table{ - border:0; -} -/* 日期栏表格 TABLE */ -.WdateDiv .WdayTable{ - line-height:20px; - border:#c5d9e8 1px solid; -} -.WdateDiv .WdayTable td{ - text-align:center; -} -/* 日期格的样式 TD */ -.WdateDiv .Wday{ - cursor:pointer; -} -/* 日期格的mouseover样式 TD */ -.WdateDiv .WdayOn{ - cursor:pointer; - background-color:#C0EBEF; -} -/* 周末日期格的样式 TD */ -.WdateDiv .Wwday{ - cursor:pointer; - color:#FF2F2F; -} -/* 周末日期格的mouseover样式 TD */ -.WdateDiv .WwdayOn{ - cursor:pointer; - color:#000; - background-color:#C0EBEF; -} -.WdateDiv .Wtoday{ - cursor:pointer; - color:blue; -} -.WdateDiv .Wselday{ - background-color:#A9E4E9; -} -.WdateDiv .WspecialDay{ - background-color:#66F4DF; -} -/* 其他月份的日期 */ -.WdateDiv .WotherDay{ - cursor:pointer; - color:#6A6AFF; -} -/* 其他月份的日期mouseover样式 */ -.WdateDiv .WotherDayOn{ - cursor:pointer; - background-color:#C0EBEF; -} -/* 无效日期的样式,即在日期范围以外日期格的样式,不能选择的日期 */ -.WdateDiv .WinvalidDay{ - color:#aaa; -} - -/**************************** - * 时间相关 - ***************************/ -/* 时间栏 DIV */ -.WdateDiv #dpTime{ - float:left; - margin-top:3px; - margin-right:30px; -} -/* 时间文字 SPAN */ -.WdateDiv #dpTime #dpTimeStr{ - margin-left:1px; -} -/* 时间输入框 INPUT */ -.WdateDiv #dpTime input{ - width:18px; - height:20px; - text-align:center; - border:#ccc 1px solid; -} -/* 时间 时 INPUT */ -.WdateDiv #dpTime .tB{ - border-right:0px; -} -/* 时间 分和间隔符 ':' INPUT */ -.WdateDiv #dpTime .tE{ - border-left:0; - border-right:0; -} -/* 时间 秒 INPUT */ -.WdateDiv #dpTime .tm{ - width:7px; - border-left:0; - border-right:0; -} -/* 时间右边的向上按钮 BUTTON */ -.WdateDiv #dpTime #dpTimeUp{ - height:10px; - width:13px; - border:0px; - background:url(img.gif) no-repeat -32px -16px; -} -/* 时间右边的向下按钮 BUTTON */ -.WdateDiv #dpTime #dpTimeDown{ - height:10px; - width:13px; - border:0px; - background:url(img.gif) no-repeat -48px -16px; -} -/**************************** - * 其他 - ***************************/ - .WdateDiv #dpQS { - float:left; - margin-right:3px; - margin-top:3px; - background:url(img.gif) no-repeat 0px -16px; - width:20px; - height:20px; - cursor:pointer; - } -.WdateDiv #dpControl { - text-align:right; -} -.WdateDiv .dpButton{ - height:20px; - width:45px; - border:#ccc 1px solid; - margin-top:2px; - margin-right:1px; +/* + * My97 DatePicker 4.7 + * 鐨偆鍚嶇О:default + */ + +/* 鏃ユ湡閫夋嫨瀹瑰櫒 DIV */ +.WdateDiv{ + width:180px; + background-color:#FFFFFF; + border:#bbb 1px solid; + padding:2px; +} +/* 鍙屾湀鏃ュ巻鐨勫搴 */ +.WdateDiv2{ + width:360px; +} +.WdateDiv *{font-size:9pt;} + +/**************************** + * 瀵艰埅鍥炬爣 鍏ㄩ儴鏄疉鏍囩 + ***************************/ +.WdateDiv .NavImg a{ + display:block; + cursor:pointer; + height:16px; + width:16px; +} + +.WdateDiv .NavImgll a{ + float:left; + background:transparent url(img.gif) no-repeat scroll 0 0; +} +.WdateDiv .NavImgl a{ + float:left; + background:transparent url(img.gif) no-repeat scroll -16px 0; +} +.WdateDiv .NavImgr a{ + float:right; + background:transparent url(img.gif) no-repeat scroll -32px 0; +} +.WdateDiv .NavImgrr a{ + float:right; + background:transparent url(img.gif) no-repeat scroll -48px 0; +} + +/**************************** + * 骞翠唤鏈堜唤鐩稿叧 + ***************************/ +/* 骞翠唤鏈堜唤鏍 DIV */ +.WdateDiv #dpTitle{ + height:24px; + margin-bottom:2px; + padding:1px; +} +/* 骞翠唤鏈堜唤杈撳叆妗 INPUT */ +.WdateDiv .yminput{ + margin-top:2px; + text-align:center; + height:20px; + border:0px; + width:50px; + cursor:pointer; +} +/* 骞翠唤鏈堜唤杈撳叆妗嗚幏寰楃劍鐐规椂鐨勬牱寮 INPUT */ +.WdateDiv .yminputfocus{ + margin-top:2px; + text-align:center; + font-weight:bold; + height:20px; + color:blue; + border:#ccc 1px solid; + width:50px; +} +/* 鑿滃崟閫夋嫨妗 DIV */ +.WdateDiv .menuSel{ + z-index:1; + position:absolute; + background-color:#FFFFFF; + border:#ccc 1px solid; + display:none; +} +/* 鑿滃崟鐨勬牱寮 TD */ +.WdateDiv .menu{ + cursor:pointer; + background-color:#fff; +} +/* 鑿滃崟鐨刴ouseover鏍峰紡 TD */ +.WdateDiv .menuOn{ + cursor:pointer; + background-color:#BEEBEE; +} +/* 鑿滃崟鏃犳晥鏃剁殑鏍峰紡 TD */ +.WdateDiv .invalidMenu{ + color:#aaa; +} +/* 骞撮夋嫨妗嗙殑鍋忕Щ DIV */ +.WdateDiv .YMenu{ + margin-top:20px; + +} +/* 鏈堥夋嫨妗嗙殑鍋忕Щ DIV */ +.WdateDiv .MMenu{ + margin-top:20px; + *width:62px; +} +/* 鏃堕夋嫨妗嗙殑浣嶇疆 DIV */ +.WdateDiv .hhMenu{ + margin-top:-90px; + margin-left:26px; +} +/* 鍒嗛夋嫨妗嗙殑浣嶇疆 DIV */ +.WdateDiv .mmMenu{ + margin-top:-46px; + margin-left:26px; +} +/* 绉掗夋嫨妗嗙殑浣嶇疆 DIV */ +.WdateDiv .ssMenu{ + margin-top:-24px; + margin-left:26px; +} + +/**************************** + * 鍛ㄧ浉鍏 + ***************************/ +.WdateDiv .Wweek { + text-align:center; + background:#DAF3F5; + border-right:#BDEBEE 1px solid; +} +/**************************** + * 鏄熸湡,鏃ユ湡鐩稿叧 + ***************************/ +/* 鏄熸湡鏍 TR */ +.WdateDiv .MTitle{ + background-color:#BDEBEE; +} +.WdateDiv .WdayTable2{ + border-collapse:collapse; + border:#c5d9e8 1px solid; +} +.WdateDiv .WdayTable2 table{ + border:0; +} +/* 鏃ユ湡鏍忚〃鏍 TABLE */ +.WdateDiv .WdayTable{ + line-height:20px; + border:#c5d9e8 1px solid; +} +.WdateDiv .WdayTable td{ + text-align:center; +} +/* 鏃ユ湡鏍肩殑鏍峰紡 TD */ +.WdateDiv .Wday{ + cursor:pointer; +} +/* 鏃ユ湡鏍肩殑mouseover鏍峰紡 TD */ +.WdateDiv .WdayOn{ + cursor:pointer; + background-color:#C0EBEF; +} +/* 鍛ㄦ湯鏃ユ湡鏍肩殑鏍峰紡 TD */ +.WdateDiv .Wwday{ + cursor:pointer; + color:#FF2F2F; +} +/* 鍛ㄦ湯鏃ユ湡鏍肩殑mouseover鏍峰紡 TD */ +.WdateDiv .WwdayOn{ + cursor:pointer; + color:#000; + background-color:#C0EBEF; +} +.WdateDiv .Wtoday{ + cursor:pointer; + color:blue; +} +.WdateDiv .Wselday{ + background-color:#A9E4E9; +} +.WdateDiv .WspecialDay{ + background-color:#66F4DF; +} +/* 鍏朵粬鏈堜唤鐨勬棩鏈 */ +.WdateDiv .WotherDay{ + cursor:pointer; + color:#6A6AFF; +} +/* 鍏朵粬鏈堜唤鐨勬棩鏈焟ouseover鏍峰紡 */ +.WdateDiv .WotherDayOn{ + cursor:pointer; + background-color:#C0EBEF; +} +/* 鏃犳晥鏃ユ湡鐨勬牱寮,鍗冲湪鏃ユ湡鑼冨洿浠ュ鏃ユ湡鏍肩殑鏍峰紡,涓嶈兘閫夋嫨鐨勬棩鏈 */ +.WdateDiv .WinvalidDay{ + color:#aaa; +} + +/**************************** + * 鏃堕棿鐩稿叧 + ***************************/ +/* 鏃堕棿鏍 DIV */ +.WdateDiv #dpTime{ + float:left; + margin-top:3px; + margin-right:30px; +} +/* 鏃堕棿鏂囧瓧 SPAN */ +.WdateDiv #dpTime #dpTimeStr{ + margin-left:1px; +} +/* 鏃堕棿杈撳叆妗 INPUT */ +.WdateDiv #dpTime input{ + width:18px; + height:20px; + text-align:center; + border:#ccc 1px solid; +} +/* 鏃堕棿 鏃 INPUT */ +.WdateDiv #dpTime .tB{ + border-right:0px; +} +/* 鏃堕棿 鍒嗗拰闂撮殧绗 ':' INPUT */ +.WdateDiv #dpTime .tE{ + border-left:0; + border-right:0; +} +/* 鏃堕棿 绉 INPUT */ +.WdateDiv #dpTime .tm{ + width:7px; + border-left:0; + border-right:0; +} +/* 鏃堕棿鍙宠竟鐨勫悜涓婃寜閽 BUTTON */ +.WdateDiv #dpTime #dpTimeUp{ + height:10px; + width:13px; + border:0px; + background:url(img.gif) no-repeat -32px -16px; +} +/* 鏃堕棿鍙宠竟鐨勫悜涓嬫寜閽 BUTTON */ +.WdateDiv #dpTime #dpTimeDown{ + height:10px; + width:13px; + border:0px; + background:url(img.gif) no-repeat -48px -16px; +} +/**************************** + * 鍏朵粬 + ***************************/ +.WdateDiv #dpQS { + float:left; + margin-right:3px; + margin-top:3px; + background:url(img.gif) no-repeat 0px -16px; + width:20px; + height:20px; + cursor:pointer; +} +.WdateDiv #dpControl { + text-align:right; +} +.WdateDiv .dpButton{ + height:20px; + width:45px; + border:#ccc 1px solid; + margin-top:2px; + margin-right:1px; } \ No newline at end of file diff --git "a/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/datepicker.css" "b/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/datepicker.css" index 2c3b9b74..122ad3a6 100644 --- "a/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/datepicker.css" +++ "b/erp_web/js/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/datepicker.css" @@ -1,277 +1,277 @@ -/* - * My97 DatePicker 4.7 - * 皮肤名称:whyGreen - */ - -/* 日期选择容器 DIV */ -.WdateDiv{ - width:180px; - background-color:#fff; - border:#C5E1E4 1px solid; - padding:2px; -} -/* 双月日历的宽度 */ -.WdateDiv2{ - width:360px; -} -.WdateDiv *{font-size:9pt;} - -/**************************** - * 导航图标 全部是A标签 - ***************************/ -.WdateDiv .NavImg a{ - cursor:pointer; - display:block; - width:16px; - height:16px; - margin-top:1px; -} - -.WdateDiv .NavImgll a{ - float:left; - background:url(img.gif) no-repeat; -} -.WdateDiv .NavImgl a{ - float:left; - background:url(img.gif) no-repeat -16px 0px; -} -.WdateDiv .NavImgr a{ - float:right; - background:url(img.gif) no-repeat -32px 0px; -} -.WdateDiv .NavImgrr a{ - float:right; - background:url(img.gif) no-repeat -48px 0px; -} -/**************************** - * 年份月份相关 - ***************************/ -/* 年份月份栏 DIV */ -.WdateDiv #dpTitle{ - height:24px; - padding:1px; - border:#c5d9e8 1px solid; - background:url(bg.jpg); - margin-bottom:2px; -} -/* 年份月份输入框 INPUT */ -.WdateDiv .yminput{ - margin-top:2px; - text-align:center; - border:0px; - height:20px; - width:50px; - color:#034c50; - background-color:transparent; - cursor:pointer; -} -/* 年份月份输入框获得焦点时的样式 INPUT */ -.WdateDiv .yminputfocus{ - margin-top:2px; - text-align:center; - border:#939393 1px solid; - font-weight:bold; - color:#034c50; - height:20px; - width:50px; -} -/* 菜单选择框 DIV */ -.WdateDiv .menuSel{ - z-index:1; - position:absolute; - background-color:#FFFFFF; - border:#A3C6C8 1px solid; - display:none; -} -/* 菜单的样式 TD */ -.WdateDiv .menu{ - cursor:pointer; - background-color:#fff; - color:#11777C; -} -/* 菜单的mouseover样式 TD */ -.WdateDiv .menuOn{ - cursor:pointer; - background-color:#BEEBEE; -} -/* 菜单无效时的样式 TD */ -.WdateDiv .invalidMenu{ - color:#aaa; -} -/* 年选择框的偏移 DIV */ -.WdateDiv .YMenu{ - margin-top:20px; -} -/* 月选择框的偏移 DIV */ -.WdateDiv .MMenu{ - margin-top:20px; - *width:62px; -} -/* 时选择框的位置 DIV */ -.WdateDiv .hhMenu{ - margin-top:-90px; - margin-left:26px; -} -/* 分选择框的位置 DIV */ -.WdateDiv .mmMenu{ - margin-top:-46px; - margin-left:26px; -} -/* 秒选择框的位置 DIV */ -.WdateDiv .ssMenu{ - margin-top:-24px; - margin-left:26px; -} - -/**************************** - * 周相关 - ***************************/ - .WdateDiv .Wweek { - text-align:center; - background:#DAF3F5; - border-right:#BDEBEE 1px solid; - } -/**************************** - * 星期,日期相关 - ***************************/ - /* 星期栏 TR */ -.WdateDiv .MTitle{ - color:#13777e; - background-color:#bdebee; -} -.WdateDiv .WdayTable2{ - border-collapse:collapse; - border:#BEE9F0 1px solid; -} -.WdateDiv .WdayTable2 table{ - border:0; -} -/* 日期栏表格 TABLE */ -.WdateDiv .WdayTable{ - line-height:20px; - color:#13777e; - background-color:#edfbfb; - border:#BEE9F0 1px solid; -} -.WdateDiv .WdayTable td{ - text-align:center; -} -/* 日期格的样式 TD */ -.WdateDiv .Wday{ - cursor:pointer; -} -/* 日期格的mouseover样式 TD */ -.WdateDiv .WdayOn{ - cursor:pointer; - background-color:#74d2d9 ; -} -/* 周末日期格的样式 TD */ -.WdateDiv .Wwday{ - cursor:pointer; - color:#ab1e1e; -} -/* 周末日期格的mouseover样式 TD */ -.WdateDiv .WwdayOn{ - cursor:pointer; - background-color:#74d2d9; -} -.WdateDiv .Wtoday{ - cursor:pointer; - color:blue; -} -.WdateDiv .Wselday{ - background-color:#A7E2E7; -} -.WdateDiv .WspecialDay{ - background-color:#66F4DF; -} -/* 其他月份的日期 */ -.WdateDiv .WotherDay{ - cursor:pointer; - color:#0099CC; -} -/* 其他月份的日期mouseover样式 */ -.WdateDiv .WotherDayOn{ - cursor:pointer; - background-color:#C0EBEF; -} -/* 无效日期的样式,即在日期范围以外日期格的样式,不能选择的日期 */ -.WdateDiv .WinvalidDay{ - color:#aaa; -} - -/**************************** - * 时间相关 - ***************************/ -/* 时间栏 DIV */ -.WdateDiv #dpTime{ - float:left; - margin-top:3px; - margin-right:30px; -} -/* 时间文字 SPAN */ -.WdateDiv #dpTime #dpTimeStr{ - margin-left:1px; - color:#497F7F; -} -/* 时间输入框 INPUT */ -.WdateDiv #dpTime input{ - height:20px; - width:18px; - text-align:center; - color:#333; - border:#61CAD0 1px solid; -} -/* 时间 时 INPUT */ -.WdateDiv #dpTime .tB{ - border-right:0px; -} -/* 时间 分和间隔符 ':' INPUT */ -.WdateDiv #dpTime .tE{ - border-left:0; - border-right:0; -} -/* 时间 秒 INPUT */ -.WdateDiv #dpTime .tm{ - width:7px; - border-left:0; - border-right:0; -} -/* 时间右边的向上按钮 BUTTON */ -.WdateDiv #dpTime #dpTimeUp{ - height:10px; - width:13px; - border:0px; - background:url(img.gif) no-repeat -32px -16px; -} -/* 时间右边的向下按钮 BUTTON */ -.WdateDiv #dpTime #dpTimeDown{ - height:10px; - width:13px; - border:0px; - background:url(img.gif) no-repeat -48px -16px; -} -/**************************** - * 其他 - ***************************/ - .WdateDiv #dpQS { - float:left; - margin-right:3px; - margin-top:3px; - background:url(img.gif) no-repeat 0px -16px; - width:20px; - height:20px; - cursor:pointer; - } -.WdateDiv #dpControl { - text-align:right; - margin-top:3px; -} -.WdateDiv .dpButton{ - height:20px; - width:45px; - margin-top:2px; - border:#38B1B9 1px solid; - background-color:#CFEBEE; - color:#08575B; +/* + * My97 DatePicker 4.7 + * 鐨偆鍚嶇О:whyGreen + */ + +/* 鏃ユ湡閫夋嫨瀹瑰櫒 DIV */ +.WdateDiv{ + width:180px; + background-color:#fff; + border:#C5E1E4 1px solid; + padding:2px; +} +/* 鍙屾湀鏃ュ巻鐨勫搴 */ +.WdateDiv2{ + width:360px; +} +.WdateDiv *{font-size:9pt;} + +/**************************** + * 瀵艰埅鍥炬爣 鍏ㄩ儴鏄疉鏍囩 + ***************************/ +.WdateDiv .NavImg a{ + cursor:pointer; + display:block; + width:16px; + height:16px; + margin-top:1px; +} + +.WdateDiv .NavImgll a{ + float:left; + background:url(img.gif) no-repeat; +} +.WdateDiv .NavImgl a{ + float:left; + background:url(img.gif) no-repeat -16px 0px; +} +.WdateDiv .NavImgr a{ + float:right; + background:url(img.gif) no-repeat -32px 0px; +} +.WdateDiv .NavImgrr a{ + float:right; + background:url(img.gif) no-repeat -48px 0px; +} +/**************************** + * 骞翠唤鏈堜唤鐩稿叧 + ***************************/ +/* 骞翠唤鏈堜唤鏍 DIV */ +.WdateDiv #dpTitle{ + height:24px; + padding:1px; + border:#c5d9e8 1px solid; + background:url(bg.jpg); + margin-bottom:2px; +} +/* 骞翠唤鏈堜唤杈撳叆妗 INPUT */ +.WdateDiv .yminput{ + margin-top:2px; + text-align:center; + border:0px; + height:20px; + width:50px; + color:#034c50; + background-color:transparent; + cursor:pointer; +} +/* 骞翠唤鏈堜唤杈撳叆妗嗚幏寰楃劍鐐规椂鐨勬牱寮 INPUT */ +.WdateDiv .yminputfocus{ + margin-top:2px; + text-align:center; + border:#939393 1px solid; + font-weight:bold; + color:#034c50; + height:20px; + width:50px; +} +/* 鑿滃崟閫夋嫨妗 DIV */ +.WdateDiv .menuSel{ + z-index:1; + position:absolute; + background-color:#FFFFFF; + border:#A3C6C8 1px solid; + display:none; +} +/* 鑿滃崟鐨勬牱寮 TD */ +.WdateDiv .menu{ + cursor:pointer; + background-color:#fff; + color:#11777C; +} +/* 鑿滃崟鐨刴ouseover鏍峰紡 TD */ +.WdateDiv .menuOn{ + cursor:pointer; + background-color:#BEEBEE; +} +/* 鑿滃崟鏃犳晥鏃剁殑鏍峰紡 TD */ +.WdateDiv .invalidMenu{ + color:#aaa; +} +/* 骞撮夋嫨妗嗙殑鍋忕Щ DIV */ +.WdateDiv .YMenu{ + margin-top:20px; +} +/* 鏈堥夋嫨妗嗙殑鍋忕Щ DIV */ +.WdateDiv .MMenu{ + margin-top:20px; + *width:62px; +} +/* 鏃堕夋嫨妗嗙殑浣嶇疆 DIV */ +.WdateDiv .hhMenu{ + margin-top:-90px; + margin-left:26px; +} +/* 鍒嗛夋嫨妗嗙殑浣嶇疆 DIV */ +.WdateDiv .mmMenu{ + margin-top:-46px; + margin-left:26px; +} +/* 绉掗夋嫨妗嗙殑浣嶇疆 DIV */ +.WdateDiv .ssMenu{ + margin-top:-24px; + margin-left:26px; +} + +/**************************** + * 鍛ㄧ浉鍏 + ***************************/ +.WdateDiv .Wweek { + text-align:center; + background:#DAF3F5; + border-right:#BDEBEE 1px solid; +} +/**************************** + * 鏄熸湡,鏃ユ湡鐩稿叧 + ***************************/ +/* 鏄熸湡鏍 TR */ +.WdateDiv .MTitle{ + color:#13777e; + background-color:#bdebee; +} +.WdateDiv .WdayTable2{ + border-collapse:collapse; + border:#BEE9F0 1px solid; +} +.WdateDiv .WdayTable2 table{ + border:0; +} +/* 鏃ユ湡鏍忚〃鏍 TABLE */ +.WdateDiv .WdayTable{ + line-height:20px; + color:#13777e; + background-color:#edfbfb; + border:#BEE9F0 1px solid; +} +.WdateDiv .WdayTable td{ + text-align:center; +} +/* 鏃ユ湡鏍肩殑鏍峰紡 TD */ +.WdateDiv .Wday{ + cursor:pointer; +} +/* 鏃ユ湡鏍肩殑mouseover鏍峰紡 TD */ +.WdateDiv .WdayOn{ + cursor:pointer; + background-color:#74d2d9 ; +} +/* 鍛ㄦ湯鏃ユ湡鏍肩殑鏍峰紡 TD */ +.WdateDiv .Wwday{ + cursor:pointer; + color:#ab1e1e; +} +/* 鍛ㄦ湯鏃ユ湡鏍肩殑mouseover鏍峰紡 TD */ +.WdateDiv .WwdayOn{ + cursor:pointer; + background-color:#74d2d9; +} +.WdateDiv .Wtoday{ + cursor:pointer; + color:blue; +} +.WdateDiv .Wselday{ + background-color:#A7E2E7; +} +.WdateDiv .WspecialDay{ + background-color:#66F4DF; +} +/* 鍏朵粬鏈堜唤鐨勬棩鏈 */ +.WdateDiv .WotherDay{ + cursor:pointer; + color:#0099CC; +} +/* 鍏朵粬鏈堜唤鐨勬棩鏈焟ouseover鏍峰紡 */ +.WdateDiv .WotherDayOn{ + cursor:pointer; + background-color:#C0EBEF; +} +/* 鏃犳晥鏃ユ湡鐨勬牱寮,鍗冲湪鏃ユ湡鑼冨洿浠ュ鏃ユ湡鏍肩殑鏍峰紡,涓嶈兘閫夋嫨鐨勬棩鏈 */ +.WdateDiv .WinvalidDay{ + color:#aaa; +} + +/**************************** + * 鏃堕棿鐩稿叧 + ***************************/ +/* 鏃堕棿鏍 DIV */ +.WdateDiv #dpTime{ + float:left; + margin-top:3px; + margin-right:30px; +} +/* 鏃堕棿鏂囧瓧 SPAN */ +.WdateDiv #dpTime #dpTimeStr{ + margin-left:1px; + color:#497F7F; +} +/* 鏃堕棿杈撳叆妗 INPUT */ +.WdateDiv #dpTime input{ + height:20px; + width:18px; + text-align:center; + color:#333; + border:#61CAD0 1px solid; +} +/* 鏃堕棿 鏃 INPUT */ +.WdateDiv #dpTime .tB{ + border-right:0px; +} +/* 鏃堕棿 鍒嗗拰闂撮殧绗 ':' INPUT */ +.WdateDiv #dpTime .tE{ + border-left:0; + border-right:0; +} +/* 鏃堕棿 绉 INPUT */ +.WdateDiv #dpTime .tm{ + width:7px; + border-left:0; + border-right:0; +} +/* 鏃堕棿鍙宠竟鐨勫悜涓婃寜閽 BUTTON */ +.WdateDiv #dpTime #dpTimeUp{ + height:10px; + width:13px; + border:0px; + background:url(img.gif) no-repeat -32px -16px; +} +/* 鏃堕棿鍙宠竟鐨勫悜涓嬫寜閽 BUTTON */ +.WdateDiv #dpTime #dpTimeDown{ + height:10px; + width:13px; + border:0px; + background:url(img.gif) no-repeat -48px -16px; +} +/**************************** + * 鍏朵粬 + ***************************/ +.WdateDiv #dpQS { + float:left; + margin-right:3px; + margin-top:3px; + background:url(img.gif) no-repeat 0px -16px; + width:20px; + height:20px; + cursor:pointer; +} +.WdateDiv #dpControl { + text-align:right; + margin-top:3px; +} +.WdateDiv .dpButton{ + height:20px; + width:45px; + margin-top:2px; + border:#38B1B9 1px solid; + background-color:#CFEBEE; + color:#08575B; } \ No newline at end of file diff --git a/erp_web/login.html b/erp_web/login.html index fbf3cf42..96131d1c 100644 --- a/erp_web/login.html +++ b/erp_web/login.html @@ -1,179 +1,180 @@ - - - - ERP绯荤粺 - - - - - - - - - -
-
-
-

login

-

- -

-

- -

- - - - - -
- -
-
- - + + + + ERP绯荤粺 + + + + + + + + + +
+
+
+

login

+

+ +

+

+ +

+ + + + + +
+ +
+
+ + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 67881160..4e4cfd75 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,30 @@ 4.0.0 + + + dev + + dev + + + true + + + + test + + test + + + + prod + + prod + + + com.jsh jshERP 2.0.2-SNAPSHOT @@ -14,7 +37,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.1.RELEASE + 2.0.0.RELEASE diff --git a/src/main/java/com/jsh/erp/config/DbConfig.java b/src/main/java/com/jsh/erp/config/DbConfig.java deleted file mode 100644 index 7ba75140..00000000 --- a/src/main/java/com/jsh/erp/config/DbConfig.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.jsh.erp.config; - -import com.alibaba.druid.pool.DruidDataSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -import javax.sql.DataSource; - - -@Configuration -@EnableTransactionManagement(proxyTargetClass = true) -public class DbConfig { - private static final Logger logger = LoggerFactory.getLogger(DbConfig.class); - - @Bean(name = "erpDatasource") - @Primary - public DataSource erpDatasource(ErpDatasourceProperties properties){ - try { - DruidDataSource datasource = new DruidDataSource(); - datasource.setDriverClassName(properties.driverClassName); - datasource.setUrl(properties.url); - datasource.setUsername(properties.username); - datasource.setPassword(properties.password); - datasource.setInitialSize(1); - datasource.setMinIdle(1); - datasource.setMaxWait(60000); - datasource.setMaxActive(5); - datasource.setTimeBetweenEvictionRunsMillis(60000); - datasource.setValidationQuery("select '1'"); - datasource.setTestOnBorrow(false); - datasource.setTestOnReturn(false); - datasource.setTestWhileIdle(true); - datasource.setPoolPreparedStatements(true); - datasource.setMaxOpenPreparedStatements(20); - datasource.setMinEvictableIdleTimeMillis(300000); - datasource.init(); - return datasource; - }catch (Exception e){ - logger.error("鏈嶅姟鍚姩澶辫触锛宩sh_erp鏁版嵁搴揇atasource鍒濆鍖栧け璐:"+e.getMessage()); - throw new IllegalArgumentException(e); - } - } - - @Bean - @Primary - public JdbcTemplate jdbcTemplate(@Qualifier("erpDatasource") DataSource dataSource) { - return new JdbcTemplate(dataSource); - } - - @Configuration - @ConfigurationProperties(prefix = "erpDatasource") - public static class ErpDatasourceProperties { - private String driverClassName; - private String url; - private String username; - private String password; - - public String getDriverClassName() { - return driverClassName; - } - - public void setDriverClassName(String driverClassName) { - this.driverClassName = driverClassName; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - } -} diff --git a/src/main/java/com/jsh/erp/config/WebConfig.java b/src/main/java/com/jsh/erp/config/WebConfig.java index 3ee2c26a..0699244b 100644 --- a/src/main/java/com/jsh/erp/config/WebConfig.java +++ b/src/main/java/com/jsh/erp/config/WebConfig.java @@ -1,40 +1,33 @@ -package com.jsh.erp.config; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer; -import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; -import java.io.File; - -@Configuration -public class WebConfig { - private static final Logger logger = LoggerFactory.getLogger(WebConfig.class); - - @Configuration - @ConfigurationProperties(prefix = "web.front") - public static class FrontEnd implements EmbeddedServletContainerCustomizer { - private File baseDir; - - public File getBaseDir() { - return baseDir; - } - - public void setBaseDir(File baseDir) { - this.baseDir = baseDir; - } - - @Override - public void customize(ConfigurableEmbeddedServletContainer container) { - if (!baseDir.exists()) { - if (!baseDir.mkdir()) { - logger.info("create web.front base path:" + baseDir + " failed!already exists!"); - } else { - logger.info("create web.front base path:" + baseDir + " success!"); - } - } - container.setDocumentRoot(baseDir); - } - } +package com.jsh.erp.config; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; +import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory; +import org.springframework.context.annotation.Configuration; + +import java.io.File; + +//@Configuration +public class WebConfig { + private static final Logger logger = LoggerFactory.getLogger(WebConfig.class); + + @Configuration + public static class FrontEnd implements WebServerFactoryCustomizer { + @Value("${web.front.baseDir}") + private File baseDir; + + @Override + public void customize(ConfigurableServletWebServerFactory factory) { + if (!baseDir.exists()) { + if (!baseDir.mkdir()) { + logger.info("create web.front base path:" + baseDir + " failed!already exists!"); + } else { + logger.info("create web.front base path:" + baseDir + " success!"); + } + } + factory.setDocumentRoot(baseDir); + } + } } \ No newline at end of file diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 00000000..463f95a6 --- /dev/null +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,4 @@ +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false +spring.datasource.driverClassName=com.mysql.jdbc.Driver +spring.datasource.username=root +spring.datasource.password=123456 \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..c3d78d4c --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,37 @@ +server.port=9000 +#spring.application.name=erp +#eureka.client.service-url.defaultZone=http://sinldo-eureka:8001/eureka/ +#eureka.client.service-url.defaultZone=http://localhost:8001/eureka/ +#eureka.instance.instance-id=${spring.application.name}-instance-${random.value} +#eureka.instance.prefer-ip-address=true +spring.profiles.active=@activatedProperties@ +#generatorConfig专用属性 +project=src/main/java +resource=src/main/resources +web.front.baseDir=erp_web +#web.front.baseDir=erp_web +mybatis.type-aliases-package=com.chinamobile.model.* +mybatis.mapper-locations=classpath:./mapper_xml/*.xml + + +spring.cas.sign-out-filters=/logout +spring.cas.auth-filters=/* +spring.cas.validate-filters=/* +spring.cas.request-wrapper-filters=/* +spring.cas.assertion-filters=/* +spring.cas.cas-server-login-url=http://localhost:8080/login +spring.cas.cas-server-url-prefix=http://localhost:8080 +spring.cas.redirect-after-validation=true +spring.cas.use-session=true +spring.cas.server-name=http://localhost:9000 + + +##静态资源路径 +#spring.mvc.view.prefix=/templates/ +#spring.mvc.view.suffix=.html +#spring.mvc.static-path-pattern=/** + + + + + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml deleted file mode 100644 index b31e0135..00000000 --- a/src/main/resources/application.yml +++ /dev/null @@ -1,13 +0,0 @@ -server: - port: 80 -erpDatasource: - driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false - username: root - password: 1234 -web: - front: - base-dir: erp_web -mybatis: - mapperLocations: classpath:mapper_xml/*.xml #涓瀹氳瀵瑰簲mapper鏄犲皠xml鏂囦欢鐨勬墍鍦ㄨ矾寰 - executorType: SIMPLE \ No newline at end of file -- GitLab From 9c6215af992e7d629ba22c8842256abbd3cab3d3 Mon Sep 17 00:00:00 2001 From: cjl Date: Fri, 11 Jan 2019 09:06:18 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c3d78d4c..6a356137 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,7 +5,7 @@ server.port=9000 #eureka.instance.instance-id=${spring.application.name}-instance-${random.value} #eureka.instance.prefer-ip-address=true spring.profiles.active=@activatedProperties@ -#generatorConfig专用属性 +#generatorConfig涓撶敤灞炴 project=src/main/java resource=src/main/resources web.front.baseDir=erp_web @@ -26,7 +26,7 @@ spring.cas.use-session=true spring.cas.server-name=http://localhost:9000 -##静态资源路径 +##闈欐佽祫婧愯矾寰 #spring.mvc.view.prefix=/templates/ #spring.mvc.view.suffix=.html #spring.mvc.static-path-pattern=/** -- GitLab From 22215b9b0b57e1c0790bf3ea5659c960c6e781c8 Mon Sep 17 00:00:00 2001 From: cjl Date: Fri, 11 Jan 2019 09:50:58 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=8F=B7=E4=B8=BA=E5=B8=B8=E7=94=A88080?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6a356137..c234628a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.port=9000 +server.port=8080 #spring.application.name=erp #eureka.client.service-url.defaultZone=http://sinldo-eureka:8001/eureka/ #eureka.client.service-url.defaultZone=http://localhost:8001/eureka/ -- GitLab From 5df1748c794e7d22fecc1f4f8331fea4649acaed Mon Sep 17 00:00:00 2001 From: cjl Date: Fri, 11 Jan 2019 11:46:06 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E8=BF=87?= =?UTF-8?q?=E9=95=BF=E6=97=B6=EF=BC=8C=E8=B6=85=E5=87=BA=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/common/main.html | 305 +++++++++++++++++---------------- 1 file changed, 160 insertions(+), 145 deletions(-) diff --git a/erp_web/pages/common/main.html b/erp_web/pages/common/main.html index 3199cdce..54a3b298 100644 --- a/erp_web/pages/common/main.html +++ b/erp_web/pages/common/main.html @@ -1,146 +1,161 @@ - - - - - ERP绯荤粺 - - - - -
- -
-
-
鎮ㄦ鍦ㄤ娇鐢ㄧ殑IE娴忚鍣ㄧ増鏈繃浣庯紝
鎴戜滑寤鸿鎮ㄥ崌绾ф垨鑰呮洿鎹㈡祻瑙堝櫒锛屼互渚夸綋楠岄『鐣呫佸吋瀹广佸畨鍏ㄧ殑浜掕仈缃戙
-
閫夋嫨涓娆鏂娴忚鍣ㄥ惂
-
- ie娴忚鍣 - 璋锋瓕娴忚鍣 - 鐏嫄娴忚鍣 - opera娴忚鍣 - safari娴忚鍣 -
-
[ 瀵笽E6璇村啀瑙 ] -
-
-
- -
-
-
鈥鈥
- 脳
-
-
-
-
-
-
-
-
-
-
- - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - + + + + + ERP绯荤粺 + + + + + +
+ +
+
+
鎮ㄦ鍦ㄤ娇鐢ㄧ殑IE娴忚鍣ㄧ増鏈繃浣庯紝
鎴戜滑寤鸿鎮ㄥ崌绾ф垨鑰呮洿鎹㈡祻瑙堝櫒锛屼互渚夸綋楠岄『鐣呫佸吋瀹广佸畨鍏ㄧ殑浜掕仈缃戙
+
閫夋嫨涓娆鏂娴忚鍣ㄥ惂
+
+ ie娴忚鍣 + 璋锋瓕娴忚鍣 + 鐏嫄娴忚鍣 + opera娴忚鍣 + safari娴忚鍣 +
+
[ 瀵笽E6璇村啀瑙 ] +
+
+
+ +
+
+
鈥鈥
+ 脳
+
+
+
+
+
+
+
+
+
+
+ + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- GitLab From 85d96bb2265182d96330392bc4650c6c6f85aa7b Mon Sep 17 00:00:00 2001 From: cjl Date: Fri, 11 Jan 2019 16:07:43 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/common/main.html | 2 +- .../erp/controller/AccountHeadController.java | 298 +-- .../erp/controller/AccountItemController.java | 256 +-- .../erp/controller/DepotItemController.java | 1703 ++++++++--------- .../jsh/erp/service/CommonQueryManager.java | 257 +-- .../erp/service/account/AccountService.java | 620 +++--- .../accountHead/AccountHeadService.java | 237 +-- .../accountItem/AccountItemService.java | 239 ++- .../com/jsh/erp/service/app/AppService.java | 175 +- .../jsh/erp/service/depot/DepotService.java | 187 +- .../service/depotHead/DepotHeadService.java | 490 ++--- .../service/depotItem/DepotItemService.java | 582 ++++-- .../service/functions/FunctionsService.java | 191 +- .../service/inOutItem/InOutItemService.java | 163 +- .../com/jsh/erp/service/log/LogService.java | 141 +- .../erp/service/material/MaterialService.java | 320 ++-- .../MaterialCategoryService.java | 161 +- .../MaterialPropertyService.java | 133 +- .../jsh/erp/service/person/PersonService.java | 191 +- .../com/jsh/erp/service/role/RoleService.java | 146 +- .../erp/service/supplier/SupplierService.java | 245 +-- .../systemConfig/SystemConfigService.java | 139 +- .../com/jsh/erp/service/unit/UnitService.java | 141 +- .../com/jsh/erp/service/user/UserService.java | 304 +-- .../userBusiness/UserBusinessService.java | 206 +- 25 files changed, 3856 insertions(+), 3671 deletions(-) diff --git a/erp_web/pages/common/main.html b/erp_web/pages/common/main.html index 54a3b298..2be5c92e 100644 --- a/erp_web/pages/common/main.html +++ b/erp_web/pages/common/main.html @@ -7,7 +7,7 @@