url change and some small change -- frank

atms-api/src/main/resources/conf/conf_profile_dev.properties

@@ -18,7 +18,7 @@ email.password=7C4858868DDFAAFBFCE08C57997427A3
 email.aesKey=47CA9CA045075A721E16B111536BD3C5
 
 
-web.url=http://dts.erp.didichuxing.com:8080
+web.url=http://localhost:8080
 #web.url=*
 jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
@@ -37,7 +37,7 @@ distributed_id_datacenter=1
 distributed_id_machine=1
 id.generator.mapping={1:"127.0.0.1", 2:"10.158.230.16", 3:"10.158.141.14"}
 
-api.url=http://dts.erp.didichuxing.com:8180
+api.url=http://localhost:8180
 
 # Longi config
 longi_api_basic_user=

atms-web/src/main/java/pwc/taxtech/atms/web/controller/AccountController.java

@@ -176,8 +176,7 @@ public class AccountController {
     }
 
     @RequestMapping(value = {"/LogOut", "/Logout"}, produces = "text/html;charset=UTF-8")
-    public void logout(HttpServletRequest request, HttpServletResponse response) {
-        try {
+    public ModelAndView logout(HttpServletRequest request, HttpServletResponse response) {
         HttpSession session = request.getSession(false);
         if (session != null) {
             // 删除会话
@@ -186,25 +185,9 @@ public class AccountController {
         Cookie cookie = new Cookie("AtmsApiToken", "");
         cookie.setPath("/");
         cookie.setMaxAge(0);
-            Cookie ddCodeCookie = new Cookie("ddCode", "");
-            ddCodeCookie.setPath("/");
-            ddCodeCookie.setMaxAge(0);
-            Cookie ddTicketCookie = new Cookie("ddTicket", "");
-            ddTicketCookie.setPath("/");
-            ddTicketCookie.setMaxAge(0);
-            Cookie ddJumptoCookie = new Cookie("ddJumpto", "");
-            ddJumptoCookie.setPath("/");
-            ddJumptoCookie.setMaxAge(0);
         // 删除Cookie
         response.addCookie(cookie);
-            response.addCookie(ddCodeCookie);
-            response.addCookie(ddTicketCookie);
-            response.addCookie(ddJumptoCookie);
-            // todo 这里写死为DD的登出地址了
-            response.sendRedirect("http://mis.diditaxi.com.cn/auth/ldap/logout?app_id=2500&jumpto=http://dts-test.erp.didichuxing.com/sso/accept");
-        } catch (Exception e) {
-            logger.error("登出失败", e);
-        }
+        return new ModelAndView("logon");
     }
     
     

atms-web/src/main/resources/conf_profile_dev.properties

-api.url=http://dts.erp.didichuxing.com:8180/
+api.url=http://localhost:8180/
 
 jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
@@ -23,49 +23,49 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi
 #tableau config
 tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
 
-#税种未返还税金
+#˰��δ����˰��
 tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#地区未返还税金
+#����δ����˰��
 tableau_district_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#未返还/返还后税金比较
+#δ����/������˰��Ƚ�
 tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#费用分析
+#���÷���
 tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#地区利润总额 / 亏损额
+#���������ܶ� / �����
 tableau_district_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#公司利润总额 / 亏损额
+#��˾�����ܶ� / �����
 tableau_company_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#司机 / 员工人数
+#˾�� / Ա������
 tableau_driver_and_employee=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#业务线GMV及补贴统计
+#ҵ����GMV������ͳ��
 tableau_gmv_and_subsidy=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#档案归档情况
+#�����鵵���
 tableau_file_arrangement=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#国际税全球概覧
+#����˰ȫ����E
 tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#国际税业务数据
+#����˰ҵ������
 tableau_global_business=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#墨西哥税务分析
+#ī����˰�����
 tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#澳洲税务分析
+#����˰�����
 tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#巴西税务分析
+#����˰�����
 tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
-#其他税务分析
+#����˰�����
 tableau_other_tax_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
 
 

atms-web/src/main/webapp/WEB-INF/templates/admin.html

@@ -9,7 +9,7 @@
 <head>
     <!--<base href="/Home/Admin/" />-->
     <meta charset="utf-8" http-equiv="X-UA-Compatible" content="chrome=1; IE=11; IE=10; IE=9; IE=EDGE">
-    <title>DTS</title>
+    <title>LEMS</title>
     <style>
         [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
             display: none !important;

atms-web/src/main/webapp/WEB-INF/templates/index.html

@@ -9,7 +9,7 @@
     <base href="/"/>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="utf-8" http-equiv="X-UA-Compatible" content="chrome=1; IE=11; IE=10; IE=9; IE=EDGE">
-    <title>DTS</title>
+    <title>LEMS</title>
     <style>
         [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
             display: none !important;

atms-web/src/main/webapp/app-resources/i18n/zh-CN/adminHomePage.json

 {
-	"WelcomeATMS-Longi":"欢迎使用DTS申报系统管理"
+	"WelcomeATMS-Longi":"欢迎使用LEMS申报系统管理"
 }
\ No newline at end of file