Skip to content

Commit

Permalink
new version 3.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Thecosy committed Apr 16, 2024
1 parent 648bbb9 commit 3353c6e
Show file tree
Hide file tree
Showing 1,972 changed files with 85,187 additions and 141,048 deletions.
19 changes: 0 additions & 19 deletions HELP.md

This file was deleted.

14 changes: 14 additions & 0 deletions IceCMS-Docker/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 1,14 @@
build:
docker-compose build

run:
docker-compose up -d

clear:
docker-compose stop

restart:
docker-compose restart

debug:
docker-compose logs -f
45 changes: 45 additions & 0 deletions IceCMS-Docker/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 1,45 @@
#!/bin/bash

RELEASE_VERSION=$1
if [ ! -n "$RELEASE_VERSION" ] ; then
echo "发布失败,请在命令后输入分支名或tag版本号,如:restart-backend release-1.0" && exit 1
fi

echo "当前发布版本号:"$RELEASE_VERSION

echo "starting deployment..."

# 获取当前脚本文件所在目录的绝对路径
CURR_DIR=`S=\`readlink "$0"\`; [ -z "$S" ] && S=$0; dirname $S`
echo $CURR_DIR

# 重新激活环境配置
source /etc/profile

# 切换到后端工程项目根路径
cd $CURR_DIR/../

git fetch && git checkout $1 && git pull || ! echo '[ERROR]Git拉取代码失败' || exit
echo "[check point] code update successful"

# maven打包构建
mvn clean package -Dmaven.test.skip=true || ! echo '[ERROR]Maven编译构建失败!' || exit
echo "[check point] package successful"

# 构建容器镜像
docker-compose -f renren-generator/docker-compose-renren-generator.yml build || ! echo '[ERROR]镜像构建失败' || exit
echo "[check point] image build successful"

# 停止容器
docker-compose -f renren-generator/docker-compose-renren-generator.yml down || ! echo '[ERROR]停止容器失败' || exit
echo "[check point] down successful..."

# 启动容器
docker-compose -f renren-generator/docker-compose-renren-generator.yml up -d || ! echo '[ERROR]容器启动失败' || exit
echo "[check point] starting up..."

# 清理虚悬镜像
docker image prune -a -f || ! echo '[ERROR]虚悬镜像清理失败' || exit
echo "[check point] clean suspended images successful"

echo "[check point] Congratulations! startup successful!"
61 changes: 61 additions & 0 deletions IceCMS-Docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 1,61 @@
version: '3.9'
services:
# 数据库
icecms-sql:
build:
context: ./icecms-sql
container_name: icecms-sql
image: icecms-sql
restart: always
ports:
- "0:3306"
#后台服务
icecms-api:
build:
context: ./icecms-api
# environment:
# MYSQL_SERVER: renren-mysql:3306
# MYSQL_USER: root
# MYSQL_PASSWORD: avit123
# JAVA_OPTS: "-server -XX: UseG1GC -Xmx2g -XX:MaxGCPauseMillis=200 -XX:-OmitStackTraceInFastThrow -XX: HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=logs/java_heapdump.hprof -XX:-UseLargePages -Xloggc:logs/gc.log -verbose:gc -XX: PrintGCDetails -XX: PrintGCDateStamps -XX: PrintGCTimeStamps -XX: UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M"
links:
- "icecms-sql:db"
container_name: icecms-api
image: icecms-api
restart: always
ports:
- "8181:8181"
# 前端UI
icecms-vue:
build:
context: ./icecms-vue
links:
- "icecms-api:iceApi"
restart: always
container_name: icecms-vue
image: icecms-vue
ports:
- "3000:80"
# me_traefik:
# restart: always
# image: traefik:1.7.4
# ports:
# - '80:80'
# - '443:443'
# labels:
# - 'traefik.backend=me_traefik'
# - 'traefik.frontend.rule=Host:traefik.testdomain.com'
# - 'traefik.enable=true'
# - 'traefik.passHostHeader=true'
# - 'traefik.protocol=https'
# - 'traefik.port=8090'
# volumes:
# - /var/run/docker.sock:/var/run/docker.sock
# - ./traefik.toml:/traefik.toml
# - ./acme.json:/acme.json
# networks:
# - webgateway
# networks:
# webgateway:
# external:
# name: me_gateway
15 changes: 15 additions & 0 deletions IceCMS-Docker/icecms-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 1,15 @@
# 该镜像需要依赖的基础镜像
FROM openjdk:latest

# 指定维护者的名字
MAINTAINER ttice

# 将指定目录下的jar包复制到docker容器的/export/Apps/springboot-admin目录下
COPY main.jar /export/Apps/springboot-admin/main.jar

# 声明服务运行在8080端口
EXPOSE 8181

# 指定docker容器启动时运行jar包
ENTRYPOINT ["java","-Xmx128m","-Xss256k","-XX:ParallelGCThreads=2","-Djava.compiler=NONE", "-jar","/export/Apps/springboot-admin/main.jar"]

16 changes: 16 additions & 0 deletions IceCMS-Docker/icecms-sql/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 1,16 @@
FROM mysql:8.0
MAINTAINER BolingCavalry <[email protected]>

ENV WORK_PATH /usr/local/work
ENV AUTO_RUN_DIR /docker-entrypoint-initdb.d

ENV MYSQL_ROOT_PASSWORD 123456789

ENV FILE_0 IceCMS.sql
ENV INSTALL_DATA_SHELL setup.sh

RUN mkdir -p $WORK_PATH
COPY ./$FILE_0 $WORK_PATH/
COPY ./$INSTALL_DATA_SHELL $AUTO_RUN_DIR/
EXPOSE 3306
RUN chmod a x $AUTO_RUN_DIR/$INSTALL_DATA_SHELL
1,464 changes: 1,464 additions & 0 deletions IceCMS-Docker/icecms-sql/IceCMS.sql

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions IceCMS-Docker/icecms-sql/privileges.sql
Original file line number Diff line number Diff line change
@@ -0,0 1,8 @@
use mysql;
select host, user from user;
-- 因为mysql版本是5.7,因此新建用户为如下命令:
create user docker identified by '123456789';
-- 将docker_mysql数据库的权限授权给创建的docker用户,密码为123456:
grant all on docker_mysql.* to docker@'%' identified by '123456789' with grant option;
-- 这一条命令一定要有:
flush privileges;
3 changes: 3 additions & 0 deletions IceCMS-Docker/icecms-sql/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 1,3 @@
#!/bin/bash
mysql -uroot -p$MYSQL_ROOT_PASSWORD <<EOF
source $WORK_PATH/$FILE_0;
5 changes: 5 additions & 0 deletions IceCMS-Docker/icecms-vue/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 1,5 @@
FROM nginx:latest
COPY dist/ /usr/share/nginx/html/
#将项目根目录下 dist 文件夹中的所有文件复制到镜像中 /usr/share/nginx/html/ 目录下;
COPY default.conf /etc/nginx/conf.d/default.conf
#将 default.conf 复制到 etc/nginx/conf.d/default.conf,用本地的 default.con
31 changes: 31 additions & 0 deletions IceCMS-Docker/icecms-vue/default.conf
Original file line number Diff line number Diff line change
@@ -0,0 1,31 @@
server {
listen 80;
server_name localhost;

#charset koi8-r;
access_log /var/log/nginx/host.access.log main;
error_log /var/log/nginx/error.log error;

location / {
try_files $uri $uri/ /index.html;
root /usr/share/nginx/html;
index index.html index.htm;
}
# 设置接口代理,适用vue项目中配置反向代理的情况,不需要不开
location ^~/api/ {
rewrite /api/(.*) /$1 break;
add_header Access-Control-Allow-Methods *;
add_header Access-Control-Allow-Origin $http_origin;
add_header Access-Control-Allow-Credentials true;
proxy_pass http://iceApi:8181/;
}

#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 /usr/share/nginx/html;
}
}
1 change: 1 addition & 0 deletions IceCMS-Docker/icecms-vue/dist/index.html
Original file line number Diff line number Diff line change
@@ -0,0 1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/logo.svg><title></title><link href=/static/css/app.76054ede.css rel=preload as=style><link href=/static/css/chunk-elementUI.9e67df33.css rel=preload as=style><link href=/static/css/chunk-libs.3dfb7769.css rel=preload as=style><link href=/static/js/app.b1782fe0.js rel=preload as=script><link href=/static/js/chunk-elementUI.9762940c.js rel=preload as=script><link href=/static/js/chunk-libs.d1ad059f.js rel=preload as=script><link href=/static/css/chunk-elementUI.9e67df33.css rel=stylesheet><link href=/static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=/static/css/app.76054ede.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function(c){function e(e){for(var u,a,h=e[0],k=e[1],t=e[2],r=0,o=[];r<h.length;r )a=h[r],Object.prototype.hasOwnProperty.call(f,a)&&f[a]&&o.push(f[a][0]),f[a]=0;for(u in k)Object.prototype.hasOwnProperty.call(k,u)&&(c[u]=k[u]);b&&b(e);while(o.length)o.shift()();return d.push.apply(d,t||[]),n()}function n(){for(var c,e=0;e<d.length;e ){for(var n=d[e],u=!0,a=1;a<n.length;a ){var h=n[a];0!==f[h]&&(u=!1)}u&&(d.splice(e--,1),c=k(k.s=n[0]))}return c}var u={},a={runtime:0},f={runtime:0},d=[];function h(c){return k.p "static/js/" ({"chunk-commons":"chunk-commons"}[c]||c) "." {"chunk-0b30c506":"3717972a","chunk-399fe388":"7bb36840","chunk-3b4298c6":"d00f5de5","chunk-22eecdd6":"93a0d9b6","chunk-26df11ee":"59ddfa39","chunk-2d0b63a5":"bc2e944a","chunk-2d21e6fe":"0979feac","chunk-330da104":"4e3967cf","chunk-34a56ee0":"b85108e8","chunk-21300515":"7327c0ff","chunk-26fcafe0":"d1b9d41b","chunk-3732d2d6":"3aa711f0","chunk-3bca99f0":"ee08b958","chunk-3c2f8cf4":"809b5aa2","chunk-a9b7ac3e":"9fbf9304","chunk-c3573e8c":"dc18626e","chunk-e7eb55b8":"ead5d42a","chunk-39a26fc2":"5a799cc9","chunk-3c32f31c":"0fbe1f5a","chunk-3f66fd83":"a5c2ecc9","chunk-40cd251c":"030fab9a","chunk-4d6ec976":"9f325be6","chunk-63da7a98":"4d815863","chunk-76d51228":"63471e1c","chunk-fcecf75c":"8def74d4","chunk-78744ca3":"57e12870","chunk-9eae4e6a":"b5eaefc4","chunk-commons":"ad31ab1e","chunk-4d8c3aba":"f7497d33","chunk-dc6c0344":"90c72efc","chunk-3674aada":"9140f979","chunk-15475e8e":"11702d7c","chunk-7c3f443e":"3caefc3b","chunk-8b7f45e2":"23fe7468","chunk-b88b7ddc":"c6326f0d","chunk-4fc84ff8":"421c4fdd","chunk-570095ea":"6c769fc0","chunk-60dad59c":"b9684e3a","chunk-613049fb":"f8d4043b","chunk-6362d667":"aa6384a3","chunk-63dad890":"a61f6c42","chunk-8ceb9ad6":"3f32f02c","chunk-a32833a0":"ed11ff54","chunk-a85794b2":"0ef58e01","chunk-ad5aae70":"308f0c38","chunk-e9a0b188":"d944e182","chunk-4a6a470c":"e2207c59","chunk-2d212b99":"b7778d5a","chunk-3fbae9c0":"c874d63c","chunk-2d0d63ac":"0cb208c3","chunk-2d229b98":"303610f3","chunk-e73cfe26":"cc4881fa","chunk-2d221c14":"b64a8acb","chunk-2d22d3eb":"b9320122","chunk-f2dfa70a":"75df2161","chunk-e2104fd0":"2280ae4c"}[c] ".js"}function k(e){if(u[e])return u[e].exports;var n=u[e]={i:e,l:!1,exports:{}};return c[e].call(n.exports,n,n.exports,k),n.l=!0,n.exports}k.e=function(c){var e=[],n={"chunk-399fe388":1,"chunk-3b4298c6":1,"chunk-22eecdd6":1,"chunk-26df11ee":1,"chunk-330da104":1,"chunk-34a56ee0":1,"chunk-3732d2d6":1,"chunk-3bca99f0":1,"chunk-a9b7ac3e":1,"chunk-e7eb55b8":1,"chunk-39a26fc2":1,"chunk-3c32f31c":1,"chunk-3f66fd83":1,"chunk-40cd251c":1,"chunk-4d6ec976":1,"chunk-63da7a98":1,"chunk-76d51228":1,"chunk-fcecf75c":1,"chunk-78744ca3":1,"chunk-9eae4e6a":1,"chunk-commons":1,"chunk-4d8c3aba":1,"chunk-dc6c0344":1,"chunk-3674aada":1,"chunk-15475e8e":1,"chunk-7c3f443e":1,"chunk-8b7f45e2":1,"chunk-b88b7ddc":1,"chunk-570095ea":1,"chunk-613049fb":1,"chunk-6362d667":1,"chunk-63dad890":1,"chunk-8ceb9ad6":1,"chunk-a32833a0":1,"chunk-a85794b2":1,"chunk-4a6a470c":1,"chunk-3fbae9c0":1,"chunk-e73cfe26":1,"chunk-f2dfa70a":1,"chunk-e2104fd0":1};a[c]?e.push(a[c]):0!==a[c]&&n[c]&&e.push(a[c]=new Promise((function(e,n){for(var u="static/css/" ({"chunk-commons":"chunk-commons"}[c]||c) "." {"chunk-0b30c506":"31d6cfe0","chunk-399fe388":"58c36022","chunk-3b4298c6":"7ac84664","chunk-22eecdd6":"5affa2cc","chunk-26df11ee":"3965a2e1","chunk-2d0b63a5":"31d6cfe0","chunk-2d21e6fe":"31d6cfe0","chunk-330da104":"86b88463","chunk-34a56ee0":"7304f0b5","chunk-21300515":"31d6cfe0","chunk-26fcafe0":"31d6cfe0","chunk-3732d2d6":"5655f463","chunk-3bca99f0":"c94d712d","chunk-3c2f8cf4":"31d6cfe0","chunk-a9b7ac3e":"01449401","chunk-c3573e8c":"31d6cfe0","chunk-e7eb55b8":"fa6477ba","chunk-39a26fc2":"71748e32","chunk-3c32f31c":"9ebee28d","chunk-3f66fd83":"f4b50d96","chunk-40cd251c":"bfa1487f","chunk-4d6ec976":"bd427a34","chunk-63da7a98":"57ecf4dd","chunk-76d51228":"71a233fb","chunk-fcecf75c":"ab823bf0","chunk-78744ca3":"451e1ada","chunk-9eae4e6a":"48397311","chunk-commons":"3888b39d","chunk-4d8c3aba":"ea405d13","chunk-dc6c0344":"5f7705be","chunk-3674aada":"f333060c","chunk-15475e8e":"6e54656f","chunk-7c3f443e":"5b1cf7d2","chunk-8b7f45e2":"6e7d0f14","chunk-b88b7ddc":"03863940","chunk-4fc84ff8":"31d6cfe0","chunk-570095ea":"c5271ecc","chunk-60dad59c":"31d6cfe0","chunk-613049fb":"bac7f724","chunk-6362d667":"2a30ae2b","chunk-63dad890":"e130abe3","chunk-8ceb9ad6":"a0453740","chunk-a32833a0":"8d5c73d8","chunk-a85794b2":"fbbfad22","chunk-ad5aae70":"31d6cfe0","chunk-e9a0b188":"31d6cfe0","chunk-4a6a470c":"134cd1d3","chunk-2d212b99":"31d6cfe0","chunk-3fbae9c0":"8ef93b69","chunk-2d0d63ac":"31d6cfe0","chunk-2d229b98":"31d6cfe0","chunk-e73cfe26":"c45795f1","chunk-2d221c14":"31d6cfe0","chunk-2d22d3eb":"31d6cfe0","chunk-f2dfa70a":"9d200f94","chunk-e2104fd0":"2d8fbf46"}[c] ".css",f=k.p u,d=document.getElementsByTagName("link"),h=0;h<d.length;h ){var t=d[h],r=t.getAttribute("data-href")||t.getAttribute("href");if("stylesheet"===t.rel&&(r===u||r===f))return e()}var o=document.getElementsByTagName("style");for(h=0;h<o.length;h ){t=o[h],r=t.getAttribute("data-href");if(r===u||r===f)return e()}var b=document.createElement("link");b.rel="stylesheet",b.type="text/css",b.onload=e,b.onerror=function(e){var u=e&&e.target&&e.target.src||f,d=new Error("Loading CSS chunk " c " failed.\n(" u ")");d.code="CSS_CHUNK_LOAD_FAILED",d.request=u,delete a[c],b.parentNode.removeChild(b),n(d)},b.href=f;var i=document.getElementsByTagName("head")[0];i.appendChild(b)})).then((function(){a[c]=0})));var u=f[c];if(0!==u)if(u)e.push(u[2]);else{var d=new Promise((function(e,n){u=f[c]=[e,n]}));e.push(u[2]=d);var t,r=document.createElement("script");r.charset="utf-8",r.timeout=120,k.nc&&r.setAttribute("nonce",k.nc),r.src=h(c);var o=new Error;t=function(e){r.onerror=r.onload=null,clearTimeout(b);var n=f[c];if(0!==n){if(n){var u=e&&("load"===e.type?"missing":e.type),a=e&&e.target&&e.target.src;o.message="Loading chunk " c " failed.\n(" u ": " a ")",o.name="ChunkLoadError",o.type=u,o.request=a,n[1](o)}f[c]=void 0}};var b=setTimeout((function(){t({type:"timeout",target:r})}),12e4);r.onerror=r.onload=t,document.head.appendChild(r)}return Promise.all(e)},k.m=c,k.c=u,k.d=function(c,e,n){k.o(c,e)||Object.defineProperty(c,e,{enumerable:!0,get:n})},k.r=function(c){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(c,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(c,"__esModule",{value:!0})},k.t=function(c,e){if(1&e&&(c=k(c)),8&e)return c;if(4&e&&"object"===typeof c&&c&&c.__esModule)return c;var n=Object.create(null);if(k.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:c}),2&e&&"string"!=typeof c)for(var u in c)k.d(n,u,function(e){return c[e]}.bind(null,u));return n},k.n=function(c){var e=c&&c.__esModule?function(){return c["default"]}:function(){return c};return k.d(e,"a",e),e},k.o=function(c,e){return Object.prototype.hasOwnProperty.call(c,e)},k.p="/",k.oe=function(c){throw console.error(c),c};var t=window["webpackJsonp"]=window["webpackJsonp"]||[],r=t.push.bind(t);t.push=e,t=t.slice();for(var o=0;o<t.length;o )e(t[o]);var b=r;n()})([]);</script><script src=/static/js/chunk-elementUI.9762940c.js></script><script src=/static/js/chunk-libs.d1ad059f.js></script><script src=/static/js/app.b1782fe0.js></script></body></html>
1 change: 1 addition & 0 deletions IceCMS-Docker/icecms-vue/dist/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions IceCMS-Docker/icecms-vue/dist/static/css/app.76054ede.css

Large diffs are not rendered by default.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3353c6e

Please sign in to comment.