Index: /branches/amp_3_6_0/amp.spec
===================================================================
--- /branches/amp_3_6_0/amp.spec	(revision 2336)
+++ /branches/amp_3_6_0/amp.spec	(working copy)
@@ -4,7 +4,7 @@
 Summary:        Array Management Platform 
 Group:          Development/Tools
 License:        LGPL
-URL:            www.arraynetworks.com.cn
+URL:            www.arraynetworks.com
 Source0:        amp.tar.gz
 
 BuildArch: x86_64
Index: /branches/amp_3_6_0/extensions/auditing/rpm.spec
===================================================================
--- /branches/amp_3_6_0/extensions/auditing/rpm.spec	(revision 2336)
+++ /branches/amp_3_6_0/extensions/auditing/rpm.spec	(working copy)
@@ -5,7 +5,7 @@
 
 Group:      TO
 License:    ARRAY LICENSE
-URL:        www.arraynetworks.com.cn
+URL:        www.arraynetworks.com
 Source0:    auditing.tar.gz
 
 #BuildRequires:      gcc
Index: /branches/amp_3_6_0/extensions/avx_mgmt/rpm.spec
===================================================================
--- /branches/amp_3_6_0/extensions/avx_mgmt/rpm.spec	(revision 2336)
+++ /branches/amp_3_6_0/extensions/avx_mgmt/rpm.spec	(working copy)
@@ -5,7 +5,7 @@
 
 Group:      TO
 License:    ARRAY LICENSE
-URL:        www.arraynetworks.com.cn
+URL:        www.arraynetworks.com
 Source0:    avx_mgmt.tar.gz
 
 #BuildRequires:      gcc
Index: /branches/amp_3_6_0/extensions/license_server/rpm.spec
===================================================================
--- /branches/amp_3_6_0/extensions/license_server/rpm.spec	(revision 2336)
+++ /branches/amp_3_6_0/extensions/license_server/rpm.spec	(working copy)
@@ -6,7 +6,7 @@
 
 Group:      TO
 License:    ARRAY LICENSE
-URL:        www.arraynetworks.com.cn
+URL:        www.arraynetworks.com
 Source0:    license_server.tar
 
 BuildRequires:      gcc
Index: /branches/amp_3_6_0/extensions/monitoring/rpm.spec
===================================================================
--- /branches/amp_3_6_0/extensions/monitoring/rpm.spec	(revision 2336)
+++ /branches/amp_3_6_0/extensions/monitoring/rpm.spec	(working copy)
@@ -5,7 +5,7 @@
 
 Group:      TO
 License:    ARRAY LICENSE
-URL:        www.arraynetworks.com.cn
+URL:        www.arraynetworks.com
 Source0:    monitoring.tar.gz
 
 Requires:       /bin/bash
Index: /branches/amp_3_6_0/extensions/rs_api/rpm.spec
===================================================================
--- /branches/amp_3_6_0/extensions/rs_api/rpm.spec	(revision 2336)
+++ /branches/amp_3_6_0/extensions/rs_api/rpm.spec	(working copy)
@@ -6,7 +6,7 @@
 
 Group:      TO
 License:    ARRAY LICENSE
-URL:        www.arraynetworks.com.cn
+URL:        www.arraynetworks.com
 Source0:    rs_api.tar
 
 BuildRequires:      gcc
Index: /branches/amp_3_6_0/extensions/vpn_license_server/rpm.spec
===================================================================
--- /branches/amp_3_6_0/extensions/vpn_license_server/rpm.spec	(revision 2336)
+++ /branches/amp_3_6_0/extensions/vpn_license_server/rpm.spec	(working copy)
@@ -6,7 +6,7 @@
 
 Group:      TO
 License:    ARRAY LICENSE
-URL:        www.arraynetworks.com.cn
+URL:        www.arraynetworks.com
 Source0:    license_server.tar
 
 BuildRequires:      gcc
Index: /branches/amp_3_6_0/extensions/vpn_mgmt/rpm.spec
===================================================================
--- /branches/amp_3_6_0/extensions/vpn_mgmt/rpm.spec	(revision 2336)
+++ /branches/amp_3_6_0/extensions/vpn_mgmt/rpm.spec	(working copy)
@@ -5,7 +5,7 @@
 
 Group:      TO
 License:    ARRAY LICENSE
-URL:        www.arraynetworks.com.cn
+URL:        www.arraynetworks.com
 Source0:    vpn_mgmt.tar.gz
 
 #BuildRequires:      gcc
Index: /branches/amp_3_6_0/src/include/clickarray.h
===================================================================
--- /branches/amp_3_6_0/src/include/clickarray.h	(revision 2336)
+++ /branches/amp_3_6_0/src/include/clickarray.h	(working copy)
@@ -9,10 +9,10 @@
 #define ARRAY_COMPINFO_OS "AMP"
 #define ARRAY_COMPINFO_KEYWORD "array"
 #define ARRAY_COMPINFO_OEM_FLAG
-#define ARRAY_COMPINFO_COPYRIGHT "Copyright (c) 2000-2021 Beijing Array Networks Co., Ltd. All Rights reserved."
-#define ARRAY_COMPINFO_COPYRIGHT_US "Copyright (c) 2000-2021 Array Networks, Inc. All Rights reserved."
-#define ARRAY_COMPINFO_EMAIL "support@arraynetworks.com.cn"
-#define ARRAY_COMPINFO_WEBSITE "www.arraynetworks.com.cn"
+#define ARRAY_COMPINFO_COPYRIGHT "© 2024 ARRAY NETWORKS, INC. ALL RIGHTS RESERVED."
+#define ARRAY_COMPINFO_COPYRIGHT_US "© 2024 ARRAY NETWORKS, INC. ALL RIGHTS RESERVED."
+#define ARRAY_COMPINFO_EMAIL "support@arraynetworks.com"
+#define ARRAY_COMPINFO_WEBSITE "www.arraynetworks.com"
 #define ARRAY_COMPINFO_US_FLAG "/ca/etc/array"
 
 #define ARRAY_COMPINFO_MIBOID_STR "7564"
Index: /branches/amp_3_6_0/src/webui/webui/conf/composer_ui.toml
===================================================================
--- /branches/amp_3_6_0/src/webui/webui/conf/composer_ui.toml	(revision 2336)
+++ /branches/amp_3_6_0/src/webui/webui/conf/composer_ui.toml	(working copy)
@@ -23,8 +23,8 @@
 maxOpen = 100
 
 [company]
-name = "Beijing Array Networks Co., Ltd."
-website = "https://www.arraynetworks.com.cn/"
+name = "Array Networks"
+website = "https://www.arraynetworks.com/"
 [company.US]
 name = "Array Networks"
 website = "https://www.arraynetworks.com/"
Index: /branches/amp_3_6_0/src/webui/webui/conf/default.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/images/login/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/images/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/images/navbar/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/modules/login/login.controller.js
===================================================================
--- /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/modules/login/login.controller.js	(revision 2336)
+++ /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/modules/login/login.controller.js	(working copy)
@@ -42,6 +42,7 @@
 
             if (CMSettings.app == "AMP") {
                 loginViewModel.company_theme = $filter("T")(CMSettings.company_name[0].name);
+                loginViewModel.current_year = new Date().getFullYear();
             }
             var previous_user;
             if (localStorageService.getWebStorage("user_info")) {
@@ -113,7 +114,7 @@
                                                     $state.go(previous_page.state, previous_page.params);
                                                 } else {
                                                     $state.go('index.dashboard');//index.dashboard.sys_statistics
-                                                } 
+                                                }
                                             }
                                         } else {
                                             alert($filter('T')("Internal server error"))
@@ -153,7 +154,7 @@
                                         if (language != res.data['language']) {
                                             cmService.post_composer_language(language).then(function(res) {});
                                         }
-                                    }                                    
+                                    }
                                 });
 
                             } else if (error_code === -1) {
Index: /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/modules/login/login.html
===================================================================
--- /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/modules/login/login.html	(revision 2336)
+++ /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/modules/login/login.html	(working copy)
@@ -54,10 +54,10 @@
                     </form>
                 </div>
                 <div class="copyright">
-                    <span>&copy;{{'{0} {1} All Rights reserved.' | T:['2021', login.company_theme]}}</span>
+                    <span>&copy;{{'{0} {1} All Rights reserved.' | T:[login.current_year, login.company_theme]}}</span>
                 </div>
             </div>
-            
+
         </div>
     </div>
 </div>
Index: /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/modules/notification/setting/mail_test.html
===================================================================
--- /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/modules/notification/setting/mail_test.html	(revision 2336)
+++ /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/app/modules/notification/setting/mail_test.html	(working copy)
@@ -8,7 +8,7 @@
             <div class="form-group">
                 <label class="col-md-3 control-label">{{'Mail Receiver'|T}}</label>
                 <div class="col-md-8">
-                    <input ng-verify type="email" class="form-control" placeholder="admin@arraynetworks.com.cn" ng-model="testMail.mail_receiver">
+                    <input ng-verify type="email" class="form-control" placeholder="admin@arraynetworks.com" ng-model="testMail.mail_receiver">
                 </div>
             </div>
             <div class="form-group">
@@ -19,4 +19,4 @@
             </div>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
Index: /branches/amp_3_6_0/src/webui/webui/htdocs/new/src/client/favicon.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/x-icon