miaofuhao преди 10 месеца
родител
ревизия
28ee6c4f65
променени са 4 файла, в които са добавени 118 реда и са изтрити 17 реда
  1. 9 0
      .project
  2. 16 14
      Script/Common/huayi.config.js
  3. 89 0
      default
  4. 4 3
      login.html

+ 9 - 0
.project

@@ -123,5 +123,14 @@
123 123
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
124 124
 			</matcher>
125 125
 		</filter>
126
+		<filter>
127
+			<id>1709534682738</id>
128
+			<name></name>
129
+			<type>26</type>
130
+			<matcher>
131
+				<id>org.eclipse.ui.ide.multiFilter</id>
132
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
133
+			</matcher>
134
+		</filter>
126 135
 	</filteredResources>
127 136
 </projectDescription>

+ 16 - 14
Script/Common/huayi.config.js

@@ -4,27 +4,29 @@ if(huayi == undefined) {
4 4
 huayi.config = {
5 5
 	//测试环境
6 6
 	callcenter_url: "http://192.168.5.46:28000/", // 后端API站IP和端口  http://117.158.3.104:28000/
7
-//	callcenter_url: "http://39.164.159.226:28000/", // 后端API站IP和端口  http://117.158.3.104:28000/
8
-//	callcenter_url: "http://117.158.3.104:28000/", //
9
-	call_url:"http://192.168.1.26:8082/",  //话务IP和端口
10
-	img_url:"http://192.168.5.46/",
7
+	//	callcenter_url: "http://39.164.159.226:28000/", // 后端API站IP和端口  http://117.158.3.104:28000/
8
+	//callcenter_url: "http://123.56.29.119:8080/", // 后端API站IP和端口  http://117.158.3.104:28000/
9
+
10
+	//	callcenter_url: "http://117.158.3.104:28000/", //
11
+	call_url: "http://192.168.1.26:8082/", //话务IP和端口
12
+	img_url: "http://192.168.5.46/",
11 13
 	//callcenter_url: "http://localhost:63651/",
12 14
 	socket_ip: "192.168.8.7", // WebSocket通讯ip192.168.5.41
13 15
 	socket_port: "8081", // WebSocket通讯端口
14 16
 	callcenter_acd_url: "http://192.168.5.41:80/", // ACD 对应的监听服务地址 用于这个坐席实时状态HTTP路由
15 17
 	callcenter_cti_url: "http://192.168.5.41:9001/", // CTI 对应的监听服务地址 坐席通话关联状态HTTP路由
16
-	
18
+
17 19
 	// 正式环境
18 20
 	// callcenter_url: "http://122.114.231.155:28000/", // 后端API站IP和端口
19
-// 	callcenter_url: "http://122.114.109.238:28000/", // 后端API站IP和端口 之前老地址已经不用
20
-// 	socket_ip: "122.114.109.141", // WebSocket通讯ip
21
-// 	socket_port: "28820", // WebSocket通讯端口
22
-// 	callcenter_acd_url: "http://122.114.109.141:8002/", // ACD 用于这个坐席实时状态HTTP路由
23
-// 	callcenter_cti_url: "http://122.114.109.141:9021/", // CTI 坐席通话关联状态HTTP路由
24
-	
21
+	// 	callcenter_url: "http://122.114.109.238:28000/", // 后端API站IP和端口 之前老地址已经不用
22
+	// 	socket_ip: "122.114.109.141", // WebSocket通讯ip
23
+	// 	socket_port: "28820", // WebSocket通讯端口
24
+	// 	callcenter_acd_url: "http://122.114.109.141:8002/", // ACD 用于这个坐席实时状态HTTP路由
25
+	// 	callcenter_cti_url: "http://122.114.109.141:9021/", // CTI 坐席通话关联状态HTTP路由
26
+
25 27
 	repairPlatformTime: 10000, //报修平台 数据刷新间隔
26 28
 	taskRealInfoTime: 10000, //右上角当前任务信息  数据刷新间隔
27 29
 	monitorPlatformTime: 5000, //自动外呼监控  坐席监控  数据刷新间隔
28
-	menuworktime: 30000,        //菜单工单数量刷新间隔
29
-	indextime: 5000             //首页报表刷新间隔
30
-};
30
+	menuworktime: 30000, //菜单工单数量刷新间隔
31
+	indextime: 5000 //首页报表刷新间隔
32
+};

+ 89 - 0
default

@@ -0,0 +1,89 @@
1
+##
2
+# You should look at the following URL's in order to grasp a solid understanding
3
+# of Nginx configuration files in order to fully unleash the power of Nginx.
4
+# http://wiki.nginx.org/Pitfalls
5
+# http://wiki.nginx.org/QuickStart
6
+# http://wiki.nginx.org/Configuration
7
+#
8
+# Generally, you will want to move this file somewhere, and start with a clean
9
+# file but keep this around for reference. Or just disable in sites-enabled.
10
+#
11
+# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
12
+##
13
+
14
+# Default server configuration
15
+#
16
+server {
17
+	listen 80 default_server;
18
+	listen [::]:80 default_server;
19
+
20
+	# SSL configuration
21
+	#
22
+	# listen 443 ssl default_server;
23
+	# listen [::]:443 ssl default_server;
24
+	#
25
+	# Note: You should disable gzip for SSL traffic.
26
+	# See: https://bugs.debian.org/773332
27
+	#
28
+	# Read up on ssl_ciphers to ensure a secure configuration.
29
+	# See: https://bugs.debian.org/765782
30
+	#
31
+	# Self signed certs generated by the ssl-cert package
32
+	# Don't use them in a production server!
33
+	#
34
+	# include snippets/snakeoil.conf;
35
+
36
+	root /home/Web/WebUI;
37
+
38
+	# Add index.php to the list if you are using PHP
39
+	index index.html index.htm index.nginx-debian.html;
40
+
41
+	server_name _;
42
+
43
+	location / {
44
+		# First attempt to serve request as file, then
45
+		# as directory, then fall back to displaying a 404.
46
+		try_files $uri $uri/ =404;
47
+	}
48
+    location /fileapi/{
49
+	proxy_pass http://localhost:28000/fileserverapi/;
50
+	proxy_cookie_path / /fileapi;
51
+	client_max_body_size    1000m;
52
+	}
53
+	# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
54
+	#
55
+	#location ~ \.php$ {
56
+	#	include snippets/fastcgi-php.conf;
57
+	#
58
+	#	# With php7.0-cgi alone:
59
+	#	fastcgi_pass 127.0.0.1:9000;
60
+	#	# With php7.0-fpm:
61
+	#	fastcgi_pass unix:/run/php/php7.0-fpm.sock;
62
+	#}
63
+
64
+	# deny access to .htaccess files, if Apache's document root
65
+	# concurs with nginx's one
66
+	#
67
+	#location ~ /\.ht {
68
+	#	deny all;
69
+	#}
70
+}
71
+
72
+
73
+# Virtual Host configuration for example.com
74
+#
75
+# You can move that to a different file under sites-available/ and symlink that
76
+# to sites-enabled/ to enable it.
77
+#
78
+server {
79
+       listen 81 ;
80
+       listen [::]:81 ;
81
+
82
+
83
+       root /home/Web/WebUI.BI;
84
+       index index.html index.htm index.nginx-debian.html;
85
+       server_name _;
86
+       location / {
87
+               try_files $uri $uri/ =404;
88
+       }
89
+}

+ 4 - 3
login.html

@@ -154,11 +154,12 @@
154 154
 			/*点击提交*/
155 155
 			function login() {
156 156
 				$.ajax({
157
+					// contentType: "application/json;charset=UTF-8",   /signtokenapi/api/token/login
157 158
 					type: "post",
158
-					url: huayi.config.callcenter_url + "signtokenapi/api/token/login",
159
+					url: huayi.config.callcenter_url + "/signtokenapi/api/token/login", //signtokenapi/api/token
159 160
 					dataType: 'json',
160 161
 					async: false,
161
-					beforeSend: function() { //触发ajax请求开始时执行
162
+					beforeSend: function() { 	// 触发ajax请求开始时执行
162 163
 						$('.btns').attr("disabled", true);
163 164
 						$('.btns').text('登录中...');
164 165
 						$(document).off('click', '.btns', login);
@@ -214,7 +215,7 @@
214 215
 						layer.confirm(xhr.status+'网络繁忙,请稍后再试...', {
215 216
 							icon: 7,
216 217
 							closeBtn: 0,
217
-							btn: ['确定'] //按钮
218
+							btn: ['确定'] // 按钮
218 219
 						});
219 220
 						$('.btns').text('登录');
220 221
 						$('.btns').attr("disabled", false);