内网版本更新

2024-07-12 14:29:06 +08:00 · 2024-07-12 14:29:06 +08:00 · fb1bfdb3e2
parent 882165dae1
commit fb1bfdb3e2
6 changed files with 55 additions and 53 deletions
--- a/public/index.html
+++ b/public/index.html
@ -8,23 +8,35 @@
  <meta name="description" content="星云 是一个新一代的开源创新服务平台，提供分布式协作开发、流水线运维、代码分析等功能，基于 Git 打造分布式代码托管环境。">
  <meta property="og:title" content="星云协同开发平台" />
  <meta property="og:type" content="website" />
-  <meta property="og:url" content="https://gitlink.org.cn/" />
-  <meta property="og:image" content="https://www.gitlink.org.cn/images/logo.png" />
  <meta property="og:image:alt" content="星云协同开发平台" />
  <meta property="og:site_name" content="星云协同开发平台" />
+  <meta property="og:url" content="https://gitlink.org.cn/" />
+  <meta property="og:image" content="https://www.gitlink.org.cn/images/logo.png" />
  <meta property="og:description" content="星云 是一个新一代的开源创新服务平台，提供分布式协作开发、流水线运维、代码分析等功能，基于 Git 打造分布式代码托管环境。" />
-  <meta name="hostname" content="gitlink.org.cn">
  <meta name="keyboard-shortcuts-preference" content="all">
-  <meta name="expected-hostname" content="gitlink.org.cn">
-  <meta name="go-import" content="gitlink.org.cn git https://gitlink.org.cn">
  <meta name="octolytics-dimension-user_login" content="星云协同开发平台"></meta>
  <meta name="octolytics-dimension-repository_nwo" content="星云协同开发平台"></meta>
  <meta name="octolytics-dimension-repository_network_root_nwo" content="星云协同开发平台"></meta>
  <meta name="theme-color" content="#000000">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="referrer" content="always">
+  <meta name="hostname" content="gitlink.org.cn">
+  <meta name="keyboard-shortcuts-preference" content="all">
+  <meta name="expected-hostname" content="gitlink.org.cn">
+  <meta name="go-import" content="gitlink.org.cn git https://gitlink.org.cn">
  <!-- 按需引用viewport content -->
  <meta name="viewport" content="">
+  <meta name="keyboard-shortcuts-preference" content="all">
+  <meta name="octolytics-dimension-user_login" content="星云协同开发平台"></meta>
+  <meta name="octolytics-dimension-repository_nwo" content="星云协同开发平台"></meta>
+  <meta name="octolytics-dimension-repository_network_root_nwo" content="星云协同开发平台"></meta>
+  <meta name="theme-color" content="#000000">
+  <meta content="IE=edge" http-equiv="X-UA-Compatible">
+  <meta name="twitter:site" content="@gitlink">
+  <meta name="twitter:card" content="summary_large_image">
+  <meta name="twitter:title" content="星云协同开发平台">
+  <meta name="twitter:description" content="星云 开源创新服务平台 提供分布式协作开发 流水线运维 代码分析等功能 基于 Git 打造分布式代码托管环境">
+  <meta content="always" name="referrer">
  <link rel="canonical" href="https://gitlink.org.cn" data-turbo-transient="">
  <link rel="fluid-icon" href="https://www.gitlink.org.cn/images/logo.png" title="GitLink">
  <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
@ -42,27 +54,17 @@
  <div id="md_div" style="display: none;"></div>
  <div id="root" class="page -layout-v -fit widthunit"></div>
  <div id="picture_display" style="display: none;"></div>
-  <script src="https://gw.alipayobjects.com/os/lib/react/16.14.0/umd/react.%REACT_URL%.js"></script>
-  <script src="https://gw.alipayobjects.com/os/lib/react-dom/16.14.0/umd/react-dom.%REACT_URL%.js"></script>
  <script src="%PUBLIC_URL%js/jquery-1.8.3.min.js"></script>
  <script src="%PUBLIC_URL%js/js_min_all.js"></script>
  <!-- <script src="%PUBLIC_URL%js/common.js"></script> -->
  <script src="%PUBLIC_URL%js/codemirror/codemirror.js"></script>
  <script src="%PUBLIC_URL%js/editormd/editormd.min.js"></script>
  <script src="%PUBLIC_URL%js/codemirror/merge/merge.js"></script>
+  <script src="%PUBLIC_URL%js/react.production.min.js"></script>
+  <script src="%PUBLIC_URL%js/react-dom.production.min.js"></script>
  <script src="%PUBLIC_URL%js/alex/moment.js"></script>
-  <script src="https://gw.alipayobjects.com/os/lib/alipay/alex/2.0.19/bundle/alex.all.global.min.js"></script>
-  <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
  <%= htmlWebpackPlugin.tags.bodyTags %>
  <script>
-    var _hmt = _hmt || [];
-    (function() {
-      var hm = document.createElement("script");
-      hm.src = "https://hm.baidu.com/hm.js?7e2def1fe918f15f9f1c5c061f69b256";
-      var s = document.getElementsByTagName("script")[0]; 
-      s.parentNode.insertBefore(hm, s);
-      
-    })();
    window.onload=function(){
      $(".newContainer").delegate("a.anchors","click",function(){
        let h = $(this).offset().top - 180;
@ -70,8 +72,7 @@
        window.location.hash = $(this).attr("name");
        return false;
      });
-    }                 
+    }
  </script>    
 </body>
-
 </html>
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@ -60,18 +60,18 @@ class Index extends Component {
            )}
          ></Route>
          <Route
-            path="/explore"
+            path="/explore/all"
            render={(props) => (
              <ProjectIndex {...this.props} {...props} />
            )}
          ></Route>

-          {/* <Route
+          <Route
            path="/explore"
            render={(props) => (
              <ProjectHome {...this.props} {...props} />
            )}
-          ></Route> */}
+          ></Route>
        </Switch>
      </div>
    );
--- a/src/forge/Main/projecthome/Index.jsx
+++ b/src/forge/Main/projecthome/Index.jsx
@ -14,7 +14,7 @@ import Nodata from '../../Nodata';
 const { Search } = Input;

 const LIMIT = 20;
-function Index() {
+function Index(props) {

  const [ cateList , setCateList ] = useState(undefined);
  const [ projectsList , setProjectsList ] = useState(undefined);
@ -64,7 +64,7 @@ function Index() {

  return(
    <div>
-      <SubBanner />
+      <SubBanner {...props}/>
      {/* <SubUnitBanner /> */}
      <div className="dataPanel">
        <div className="left">
@ -93,7 +93,7 @@ function Index() {
                style={{width:"300px"}}
                allowClear
              />
-              <Link to={`/explore${search ? '?search='+search : ''}`}>更多<i className="iconfont icon-triangle font-12"></i></Link>
+              <Link to={`/explore/all${search ? '?search='+search : ''}`}>更多<i className="iconfont icon-triangle font-12"></i></Link>
            </div>
            <Spin spinning={isSpin}>
              <div style={{minHeight:"400px"}}>
@ -146,7 +146,7 @@ function Index() {
            {
              projectsList && projectsList.length > 0 &&
              <div className="left-bottom-btn">
-                <Link to={`/explore${search ? '?search='+search : ''}`} target="_blank">查看更多开源项目<img src={more} alt="" /></Link>
+                <Link to={`/explore/all${search ? '?search='+search : ''}`} target="_blank">查看更多开源项目<img src={more} alt="" /></Link>
              </div>
            }
          </div>
--- a/src/forge/Main/projecthome/SubBanner.jsx
+++ b/src/forge/Main/projecthome/SubBanner.jsx
@ -31,8 +31,8 @@ const settings={
  adaptiveHeight:true
 }

-function SubBanner() {
-
+function SubBanner(props) {
+  const mygetHelmetapi = props && props.mygetHelmetapi;
  const [ list , setList ] = useState(undefined);

  useEffect(()=>{
@ -50,8 +50,8 @@ function SubBanner() {
  return(
    <div className="banners">
      <div className="bannersCenter">
-        <p className="bTitle"><span>GitLink 确实开源</span></p>
-        <p className="bSubTitle">新一代开发创新服务平台  让你的创意在这里释放</p>
+        <p className="bTitle"><span>{mygetHelmetapi && mygetHelmetapi.name}</span></p>
+        <p className="bSubTitle">新一代开发创新服务平台 让你的创意在这里释放</p>
        <div className="bannerBox">
          {
            list && list.length > 0 ?
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@ -1,12 +1,12 @@
 import React, { Component, Fragment } from "react";
-import { UnControlled as CodeMirror } from 'react-codemirror2';
-import 'codemirror/addon/selection/active-line.js';
-import 'codemirror/mode/javascript/javascript.js';
-import 'codemirror/mode/clike/clike';
-import 'codemirror/mode/css/css';
+// import { UnControlled as CodeMirror } from 'react-codemirror2';
+// import 'codemirror/addon/selection/active-line.js';
+// import 'codemirror/mode/javascript/javascript.js';
+// import 'codemirror/mode/clike/clike';
+// import 'codemirror/mode/css/css';
 import UserSubmitComponent from "./UserSubmitComponent";
-import CloudIDE from "./cloudIDE";
-import { Base64 } from "js-base64";
+// import CloudIDE from "./cloudIDE";
+import Editor from "react-monaco-editor";

 import "./index.css";
 import "./editor.css";
@ -35,7 +35,8 @@ class m_editor extends Component {

  render() {
    const { editorValue, changeValue } = this.state;
-    const { readOnly, editorType,onEmpty,filename,empty, currentBranch, descName, checkName, detail, match: { params },filepath, ideTheme , md } = this.props;
+    console.log("editorValue:",editorValue)
+    const { readOnly, editorType,onEmpty,filename,empty, currentBranch, descName, checkName, detail , language , match: { params },filepath,ideTheme } = this.props;
    const editor_options = {
      lineNumbers: "on",
      lineWrapping: true, //强制换行
@ -61,16 +62,17 @@ class m_editor extends Component {
    let download_url = detail && detail.download_url;
    return (
      <Fragment>
-        <div className="editorBorderBox">
-          {!readOnly ?
-            <CodeMirror
-              placeholder="请输入内容"
-              value={editorValue}
-              options={editor_options}
-              onChange={this.changeEditor}
-            /> :
-            <CloudIDE download_url={download_url} value={editorValue} params={params} filepath={filepath&&filepath.startsWith('/')?filepath.slice(1):filepath}/>
-          }
+        <div className="branchTable" style={{border:"1px solid #eee"}}>
+          <Editor
+            height="400px"
+            language={language ? language : "plaintext"}
+            theme={"vs-grey"}
+            placeholder="请输入内容"
+            value={editorValue}
+            options={editor_options}
+            onChange={this.changeEditor}
+            editorWillMount={this.editorWillMount}
+          />
        </div>
        {!readOnly && (
          <div className="editorBorderSubmitBox" style={{ padding: "20px" }}>
@ -86,7 +88,6 @@ class m_editor extends Component {
              onEmpty={onEmpty}
              empty={empty}
              filename={filename}
-              changeValueFlag={this.props.content !== changeValue}
            ></UserSubmitComponent>
          </div>
        )}
@ -94,4 +95,4 @@ class m_editor extends Component {
    );
  }
 }
-export default m_editor;
+export default m_editor;
--- a/src/forge/Server/fetch.js
+++ b/src/forge/Server/fetch.js
@ -1,10 +1,10 @@
 import javaFetch from '../javaFetch';

-let settings = localStorage.chromesetting && JSON.parse(localStorage.chromesetting);
-let actionUrl = (settings && settings.common && settings.common.softbot) ? settings.common.softbot :'http://172.20.32.202:4000' ;
+// let settings = localStorage.chromesetting && JSON.parse(localStorage.chromesetting);
+// let actionUrl = (settings && settings.common && settings.common.softbot) ? settings.common.softbot :'http://172.20.32.202:4000' ;
 // let actionUrl = 'http://172.20.32.202:4000'

-const service = javaFetch(actionUrl);
+const service = javaFetch();
 // export const httpUrl = actionUrl;
 // export const main_site_url = settings && settings.common.main_site_url
 export default service;