merge

config/dev.env.js

@@ -2,6 +2,14 @@
 const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
+// module.exports = merge(prodEnv, {
+//   NODE_ENV: '"development"',
+//   ENV_CONFIG: "'dev'",
+//   API_ROOT: '"//127.0.0.1"',
+//   LOGIN_URL: '"http://127.0.0.1:8081/page/login?redirect=http%3a%2f%2f127.0.0.1%2f%23%2fhome"',
+//   REGISTER_URL: '"http://127.0.0.1:8081/page/register"'
+// })
+
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG: "'dev'",

config/private.env.js

@@ -0,0 +1,11 @@
+'use strict'
+const merge = require('webpack-merge')
+const prodEnv = require('./prod.env')
+
+module.exports = merge(prodEnv, {
+  NODE_ENV: '"private"',
+  ENV_CONFIG: "'private'",
+  API_ROOT: '"//crowd.dev.mooctest.net"',
+  LOGIN_URL: '"http://user.mooctest.net:8081/page/login?redirect=http%3a%2f%2fcrowd.dev.mooctest.net%2f%23%2fhome"',
+  REGISTER_URL: '"http://user.mooctest.net:8081/page/register"'
+})

package.json

@@ -14,18 +14,18 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
-    "echarts": "^4.2.1",
-    "element-ui": "^2.11.0",
+    "echarts": "^4.9.0",
+    "element-ui": "^2.14.1",
     "font-awesome": "^4.7.0",
-    "mockjs": "^1.0.1-beta3",
-    "moment": "^2.27.0",
+    "mockjs": "^1.1.0",
+    "moment": "^2.29.1",
     "querystring": "^0.2.0",
     "v-region": "^2.2.2",
-    "vue": "^2.5.2",
-    "vue-router": "^3.0.1",
+    "vue": "^2.6.12",
+    "vue-router": "^3.4.9",
     "vue-waterfall": "^1.0.6",
     "vue-waterfall-easy": "^2.4.4",
-    "vuex": "^3.1.1",
+    "vuex": "^3.6.0",
     "webpack-dev-server": "^2.11.5"
   },
   "devDependencies": {
@@ -42,12 +42,12 @@
     "babel-preset-stage-2": "^6.22.0",
     "chalk": "^2.0.1",
     "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^3.2.0",
+    "css-loader": "^3.6.0",
     "eslint": "^4.15.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",
-    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^5.2.0",
     "eslint-plugin-promise": "^3.4.0",
     "eslint-plugin-standard": "^3.0.1",
@@ -56,29 +56,29 @@
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
-    "less": "^3.9.0",
+    "less": "^3.13.1",
     "less-loader": "^5.0.0",
-    "node-notifier": "^5.1.2",
-    "node-sass": "^4.12.0",
+    "node-notifier": "^5.4.3",
+    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
-    "portfinder": "^1.0.13",
+    "portfinder": "^1.0.28",
     "postcss-import": "^11.0.0",
     "postcss-loader": "^2.0.8",
     "postcss-url": "^7.2.1",
-    "rimraf": "^2.6.0",
-    "sass-loader": "^7.1.0",
-    "semver": "^5.3.0",
+    "rimraf": "^2.7.1",
+    "sass-loader": "^7.3.1",
+    "semver": "^5.7.1",
     "shelljs": "^0.7.6",
     "uglifyjs-webpack-plugin": "^1.1.1",
-    "url-loader": "^2.1.0",
+    "url-loader": "^2.3.0",
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.5.2",
+    "vue-template-compiler": "^2.6.12",
     "webpack": "^3.6.0",
-    "webpack-bundle-analyzer": "^3.4.1",
+    "webpack-bundle-analyzer": "^3.9.0",
     "webpack-dev-server": "^2.9.1",
-    "webpack-merge": "^4.1.0"
+    "webpack-merge": "^4.2.2"
   },
   "engines": {
     "node": ">= 6.0.0",

src/components/commons/Header2.0.vue

@@ -62,6 +62,11 @@
               </router-link>
             </li>
 
+            <span v-if="isLogin&&rolesPermissions.isSystemAdministrator">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>
+            <li v-if="isLogin&&rolesPermissions.isSystemAdministrator">
+              <a href="http://47.98.174.59:8101/home">后台管理</a>
+            </li>
+
             <!--            <span v-if="isLogin">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>-->
 <!--            <li>-->
 <!--              <a @click="gotoHome" style="cursor: pointer">首页</a>-->

src/config/index.js

@@ -20,18 +20,18 @@ export const home_searchTypeArr = [
     "name": "项目",
     "value": "0"
   },
-  {
-    "name": "机构",
-    "value": "1"
-  },
-  {
-    "name": "资源",
-    "value": "2"
-  },
-  {
-    "name": "专家",
-    "value": "3"
-  }
+  // {
+  //   "name": "机构",
+  //   "value": "1"
+  // },
+  // {
+  //   "name": "资源",
+  //   "value": "2"
+  // },
+  // {
+  //   "name": "专家",
+  //   "value": "3"
+  // }
 ];
 //home_searchType
 export const home_searchType = '0';
@@ -40,12 +40,12 @@ export const home_homeTabArr_left = [
   //注意：这里的第一个元素的name是"homepage"
   {label: "首页", name: "homepage", linkTo: '/home'},
   {label: "众测广场", name: "square", linkTo: '/square'},
-  {label: "众测技术", name: "technology", linkTo: 'technology'}
+  // {label: "众测技术", name: "technology", linkTo: 'technology'}
 ];
 //home_homeTabArr_right
 export const home_homeTabArr_right = [
-  {label: "找机构", name: "findInstitution", linkTo: '/agency/list/show'},
-  {label: "找专家", name: "findExpert", linkTo: '/expert/list'},
+  // {label: "找机构", name: "findInstitution", linkTo: '/agency/list/show'},
+  // {label: "找专家", name: "findExpert", linkTo: '/expert/list'},
 ];
 //home_homeTabArr_default，注意这里的值一定要和一个home_homeTabArr_*中的name值对应
 export const home_homeTabArr_default = "homepage";
@@ -53,13 +53,13 @@ export const home_homeTabArr_default = "homepage";
 export const HOME_DISPLAY = {
   test_menu: true,
   test_card: true,
-  resource_and_tool: true,
-  brand_card: true,
-  institution_card: false,
+  // resource_and_tool: true,
+  // brand_card: true,
+  // institution_card: false,
   login_card: true,
   hot_crowd: true,
-  hot_agency: true,
-  hot_user: true,
+  // hot_agency: true,
+  // hot_user: true,
   hot_contest: true
 }
 

src/pages/Homepage/Homepage.vue

@@ -59,7 +59,7 @@
           <HotCrowd :applicationTypeRank="homeDataNoCache.applicationTypeRank" v-if="HOME_DISPLAY.hot_crowd"/>
           <HotAgency :agencyRank="homeDataNoCache.agencyRank" v-if="HOME_DISPLAY.hot_agency"/>
           <HotUser :userRank="homeDataNoCache.userRank" v-if="HOME_DISPLAY.hot_user"/>
-          <HotContest :competitionList="homeData.competitionList" v-if="HOME_DISPLAY.hot_crowd"/>
+          <HotContest :competitionList="homeData.competitionList" v-if="HOME_DISPLAY.hot_contest"/>
         </el-col>
       </el-row>
       <InstitutionCard v-if="HOME_DISPLAY.institution_card"></InstitutionCard>

tool4deploy-privatecloud/Dockerfile

@@ -0,0 +1,11 @@
+FROM nginx
+
+RUN rm -rf /usr/share/nginx/html/*
+
+COPY ./crowd-web /usr/share/nginx/html/
+
+RUN chmod -R 777 /usr/share/nginx/html
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

tool4deploy-privatecloud/conf.d/nginx.conf

@@ -0,0 +1,33 @@
+server {
+        listen       80;
+        server_name  127.0.0.1;
+        root /usr/share/nginx/html;
+        #charset koi8-r;
+        client_max_body_size 100m;
+        #access_log  logs/host.access.log  main;
+
+        # 开启代理缓冲区
+        proxy_buffering on;
+        # 响应头的缓冲区
+        proxy_buffer_size 128k;
+        # 网页内容缓冲区的个数为4，单个大小为1M
+        proxy_buffers 8 1M;
+        proxy_busy_buffers_size 2M;
+
+        location / {
+            root /usr/share/nginx/html;
+        }
+
+        location /api {
+            proxy_pass http://crowd_backend:8080;
+        }
+
+        #error_page  404              /404.html;
+
+        # redirect server error pages to the static page /50x.html
+        #
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+ }