willliamguo 3 år sedan
förälder
incheckning
9c1c5352f6

+ 6 - 0
.idea/google-java-format.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GoogleJavaFormatSettings">
+    <option name="enabled" value="false" />
+  </component>
+</project>

+ 4 - 4
crowd-service/docker-compose-multi.yml

@@ -32,7 +32,7 @@ services:
       - 8280:8080
     volumes:
       - ${FILE_STORE_BASE_PATH}/${BACKEND_STORE_DIR}:/var/www
-    command: java -jar --spring.profiles.active=private-cloud --file.save.path=/var/www/ --host=http://121.196.124.158 --website.domainName=121.196.124.158 --baseUrl.service.review=http://121.196.124.158:9004 --baseUrl.service.crowd=http://121.196.124.158:8091 --baseUrl.service.crowdIndex=http://121.196.124.158:81/edit?primaryColor=%231890ff&fixSiderbar=true&colorWeak=false&title=%E4%BC%97%E6%B5%8B%E6%9C%8D%E5%8A%A1%E7%B3%BB%E7%BB%9F&pwa=false&token= site-0.0.1-SNAPSHOT.jar > nohub.out
+    command: java -jar --spring.profiles.active=private-cloud --file.save.path=/var/www/ --host=http://121.40.93.243 --website.domainName=121.40.93.243 --baseUrl.service.review=http://121.40.93.243:9004 --baseUrl.service.crowd=http://121.40.93.243:8091 --baseUrl.service.crowdIndex=http://121.40.93.243:81/edit?primaryColor=%231890ff&fixSiderbar=true&colorWeak=false&title=%E4%BC%97%E6%B5%8B%E6%9C%8D%E5%8A%A1%E7%B3%BB%E7%BB%9F&pwa=false&token= site-0.0.1-SNAPSHOT.jar > nohub.out
     ##-Dhost需要根据实际地址修改
   # 前端
   crowd_frontend:
@@ -56,8 +56,8 @@ services:
       - redis
     ports:
       - 8281:8081
-    command: java -jar --spring.profiles.active=private-cloud --host=http://121.196.124.158:8200  --redirect.url=http://121.196.124.158:8200  --default.goto=http://121.196.124.158:8200  --default.login=http://121.196.124.158:8281/page/login --website.domainName=121.196.124.158 mooctest-user-server.jar  > nohub.out
-    ##注意1:-Dhost需要根据实际地址修改 将121.196.124.158改成实际服务器的地址
+    command: java -jar --spring.profiles.active=private-cloud --host=http://121.40.93.243:8200  --redirect.url=http://121.40.93.243:8200  --default.goto=http://121.40.93.243:8200  --default.login=http://121.40.93.243:8281/page/login --website.domainName=121.40.93.243 mooctest-user-server.jar  > nohub.out
+    ##注意1:-Dhost需要根据实际地址修改 将121.40.93.243改成实际服务器的地址
     ##注意2:nginx/sites-enabled/default中的server_name改成对应的实际地址
     ##注意3:如果服务器已存在mysql和redis,或者端口被占用了,可以使用start-containers-multi-port.sh
-    ##此文件启动访问:http://121.196.124.158:8200/  将121.196.124.158改成实际服务器的地址
+    ##此文件启动访问:http://121.40.93.243:8200/  将121.40.93.243改成实际服务器的地址

+ 1 - 1
crowd-service/nginx/sites-enabled/default

@@ -1,6 +1,6 @@
 server {
         listen       80;
-        server_name  121.196.124.158; #改成对应的HOST
+        server_name  121.40.93.243; #改成对应的HOST
         root /usr/share/nginx/html;
         #charset koi8-r;
         client_max_body_size 100m;

+ 3 - 3
crowd-service/private-docker/2_cofortest_structure_and_initdata_online.sql

@@ -1,10 +1,10 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : xcc-121.196.124.158
+ Source Server         : xcc-121.40.93.243
  Source Server Type    : MySQL
  Source Server Version : 50733
- Source Host           : 121.196.124.158:3308
+ Source Host           : 121.40.93.243:3308
  Source Schema         : crowd-test-service
 
  Target Server Type    : MySQL
@@ -166,7 +166,7 @@ INSERT INTO `configuration` VALUES (42, 'logo_background', '{\"logo_background\"
 INSERT INTO `configuration` VALUES (43, 'logo_transparent', '{\"logo_transparent\":\"/var/www/Platform/logo-transparent.png\"}');
 INSERT INTO `configuration` VALUES (44, 'footer_QRcode', '{\"footer_QRcode\":\"/var/www/Platform/QRcode.png\"}');
 INSERT INTO `configuration` VALUES (47, 'home_background_url', '{\"home_background_url\":\"/var/www/Platform/home-background.jpeg\"}');
-INSERT INTO `configuration` VALUES (49, 'manage_url', '{\"manage_url\":\"http://121.196.124.158:9004/home\"}');
+INSERT INTO `configuration` VALUES (49, 'manage_url', '{\"manage_url\":\"http://121.40.93.243:9004/home\"}');
 INSERT INTO `configuration` VALUES (50, 'copy_right', '{\"copy_right\":\"版权所有©南京慕测信息科技有限公司\"}');
 INSERT INTO `configuration` VALUES (51, 'internet_content_provider', '{\"internet_content_provider\":\"苏公网安备 44011602000570号\"}');
 INSERT INTO `configuration` VALUES (52, 'name_QRcode', '{\"name_QRcode\":\"官方微信公众号\"}');

+ 3 - 3
crowd-service/private-docker/mysql/2_cofortest_structure_and_initdata.sql

@@ -1,10 +1,10 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : xcc-121.196.124.158
+ Source Server         : xcc-121.40.93.243
  Source Server Type    : MySQL
  Source Server Version : 50733
- Source Host           : 121.196.124.158:3308
+ Source Host           : 121.40.93.243:3308
  Source Schema         : crowd-test-service
 
  Target Server Type    : MySQL
@@ -181,7 +181,7 @@ INSERT INTO `configuration` VALUES (42, 'logo_background', '{\"logo_background\"
 INSERT INTO `configuration` VALUES (43, 'logo_transparent', '{\"logo_transparent\":\"/var/www/Platform/logo-transparent.png\"}');
 INSERT INTO `configuration` VALUES (44, 'footer_QRcode', '{\"footer_QRcode\":\"/var/www/Platform/QRcode.png\"}');
 INSERT INTO `configuration` VALUES (47, 'home_background_url', '{\"home_background_url\":\"/var/www/Platform/home-background.jpeg\"}');
-INSERT INTO `configuration` VALUES (49, 'manage_url', '{\"manage_url\":\"http://121.196.124.158:9004/crowdTask\"}');
+INSERT INTO `configuration` VALUES (49, 'manage_url', '{\"manage_url\":\"http://121.40.93.243:9004/crowdTask\"}');
 INSERT INTO `configuration` VALUES (50, 'copy_right', '{\"copy_right\":\"版权所有©南京慕测信息科技有限公司\"}');
 INSERT INTO `configuration` VALUES (51, 'internet_content_provider', '{\"internet_content_provider\":\"苏公网安备 44011602000570号\"}');
 INSERT INTO `configuration` VALUES (52, 'name_QRcode', '{\"name_QRcode\":\"官方微信公众号\"}');

+ 2 - 2
crowd-service/private-docker/mysql/3_mooctest_user_structure_and_initdata.sql

@@ -1,10 +1,10 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : xcc-121.196.124.158
+ Source Server         : xcc-121.40.93.243
  Source Server Type    : MySQL
  Source Server Version : 50733
- Source Host           : 121.196.124.158:3308
+ Source Host           : 121.40.93.243:3308
  Source Schema         : mooctest_user
 
  Target Server Type    : MySQL